Index: /trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 9969) +++ /trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 9970) @@ -175,5 +175,5 @@ } if (targetNode == null) { - targetNode = (oldestNode != null ? oldestNode : lastNode); + targetNode = oldestNode != null ? oldestNode : lastNode; } return targetNode; Index: /trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (revision 9969) +++ /trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (revision 9970) @@ -697,5 +697,5 @@ for (OsmPrimitive ref : way.getReferrers()) { if (ref instanceof Relation && ref.isUsable()) { - affectedRelations.add((ref.getDisplayName(DefaultNameFormatter.getInstance()))); + affectedRelations.add(ref.getDisplayName(DefaultNameFormatter.getInstance())); } } Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java (revision 9969) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java (revision 9970) @@ -25,7 +25,7 @@ char c = str.charAt(2); // @formatter:off - alt = (a == '?' ? UNKNOWN : (a == 'A' ? ON : OFF)); - shift = (s == '?' ? UNKNOWN : (s == 'S' ? ON : OFF)); - ctrl = (c == '?' ? UNKNOWN : (c == 'C' ? ON : OFF)); + alt = a == '?' ? UNKNOWN : (a == 'A' ? ON : OFF); + shift = s == '?' ? UNKNOWN : (s == 'S' ? ON : OFF); + ctrl = c == '?' ? UNKNOWN : (c == 'C' ? ON : OFF); // @formatter:on } Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 9969) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 9970) @@ -410,5 +410,5 @@ // We don't want to change to draw tool if the user tries to (de)select // stuff but accidentally clicks in an empty area when selection is empty - cancelDrawMode = (shift || ctrl); + cancelDrawMode = shift || ctrl; didMouseDrag = false; initialMoveThresholdExceeded = false; @@ -1152,5 +1152,5 @@ } else { // setup for iterating a sel group again or a new, different one.. - nxt = (cycleList.contains(cycleStart)) ? cycleStart : first; + nxt = cycleList.contains(cycleStart) ? cycleStart : first; cycleStart = nxt; } Index: /trunk/src/org/openstreetmap/josm/data/imagery/CachedAttributionBingAerialTileSource.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/imagery/CachedAttributionBingAerialTileSource.java (revision 9969) +++ /trunk/src/org/openstreetmap/josm/data/imagery/CachedAttributionBingAerialTileSource.java (revision 9970) @@ -70,5 +70,5 @@ try { String xml = attributionLoader.updateIfRequiredString(); - List ret = parseAttributionText(new InputSource(new StringReader((xml)))); + List ret = parseAttributionText(new InputSource(new StringReader(xml))); if (attributionDownloadedTask != null) { GuiHelper.runInEDT(attributionDownloadedTask); Index: /trunk/src/org/openstreetmap/josm/data/oauth/SignpostAdapters.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/oauth/SignpostAdapters.java (revision 9969) +++ /trunk/src/org/openstreetmap/josm/data/oauth/SignpostAdapters.java (revision 9970) @@ -7,8 +7,8 @@ import java.util.Map; +import org.openstreetmap.josm.tools.HttpClient; + import oauth.signpost.AbstractOAuthConsumer; import oauth.signpost.AbstractOAuthProvider; - -import org.openstreetmap.josm.tools.HttpClient; /** @@ -54,5 +54,5 @@ @Override protected HttpRequest wrap(Object request) { - return new HttpRequest(((HttpClient) request)); + return new HttpRequest((HttpClient) request); } } Index: /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 9969) +++ /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 9970) @@ -292,5 +292,5 @@ protected OsmPrimitive(long id, int version, boolean allowNegativeId) { this(id, allowNegativeId); - this.version = (id > 0 ? version : 0); + this.version = id > 0 ? version : 0; setIncomplete(id > 0 && version == 0); } Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/AlbersEqualArea.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/AlbersEqualArea.java (revision 9969) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/AlbersEqualArea.java (revision 9970) @@ -110,5 +110,5 @@ double cosphi = Math.cos(phi1); double n = sinphi; - boolean secant = (Math.abs(phi1 - phi2) >= EPSILON); + boolean secant = Math.abs(phi1 - phi2) >= EPSILON; double m1 = msfn(sinphi, cosphi); double q1 = qsfn(sinphi); @@ -206,6 +206,6 @@ if (e >= EPSILON) { final double con = e * sinphi; - return (one_es * (sinphi / (1. - con*con) - - (0.5/e) * Math.log((1.-con) / (1.+con)))); + return one_es * (sinphi / (1. - con*con) - + (0.5/e) * Math.log((1.-con) / (1.+con))); } else { return sinphi + sinphi; Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/LambertAzimuthalEqualArea.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/LambertAzimuthalEqualArea.java (revision 9969) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/LambertAzimuthalEqualArea.java (revision 9970) @@ -258,6 +258,6 @@ if (e >= EPSILON) { final double con = e * sinphi; - return ((1.0 - e2) * (sinphi / (1.0 - con*con) - - (0.5 / e) * Math.log((1.0 - con) / (1.0 + con)))); + return (1.0 - e2) * (sinphi / (1.0 - con*con) - + (0.5 / e) * Math.log((1.0 - con) / (1.0 + con))); } else { return sinphi + sinphi; Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java (revision 9969) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java (revision 9970) @@ -381,5 +381,5 @@ u = AB * x; } else { - u = ArB * Math.atan2((S * cosgamma0 + V * singamma0), temp); + u = ArB * Math.atan2(S * cosgamma0 + V * singamma0, temp); } } else { @@ -408,5 +408,5 @@ y = Math.pow(E / Math.sqrt((1. + Up) / (1. - Up)), 1.0 / B); //calculate t y = cphi2(y); - x = -Math.atan2((Sp * cosgamma0 - Vp * singamma0), Math.cos(BrA * u)) / B; + x = -Math.atan2(Sp * cosgamma0 - Vp * singamma0, Math.cos(BrA * u)) / B; } return new double[] {y, x}; Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/PolarStereographic.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/PolarStereographic.java (revision 9969) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/PolarStereographic.java (revision 9970) @@ -161,5 +161,5 @@ if (Math.abs(phi-phi0) < ITERATION_TOLERANCE) { x = (Math.abs(rho) < EPSILON) ? 0.0 : Math.atan2(x, -y); - y = (southPole) ? -phi : phi; + y = southPole ? -phi : phi; break; } Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java (revision 9969) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java (revision 9970) @@ -137,10 +137,10 @@ /* NOTE: meridinal distance at latitudeOfOrigin is always 0 */ - y = (mlfn(y, sinphi, cosphi) - ml0 + + y = mlfn(y, sinphi, cosphi) - ml0 + sinphi * al * x * FC2 * (1.0 + FC4 * als * (5.0 - t + n*(9.0 + 4.0*n) + FC6 * als * (61.0 + t * (t - 58.0) + n*(270.0 - 330.0*t) + - FC8 * als * (1385.0 + t * (t*(543.0 - t) - 3111.0)))))); + FC8 * als * (1385.0 + t * (t*(543.0 - t) - 3111.0))))); x = al*(FC1 + FC3 * als*(1.0 - t + n + Index: /trunk/src/org/openstreetmap/josm/data/validation/util/Entities.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/util/Entities.java (revision 9969) +++ /trunk/src/org/openstreetmap/josm/data/validation/util/Entities.java (revision 9970) @@ -393,5 +393,5 @@ } String value = mapNameToValue.get(entityContent); - entityValue = (value == null ? -1 : Integer.parseInt(value)); + entityValue = value == null ? -1 : Integer.parseInt(value); } } Index: /trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java (revision 9969) +++ /trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java (revision 9970) @@ -230,5 +230,5 @@ if (msg instanceof String) { - msg = new JMultilineLabel(((String) msg), true); + msg = new JMultilineLabel((String) msg, true); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 9969) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 9970) @@ -991,5 +991,5 @@ 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 Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java (revision 9969) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java (revision 9970) @@ -77,5 +77,5 @@ if (!RelationSortUtils.isOneway(m) && lastWct != null) { wct.direction = determineDirection(i-1, lastWct.direction, i); - wct.linkPrev = (wct.direction != NONE); + wct.linkPrev = wct.direction != NONE; } } Index: /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java (revision 9969) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java (revision 9970) @@ -388,5 +388,5 @@ Rectangle splitChildBounds = splitChild.getBounds(); double minSplitChildWidth = minimumNodeSize(splitChild).getWidth(); - double splitChildWeight = (onlyShrinkWeightedComponents) + double splitChildWeight = onlyShrinkWeightedComponents ? splitChild.getWeight() : (splitChildBounds.getWidth() / totalWidth); @@ -434,5 +434,5 @@ Rectangle splitChildBounds = splitChild.getBounds(); double minSplitChildHeight = minimumNodeSize(splitChild).getHeight(); - double splitChildWeight = (onlyShrinkWeightedComponents) + double splitChildWeight = onlyShrinkWeightedComponents ? splitChild.getWeight() : (splitChildBounds.getHeight() / totalHeight); @@ -499,5 +499,5 @@ 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,5 +537,5 @@ 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,5 +616,5 @@ Node splitChild = splitChildren.next(); Divider dividerChild = - (splitChildren.hasNext()) ? (Divider) (splitChildren.next()) : null; + splitChildren.hasNext() ? (Divider) (splitChildren.next()) : null; double childWidth = 0.0; @@ -650,5 +650,5 @@ Node splitChild = splitChildren.next(); Divider dividerChild = - (splitChildren.hasNext()) ? (Divider) (splitChildren.next()) : null; + splitChildren.hasNext() ? (Divider) splitChildren.next() : null; double childHeight = 0.0; @@ -762,5 +762,5 @@ 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; Index: /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java (revision 9969) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java (revision 9970) @@ -336,5 +336,5 @@ MultiSplitLayout.Divider divider = getMultiSplitLayout().dividerAt(x, y); if (divider != null) { - cursorID = (divider.isVertical()) ? + cursorID = divider.isVertical() ? Cursor.E_RESIZE_CURSOR : Cursor.N_RESIZE_CURSOR; Index: /trunk/src/org/openstreetmap/josm/io/OsmWriter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmWriter.java (revision 9969) +++ /trunk/src/org/openstreetmap/josm/io/OsmWriter.java (revision 9970) @@ -56,5 +56,5 @@ super(out); this.osmConform = osmConform; - this.version = (version == null ? DEFAULT_API_VERSION : version); + this.version = version == null ? DEFAULT_API_VERSION : version; } Index: /trunk/src/org/openstreetmap/josm/tools/ExifReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/ExifReader.java (revision 9969) +++ /trunk/src/org/openstreetmap/josm/tools/ExifReader.java (revision 9970) @@ -190,5 +190,5 @@ throw new IllegalArgumentException("deg, min and sec are NaN"); - value = (Double.isNaN(deg) ? 0 : deg + (Double.isNaN(min) ? 0 : (min / 60)) + (Double.isNaN(sec) ? 0 : (sec / 3600))); + value = Double.isNaN(deg) ? 0 : deg + (Double.isNaN(min) ? 0 : (min / 60)) + (Double.isNaN(sec) ? 0 : (sec / 3600)); if (dirGps.getString(gpsTagRef).charAt(0) == cRef) {