Changeset 14153 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

Timestamp:

2018-08-13T02:18:54+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate Main.parent and Main itself

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (15 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -60 +60 @@
 import javax.swing.event.DocumentListener;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.DiskAccessAction;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
@@ -133 +132 @@
                 timezone = Timezone.parseTimezone(tfTimezone.getText().trim());
             } catch (ParseException e) {
-                JOptionPane.showMessageDialog(Main.parent, e.getMessage(),
+                JOptionPane.showMessageDialog(MainApplication.getMainFrame(), e.getMessage(),
                         tr("Invalid timezone"), JOptionPane.ERROR_MESSAGE);
                 return AGAIN;
@@ -141 +140 @@
                 delta = Offset.parseOffset(tfOffset.getText().trim());
             } catch (ParseException e) {
-                JOptionPane.showMessageDialog(Main.parent, e.getMessage(),
+                JOptionPane.showMessageDialog(MainApplication.getMainFrame(), e.getMessage(),
                         tr("Invalid offset"), JOptionPane.ERROR_MESSAGE);
                 return AGAIN;
@@ -147 +146 @@
 
             if (lastNumMatched == 0 && new ExtendedDialog(
-                        Main.parent,
+                        MainApplication.getMainFrame(),
                         tr("Correlate images with GPX track"),
                         tr("OK"), tr("Try Again")).
@@ -272 +271 @@
                         if (!sel.getName().equals(wrapper.name)) {
                             JOptionPane.showMessageDialog(
-                                    Main.parent,
+                                    MainApplication.getMainFrame(),
                                     tr("File {0} is loaded yet under the name \"{1}\"", sel.getName(), wrapper.name),
                                     tr("Error"),
@@ -291 +290 @@
                     Logging.error(ex);
                     JOptionPane.showMessageDialog(
-                            Main.parent,
+                            MainApplication.getMainFrame(),
                             tr("Error while parsing {0}", sel.getName())+": "+ex.getMessage(),
                             tr("Error"),
@@ -300 +299 @@
                     Logging.error(ex);
                     JOptionPane.showMessageDialog(
-                            Main.parent,
+                            MainApplication.getMainFrame(),
                             tr("Could not read \"{0}\"", sel.getName())+'\n'+ex.getMessage(),
                             tr("Error"),
@@ -490 +489 @@
             while (!isOk) {
                 int answer = JOptionPane.showConfirmDialog(
-                        Main.parent, panel,
+                        MainApplication.getMainFrame(), panel,
                         tr("Synchronize time from a photo of the GPS receiver"),
                         JOptionPane.OK_CANCEL_OPTION,
@@ -504 +503 @@
                     - dateFormat.parse(tfGpsTime.getText()).getTime();
                 } catch (ParseException e) {
-                    JOptionPane.showMessageDialog(Main.parent, tr("Error while parsing the date.\n"
+                    JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr("Error while parsing the date.\n"
                             + "Please use the requested format"),
                             tr("Invalid date"), JOptionPane.ERROR_MESSAGE);
@@ -723 +722 @@
         if (!GraphicsEnvironment.isHeadless()) {
             syncDialog = new ExtendedDialog(
-                    Main.parent,
+                    MainApplication.getMainFrame(),
                     tr("Correlate images with GPX track"),
                     new String[] {tr("Correlate"), tr("Cancel")},
@@ -932 +931 @@
             } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
                 Logging.warn(e);
-                JOptionPane.showMessageDialog(Main.parent,
+                JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                         tr("An error occurred while trying to match the photos to the GPX track."
                                 +" You can adjust the sliders to manually match the photos."),
@@ -950 +949 @@
             // immediately. Therefore "Close" is marked with an "OK" icon.
             // Settings are only saved temporarily to the layer.
-            new ExtendedDialog(Main.parent,
+            new ExtendedDialog(MainApplication.getMainFrame(),
                     tr("Adjust timezone and offset"),
                     tr("Close")).
@@ -1012 +1011 @@
             } catch (IndexOutOfBoundsException ex) {
                 Logging.debug(ex);
-                JOptionPane.showMessageDialog(Main.parent,
+                JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                         tr("The selected photos do not contain time information."),
                         tr("Photos do not contain time information"), JOptionPane.WARNING_MESSAGE);
@@ -1018 +1017 @@
             } catch (NoGpxTimestamps ex) {
                 Logging.debug(ex);
-                JOptionPane.showMessageDialog(Main.parent,
+                JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                         tr("The selected GPX track does not contain timestamps. Please select another one."),
                         tr("GPX Track has no time information"), JOptionPane.WARNING_MESSAGE);
@@ -1081 +1080 @@
         if (item == null || ((GpxDataWrapper) item).file == null) {
             if (complain) {
-                JOptionPane.showMessageDialog(Main.parent, tr("You should select a GPX track"),
+                JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr("You should select a GPX track"),
                         tr("No selected GPX track"), JOptionPane.ERROR_MESSAGE);
             }