Index: /trunk/build.xml =================================================================== --- /trunk/build.xml (revision 16629) +++ /trunk/build.xml (revision 16630) @@ -302,5 +302,5 @@ - + Index: /trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java (revision 16630) @@ -157,5 +157,5 @@ Collection corrCmds = Collections.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)); Index: /trunk/src/org/openstreetmap/josm/actions/SaveAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/SaveAction.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/actions/SaveAction.java (revision 16630) @@ -101,6 +101,6 @@ 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)); } Index: /trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java (revision 16630) @@ -173,5 +173,5 @@ auto ? tr("Proceed without simplifying") : tr("Cancel")) .setContent(p) - .configureContextsensitiveHelp(("Action/SimplifyWay"), true); + .configureContextsensitiveHelp("Action/SimplifyWay", true); if (auto) { ed.setButtonIcons("simplify", "ok"); Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadSessionTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadSessionTask.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadSessionTask.java (revision 16630) @@ -44,5 +44,5 @@ @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); Index: /trunk/src/org/openstreetmap/josm/command/PurgeCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/PurgeCommand.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/command/PurgeCommand.java (revision 16630) @@ -375,5 +375,5 @@ 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,5 +386,5 @@ 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); Index: /trunk/src/org/openstreetmap/josm/data/osm/Storage.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/Storage.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/data/osm/Storage.java (revision 16630) @@ -174,5 +174,5 @@ public Storage(Hash 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]; Index: /trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java (revision 16630) @@ -304,9 +304,9 @@ 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; } Index: /trunk/src/org/openstreetmap/josm/data/projection/datum/SevenParameterDatum.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/datum/SevenParameterDatum.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/data/projection/datum/SevenParameterDatum.java (revision 16630) @@ -59,7 +59,7 @@ 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); } Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java (revision 16630) @@ -126,5 +126,5 @@ (en2 + sphi * (en3 + sphi * - (en4)))); + en4))); } Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/CassiniSoldner.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/CassiniSoldner.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/CassiniSoldner.java (revision 16630) @@ -76,5 +76,5 @@ 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; Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/Mercator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/Mercator.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/Mercator.java (revision 16630) @@ -84,5 +84,5 @@ 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); } } Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/ConnectivityRelations.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/ConnectivityRelations.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/ConnectivityRelations.java (revision 16630) @@ -308,5 +308,5 @@ private static boolean checkMemberTagsForImpliedConnectivity(Relation relation, Map 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; } Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java (revision 16630) @@ -233,5 +233,5 @@ 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()); } Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (revision 16630) @@ -630,7 +630,7 @@ 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")) Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 16630) @@ -737,5 +737,5 @@ 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,5 +761,5 @@ 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,5 +795,5 @@ 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) Index: /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 16630) @@ -1042,5 +1042,5 @@ } } else { - if (distSq-minDistSq < (4)*(4)) { + if (distSq-minDistSq < 16) { nearestList.addAll(nlist); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 16630) @@ -856,5 +856,5 @@ */ public boolean isDialogInDefaultView() { - return isShowing && isDocked && (!isCollapsed); + return isShowing && isDocked && !isCollapsed; } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MergeGpxLayerDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MergeGpxLayerDialog.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MergeGpxLayerDialog.java (revision 16630) @@ -133,5 +133,5 @@ if ((row == 0 || newRow == 0) - && (!ConditionalOptionPaneUtil.showConfirmationDialog( + && !ConditionalOptionPaneUtil.showConfirmationDialog( "gpx_target_change", getParent(), @@ -142,5 +142,5 @@ JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE, - JOptionPane.OK_OPTION))) { + JOptionPane.OK_OPTION)) { return; } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java (revision 16630) @@ -62,5 +62,5 @@ int count = 0; for (RelationMember member : parent.getMembers()) { - if (!(member.isRelation())) { + if (!member.isRelation()) { continue; } @@ -87,5 +87,5 @@ int idx = 0; for (RelationMember member : parent.getMembers()) { - if (!(member.isRelation())) { + if (!member.isRelation()) { continue; } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java (revision 16630) @@ -199,5 +199,5 @@ 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; Index: /trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java (revision 16630) @@ -292,5 +292,5 @@ @Override protected Collection 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."))); Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java (revision 16630) @@ -21,5 +21,5 @@ * 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; Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/RepeatImageElement.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/RepeatImageElement.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/RepeatImageElement.java (revision 16630) @@ -155,5 +155,5 @@ return "RepeatImageStyle{" + super.toString() + "pattern=[" + pattern + "], offset=" + offset + ", spacing=" + spacing + - ", phase=" + (-phase) + ", align=" + align + '}'; + ", phase=" + -phase + ", align=" + align + '}'; } } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java (revision 16630) @@ -146,7 +146,7 @@ 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,5 +280,5 @@ 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"); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (revision 16630) @@ -488,5 +488,5 @@ // iterate over the buttons, add change listener to any change event for (Enumeration button = colorGroup.getElements(); button.hasMoreElements();) { - (button.nextElement()).addChangeListener(e -> { + button.nextElement().addChangeListener(e -> { colorTypeVelocityTune.setEnabled(colorTypeVelocity.isSelected()); colorTypeHeatMapTune.setEnabled(colorTypeHeatMap.isSelected()); Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java (revision 16630) @@ -135,5 +135,5 @@ 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); Index: /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java (revision 16630) @@ -344,5 +344,5 @@ 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,5 +350,5 @@ 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; } Index: /trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java (revision 16630) @@ -131,5 +131,5 @@ 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; } Index: /trunk/src/org/openstreetmap/josm/io/OsmApi.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 16630) @@ -188,5 +188,5 @@ String host = null; try { - host = (new URL(serverUrl)).getHost(); + host = new URL(serverUrl).getHost(); } catch (MalformedURLException e) { Logging.warn(e); Index: /trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java (revision 16630) @@ -205,5 +205,5 @@ throwException(tr("Missing mandatory attribute ''{0}''.", "version")); } - if (!("0.6".equals(v))) { + if (!"0.6".equals(v)) { throwException(tr("Unsupported version: {0}", v)); } Index: /trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (revision 16630) @@ -485,5 +485,5 @@ 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 + "?"; Index: /trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java (revision 16630) @@ -649,5 +649,5 @@ public static T getNestedException(Exception e, Class nestedClass) { Throwable t = e; - while (t != null && !(nestedClass.isInstance(t))) { + while (t != null && !nestedClass.isInstance(t)) { t = t.getCause(); } Index: /trunk/src/org/openstreetmap/josm/tools/TextTagParser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/TextTagParser.java (revision 16629) +++ /trunk/src/org/openstreetmap/josm/tools/TextTagParser.java (revision 16630) @@ -38,5 +38,5 @@ } String text = k.substring(1, k.length()-1); - return (new TextAnalyzer(text)).parseString("\r\t\n"); + return new TextAnalyzer(text).parseString("\r\t\n"); }