Changeset 33835 in osm

Timestamp:

2017-11-17T21:34:13+01:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12840

Location:

applications/editors/josm/plugins/undelete

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/undelete/Undelete.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/undelete/UndeleteAction.java (modified) (8 diffs)

applications/editors/josm/plugins/undelete/build.xml

@@ -4 +4 @@
     <property name="commit.message" value="adapt to core changes (backwards compatible)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="12840"/>
 
     <property name="plugin.author" value="Nakor"/>

applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.undelete;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -11 +11 @@
     public Undelete(PluginInformation info) {
         super(info);
-        MainMenu.addAfter(Main.main.menu.fileMenu, new UndeleteAction(), false, Main.main.menu.updateModified);
+        MainMenu.addAfter(MainApplication.getMenu().fileMenu, new UndeleteAction(), false, MainApplication.getMenu().updateModified);
     }
 }

applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/UndeleteAction.java

@@ -31 +31 @@
 import org.openstreetmap.josm.data.osm.history.HistoryRelation;
 import org.openstreetmap.josm.data.osm.history.HistoryWay;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.history.HistoryLoadTask;
@@ -36 +37 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -66 +68 @@
 
                         if (h == null) {
-                            Main.warn("Cannot find history for " + type + " " + id);
+                            Logging.warn("Cannot find history for " + type + " " + id);
                             return;
                         }
@@ -171 +173 @@
                                   : null;
                                 GuiHelper.runInEDT(() -> new Notification(msg).setIcon(JOptionPane.WARNING_MESSAGE).show());
-                                Main.warn(msg);
+                                Logging.warn(msg);
                             }
                         }
                     } catch (Exception t) {
-                        Main.error(t);
+                        Logging.error(t);
                     }
                 }
@@ -184 +186 @@
             if (parent instanceof Way && !nodes.isEmpty()) {
                 ((Way) parent).setNodes(nodes);
-                Main.map.repaint();
+                MainApplication.getMap().repaint();
             }
             GuiHelper.runInEDT(() -> AutoScaleAction.zoomTo(layer.data.allNonDeletedPrimitives()));
@@ -200 +202 @@
         if (dialog.showDialog().getValue() != 1)
             return;
-        Main.pref.put("undelete.newlayer", dialog.isNewLayerSelected());
+        Main.pref.putBoolean("undelete.newlayer", dialog.isNewLayerSelected());
         Main.pref.put("undelete.osmid", dialog.getOsmIdsString());
         undelete(dialog.isNewLayerSelected(), dialog.getOsmIds(), null);
@@ -210 +212 @@
     public void undelete(boolean newLayer, final List<PrimitiveId> ids, final OsmPrimitive parent) {
 
-        Main.info("Undeleting "+ids+(parent == null ? "" : " with parent "+parent));
-
-        OsmDataLayer tmpLayer = Main.getLayerManager().getEditLayer();
+        Logging.info("Undeleting "+ids+(parent == null ? "" : " with parent "+parent));
+
+        OsmDataLayer tmpLayer = MainApplication.getLayerManager().getEditLayer();
         if ((tmpLayer == null) || newLayer) {
             tmpLayer = new OsmDataLayer(new DataSet(), OsmDataLayer.createNewName(), null);
-            Main.getLayerManager().addLayer(tmpLayer);
+            MainApplication.getLayerManager().addLayer(tmpLayer);
         }
 
@@ -225 +227 @@
         }
 
-        Main.worker.execute(task);
-        Main.worker.submit(new Worker(parent, layer, ids));
+        MainApplication.worker.execute(task);
+        MainApplication.worker.submit(new Worker(parent, layer, ids));
     }
 }