Changeset 34425 in osm

Timestamp:

2018-07-17T19:29:40+02:00 (6 years ago)

Author:

nzara

Message:

bug fix

Location:

applications/editors/josm/plugins/pdfimport/src/pdfimport

Files:

• LoadPdfDialog.java (modified) (4 diffs)
• PdfImportAction.java (modified) (1 diff)

applications/editors/josm/plugins/pdfimport/src/pdfimport/LoadPdfDialog.java

@@ -300 +300 @@
                         actionPanel.showButton.setVisible(false);
                         setSize(new Dimension(380, 350));
-                        loadAction();
+                        if (!loadAction()) {
+                                cancelAction();
+                                return;
+                        }
                 } else {
                         setSize(new Dimension(450, 600));
-//                      setSize(450, 600);
-                }
+                }
+                setAlwaysOnTop(true);
+                setVisible(true);
         }
 
@@ -360 +364 @@
         }
 
-         private void loadAction() {
+         private boolean loadAction() {
                  /*
                   * perform load PDF file to preview
@@ -368 +372 @@
 
                 if (newFileName == null) {
-                        if (Preferences.getGuiMode() == Preferences.GuiMode.Simple) {
-                                cancelAction();
-                        } else
-                                return;
+                        return false;
                 }
                 Logging.debug("PdfImport: Load Preview");
@@ -425 +426 @@
                         }
                 });
+                return true;
         }
 

applications/editors/josm/plugins/pdfimport/src/pdfimport/PdfImportAction.java

@@ -37 +37 @@
          */
         LoadPdfDialog dialog = new LoadPdfDialog();
-        dialog.setAlwaysOnTop(true);
         dialog.setTitle(tr("Import PDF"));
-        dialog.setVisible(true);
     }
 }