Changeset 13277 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

Timestamp:

2018-01-04T16:00:01+01:00 (6 years ago)

Author:

stoecker

Message:

see #15734 - fix icon detection

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -72 +72 @@
 public class SelectAction extends MapMode implements ModifierExListener, KeyPressReleaseListener, SelectionEnded {
 
-    private static final String NORMAL = "normal";
+    private static final String NORMAL = /* ICON(cursor/)*/ "normal";
 
     /**
@@ -92 +92 @@
     enum SelectActionCursor {
 
-        rect(NORMAL, "selection"),
-        rect_add(NORMAL, "select_add"),
-        rect_rm(NORMAL, "select_remove"),
-        way(NORMAL, "select_way"),
-        way_add(NORMAL, "select_way_add"),
-        way_rm(NORMAL, "select_way_remove"),
-        node(NORMAL, "select_node"),
-        node_add(NORMAL, "select_node_add"),
-        node_rm(NORMAL, "select_node_remove"),
-        virtual_node(NORMAL, "addnode"),
-        scale("scale", null),
-        rotate("rotate", null),
-        merge("crosshair", null),
-        lasso(NORMAL, "rope"),
-        merge_to_node("crosshair", "joinnode"),
+        rect(NORMAL, /* ICON(cursor/modifier/)*/ "selection"), 
+        rect_add(NORMAL, /* ICON(cursor/modifier/)*/ "select_add"),
+        rect_rm(NORMAL, /* ICON(cursor/modifier/)*/ "select_remove"),
+        way(NORMAL, /* ICON(cursor/modifier/)*/ "select_way"),
+        way_add(NORMAL, /* ICON(cursor/modifier/)*/ "select_way_add"),
+        way_rm(NORMAL, /* ICON(cursor/modifier/)*/ "select_way_remove"),
+        node(NORMAL, /* ICON(cursor/modifier/)*/ "select_node"),
+        node_add(NORMAL, /* ICON(cursor/modifier/)*/ "select_node_add"),
+        node_rm(NORMAL, /* ICON(cursor/modifier/)*/ "select_node_remove"),
+        virtual_node(NORMAL, /* ICON(cursor/modifier/)*/ "addnode"),
+        scale(/* ICON(cursor/)*/ "scale", null), 
+        rotate(/* ICON(cursor/)*/ "rotate", null),
+        merge(/* ICON(cursor/)*/ "crosshair", null),
+        lasso(NORMAL, /* ICON(cursor/modifier/)*/ "rope"), 
+        merge_to_node(/* ICON(cursor/)*/ "crosshair", /* ICON(cursor/modifier/)*/"joinnode"),
         move(Cursor.MOVE_CURSOR);