Changeset 33844 in osm for applications

Timestamp:

2017-11-21T01:18:27+01:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12987

Location:

applications/editors/josm/plugins/splinex

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/Splinex/DrawSplineAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/Splinex/Spline.java (modified) (8 diffs)
• src/org/openstreetmap/josm/plugins/Splinex/UndeleteNodeCommand.java (modified) (2 diffs)

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

@@ -5 +5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12663"/>
+    <property name="plugin.main.version" value="12987"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/splinex/src/org/openstreetmap/josm/plugins/Splinex/DrawSplineAction.java

@@ -28 +28 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -108 +108 @@
     @Override
     protected void readPreferences() {
-        rubberLineColor = new ColorProperty(marktr("helper line"), Color.RED).get();
-        initialMoveDelay = Main.pref.getInteger("edit.initial-move-", 200);
-        initialMoveThreshold = Main.pref.getInteger("edit.initial-move-threshold", 5);
+        rubberLineColor = new NamedColorProperty(marktr("helper line"), Color.RED).get();
+        initialMoveDelay = Main.pref.getInt("edit.initial-move-", 200);
+        initialMoveThreshold = Main.pref.getInt("edit.initial-move-threshold", 5);
         initialMoveThreshold *= initialMoveThreshold;
         drawHelperLine = Main.pref.getBoolean("draw.helper-line", true);

applications/editors/josm/plugins/splinex/src/org/openstreetmap/josm/plugins/Splinex/Spline.java

@@ -28 +28 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.Node;
@@ -251 +252 @@
         EastNorth a = sn.node.getEastNorth();
         EastNorth ca = a.add(sn.cnext);
+        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
         while (it.hasNext()) {
             sn = it.next();
@@ -265 +267 @@
                         return;
                     }
-                    cmds.add(new AddCommand(n));
+                    cmds.add(new AddCommand(ds, n));
                     w.addNode(n);
                 }
@@ -273 +275 @@
         }
         if (!cmds.isEmpty())
-            cmds.add(new AddCommand(w));
+            cmds.add(new AddCommand(ds, w));
         MainApplication.undoRedo.add(new FinishSplineCommand(cmds));
     }
@@ -301 +303 @@
 
         public AddSplineNodeCommand(SNode sn, boolean existing, int idx) {
+            super(MainApplication.getLayerManager().getEditDataSet());
             this.sn = sn;
             this.existing = existing;
@@ -362 +365 @@
 
         public DeleteSplineNodeCommand(int idx) {
+            super(MainApplication.getLayerManager().getEditDataSet());
             this.idx = idx;
         }
@@ -419 +423 @@
 
         public EditSplineCommand(SNode sn) {
+            super(MainApplication.getLayerManager().getEditDataSet());
             this.sn = sn;
             cprev = sn.cprev.add(0, 0);
@@ -458 +463 @@
 
     public class CloseSplineCommand extends Command {
+        
+        public CloseSplineCommand() {
+            super(MainApplication.getLayerManager().getEditDataSet());
+        }
+
         @Override
         public boolean executeCommand() {

applications/editors/josm/plugins/splinex/src/org/openstreetmap/josm/plugins/Splinex/UndeleteNodeCommand.java

@@ -10 +10 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
 
 class UndeleteNodeCommand extends Command {
@@ -16 +17 @@
 
     UndeleteNodeCommand(Node n) {
+        super(MainApplication.getLayerManager().getEditDataSet());
         this.n = n;
     }