Changeset 34568 in osm for applications

Timestamp:

2018-08-18T20:51:52+02:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14153

Location:

applications/editors/josm/plugins/undelete

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/undelete/UndeleteAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/undelete/UndeleteDialog.java (modified) (3 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="13914"/>
+    <property name="plugin.main.version" value="14153"/>
 
     <property name="plugin.author" value="Nakor"/>

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

@@ -12 +12 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.JosmAction;
@@ -37 +36 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -199 +199 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        UndeleteDialog dialog = new UndeleteDialog(Main.parent);
+        UndeleteDialog dialog = new UndeleteDialog(MainApplication.getMainFrame());
         if (dialog.showDialog().getValue() != 1)
             return;
-        Main.pref.putBoolean("undelete.newlayer", dialog.isNewLayerSelected());
-        Main.pref.put("undelete.osmid", dialog.getOsmIdsString());
+        Config.getPref().putBoolean("undelete.newlayer", dialog.isNewLayerSelected());
+        Config.getPref().put("undelete.osmid", dialog.getOsmIdsString());
         undelete(dialog.isNewLayerSelected(), dialog.getOsmIds(), null);
     }

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

@@ -15 +15 @@
 import javax.swing.KeyStroke;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.widgets.OsmIdTextField;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 public class UndeleteDialog extends ExtendedDialog {
@@ -36 +36 @@
         all.add(new JLabel(tr("Object ID:")), gc);
 
-        tfId.setText(Main.pref.get("undelete.osmid"));
+        tfId.setText(Config.getPref().get("undelete.osmid"));
         tfId.setToolTipText(tr("Enter the type and ID of the objects that should be undeleted, e.g., ''n1 w2''"));
         // forward the enter key stroke to the undelete button
@@ -49 +49 @@
 
         layer.setToolTipText(tr("Select if the data should be added into a new layer"));
-        layer.setSelected(Main.pref.getBoolean("undelete.newlayer"));
+        layer.setSelected(Config.getPref().getBoolean("undelete.newlayer"));
         all.add(layer, gc);
         setContent(all, false);