Changeset 10220 in josm for trunk/src

Timestamp:

2016-05-15T19:51:21+02:00 (8 years ago)

Author:

Don-vip

Message:

add new icons for ParallelWayAction + findbugs - DB_DUPLICATE_BRANCHES

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• mapmode/ParallelWayAction.java (modified) (10 diffs)
• search/SearchCompiler.java (modified) (1 diff)

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

@@ -55 +55 @@
  * 4. Visual cues could be better
  *
- * 5. Cursors (Half-done)
- *
- * 6. (long term) Parallelize and adjust offsets of existing ways
+ * 5. (long term) Parallelize and adjust offsets of existing ways
  *
  * == Code quality ==
@@ -83 +81 @@
 
     private enum Mode {
-        dragging, normal
+        DRAGGING, NORMAL
     }
 
@@ -145 +143 @@
     public void enterMode() {
         // super.enterMode() updates the status line and cursor so we need our state to be set correctly
-        setMode(Mode.normal);
+        setMode(Mode.NORMAL);
         pWays = null;
         updateAllPreferences(); // All default values should've been set now
@@ -190 +188 @@
         // TODO: dynamic messages based on preferences. (Could be problematic translation wise)
         switch (mode) {
-        case normal:
+        case NORMAL:
             // CHECKSTYLE.OFF: LineLength
             return tr("Select ways as in Select mode. Drag selected ways or a single way to create a parallel copy (Alt toggles tag preservation)");
             // CHECKSTYLE.ON: LineLength
-        case dragging:
+        case DRAGGING:
             return tr("Hold Ctrl to toggle snapping");
         }
@@ -203 +201 @@
     private void updateAllPreferences() {
         updateModeLocalPreferences();
-        // @formatter:off
-        // @formatter:on
     }
 
@@ -252 +248 @@
         Cursor newCursor = null;
         switch (mode) {
-        case normal:
+        case NORMAL:
             if (matchesCurrentModifiers(setSelectedModifierCombo)) {
                 newCursor = ImageProvider.getCursor("normal", "parallel");
             } else if (matchesCurrentModifiers(addToSelectionModifierCombo)) {
-                newCursor = ImageProvider.getCursor("normal", "parallel"); // FIXME
+                newCursor = ImageProvider.getCursor("normal", "parallel_add");
             } else if (matchesCurrentModifiers(toggleSelectedModifierCombo)) {
-                newCursor = ImageProvider.getCursor("normal", "parallel"); // FIXME
-            } else if (Main.isDebugEnabled()) {
-                // TODO: set to a cursor indicating an error
-                Main.debug("TODO: set an error cursor");
+                newCursor = ImageProvider.getCursor("normal", "parallel_remove");
             }
             break;
-        case dragging:
-            if (snap) {
-                // TODO: snapping cursor?
-                newCursor = Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR);
-            } else {
-                newCursor = Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR);
-            }
+        case DRAGGING:
+            newCursor = Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR);
+            break;
+        default: throw new AssertionError();
         }
         if (newCursor != null) {
@@ -352 +342 @@
                 addSourceWay(nearestWay);
             } // else -> invalid modifier combination
-        } else if (mode == Mode.dragging) {
+        } else if (mode == Mode.DRAGGING) {
             clearSourceWays();
         }
 
-        setMode(Mode.normal);
+        setMode(Mode.NORMAL);
         resetMouseTrackingState();
         mv.repaint();
@@ -392 +382 @@
         mouseHasBeenDragged = true;
 
-        if (mode == Mode.normal) {
+        if (mode == Mode.NORMAL) {
             // Should we ensure that the copyTags modifiers are still valid?
 
@@ -401 +391 @@
             if (!initParallelWays(mousePressedPos, copyTags))
                 return;
-            setMode(Mode.dragging);
+            setMode(Mode.DRAGGING);
         }
 
@@ -465 +455 @@
     @Override
     public void paint(Graphics2D g, MapView mv, Bounds bbox) {
-        if (mode == Mode.dragging) {
+        if (mode == Mode.DRAGGING) {
             // sanity checks
             if (mv == null)

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -611 +611 @@
                 this.value = value;
 
-            } else if (caseSensitive) {
-                this.key = key;
-                this.value = value;
-                this.keyPattern = null;
-                this.valuePattern = null;
             } else {
                 this.key = key;