Changeset 16630 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-06-14T17:17:08+02:00 (4 years ago)

Author:

simon04

Message:

see #19334 - ​https://errorprone.info/bugpattern/UnnecessaryParentheses

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ReverseWayAction.java (modified) (1 diff)
• actions/SaveAction.java (modified) (1 diff)
• actions/SimplifyWayAction.java (modified) (1 diff)
• actions/downloadtasks/DownloadSessionTask.java (modified) (1 diff)
• command/PurgeCommand.java (modified) (2 diffs)
• data/osm/Storage.java (modified) (1 diff)
• data/projection/Ellipsoid.java (modified) (1 diff)
• data/projection/datum/SevenParameterDatum.java (modified) (1 diff)
• data/projection/proj/AbstractProj.java (modified) (1 diff)
• data/projection/proj/CassiniSoldner.java (modified) (1 diff)
• data/projection/proj/Mercator.java (modified) (1 diff)
• data/validation/tests/ConnectivityRelations.java (modified) (1 diff)
• data/validation/tests/CrossingWays.java (modified) (1 diff)
• data/validation/tests/MultipolygonTest.java (modified) (1 diff)
• data/validation/tests/TagChecker.java (modified) (3 diffs)
• gui/NavigatableComponent.java (modified) (1 diff)
• gui/dialogs/ToggleDialog.java (modified) (1 diff)
• gui/dialogs/layer/MergeGpxLayerDialog.java (modified) (2 diffs)
• gui/dialogs/relation/RelationTreeModel.java (modified) (2 diffs)
• gui/dialogs/relation/sort/RelationNodeMap.java (modified) (1 diff)
• gui/layer/MainLayerManager.java (modified) (1 diff)
• gui/mappaint/StyleCache.java (modified) (1 diff)
• gui/mappaint/styleelement/RepeatImageElement.java (modified) (1 diff)
• gui/preferences/advanced/AdvancedPreference.java (modified) (2 diffs)
• gui/preferences/display/GPXSettingsPanel.java (modified) (1 diff)
• gui/tagging/presets/items/Text.java (modified) (1 diff)
• gui/widgets/MultiSplitLayout.java (modified) (2 diffs)
• io/CacheCustomContent.java (modified) (1 diff)
• io/OsmApi.java (modified) (1 diff)
• io/OsmChangesetParser.java (modified) (1 diff)
• io/imagery/WMSImagery.java (modified) (1 diff)
• tools/ExceptionUtil.java (modified) (1 diff)
• tools/TextTagParser.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java

@@ -157 +157 @@
         Collection<Command> corrCmds = Collections.<Command>emptyList();
         if (Config.getPref().getBoolean("tag-correction.reverse-way", true)) {
-            corrCmds = (new ReverseWayTagCorrector()).execute(w, wnew);
+            corrCmds = new ReverseWayTagCorrector().execute(w, wnew);
         }
         return new ReverseWayResult(wnew, corrCmds, new ChangeCommand(w, wnew));

trunk/src/org/openstreetmap/josm/actions/SaveAction.java

@@ -101 +101 @@
         Layer activeLayer = getLayerManager().getActiveLayer();
         boolean en = activeLayer != null
-                && activeLayer.isSavable() && (!(activeLayer.getAssociatedFile() != null
-                && activeLayer instanceof SaveToFile && !((SaveToFile) activeLayer).requiresSaveToFile()));
+                && activeLayer.isSavable() && !(activeLayer.getAssociatedFile() != null
+                && activeLayer instanceof SaveToFile && !((SaveToFile) activeLayer).requiresSaveToFile());
         GuiHelper.runInEDT(() -> setEnabled(en));
     }

trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java

@@ -173 +173 @@
                 auto ? tr("Proceed without simplifying") : tr("Cancel"))
                 .setContent(p)
-                .configureContextsensitiveHelp(("Action/SimplifyWay"), true);
+                .configureContextsensitiveHelp("Action/SimplifyWay", true);
         if (auto) {
             ed.setButtonIcons("simplify", "ok");

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadSessionTask.java

@@ -44 +44 @@
     @Override
     public Future<?> loadUrl(DownloadParams settings, String url, ProgressMonitor progressMonitor) {
-        if (url != null && (url.matches(PATTERN_SESSION))) {
+        if (url != null && url.matches(PATTERN_SESSION)) {
             try {
                 URL u = new URL(url);

trunk/src/org/openstreetmap/josm/command/PurgeCommand.java

@@ -375 +375 @@
                 for (OsmPrimitive parent : osm.getReferrers()) {
                     if (parent instanceof Relation
-                            && !(toPurgeChecked.contains(parent))
+                            && !toPurgeChecked.contains(parent)
                             && hasOnlyIncompleteMembers((Relation) parent, toPurgeChecked, relSet)) {
                         relSet.add((Relation) parent);
@@ -386 +386 @@
             for (int i = 0; i < relLst.size(); ++i) { // foreach loop not applicable since list gets extended while looping over it
                 for (OsmPrimitive parent : relLst.get(i).getReferrers()) {
-                    if (!(toPurgeChecked.contains(parent))
+                    if (!toPurgeChecked.contains(parent)
                             && hasOnlyIncompleteMembers((Relation) parent, toPurgeChecked, relLst)) {
                         relLst.add((Relation) parent);

trunk/src/org/openstreetmap/josm/data/osm/Storage.java

@@ -174 +174 @@
     public Storage(Hash<? super T, ? super T> ha, int capacity, boolean safeIterator) {
         this.hash = ha;
-        int cap = 1 << (int) (Math.ceil(Math.log(capacity/LOAD_FACTOR) / Math.log(2)));
+        int cap = 1 << (int) Math.ceil(Math.log(capacity/LOAD_FACTOR) / Math.log(2));
         @SuppressWarnings("unchecked")
         T[] newData = (T[]) new Object[cap];

trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java

@@ -304 +304 @@
         final double n3n4 = n3 - n4;
         final double n4n5 = n4 - n5;
-        final double ap = a * (1.0 - n + (5.0 / 4.0) * (n2n3) + (81.0 / 64.0) * (n4n5));
-        final double bp = (3.0 / 2.0) * a * (n1n2 + (7.0 / 8.0) * (n3n4) + (55.0 / 64.0) * n5);
-        final double cp = (15.0 / 16.0) * a * (n2n3 + (3.0 / 4.0) * (n4n5));
+        final double ap = a * (1.0 - n + (5.0 / 4.0) * n2n3 + (81.0 / 64.0) * n4n5);
+        final double bp = (3.0 / 2.0) * a * (n1n2 + (7.0 / 8.0) * n3n4 + (55.0 / 64.0) * n5);
+        final double cp = (15.0 / 16.0) * a * (n2n3 + (3.0 / 4.0) * n4n5);
         final double dp = (35.0 / 48.0) * a * (n3n4 + (11.0 / 16.0) * n5);
-        final double ep = (315.0 / 512.0) * a * (n4n5);
+        final double ep = (315.0 / 512.0) * a * n4n5;
         return ap * phi - bp * sin2Phi + cp * sin4Phi - dp * sin6Phi + ep * sin8Phi;
     }

trunk/src/org/openstreetmap/josm/data/projection/datum/SevenParameterDatum.java

@@ -59 +59 @@
     public LatLon fromWGS84(LatLon ll) {
         double[] xyz = Ellipsoid.WGS84.latLon2Cart(ll);
-        double x = (1-s)*(-dx + xyz[0] + ((-dz+xyz[2])*(-ry) - (-dy+xyz[1])*(-rz)));
-        double y = (1-s)*(-dy + xyz[1] + ((-dx+xyz[0])*(-rz) - (-dz+xyz[2])*(-rx)));
-        double z = (1-s)*(-dz + xyz[2] + ((-dy+xyz[1])*(-rx) - (-dx+xyz[0])*(-ry)));
+        double x = (1-s)*(-dx + xyz[0] + ((-dz+xyz[2])* -ry - (-dy+xyz[1])* -rz));
+        double y = (1-s)*(-dy + xyz[1] + ((-dx+xyz[0])* -rz - (-dz+xyz[2])* -rx));
+        double z = (1-s)*(-dz + xyz[2] + ((-dy+xyz[1])* -rx - (-dx+xyz[0])* -ry));
         return this.ellps.cart2LatLon(x, y, z);
     }

trunk/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java

@@ -126 +126 @@
               (en2 + sphi *
               (en3 + sphi *
-              (en4))));
+              en4)));
     }
 

trunk/src/org/openstreetmap/josm/data/projection/proj/CassiniSoldner.java

@@ -76 +76 @@
             double cosphi = Math.cos(phi);
 
-            double n = 1.0 / (Math.sqrt(1.0 - e2 * sinphi * sinphi));
+            double n = 1.0 / Math.sqrt(1.0 - e2 * sinphi * sinphi);
             double tn = Math.tan(phi);
             double t = tn * tn;

trunk/src/org/openstreetmap/josm/data/projection/proj/Mercator.java

@@ -84 +84 @@
             final double lat0 = Utils.toRadians(params.lat0);
             final double sinPhi = Math.sin(lat0);
-            scaleFactor *= (Math.cos(lat0) / (Math.sqrt(1 - e2 * sinPhi * sinPhi)));
+            scaleFactor *= Math.cos(lat0) / Math.sqrt(1 - e2 * sinPhi * sinPhi);
         }
     }

trunk/src/org/openstreetmap/josm/data/validation/tests/ConnectivityRelations.java

@@ -308 +308 @@
     private static boolean checkMemberTagsForImpliedConnectivity(Relation relation, Map<String, Integer> roleLanes) {
         // The members have different lane counts
-        if (roleLanes.containsKey(TO) && roleLanes.containsKey(FROM) && (!roleLanes.get(TO).equals(roleLanes.get(FROM)))) {
+        if (roleLanes.containsKey(TO) && roleLanes.containsKey(FROM) && !roleLanes.get(TO).equals(roleLanes.get(FROM))) {
             return false;
         }

trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java

@@ -233 +233 @@
         public boolean isPrimitiveUsable(OsmPrimitive p) {
             return super.isPrimitiveUsable(p) && p.hasKey("boundary") && !p.hasTag("boundary", "protected_area")
-                    && (!(p instanceof Relation) || (((Relation) p).isMultipolygon()));
+                    && (!(p instanceof Relation) || p.isMultipolygon());
         }
 

trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java

@@ -630 +630 @@
         for (RelationMember rm : r.getMembers()) {
             if (rm.isWay()) {
-                if (rm.hasRole() && !(rm.hasRole("inner", "outer")))
+                if (rm.hasRole() && !rm.hasRole("inner", "outer"))
                     hasUnexpectedWayRole = true;
-                if (!(rm.hasRole("inner", "outer")) || !rm.hasRole()) {
+                if (!rm.hasRole("inner", "outer") || !rm.hasRole()) {
                     tmpErrors.add(TestError.builder(this, Severity.ERROR, WRONG_MEMBER_ROLE)
                             .message(tr("Role for multipolygon way member should be inner or outer"))

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -737 +737 @@
         if (!checkValues || value == null)
             return;
-        if ((containsUnwantedNonPrintingControlCharacter(value)) && !withErrors.contains(p, "ICV")) {
+        if (containsUnwantedNonPrintingControlCharacter(value) && !withErrors.contains(p, "ICV")) {
             errors.add(TestError.builder(this, Severity.WARNING, LOW_CHAR_VALUE)
                     .message(tr("Tag value contains non-printing (usually invisible) character"), s, key)
@@ -761 +761 @@
             withErrors.put(p, "LV");
         }
-        if ((value.trim().isEmpty()) && !withErrors.contains(p, "EV")) {
+        if (value.trim().isEmpty() && !withErrors.contains(p, "EV")) {
             errors.add(TestError.builder(this, Severity.WARNING, EMPTY_VALUES)
                     .message(tr("Tags with empty values"), s, key)
@@ -795 +795 @@
         if (!checkKeys || key == null)
             return;
-        if ((containsUnwantedNonPrintingControlCharacter(key)) && !withErrors.contains(p, "ICK")) {
+        if (containsUnwantedNonPrintingControlCharacter(key) && !withErrors.contains(p, "ICK")) {
             errors.add(TestError.builder(this, Severity.WARNING, LOW_CHAR_KEY)
                     .message(tr("Tag key contains non-printing character"), s, key)

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

@@ -1042 +1042 @@
                     }
                 } else {
-                    if (distSq-minDistSq < (4)*(4)) {
+                    if (distSq-minDistSq < 16) {
                         nearestList.addAll(nlist);
                     }

trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

@@ -856 +856 @@
      */
     public boolean isDialogInDefaultView() {
-        return isShowing && isDocked && (!isCollapsed);
+        return isShowing && isDocked && !isCollapsed;
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MergeGpxLayerDialog.java

@@ -133 +133 @@
 
             if ((row == 0 || newRow == 0)
-                    && (!ConditionalOptionPaneUtil.showConfirmationDialog(
+                    && !ConditionalOptionPaneUtil.showConfirmationDialog(
                             "gpx_target_change",
                             getParent(),
@@ -142 +142 @@
                             JOptionPane.OK_CANCEL_OPTION,
                             JOptionPane.INFORMATION_MESSAGE,
-                            JOptionPane.OK_OPTION))) {
+                            JOptionPane.OK_OPTION)) {
                 return;
             }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java

@@ -62 +62 @@
         int count = 0;
         for (RelationMember member : parent.getMembers()) {
-            if (!(member.isRelation())) {
+            if (!member.isRelation()) {
                 continue;
             }
@@ -87 +87 @@
         int idx = 0;
         for (RelationMember member : parent.getMembers()) {
-            if (!(member.isRelation())) {
+            if (!member.isRelation()) {
                 continue;
             }

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

@@ -199 +199 @@
         if (onewayReverseMap.ways.containsKey(way)) {
             for (Node n : onewayReverseMap.ways.get(way)) {
-                if ((map.nodes.containsKey(n))
+                if (map.nodes.containsKey(n)
                         || (onewayMap.nodes.containsKey(n) && onewayMap.nodes.get(n).size() > 1))
                     return n;

trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java

@@ -292 +292 @@
     @Override
     protected Collection<Layer> realRemoveSingleLayer(Layer layer) {
-        if ((layer instanceof OsmDataLayer) && (((OsmDataLayer) layer).isUploadInProgress())) {
+        if (layer instanceof OsmDataLayer && ((OsmDataLayer) layer).isUploadInProgress()) {
             GuiHelper.runInEDT(() -> JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                     tr("Trying to delete the layer with background upload. Please wait until the upload is finished.")));

trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java

@@ -21 +21 @@
      * An empty style cache entry
      */
-    public static final StyleCache EMPTY_STYLECACHE = (new StyleCache()).intern();
+    public static final StyleCache EMPTY_STYLECACHE = new StyleCache().intern();
 
     private static final int PLAIN = 0;

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/RepeatImageElement.java

@@ -155 +155 @@
         return "RepeatImageStyle{" + super.toString() + "pattern=[" + pattern +
                 "], offset=" + offset + ", spacing=" + spacing +
-                ", phase=" + (-phase) + ", align=" + align + '}';
+                ", phase=" + -phase + ", align=" + align + '}';
     }
 }

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java

@@ -146 +146 @@
         if (o2.isChanged() && !o1.isChanged())
             return 1;
-        if (!(o1.isDefault()) && o2.isDefault())
+        if (!o1.isDefault() && o2.isDefault())
             return -1;
-        if (!(o2.isDefault()) && o1.isDefault())
+        if (!o2.isDefault() && o1.isDefault())
             return 1;
         return o1.compareTo(o2);
@@ -280 +280 @@
                 JFileChooser.FILES_ONLY, "customsettings.lastDirectory");
         if (fc != null) {
-            File[] sel = fc.isMultiSelectionEnabled() ? fc.getSelectedFiles() : (new File[]{fc.getSelectedFile()});
+            File[] sel = fc.isMultiSelectionEnabled() ? fc.getSelectedFiles() : new File[]{fc.getSelectedFile()};
             if (sel.length == 1 && !sel[0].getName().contains("."))
                 sel[0] = new File(sel[0].getAbsolutePath()+".xml");

trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java

@@ -488 +488 @@
         // iterate over the buttons, add change listener to any change event
         for (Enumeration<AbstractButton> button = colorGroup.getElements(); button.hasMoreElements();) {
-            (button.nextElement()).addChangeListener(e -> {
+            button.nextElement().addChangeListener(e -> {
                 colorTypeVelocityTune.setEnabled(colorTypeVelocity.isSelected());
                 colorTypeHeatMapTune.setEnabled(colorTypeHeatMap.isSelected());

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java

@@ -135 +135 @@
                 try {
                     // TODO there must be a better way to parse a number like "+3" than this.
-                    final int buttonvalue = (NumberFormat.getIntegerInstance().parse(ai.replace("+", ""))).intValue();
+                    final int buttonvalue = NumberFormat.getIntegerInstance().parse(ai.replace("+", "")).intValue();
                     if (auto_increment_selected == buttonvalue) aibutton.setSelected(true);
                     aibutton.addActionListener(e -> auto_increment_selected = buttonvalue);

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

@@ -344 +344 @@
     private static Rectangle boundsWithYandHeight(Rectangle bounds, double y, double height) {
         Rectangle r = new Rectangle();
-        r.setBounds((int) (bounds.getX()), (int) y, (int) (bounds.getWidth()), (int) height);
+        r.setBounds((int) bounds.getX(), (int) y, (int) bounds.getWidth(), (int) height);
         return r;
     }
@@ -350 +350 @@
     private static Rectangle boundsWithXandWidth(Rectangle bounds, double x, double width) {
         Rectangle r = new Rectangle();
-        r.setBounds((int) x, (int) (bounds.getY()), (int) width, (int) (bounds.getHeight()));
+        r.setBounds((int) x, (int) bounds.getY(), (int) width, (int) bounds.getHeight());
         return r;
     }

trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java

@@ -131 +131 @@
         this.data = updateData();
         saveToDisk();
-        Config.getPref().putInt("cache." + ident, (int) (TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())));
+        Config.getPref().putInt("cache." + ident, (int) TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()));
         return data;
     }

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -188 +188 @@
         String host = null;
         try {
-            host = (new URL(serverUrl)).getHost();
+            host = new URL(serverUrl).getHost();
         } catch (MalformedURLException e) {
             Logging.warn(e);

trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java

@@ -205 +205 @@
                     throwException(tr("Missing mandatory attribute ''{0}''.", "version"));
                 }
-                if (!("0.6".equals(v))) {
+                if (!"0.6".equals(v)) {
                     throwException(tr("Unsupported version: {0}", v));
                 }

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -485 +485 @@
                         if ("GET".equalsIgnoreCase(mode) && getMapUrl != null && !"".equals(getMapUrl)) {
                             try {
-                                String query = (new URL(getMapUrl)).getQuery();
+                                String query = new URL(getMapUrl).getQuery();
                                 if (query == null) {
                                     this.getMapUrl = getMapUrl + "?";

trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java

@@ -649 +649 @@
     public static <T> T getNestedException(Exception e, Class<T> nestedClass) {
         Throwable t = e;
-        while (t != null && !(nestedClass.isInstance(t))) {
+        while (t != null && !nestedClass.isInstance(t)) {
             t = t.getCause();
         }

trunk/src/org/openstreetmap/josm/tools/TextTagParser.java

@@ -38 +38 @@
         }
         String text = k.substring(1, k.length()-1);
-        return (new TextAnalyzer(text)).parseString("\r\t\n");
+        return new TextAnalyzer(text).parseString("\r\t\n");
     }