Changeset 34557 in osm for applications

Timestamp:

2018-08-18T20:17:12+02:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14153

Location:

applications/editors/josm/plugins/splinex

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/Splinex/DrawSplineAction.java (modified) (12 diffs)
• src/org/openstreetmap/josm/plugins/Splinex/Spline.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/Splinex/SplineHitTest.java (modified) (1 diff)

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="12987"/>
+    <property name="plugin.main.version" value="14153"/>
 
     <!-- Configure these properties (replace "..." accordingly).

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

@@ -19 +19 @@
 import javax.swing.AbstractAction;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.MoveCommand;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.Node;
@@ -29 +29 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
 import org.openstreetmap.josm.data.preferences.NamedColorProperty;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -45 +46 @@
 import org.openstreetmap.josm.plugins.Splinex.Spline.PointHandle;
 import org.openstreetmap.josm.plugins.Splinex.Spline.SplinePoint;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
@@ -109 +111 @@
     protected void readPreferences() {
         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);
+        initialMoveDelay = Config.getPref().getInt("edit.initial-move-", 200);
+        initialMoveThreshold = Config.getPref().getInt("edit.initial-move-threshold", 5);
         initialMoveThreshold *= initialMoveThreshold;
-        drawHelperLine = Main.pref.getBoolean("draw.helper-line", true);
+        drawHelperLine = Config.getPref().getBoolean("draw.helper-line", true);
     }
 
@@ -165 +167 @@
             if (!spl.isClosed() && spl.nodeCount() > 1 && ph != null && ph.point == SplinePoint.ENDPOINT
                     && ((ph.idx == 0 && direction == 1) || (ph.idx == spl.nodeCount() - 1 && direction == -1))) {
-                MainApplication.undoRedo.add(spl.new CloseSplineCommand());
+                UndoRedoHandler.getInstance().add(spl.new CloseSplineCommand());
                 return;
             }
@@ -185 +187 @@
                         + ph.sn.cnext.north()) < EPSILON);
             }
-            if (ph.point == SplinePoint.ENDPOINT && !MainApplication.undoRedo.commands.isEmpty()) {
-                Command cmd = MainApplication.undoRedo.commands.getLast();
+            if (ph.point == SplinePoint.ENDPOINT && !UndoRedoHandler.getInstance().commands.isEmpty()) {
+                Command cmd = UndoRedoHandler.getInstance().commands.getLast();
                 if (cmd instanceof MoveCommand) {
                     mc = (MoveCommand) cmd;
@@ -196 +198 @@
                 }
             }
-            if (ph.point != SplinePoint.ENDPOINT && !MainApplication.undoRedo.commands.isEmpty()) {
-                Command cmd = MainApplication.undoRedo.commands.getLast();
+            if (ph.point != SplinePoint.ENDPOINT && !UndoRedoHandler.getInstance().commands.isEmpty()) {
+                Command cmd = UndoRedoHandler.getInstance().commands.getLast();
                 if (!(cmd instanceof Spline.EditSplineCommand && ((Spline.EditSplineCommand) cmd).sn == ph.sn))
                     dragControl = true;
@@ -224 +226 @@
         }
         int idx = direction == -1 ? 0 : spl.nodeCount();
-        MainApplication.undoRedo.add(spl.new AddSplineNodeCommand(new Spline.SNode(n), existing, idx));
+        UndoRedoHandler.getInstance().add(spl.new AddSplineNodeCommand(new Spline.SNode(n), existing, idx));
         ph = spl.new PointHandle(idx, direction == -1 ? SplinePoint.CONTROL_PREV : SplinePoint.CONTROL_NEXT);
         lockCounterpart = true;
@@ -257 +259 @@
             return;
         EastNorth en = MainApplication.getMap().mapView.getEastNorth(e.getX(), e.getY());
-        if (Main.getProjection().eastNorth2latlon(en).isOutSideWorld())
+        if (ProjectionRegistry.getProjection().eastNorth2latlon(en).isOutSideWorld())
             return;
         if (dragSpline) {
             if (mc == null) {
                 mc = new MoveCommand(spl.getNodes(), MainApplication.getMap().mapView.getEastNorth(clickPos.x, clickPos.y), en);
-                MainApplication.undoRedo.add(mc);
+                UndoRedoHandler.getInstance().add(mc);
                 clickPos = null;
             } else
@@ -274 +276 @@
             if (mc == null) {
                 mc = new MoveCommand(ph.sn.node, ph.sn.node.getEastNorth(), en);
-                MainApplication.undoRedo.add(mc);
+                UndoRedoHandler.getInstance().add(mc);
             } else
                 mc.applyVectorTo(en);
         } else {
             if (dragControl) {
-                MainApplication.undoRedo.add(new Spline.EditSplineCommand(ph.sn));
+                UndoRedoHandler.getInstance().add(new Spline.EditSplineCommand(ph.sn));
                 dragControl = false;
             }
@@ -400 +402 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            MainApplication.undoRedo.undo();
+            UndoRedoHandler.getInstance().undo();
         }
     }
@@ -448 +450 @@
             if (spl.nodeCount() == 3 && spl.isClosed() && ph.idx == 1)
                 return; // Don't allow to delete node when it results with two-node closed spline
-            MainApplication.undoRedo.add(spl.new DeleteSplineNodeCommand(ph.idx));
+            UndoRedoHandler.getInstance().add(spl.new DeleteSplineNodeCommand(ph.idx));
             e.consume();
         }

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

@@ -23 +23 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -34 +34 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
@@ -261 +262 @@
             if (!a.equalsEpsilon(ca, EPSILON) || !b.equalsEpsilon(cb, EPSILON))
                 for (int i = 1; i < detail; i++) {
-                    Node n = new Node(Main.getProjection().eastNorth2latlon(
+                    Node n = new Node(ProjectionRegistry.getProjection().eastNorth2latlon(
                             cubicBezier(a, ca, cb, b, (double) i / detail)));
                     if (n.getCoor().isOutSideWorld()) {
-                        JOptionPane.showMessageDialog(Main.parent, tr("Spline goes outside of the world."));
+                        JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr("Spline goes outside of the world."));
                         return;
                     }
@@ -276 +277 @@
         if (!cmds.isEmpty())
             cmds.add(new AddCommand(ds, w));
-        MainApplication.undoRedo.add(new FinishSplineCommand(cmds));
+        UndoRedoHandler.getInstance().add(new FinishSplineCommand(cmds));
     }
 

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

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.Splinex;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.Logging;