Changeset 33238 in osm for applications/editors/josm/plugins/CommandLine/src

Timestamp:

2017-04-14T23:33:58+02:00 (8 years ago)

Author:

donvip

Message:

update to JOSM 11713

Location:

applications/editors/josm/plugins/CommandLine/src/CommandLine

Files:

• AbstractOsmAction.java (modified) (2 diffs)
• AnyAction.java (modified) (1 diff)
• CommandLine.java (modified) (3 diffs)
• DummyAction.java (modified) (2 diffs)
• LengthAction.java (modified) (2 diffs)
• NodeAction.java (modified) (1 diff)
• PointAction.java (modified) (2 diffs)
• RelationAction.java (modified) (2 diffs)
• WayAction.java (modified) (1 diff)

applications/editors/josm/plugins/CommandLine/src/CommandLine/AbstractOsmAction.java

@@ -15 +15 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -27 +26 @@
     private boolean isCtrlDown;
 
-    protected AbstractOsmAction(MapFrame mapFrame, CommandLine parentPlugin, String activeCursorIcon) {
-        super(null, "addsegment.png", null, mapFrame, ImageProvider.getCursor("normal", "selection"));
+    protected AbstractOsmAction(CommandLine parentPlugin, String activeCursorIcon) {
+        super(null, "addsegment.png", null, ImageProvider.getCursor("normal", "selection"));
         this.parentPlugin = parentPlugin;
         cursorNormal = ImageProvider.getCursor("normal", "selection");

applications/editors/josm/plugins/CommandLine/src/CommandLine/AnyAction.java

@@ -6 +6 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.MapFrame;
 
 public class AnyAction extends AbstractOsmAction<OsmPrimitive> {
 
-    public AnyAction(MapFrame mapFrame, CommandLine parentPlugin) {
-        super(mapFrame, parentPlugin, "joinnode");
+    public AnyAction(CommandLine parentPlugin) {
+        super(parentPlugin, "joinnode");
     }
 

applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLine.java

@@ -239 +239 @@
             switch (currentType) {
             case POINT:
-                action = new PointAction(currentMapFrame, this);
+                action = new PointAction(this);
                 break;
             case WAY:
-                action = new WayAction(currentMapFrame, this);
+                action = new WayAction(this);
                 break;
             case NODE:
-                action = new NodeAction(currentMapFrame, this);
+                action = new NodeAction(this);
                 break;
             case RELATION:
-                action = new RelationAction(currentMapFrame, this);
+                action = new RelationAction(this);
                 break;
             case ANY:
-                action = new AnyAction(currentMapFrame, this);
+                action = new AnyAction(this);
                 break;
             case LENGTH:
-                action = new LengthAction(currentMapFrame, this);
+                action = new LengthAction(this);
                 break;
             case USERNAME:
                 loadParameter(Main.pref.get("osm-server.username", null), true);
-                action = new DummyAction(currentMapFrame, this);
+                action = new DummyAction(this);
                 break;
             case IMAGERYURL:
@@ -278 +278 @@
                     loadParameter(url.isEmpty() ? info.getImageryType().getTypeString() : url, true);
                 }
-                action = new DummyAction(currentMapFrame, this);
+                action = new DummyAction(this);
                 break;
             case IMAGERYOFFSET:
@@ -294 +294 @@
                 }
                 loadParameter((String.valueOf(((ImageryLayer) olayer).getDx()) + "," + String.valueOf(((ImageryLayer) olayer).getDy())), true);
-                action = new DummyAction(currentMapFrame, this);
+                action = new DummyAction(this);
                 break;
             default:
-                action = new DummyAction(currentMapFrame, this);
+                action = new DummyAction(this);
                 break;
             }

applications/editors/josm/plugins/CommandLine/src/CommandLine/DummyAction.java

@@ -8 +8 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
-import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -14 +13 @@
     private final CommandLine parentPlugin;
 
-    public DummyAction(MapFrame mapFrame, CommandLine parentPlugin) {
-            super(null, "addsegment.png", null, mapFrame, ImageProvider.getCursor("normal", null));
+    public DummyAction(CommandLine parentPlugin) {
+            super(null, "addsegment.png", null, ImageProvider.getCursor("normal", null));
             this.parentPlugin = parentPlugin;
     }

applications/editors/josm/plugins/CommandLine/src/CommandLine/LengthAction.java

@@ -24 +24 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -45 +45 @@
     private boolean drawing;
 
-    public LengthAction(MapFrame mapFrame, CommandLine parentPlugin) {
-        super(null, "addsegment.png", null, mapFrame, ImageProvider.getCursor("crosshair", null));
+    public LengthAction(CommandLine parentPlugin) {
+        super(null, "addsegment.png", null, ImageProvider.getCursor("crosshair", null));
         this.parentPlugin = parentPlugin;
-        selectedColor = Main.pref.getColor(marktr("selected"), Color.red);
+        selectedColor = new ColorProperty(marktr("selected"), Color.red).get();
         cursorCrosshair = ImageProvider.getCursor("crosshair", null);
         cursorJoinNode = ImageProvider.getCursor("crosshair", "joinnode");

applications/editors/josm/plugins/CommandLine/src/CommandLine/NodeAction.java

@@ -7 +7 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.MapFrame;
 
 public class NodeAction extends AbstractOsmAction<Node> {
 
-    public NodeAction(MapFrame mapFrame, CommandLine parentPlugin) {
-        super(mapFrame, parentPlugin, "joinnode");
+    public NodeAction(CommandLine parentPlugin) {
+        super(parentPlugin, "joinnode");
     }
 

applications/editors/josm/plugins/CommandLine/src/CommandLine/PointAction.java

@@ -21 +21 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -34 +33 @@
     private boolean isCtrlDown;
 
-    public PointAction(MapFrame mapFrame, CommandLine parentPlugin) {
-        super(null, "addsegment.png", null, mapFrame, ImageProvider.getCursor("crosshair", null));
+    public PointAction(CommandLine parentPlugin) {
+        super(null, "addsegment.png", null, ImageProvider.getCursor("crosshair", null));
         this.parentPlugin = parentPlugin;
         cursorCrosshair = ImageProvider.getCursor("crosshair", null);

applications/editors/josm/plugins/CommandLine/src/CommandLine/RelationAction.java

@@ -8 +8 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
-import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -14 +13 @@
     private final CommandLine parentPlugin;
 
-    public RelationAction(MapFrame mapFrame, CommandLine parentPlugin) {
-        super(null, "addsegment.png", null, mapFrame, ImageProvider.getCursor("normal", null));
+    public RelationAction(CommandLine parentPlugin) {
+        super(null, "addsegment.png", null, ImageProvider.getCursor("normal", null));
         this.parentPlugin = parentPlugin;
     }

applications/editors/josm/plugins/CommandLine/src/CommandLine/WayAction.java

@@ -7 +7 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.MapFrame;
 
 public class WayAction extends AbstractOsmAction<Way> {
 
-    public WayAction(MapFrame mapFrame, CommandLine parentPlugin) {
-        super(mapFrame, parentPlugin, "joinway");
+    public WayAction(CommandLine parentPlugin) {
+        super(parentPlugin, "joinway");
     }