Changeset 34654 in osm

Timestamp:

2018-09-15T14:14:38+02:00 (6 years ago)

Author:

donvip

Message:

fix UnnecessaryParentheses warnings

Location:

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust

Files:

• gui/MapdustGUI.java (modified) (2 diffs)
• gui/action/execute/ExecuteAddBug.java (modified) (3 diffs)
• gui/action/execute/ExecuteCloseBug.java (modified) (2 diffs)
• gui/action/execute/ExecuteCommentBug.java (modified) (2 diffs)
• gui/action/execute/ExecuteInvalidateBug.java (modified) (2 diffs)
• gui/action/execute/ExecuteReOpenBug.java (modified) (2 diffs)
• gui/action/execute/ExecuteRefresh.java (modified) (1 diff)
• gui/action/execute/MapdustExecuteActionObservable.java (modified) (1 diff)
• gui/component/panel/MapdustBugDetailsPanel.java (modified) (1 diff)
• gui/component/panel/MapdustBugListPanel.java (modified) (1 diff)
• gui/component/slider/RelevanceSliderUI.java (modified) (1 diff)
• service/value/MapdustBug.java (modified) (1 diff)
• service/value/MapdustRelevance.java (modified) (1 diff)
• service/value/RelevanceRange.java (modified) (1 diff)

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/MapdustGUI.java

@@ -513 +513 @@
                 this.bugDetailsObservers.iterator();
         while (elements.hasNext()) {
-            (elements.next()).showDetails(mapdustBug);
+            elements.next().showDetails(mapdustBug);
         }
     }
@@ -526 +526 @@
                 this.initialUpdateObservers.iterator();
         while (elements.hasNext()) {
-            (elements.next()).update(filter, first);
+            elements.next().update(filter, first);
         }
     }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java

@@ -108 +108 @@
         if (event != null) {
             CreateBugDialog createDialog = (CreateBugDialog) getDialog();
-            BugType type = (BugType) (createDialog).getCbbType().getSelectedItem();
+            BugType type = (BugType) createDialog.getCbbType().getSelectedItem();
             String nickname = createDialog.getTxtNickname().getText();
             String commentText = createDialog.getTxtDescription().getText();
@@ -205 +205 @@
         Iterator<MapdustBugObserver> elements = this.bugObservers.iterator();
         while (elements.hasNext()) {
-            (elements.next()).changedData(mapdustBug);
+            elements.next().changedData(mapdustBug);
         }
     }
@@ -243 +243 @@
                 this.actionObservers.iterator();
         while (elements.hasNext()) {
-            (elements.next()).addAction(mapdustAction);
+            elements.next().addAction(mapdustAction);
         }
     }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java

@@ -228 +228 @@
         Iterator<MapdustBugObserver> elements = this.bugObservers.iterator();
         while (elements.hasNext()) {
-            (elements.next()).changedData(mapdustBug);
+            elements.next().changedData(mapdustBug);
         }
     }
@@ -240 +240 @@
                 this.actionObservers.iterator();
         while (elements.hasNext()) {
-            (elements.next()).addAction(mapdustAction);
+            elements.next().addAction(mapdustAction);
         }
     }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java

@@ -233 +233 @@
         Iterator<MapdustBugObserver> elements = this.bugObservers.iterator();
         while (elements.hasNext()) {
-            (elements.next()).changedData(mapdustBug);
+            elements.next().changedData(mapdustBug);
         }
     }
@@ -245 +245 @@
                 this.actionObservers.iterator();
         while (elements.hasNext()) {
-            (elements.next()).addAction(mapdustAction);
+            elements.next().addAction(mapdustAction);
         }
     }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java

@@ -240 +240 @@
         Iterator<MapdustBugObserver> elements = this.bugObservers.iterator();
         while (elements.hasNext()) {
-            (elements.next()).changedData(mapdustBug);
+            elements.next().changedData(mapdustBug);
         }
     }
@@ -252 +252 @@
                 this.actionObservers.iterator();
         while (elements.hasNext()) {
-            (elements.next()).addAction(mapdustAction);
+            elements.next().addAction(mapdustAction);
         }
     }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java

@@ -231 +231 @@
         Iterator<MapdustBugObserver> elements = this.bugObservers.iterator();
         while (elements.hasNext()) {
-            (elements.next()).changedData(mapdustBug);
+            elements.next().changedData(mapdustBug);
         }
     }
@@ -243 +243 @@
                 this.actionObservers.iterator();
         while (elements.hasNext()) {
-            (elements.next()).addAction(mapdustAction);
+            elements.next().addAction(mapdustAction);
         }
     }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteRefresh.java

@@ -110 +110 @@
         Iterator<MapdustUpdateObserver> elements = this.observers.iterator();
         while (elements.hasNext()) {
-            (elements.next()).update(filter, false);
+            elements.next().update(filter, false);
         }
     }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/MapdustExecuteActionObservable.java

@@ -70 +70 @@
         Iterator<MapdustUpdateObserver> elements = this.observers.iterator();
         while (elements.hasNext()) {
-            (elements.next()).update(filter, false);
+            elements.next().update(filter, false);
         }
     }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java

@@ -205 +205 @@
             }
             if (bug.getRelevance().equals(MapdustRelevance.HIGH)) {
-                color = (Color.GREEN.darker()).darker();
+                color = Color.GREEN.darker().darker();
             }
         }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugListPanel.java

@@ -453 +453 @@
                 this.observers.iterator();
         while (elements.hasNext()) {
-            (elements.next()).showDetails(mapdustBug);
+            elements.next().showDetails(mapdustBug);
         }
     }

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/slider/RelevanceSliderUI.java

@@ -545 +545 @@
             int trackLeft = getTrackRect().x;
             int trackRight = getTrackRect().x + (getTrackRect().width - 1);
-            int hMin = xPositionForValue((getSlider()).getLowerValue());
+            int hMin = xPositionForValue(getSlider().getLowerValue());
             if (drawInverted()) {
                 trackRight = hMin;

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/value/MapdustBug.java

@@ -39 +39 @@
  *
  */
-public class MapdustBug {
+public final class MapdustBug {
 
     /** The id of the bug */

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/value/MapdustRelevance.java

@@ -147 +147 @@
     @Override
     public boolean equals(Object obj) {
-        MapdustRelevance other = (MapdustRelevance) obj;
-        if (other == null) {
+        if (!(obj instanceof MapdustRelevance)) {
             return false;
         }
+        MapdustRelevance other = (MapdustRelevance) obj;
         if (name == null || other.name == null) {
             return false;

applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/service/value/RelevanceRange.java

@@ -147 +147 @@
     @Override
     public boolean equals(Object obj) {
+        if (!(obj instanceof RelevanceRange)) {
+            return false;
+        }
         RelevanceRange other = (RelevanceRange) obj;
         if (lowerValue != other.lowerValue)