Changeset 11913 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2017-04-15T01:38:46+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S1192 - String literals should not be duplicated

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• mapmode/ImproveWayAccuracyAction.java (modified) (2 diffs)
• mapmode/SelectAction.java (modified) (2 diffs)
• upload/FixDataHook.java (modified) (2 diffs)

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

@@ -57 +57 @@
         SelectionChangedListener, ModifierListener {
 
+    private static final String CROSSHAIR = "crosshair";
+
     private enum State {
         SELECTING, IMPROVING
@@ -76 +78 @@
     private final Cursor cursorSelect = ImageProvider.getCursor("normal", "mode");
     private final Cursor cursorSelectHover = ImageProvider.getCursor("hand", "mode");
-    private final Cursor cursorImprove = ImageProvider.getCursor("crosshair", null);
-    private final Cursor cursorImproveAdd = ImageProvider.getCursor("crosshair", "addnode");
-    private final Cursor cursorImproveDelete = ImageProvider.getCursor("crosshair", "delete_node");
-    private final Cursor cursorImproveAddLock = ImageProvider.getCursor("crosshair", "add_node_lock");
-    private final Cursor cursorImproveLock = ImageProvider.getCursor("crosshair", "lock");
+    private final Cursor cursorImprove = ImageProvider.getCursor(CROSSHAIR, null);
+    private final Cursor cursorImproveAdd = ImageProvider.getCursor(CROSSHAIR, "addnode");
+    private final Cursor cursorImproveDelete = ImageProvider.getCursor(CROSSHAIR, "delete_node");
+    private final Cursor cursorImproveAddLock = ImageProvider.getCursor(CROSSHAIR, "add_node_lock");
+    private final Cursor cursorImproveLock = ImageProvider.getCursor(CROSSHAIR, "lock");
 
     private Color guideColor;

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

@@ -68 +68 @@
 public class SelectAction extends MapMode implements ModifierListener, KeyPressReleaseListener, SelectionEnded {
 
+    private static final String NORMAL = "normal";
+
     /**
      * Select action mode.
@@ -85 +87 @@
     // contains all possible cases the cursor can be in the SelectAction
     private enum SelectActionCursor {
-        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("crosshair", /* ICON(cursor/modifier/) */ "joinnode"),
+
+        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"),
         move(Cursor.MOVE_CURSOR);
 

trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java

@@ -27 +27 @@
 public class FixDataHook implements UploadHook {
 
+    private static final String ONEWAY = "oneway";
+
     /**
      * List of checks to run on data
@@ -40 +42 @@
         deprecated.add(new FixDataKey("color",            "colour"));
         deprecated.add(new FixDataTag("highway", "ford",  "ford",    "yes"));
-        deprecated.add(new FixDataTag("oneway",  "false", "oneway",  "no"));
-        deprecated.add(new FixDataTag("oneway",  "0",     "oneway",  "no"));
-        deprecated.add(new FixDataTag("oneway",  "true",  "oneway",  "yes"));
-        deprecated.add(new FixDataTag("oneway",  "1",     "oneway",  "yes"));
+        deprecated.add(new FixDataTag(ONEWAY,    "false",  ONEWAY,   "no"));
+        deprecated.add(new FixDataTag(ONEWAY,    "0",      ONEWAY,   "no"));
+        deprecated.add(new FixDataTag(ONEWAY,    "true",   ONEWAY,   "yes"));
+        deprecated.add(new FixDataTag(ONEWAY,    "1",      ONEWAY,   "yes"));
         deprecated.add(new FixDataTag("highway", "stile", "barrier", "stile"));
         // CHECKSTYLE.ON: SingleSpaceSeparator