Changeset 14153 in josm for trunk/src/org/openstreetmap/josm/gui/history

Timestamp:

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

Author:

Don-vip

Message:

see #15229 - deprecate Main.parent and Main itself

Location:

trunk/src/org/openstreetmap/josm/gui/history

Files:

• HistoryBrowserDialog.java (modified) (2 diffs)
• HistoryBrowserDialogManager.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java

@@ -18 +18 @@
 import javax.swing.JPanel;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.history.History;
@@ -48 +47 @@
      */
     public HistoryBrowserDialog(History history) {
-        super(GuiHelper.getFrameForComponent(Main.parent), false);
+        super(GuiHelper.getFrameForComponent(MainApplication.getMainFrame()), false);
         build();
         setHistory(history);

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java

@@ -19 +19 @@
 import javax.swing.SwingUtilities;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.history.History;
@@ -225 +224 @@
         if (notNewPrimitives.isEmpty()) {
             JOptionPane.showMessageDialog(
-                    Main.parent,
+                    MainApplication.getMainFrame(),
                     tr("Please select at least one already uploaded node, way, or relation."),
                     tr("Warning"),