Changeset 9970 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-03-12T23:18:04+01:00 (8 years ago)

Author:

Don-vip

Message:

sonar - remove useless parentheses

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• HelpAwareOptionPane.java (modified) (1 diff)
• dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• dialogs/relation/sort/WayConnectionTypeCalculator.java (modified) (1 diff)
• widgets/MultiSplitLayout.java (modified) (7 diffs)
• widgets/MultiSplitPane.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java

@@ -230 +230 @@
 
         if (msg instanceof String) {
-            msg = new JMultilineLabel(((String) msg), true);
+            msg = new JMultilineLabel((String) msg, true);
         }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -991 +991 @@
                 if (nextKeyIndex == rows[rows.length-1]) {
                     // no gap found, pick next or previous key in list
-                    nextKeyIndex = (nextKeyIndex + 1 < rowCount ? nextKeyIndex + 1 : rows[0] - 1);
+                    nextKeyIndex = nextKeyIndex + 1 < rowCount ? nextKeyIndex + 1 : rows[0] - 1;
                 } else {
                     // gap found

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java

@@ -77 +77 @@
                 if (!RelationSortUtils.isOneway(m) && lastWct != null) {
                     wct.direction = determineDirection(i-1, lastWct.direction, i);
-                    wct.linkPrev = (wct.direction != NONE);
+                    wct.linkPrev = wct.direction != NONE;
                 }
             }

trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java

@@ -388 +388 @@
                 Rectangle splitChildBounds = splitChild.getBounds();
                 double minSplitChildWidth = minimumNodeSize(splitChild).getWidth();
-                double splitChildWeight = (onlyShrinkWeightedComponents)
+                double splitChildWeight = onlyShrinkWeightedComponents
                 ? splitChild.getWeight()
                         : (splitChildBounds.getWidth() / totalWidth);
@@ -434 +434 @@
                 Rectangle splitChildBounds = splitChild.getBounds();
                 double minSplitChildHeight = minimumNodeSize(splitChild).getHeight();
-                double splitChildWeight = (onlyShrinkWeightedComponents)
+                double splitChildWeight = onlyShrinkWeightedComponents
                 ? splitChild.getWeight()
                         : (splitChildBounds.getHeight() / totalHeight);
@@ -499 +499 @@
                     layout2(splitChild, newSplitChildBounds);
                 } else if ((availableWidth > 0.0) && (splitChildWeight > 0.0)) {
-                    double allocatedWidth = (splitChild.equals(lastWeightedChild))
+                    double allocatedWidth = splitChild.equals(lastWeightedChild)
                     ? availableWidth
                             : Math.rint(splitChildWeight * extraWidth);
@@ -537 +537 @@
                     layout2(splitChild, newSplitChildBounds);
                 } else if ((availableHeight > 0.0) && (splitChildWeight > 0.0)) {
-                    double allocatedHeight = (splitChild.equals(lastWeightedChild))
+                    double allocatedHeight = splitChild.equals(lastWeightedChild)
                     ? availableHeight
                             : Math.rint(splitChildWeight * extraHeight);
@@ -616 +616 @@
                     Node splitChild = splitChildren.next();
                     Divider dividerChild =
-                        (splitChildren.hasNext()) ? (Divider) (splitChildren.next()) : null;
+                        splitChildren.hasNext() ? (Divider) (splitChildren.next()) : null;
 
                     double childWidth = 0.0;
@@ -650 +650 @@
                     Node splitChild = splitChildren.next();
                     Divider dividerChild =
-                        (splitChildren.hasNext()) ? (Divider) (splitChildren.next()) : null;
+                        splitChildren.hasNext() ? (Divider) splitChildren.next() : null;
 
                         double childHeight = 0.0;
@@ -762 +762 @@
         if (root instanceof Divider) {
             Divider divider = (Divider) root;
-            return (divider.getBounds().contains(x, y)) ? divider : null;
+            return divider.getBounds().contains(x, y) ? divider : null;
         } else if (root instanceof Split) {
             Split split = (Split) root;

trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java

@@ -336 +336 @@
             MultiSplitLayout.Divider divider = getMultiSplitLayout().dividerAt(x, y);
             if (divider != null) {
-                cursorID  = (divider.isVertical()) ?
+                cursorID  = divider.isVertical() ?
                     Cursor.E_RESIZE_CURSOR :
                     Cursor.N_RESIZE_CURSOR;