Index: /trunk/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java (revision 8444) @@ -29,5 +29,5 @@ super(name, iconName, tooltip, shortcut, true); multiplier = Main.pref.getDouble("audio.fastfwdmultiplier", 1.3); - if (! fast) + if (!fast) multiplier = 1.0 / multiplier; } Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (revision 8444) @@ -83,5 +83,5 @@ String[] table = url.split("\\?|=|&"); for (int i = 0; i= 1 && targetNode.equals(selectedWay.getNode(posn0-1))) || // previous node (posn0 < selectedWay.getNodesCount()-1) && targetNode.equals(selectedWay.getNode(posn0+1))) { // next node @@ -1491,5 +1491,5 @@ // heading of segment from current to calculated point, not to mouse position - if (baseHeading >=0 ) { // there is previous line segment with some heading + if (baseHeading >= 0) { // there is previous line segment with some heading angle = hdg - baseHeading; if (angle < 0) { @@ -1551,5 +1551,5 @@ } } - if (customBaseHeading >=0 ) { + if (customBaseHeading >= 0) { pointsToProject.add(segmentPoint1); pointsToProject.add(segmentPoint2); Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 8444) @@ -526,5 +526,5 @@ } } else if (mode == Mode.extrude) { - if( e.getClickCount() == 2 && e.getPoint().equals(initialMousePos) ) { + if (e.getClickCount() == 2 && e.getPoint().equals(initialMousePos)) { // double click adds a new node addNewNode(e); @@ -857,5 +857,5 @@ EastNorth n2en = selectedSegment.getSecondNode().getEastNorth(); if (n1en.distance(prevNode.getEastNorth())<1e-4 || - n2en.distance(nextNode.getEastNorth())<1e-4 ) { + n2en.distance(nextNode.getEastNorth())<1e-4) { return false; } Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java (revision 8444) @@ -156,5 +156,5 @@ mv.addTemporaryLayer(this); - helpLineStroke = GuiHelper.getCustomizedStroke(getStringPref("stroke.hepler-line", "1" )); + helpLineStroke = GuiHelper.getCustomizedStroke(getStringPref("stroke.hepler-line", "1")); refLineStroke = GuiHelper.getCustomizedStroke(getStringPref("stroke.ref-line", "1 2 2")); mainColor = Main.pref.getColor(marktr("make parallel helper line"), null); Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java (revision 8444) @@ -55,5 +55,5 @@ if ((ev.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) == 0) return; Point p = ev.getPoint(); - if (! dragging) { + if (!dragging) { if (p.distance(mouseStart) < 3) return; playHeadMarker.startDrag(); @@ -68,5 +68,5 @@ Point p = ev.getPoint(); mouseStart = null; - if (ev.getButton() != MouseEvent.BUTTON1 || p == null || ! dragging) + if (ev.getButton() != MouseEvent.BUTTON1 || p == null || !dragging) return; @@ -75,5 +75,5 @@ EastNorth en = Main.map.mapView.getEastNorth(ev.getX(), ev.getY()); - if (! shift) { + if (!shift) { playHeadMarker.reposition(en); } else { Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 8444) @@ -538,5 +538,5 @@ } - if( lastMousePos == null ) { + if (lastMousePos == null) { lastMousePos = e.getPoint(); return; Index: /trunk/src/org/openstreetmap/josm/actions/relation/DeleteRelationsAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/relation/DeleteRelationsAction.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/actions/relation/DeleteRelationsAction.java (revision 8444) @@ -30,5 +30,5 @@ return; org.openstreetmap.josm.actions.mapmode.DeleteAction - .deleteRelation( Main.main.getEditLayer(), toDelete ); + .deleteRelation(Main.main.getEditLayer(), toDelete); // clear selection after deletion if (Main.map.relationListDialog!=null) Index: /trunk/src/org/openstreetmap/josm/actions/relation/DuplicateRelationAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/relation/DuplicateRelationAction.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/actions/relation/DuplicateRelationAction.java (revision 8444) @@ -52,5 +52,5 @@ protected void updateEnabledState() { // only one selected relation can be edited - setEnabled( relations.size()==1 ); + setEnabled(relations.size()==1); } } Index: /trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java (revision 8444) @@ -34,9 +34,9 @@ long maxNodes = api.getCapabilities().getMaxWayNodes(); if (maxNodes > 0) { - if( !checkMaxNodes(apiData.getPrimitivesToAdd(), maxNodes)) + if (!checkMaxNodes(apiData.getPrimitivesToAdd(), maxNodes)) return false; - if( !checkMaxNodes(apiData.getPrimitivesToUpdate(), maxNodes)) + if (!checkMaxNodes(apiData.getPrimitivesToUpdate(), maxNodes)) return false; - if( !checkMaxNodes(apiData.getPrimitivesToDelete(), maxNodes)) + if (!checkMaxNodes(apiData.getPrimitivesToDelete(), maxNodes)) return false; } Index: /trunk/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java (revision 8444) @@ -35,5 +35,5 @@ .append('['); for (int i=0; i< cycle.size(); i++) { - if (i >0 ) { + if (i > 0) { sb.append(','); } Index: /trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java (revision 8444) @@ -61,5 +61,5 @@ @Override public void undoCommand() { - if (! Main.map.mapView.hasLayer(getLayer())) { + if (!Main.map.mapView.hasLayer(getLayer())) { Main.warn(tr("Layer ''{0}'' does not exist any more. Cannot remove conflict for object ''{1}''.", getLayer().getName(), Index: /trunk/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java (revision 8444) @@ -45,5 +45,5 @@ */ protected void rememberConflict(Conflict c) { - if (! resolvedConflicts.hasConflictForMy(c.getMy())) { + if (!resolvedConflicts.hasConflictForMy(c.getMy())) { resolvedConflicts.add(c); } @@ -68,5 +68,5 @@ super.undoCommand(); - if (! Main.map.mapView.hasLayer(getLayer())) { + if (!Main.map.mapView.hasLayer(getLayer())) { Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more", this.toString(), Index: /trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java (revision 8444) @@ -74,5 +74,5 @@ public void undoCommand() { OsmDataLayer layer = getLayer(); - if (! Main.map.mapView.hasLayer(layer)) { + if (!Main.map.mapView.hasLayer(layer)) { Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more", this.toString(), Index: /trunk/src/org/openstreetmap/josm/command/conflict/TagConflictResolveCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/conflict/TagConflictResolveCommand.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/command/conflict/TagConflictResolveCommand.java (revision 8444) @@ -84,5 +84,5 @@ // for (TagMergeItem item: mergeItems) { - if (! item.getMergeDecision().equals(MergeDecisionType.UNDECIDED)) { + if (!item.getMergeDecision().equals(MergeDecisionType.UNDECIDED)) { item.applyToMyPrimitive(conflict.getMy()); } Index: /trunk/src/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommand.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommand.java (revision 8444) @@ -58,5 +58,5 @@ // for (Node n:mergedNodeList) { - if (! getLayer().data.getNodes().contains(n)) { + if (!getLayer().data.getNodes().contains(n)) { Main.warn(tr("Main dataset does not include node {0}", n.toString())); } Index: /trunk/src/org/openstreetmap/josm/data/coor/LatLon.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (revision 8444) @@ -69,7 +69,7 @@ private static final String cDms60 = cDmsSecondFormatter.format(60.0); - private static final String cDms00 = cDmsSecondFormatter.format( 0.0); + private static final String cDms00 = cDmsSecondFormatter.format(0.0); private static final String cDm60 = cDmMinuteFormatter.format(60.0); - private static final String cDm00 = cDmMinuteFormatter.format( 0.0); + private static final String cDm00 = cDmMinuteFormatter.format(0.0); /** Index: /trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (revision 8444) @@ -150,5 +150,5 @@ for (ImageryInfo def : defaultLayers) { // temporary migration code, so all user preferences will get updated with new settings from JOSM site (can be removed ~Dez. 2015) - if (def.getNoTileHeaders() != null || def.getTileSize() > 0 || def.getMetadataHeaders() != null ) { + if (def.getNoTileHeaders() != null || def.getTileSize() > 0 || def.getMetadataHeaders() != null) { for (ImageryInfo i: layers) { if (isSimilar(def, i)) { Index: /trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (revision 8444) @@ -134,5 +134,5 @@ DefaultChangesetCacheEvent e = new DefaultChangesetCacheEvent(this); remove(id, e); - if (! e.isEmpty()) { + if (!e.isEmpty()) { fireChangesetCacheEvent(e); } @@ -160,5 +160,5 @@ remove(cs.getId(), evt); } - if (! evt.isEmpty()) { + if (!evt.isEmpty()) { fireChangesetCacheEvent(evt); } Index: /trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (revision 8444) @@ -79,5 +79,5 @@ */ protected void mergePrimitive(OsmPrimitive source, Collection candidates) { - if (!source.isNew() ) { + if (!source.isNew()) { // try to merge onto a matching primitive with the same defined id // @@ -319,5 +319,5 @@ throw new DataIntegrityProblemException(tr("Conflict in ''visible'' attribute for object of type {0} with id {1}", target.getType(), target.getId())); - else if (target.isDeleted() && ! source.isDeleted() && target.getVersion() == source.getVersion()) { + else if (target.isDeleted() && !source.isDeleted() && target.getVersion() == source.getVersion()) { // same version, but target is deleted. Assume target takes precedence // otherwise too many conflicts when refreshing from the server @@ -331,25 +331,25 @@ } } - } else if (! target.isModified() && source.isDeleted()) { + } else if (!target.isModified() && source.isDeleted()) { // target not modified. We can assume that source is the most recent version, // so mark it to be deleted. // objectsToDelete.add(target); - } else if (! target.isModified() && source.isModified()) { + } else if (!target.isModified() && source.isModified()) { // target not modified. We can assume that source is the most recent version. // clone it into target. target.mergeFrom(source); objectsWithChildrenToMerge.add(source.getPrimitiveId()); - } else if (! target.isModified() && !source.isModified() && target.getVersion() == source.getVersion()) { + } else if (!target.isModified() && !source.isModified() && target.getVersion() == source.getVersion()) { // both not modified. Merge nevertheless. // This helps when updating "empty" relations, see #4295 target.mergeFrom(source); objectsWithChildrenToMerge.add(source.getPrimitiveId()); - } else if (! target.isModified() && !source.isModified() && target.getVersion() < source.getVersion()) { + } else if (!target.isModified() && !source.isModified() && target.getVersion() < source.getVersion()) { // my not modified but other is newer. clone other onto mine. // target.mergeFrom(source); objectsWithChildrenToMerge.add(source.getPrimitiveId()); - } else if (target.isModified() && ! source.isModified() && target.getVersion() == source.getVersion()) { + } else if (target.isModified() && !source.isModified() && target.getVersion() == source.getVersion()) { // target is same as source but target is modified // => keep target and reset modified flag if target and source are semantically equal @@ -362,5 +362,5 @@ // addConflict(target,source); - } else if (! target.hasEqualSemanticAttributes(source)) { + } else if (!target.hasEqualSemanticAttributes(source)) { // target is modified and is not semantically equal with source. Can't automatically // resolve the differences Index: /trunk/src/org/openstreetmap/josm/data/osm/Node.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/Node.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/osm/Node.java (revision 8444) @@ -281,5 +281,5 @@ if (!(other instanceof Node)) return false; - if (! super.hasEqualSemanticAttributes(other)) + if (!super.hasEqualSemanticAttributes(other)) return false; Node n = (Node)other; Index: /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 8444) @@ -966,5 +966,5 @@ } else if (referrers instanceof OsmPrimitive) { if (referrers != referrer) { - referrers = new OsmPrimitive[] { (OsmPrimitive)referrers, referrer }; + referrers = new OsmPrimitive[] {(OsmPrimitive)referrers, referrer}; } } else { @@ -1144,5 +1144,5 @@ if (other.isNew() ^ isNew()) throw new DataIntegrityProblemException(tr("Cannot merge because either of the participating primitives is new and the other is not")); - if (! other.isNew() && other.getId() != id) + if (!other.isNew() && other.getId() != id) throw new DataIntegrityProblemException(tr("Cannot merge primitives with different ids. This id is {0}, the other is {1}", id, other.getId())); Index: /trunk/src/org/openstreetmap/josm/data/osm/Relation.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/Relation.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/osm/Relation.java (revision 8444) @@ -292,5 +292,5 @@ if (!(other instanceof Relation)) return false; - if (! super.hasEqualSemanticAttributes(other)) + if (!super.hasEqualSemanticAttributes(other)) return false; Relation r = (Relation)other; Index: /trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java (revision 8444) @@ -341,5 +341,5 @@ continue; } - if (! containsKey(key)) return false; + if (!containsKey(key)) return false; } return true; @@ -399,5 +399,5 @@ if (key == null) return false; Set values = getTagsFor(key).getValues(); - return values.size() == 1 && ! values.contains(""); + return values.size() == 1 && !values.contains(""); } @@ -607,5 +607,5 @@ public void applyTo(Tagged primitive) { if (primitive == null) return; - if (! isApplicableToPrimitive()) + if (!isApplicableToPrimitive()) throw new IllegalStateException(tr("Tag collection cannot be applied to a primitive because there are keys with multiple values.")); for (Tag tag: tags) { @@ -628,5 +628,5 @@ public void applyTo(Collection primitives) { if (primitives == null) return; - if (! isApplicableToPrimitive()) + if (!isApplicableToPrimitive()) throw new IllegalStateException(tr("Tag collection cannot be applied to a primitive because there are keys with multiple values.")); for (Tagged primitive: primitives) { @@ -645,5 +645,5 @@ public void replaceTagsOf(Tagged primitive) { if (primitive == null) return; - if (! isApplicableToPrimitive()) + if (!isApplicableToPrimitive()) throw new IllegalStateException(tr("Tag collection cannot be applied to a primitive because there are keys with multiple values.")); primitive.removeAll(); @@ -663,5 +663,5 @@ public void replaceTagsOf(Collection primitives) { if (primitives == null) return; - if (! isApplicableToPrimitive()) + if (!isApplicableToPrimitive()) throw new IllegalStateException(tr("Tag collection cannot be applied to a primitive because there are keys with multiple values.")); for (Tagged primitive: primitives) { Index: /trunk/src/org/openstreetmap/josm/data/osm/User.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 8444) @@ -213,5 +213,5 @@ @Override public boolean equals(Object obj) { - if (! (obj instanceof User)) + if (!(obj instanceof User)) return false; User other = (User) obj; Index: /trunk/src/org/openstreetmap/josm/data/osm/Way.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/Way.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/osm/Way.java (revision 8444) @@ -336,10 +336,10 @@ if (!(other instanceof Way)) return false; - if (! super.hasEqualSemanticAttributes(other)) + if (!super.hasEqualSemanticAttributes(other)) return false; Way w = (Way)other; if (getNodesCount() != w.getNodesCount()) return false; - for (int i=0;i 0 ) { + } else if ((outcode0 & outcode1) > 0) { done = true; } else { long x = 0, y = 0; outcodeOut = outcode0 != 0 ? outcode0: outcode1; - if ( (outcodeOut & OUT_TOP) > 0 ) { + if ((outcodeOut & OUT_TOP) > 0) { x = x1 + (x2 - x1) * (ymax - y1)/(y2 - y1); y = ymax; - } else if ((outcodeOut & OUT_BOTTOM) > 0 ) { + } else if ((outcodeOut & OUT_BOTTOM) > 0) { x = x1 + (x2 - x1) * (ymin - y1)/(y2 - y1); y = ymin; Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java (revision 8444) @@ -127,5 +127,5 @@ Main.error(tr("Activating the standard map renderer instead.")); activateDefault(); - } else if (! AbstractMapRenderer.class.isAssignableFrom(c)) { + } else if (!AbstractMapRenderer.class.isAssignableFrom(c)) { Main.error(tr("Can''t activate map renderer class ''{0}'', because it isn''t a subclass of ''{1}''.", rendererClassName, AbstractMapRenderer.class.getName())); Main.error(tr("Activating the standard map renderer instead.")); @@ -133,5 +133,5 @@ } else { Class renderer = c.asSubclass(AbstractMapRenderer.class); - if (! isRegistered(renderer)) { + if (!isRegistered(renderer)) { Main.error(tr("Can''t activate map renderer class ''{0}'', because it isn''t registered as map renderer.", rendererClassName)); Main.error(tr("Activating the standard map renderer instead.")); Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 8444) @@ -591,5 +591,5 @@ x -= textWidth / 2; } else if (bs.hAlign == HorizontalTextAlignment.LEFT) { - x -= - box.x + 4 + textWidth; + x -= -box.x + 4 + textWidth; } else throw new AssertionError(); } @@ -643,5 +643,5 @@ break; case CENTER: - dy1 = - imgHeight / 2; + dy1 = -imgHeight / 2; dy2 = imgHeight + dy1; break; @@ -1341,5 +1341,5 @@ // scale such that border is 1 px - final double fac = - (onewayReversed ? -1 : 1) * onewaySize * (1 + sinPHI) / (sinPHI * cosPHI); + final double fac = -(onewayReversed ? -1 : 1) * onewaySize * (1 + sinPHI) / (sinPHI * cosPHI); final double sx = nx * fac; final double sy = ny * fac; Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java (revision 8444) @@ -433,5 +433,5 @@ path.lineTo(p2.x + (int) Math.round(cosPHI * sx - sinPHI * sy), p2.y + (int) Math.round(sinPHI * sx + cosPHI * sy)); - path.moveTo(p2.x + (int) Math.round(cosPHI * sx + sinPHI * sy), p2.y + (int) Math.round(- sinPHI * sx + cosPHI * sy)); + path.moveTo(p2.x + (int) Math.round(cosPHI * sx + sinPHI * sy), p2.y + (int) Math.round(-sinPHI * sx + cosPHI * sy)); path.lineTo(p2.x, p2.y); } Index: /trunk/src/org/openstreetmap/josm/data/projection/datum/SevenParameterDatum.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/datum/SevenParameterDatum.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/projection/datum/SevenParameterDatum.java (revision 8444) @@ -50,5 +50,5 @@ double y = dy + xyz[1]*(1+s) + xyz[0]*rz - xyz[2]*rx; double z = dz + xyz[2]*(1+s) + xyz[1]*rx - xyz[0]*ry; - return Ellipsoid.WGS84.cart2LatLon(new double[] { x, y, z }); + return Ellipsoid.WGS84.cart2LatLon(new double[] {x, y, z}); } @@ -59,6 +59,5 @@ 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(new double[] { x, y, z }); + return this.ellps.cart2LatLon(new double[] {x, y, z}); } - } Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java (revision 8444) @@ -153,10 +153,10 @@ public double[] project(double phi, double lambda) { double sinphi = sin(phi); - double L = (0.5*log((1+sinphi)/(1-sinphi))) - e/2*log((1+e*sinphi)/(1-e*sinphi)); - double r = f*exp(-n*L); + double l = (0.5*log((1+sinphi)/(1-sinphi))) - e/2*log((1+e*sinphi)/(1-e*sinphi)); + double r = f*exp(-n*l); double gamma = n*lambda; - double X = r*sin(gamma); - double Y = r0 - r*cos(gamma); - return new double[] { X, Y }; + double x = r*sin(gamma); + double y = r0 - r*cos(gamma); + return new double[] {x, y}; } @@ -168,5 +168,5 @@ double latIso = (-1/n) * log(abs(r/f)); double phi = ellps.latitude(latIso, e, epsilon); - return new double[] { phi, lambda }; + return new double[] {phi, lambda}; } Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/LonLat.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/LonLat.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/LonLat.java (revision 8444) @@ -30,10 +30,10 @@ @Override public double[] project(double lat_rad, double lon_rad) { - return new double[] { Math.toDegrees(lon_rad) / a, Math.toDegrees(lat_rad) / a }; + return new double[] {Math.toDegrees(lon_rad) / a, Math.toDegrees(lat_rad) / a}; } @Override public double[] invproject(double east, double north) { - return new double[] { Math.toRadians(north * a), Math.toRadians(east * a) }; + return new double[] {Math.toRadians(north * a), Math.toRadians(east * a)}; } } Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/Mercator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/Mercator.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/Mercator.java (revision 8444) @@ -32,11 +32,10 @@ @Override public double[] project(double lat_rad, double lon_rad) { - return new double[] { lon_rad, log(tan(PI/4 + lat_rad/2)) }; + return new double[] {lon_rad, log(tan(PI/4 + lat_rad/2))}; } @Override public double[] invproject(double east, double north) { - return new double[] { atan(sinh(north)), east }; + return new double[] {atan(sinh(north)), east}; } - } Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java (revision 8444) @@ -81,5 +81,5 @@ double x = kR / 2 * log((1 + sin(bb)) / (1 - sin(bb))); - return new double[] { y, x }; + return new double[] {y, x}; } @@ -107,5 +107,5 @@ phi = 2 * atan(exp(s)) - PI / 2; } - return new double[] { phi, lambda }; + return new double[] {phi, lambda}; } } Index: /trunk/src/org/openstreetmap/josm/data/validation/PaintVisitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/PaintVisitor.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/validation/PaintVisitor.java (revision 8444) @@ -162,8 +162,8 @@ int deg = (int) Math.toDegrees(t); if (selected) { - int[] x = new int[] { (int) (p1.x + cosT), (int) (p2.x + cosT), - (int) (p2.x - cosT), (int) (p1.x - cosT) }; - int[] y = new int[] { (int) (p1.y - sinT), (int) (p2.y - sinT), - (int) (p2.y + sinT), (int) (p1.y + sinT) }; + int[] x = new int[] {(int) (p1.x + cosT), (int) (p2.x + cosT), + (int) (p2.x - cosT), (int) (p1.x - cosT)}; + int[] y = new int[] {(int) (p1.y - sinT), (int) (p2.y - sinT), + (int) (p2.y + sinT), (int) (p1.y + sinT)}; g.fillPolygon(x, y, 4); g.fillArc(p1.x - 5, p1.y - 5, 10, 10, deg, 180); Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java (revision 8444) @@ -195,5 +195,5 @@ if (duplicated.size() > 1) { TestError testError = new TestError(this, Severity.ERROR, tr("Duplicated relations"), DUPLICATE_RELATION, duplicated); - errors.add( testError ); + errors.add(testError); } } @@ -202,5 +202,5 @@ if (duplicated.size() > 1) { TestError testError = new TestError(this, Severity.WARNING, tr("Relations with same members"), SAME_RELATION, duplicated); - errors.add( testError ); + errors.add(testError); } } Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java (revision 8444) @@ -69,5 +69,5 @@ private boolean parentMultipolygonConcernsArea(OsmPrimitive p) { for (Relation r : OsmPrimitive.getFilteredList(p.getReferrers(), Relation.class)) { - if (r.concernsArea() ) { + if (r.concernsArea()) { return true; } Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 8444) @@ -248,5 +248,5 @@ if (errorSources.length() > 0) - throw new IOException( tr("Could not access data file(s):\n{0}", errorSources) ); + throw new IOException(tr("Could not access data file(s):\n{0}", errorSources)); } Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java (revision 8444) @@ -44,11 +44,11 @@ public static final Set NAMED_WAYS = new HashSet<>(); static { - NAMED_WAYS.add( "motorway" ); - NAMED_WAYS.add( "trunk" ); - NAMED_WAYS.add( "primary" ); - NAMED_WAYS.add( "secondary" ); - NAMED_WAYS.add( "tertiary" ); - NAMED_WAYS.add( "residential" ); - NAMED_WAYS.add( "pedestrian" ); + NAMED_WAYS.add("motorway"); + NAMED_WAYS.add("trunk"); + NAMED_WAYS.add("primary"); + NAMED_WAYS.add("secondary"); + NAMED_WAYS.add("tertiary"); + NAMED_WAYS.add("residential"); + NAMED_WAYS.add("pedestrian"); } @@ -56,9 +56,9 @@ public static final Set WHITELIST = new HashSet<>(); static { - WHITELIST.add( "outer" ); - WHITELIST.add( "inner" ); - WHITELIST.add( "perimeter" ); - WHITELIST.add( "edge" ); - WHITELIST.add( "outline" ); + WHITELIST.add("outer"); + WHITELIST.add("inner"); + WHITELIST.add("perimeter"); + WHITELIST.add("edge"); + WHITELIST.add("outline"); } Index: /trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java (revision 8444) @@ -64,5 +64,5 @@ if (!cellNodes.contains(cell)) { cellNodes.add(cell); - ways = cellWays.get( cell ); + ways = cellWays.get(cell); if (ways == null) { ways = new ArrayList<>(); @@ -157,5 +157,5 @@ long maxSteps = (gridX1 - gridX0) + Math.abs(gridY1 - gridY0) + 1; while ((gridX0 <= gridX1 && (gridY0 - gridY1)*stepY <= 0) && maxSteps-- > 0) { - cells.add( new Point2D.Double(gridX0, gridY0)); + cells.add(new Point2D.Double(gridX0, gridY0)); // Is the cross between the segment and next vertical line nearer than the cross with next horizontal line? Index: /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java (revision 8444) @@ -65,7 +65,6 @@ iSlippyMapChooser.addMouseMotionListener(this); - String[] n = { ",", ".", "up", "right", "down", "left" }; - int[] k = { KeyEvent.VK_COMMA, KeyEvent.VK_PERIOD, KeyEvent.VK_UP, KeyEvent.VK_RIGHT, KeyEvent.VK_DOWN, - KeyEvent.VK_LEFT }; + String[] n = {",", ".", "up", "right", "down", "left"}; + int[] k = {KeyEvent.VK_COMMA, KeyEvent.VK_PERIOD, KeyEvent.VK_UP, KeyEvent.VK_RIGHT, KeyEvent.VK_DOWN, KeyEvent.VK_LEFT}; if (contentPane != null) { Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (revision 8444) @@ -87,6 +87,6 @@ */ protected final void loadIcons() { - mergeComplete = ImageProvider.get("dialogs", "valid" ); - mergeIncomplete = ImageProvider.get("dialogs/conflict", "mergeincomplete" ); + mergeComplete = ImageProvider.get("dialogs", "valid"); + mergeIncomplete = ImageProvider.get("dialogs/conflict", "mergeincomplete"); } Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 8444) @@ -274,5 +274,5 @@ } - protected void copyToTop(ListRole role, int []rows) { + protected void copyToTop(ListRole role, int[] rows) { copy(role, rows, 0); mergedEntriesSelectionModel.setSelectionInterval(0, rows.length -1); @@ -286,5 +286,5 @@ * @param rows the indices */ - public void copyMyToTop(int [] rows) { + public void copyMyToTop(int[] rows) { copyToTop(MY_ENTRIES, rows); } @@ -297,5 +297,5 @@ * @param rows the indices */ - public void copyTheirToTop(int [] rows) { + public void copyTheirToTop(int[] rows) { copyToTop(THEIR_ENTRIES, rows); } @@ -310,5 +310,5 @@ */ - public void copyToEnd(ListRole source, int [] rows) { + public void copyToEnd(ListRole source, int[] rows) { copy(source, rows, getMergedEntriesSize()); mergedEntriesSelectionModel.setSelectionInterval(getMergedEntriesSize()-rows.length, getMergedEntriesSize() -1); @@ -323,5 +323,5 @@ * @param rows the indices */ - public void copyMyToEnd(int [] rows) { + public void copyMyToEnd(int[] rows) { copyToEnd(MY_ENTRIES, rows); } @@ -334,5 +334,5 @@ * @param rows the indices */ - public void copyTheirToEnd(int [] rows) { + public void copyTheirToEnd(int[] rows) { copyToEnd(THEIR_ENTRIES, rows); } @@ -417,5 +417,5 @@ * @throws IllegalArgumentException if current < 0 or >= #nodes in list of merged nodes */ - protected void copyBeforeCurrent(ListRole source, int [] rows, int current) { + protected void copyBeforeCurrent(ListRole source, int[] rows, int current) { copy(source, rows, current); mergedEntriesSelectionModel.setSelectionInterval(current, current + rows.length-1); @@ -430,6 +430,6 @@ * @throws IllegalArgumentException if current < 0 or >= #nodes in list of merged nodes */ - public void copyMyBeforeCurrent(int [] rows, int current) { - copyBeforeCurrent(MY_ENTRIES,rows,current); + public void copyMyBeforeCurrent(int[] rows, int current) { + copyBeforeCurrent(MY_ENTRIES, rows, current); } @@ -442,6 +442,6 @@ * @throws IllegalArgumentException if current < 0 or >= #nodes in list of merged nodes */ - public void copyTheirBeforeCurrent(int [] rows, int current) { - copyBeforeCurrent(THEIR_ENTRIES,rows,current); + public void copyTheirBeforeCurrent(int[] rows, int current) { + copyBeforeCurrent(THEIR_ENTRIES, rows, current); } @@ -455,5 +455,5 @@ * @throws IllegalArgumentException if current < 0 or >= #nodes in list of merged nodes */ - protected void copyAfterCurrent(ListRole source, int [] rows, int current) { + protected void copyAfterCurrent(ListRole source, int[] rows, int current) { copy(source, rows, current + 1); mergedEntriesSelectionModel.setSelectionInterval(current+1, current + rows.length-1); @@ -469,5 +469,5 @@ * @throws IllegalArgumentException if current < 0 or >= #nodes in list of merged nodes */ - public void copyMyAfterCurrent(int [] rows, int current) { + public void copyMyAfterCurrent(int[] rows, int current) { copyAfterCurrent(MY_ENTRIES, rows, current); } @@ -481,5 +481,5 @@ * @throws IllegalArgumentException if current < 0 or >= #nodes in list of merged nodes */ - public void copyTheirAfterCurrent(int [] rows, int current) { + public void copyTheirAfterCurrent(int[] rows, int current) { copyAfterCurrent(THEIR_ENTRIES, rows, current); } @@ -492,5 +492,5 @@ * */ - public void moveUpMerged(int [] rows) { + public void moveUpMerged(int[] rows) { if (rows == null || rows.length == 0) return; @@ -518,5 +518,5 @@ * @param rows the indices */ - public void moveDownMerged(int [] rows) { + public void moveDownMerged(int[] rows) { if (rows == null || rows.length == 0) return; @@ -545,5 +545,5 @@ * @param rows the indices */ - public void removeMerged(int [] rows) { + public void removeMerged(int[] rows) { if (rows == null || rows.length == 0) return; @@ -570,5 +570,5 @@ return false; for (int i=0; i < getMyEntriesSize(); i++) { - if (! isEqualEntry(getMyEntries().get(i), getTheirEntries().get(i))) + if (!isEqualEntry(getMyEntries().get(i), getTheirEntries().get(i))) return false; } Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 8444) @@ -483,8 +483,8 @@ @Override public void actionPerformed(ActionEvent e) { - int [] mergedRows = mergedEntriesTable.getSelectedRows(); + int[] mergedRows = mergedEntriesTable.getSelectedRows(); if (mergedRows == null || mergedRows.length == 0) return; - int [] myRows = myEntriesTable.getSelectedRows(); + int[] myRows = myEntriesTable.getSelectedRows(); int current = mergedRows[0]; model.copyMyBeforeCurrent(myRows, current); @@ -513,8 +513,8 @@ @Override public void actionPerformed(ActionEvent e) { - int [] mergedRows = mergedEntriesTable.getSelectedRows(); + int[] mergedRows = mergedEntriesTable.getSelectedRows(); if (mergedRows == null || mergedRows.length == 0) return; - int [] myRows = myEntriesTable.getSelectedRows(); + int[] myRows = myEntriesTable.getSelectedRows(); int current = mergedRows[0]; model.copyMyAfterCurrent(myRows, current); @@ -575,8 +575,8 @@ @Override public void actionPerformed(ActionEvent e) { - int [] mergedRows = mergedEntriesTable.getSelectedRows(); + int[] mergedRows = mergedEntriesTable.getSelectedRows(); if (mergedRows == null || mergedRows.length == 0) return; - int [] myRows = theirEntriesTable.getSelectedRows(); + int[] myRows = theirEntriesTable.getSelectedRows(); int current = mergedRows[0]; model.copyTheirBeforeCurrent(myRows, current); @@ -601,8 +601,8 @@ @Override public void actionPerformed(ActionEvent e) { - int [] mergedRows = mergedEntriesTable.getSelectedRows(); + int[] mergedRows = mergedEntriesTable.getSelectedRows(); if (mergedRows == null || mergedRows.length == 0) return; - int [] myRows = theirEntriesTable.getSelectedRows(); + int[] myRows = theirEntriesTable.getSelectedRows(); int current = mergedRows[0]; model.copyTheirAfterCurrent(myRows, current); @@ -690,5 +690,5 @@ @Override public void actionPerformed(ActionEvent arg0) { - int [] rows = mergedEntriesTable.getSelectedRows(); + int[] rows = mergedEntriesTable.getSelectedRows(); model.moveUpMerged(rows); } @@ -696,5 +696,5 @@ @Override public void valueChanged(ListSelectionEvent e) { - int [] rows = mergedEntriesTable.getSelectedRows(); + int[] rows = mergedEntriesTable.getSelectedRows(); setEnabled( rows != null @@ -724,5 +724,5 @@ @Override public void actionPerformed(ActionEvent arg0) { - int [] rows = mergedEntriesTable.getSelectedRows(); + int[] rows = mergedEntriesTable.getSelectedRows(); model.moveDownMerged(rows); } @@ -730,5 +730,5 @@ @Override public void valueChanged(ListSelectionEvent e) { - int [] rows = mergedEntriesTable.getSelectedRows(); + int[] rows = mergedEntriesTable.getSelectedRows(); setEnabled( rows != null @@ -758,5 +758,5 @@ @Override public void actionPerformed(ActionEvent arg0) { - int [] rows = mergedEntriesTable.getSelectedRows(); + int[] rows = mergedEntriesTable.getSelectedRows(); model.removeMerged(rows); } @@ -764,5 +764,5 @@ @Override public void valueChanged(ListSelectionEvent e) { - int [] rows = mergedEntriesTable.getSelectedRows(); + int[] rows = mergedEntriesTable.getSelectedRows(); setEnabled( rows != null Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java (revision 8444) @@ -57,5 +57,5 @@ */ public WayNodesConflictResolverCommand buildResolveCommand(Conflict conflict) { - if (! isFrozen()) + if (!isFrozen()) throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Cannot build resolution command.")); return new WayNodesConflictResolverCommand(conflict, getMergedEntries()); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java (revision 8444) @@ -88,5 +88,5 @@ * @param isSelected true, if the current row is selected */ - protected void renderRowId( ListMergeModel.EntriesTableModel model, int row, boolean isSelected) { + protected void renderRowId(ListMergeModel.EntriesTableModel model, int row, boolean isSelected) { setIcon(null); setBorder(rowNumberBorder); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (revision 8444) @@ -70,4 +70,7 @@ } + /** + * Constructs a new {@code PropertiesMergeModel}. + */ public PropertiesMergeModel() { coordMergeDecision = UNDECIDED; @@ -78,17 +81,14 @@ /** - * replies true if there is a coordinate conflict and if this conflict is - * resolved - * - * @return true if there is a coordinate conflict and if this conflict is - * resolved; false, otherwise + * replies true if there is a coordinate conflict and if this conflict is resolved + * + * @return true if there is a coordinate conflict and if this conflict is resolved; false, otherwise */ public boolean isDecidedCoord() { - return ! coordMergeDecision.equals(UNDECIDED); - } - - /** - * replies true if there is a conflict in the deleted state and if this conflict is - * resolved + return !coordMergeDecision.equals(UNDECIDED); + } + + /** + * replies true if there is a conflict in the deleted state and if this conflict is resolved * * @return true if there is a conflict in the deleted state and if this conflict is @@ -96,5 +96,5 @@ */ public boolean isDecidedDeletedState() { - return ! deletedMergeDecision.equals(UNDECIDED); + return !deletedMergeDecision.equals(UNDECIDED); } @@ -311,8 +311,8 @@ boolean ret = true; if (hasCoordConflict()) { - ret = ret && ! coordMergeDecision.equals(UNDECIDED); + ret = ret && !coordMergeDecision.equals(UNDECIDED); } if (hasDeletedStateConflict()) { - ret = ret && ! deletedMergeDecision.equals(UNDECIDED); + ret = ret && !deletedMergeDecision.equals(UNDECIDED); } return ret; Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (revision 8444) @@ -321,5 +321,5 @@ lblMergedCoordinates.setText(coordToString(model.getMergedCoords())); lblTheirCoordinates.setText(coordToString(model.getTheirCoords())); - if (! model.hasCoordConflict()) { + if (!model.hasCoordConflict()) { lblMyCoordinates.setBackground(ConflictColors.BGCOLOR_NO_CONFLICT.get()); lblMergedCoordinates.setBackground(ConflictColors.BGCOLOR_NO_CONFLICT.get()); @@ -349,5 +349,5 @@ lblTheirDeletedState.setText(deletedStateToString(model.getTheirDeletedState())); - if (! model.hasDeletedStateConflict()) { + if (!model.hasDeletedStateConflict()) { lblMyDeletedState.setBackground(ConflictColors.BGCOLOR_NO_CONFLICT.get()); lblMergedDeletedState.setBackground(ConflictColors.BGCOLOR_NO_CONFLICT.get()); @@ -403,5 +403,5 @@ @Override public void update(Observable o, Object arg) { - setEnabled(model.hasCoordConflict() && ! model.isDecidedCoord()); + setEnabled(model.hasCoordConflict() && !model.isDecidedCoord()); } } @@ -420,5 +420,5 @@ @Override public void update(Observable o, Object arg) { - setEnabled(model.hasCoordConflict() && ! model.isDecidedCoord()); + setEnabled(model.hasCoordConflict() && !model.isDecidedCoord()); } } @@ -454,5 +454,5 @@ @Override public void update(Observable o, Object arg) { - setEnabled(model.hasDeletedStateConflict() && ! model.isDecidedDeletedState()); + setEnabled(model.hasDeletedStateConflict() && !model.isDecidedDeletedState()); } } @@ -471,5 +471,5 @@ @Override public void update(Observable o, Object arg) { - setEnabled(model.hasDeletedStateConflict() && ! model.isDecidedDeletedState()); + setEnabled(model.hasDeletedStateConflict() && !model.isDecidedDeletedState()); } } Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java (revision 8444) @@ -109,5 +109,5 @@ CheckParameterUtil.ensureParameterNotNull(my, "my"); CheckParameterUtil.ensureParameterNotNull(their, "their"); - if (! isFrozen()) + if (!isFrozen()) throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Cannot build resolution command")); List entries = getMergedEntries(); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java (revision 8444) @@ -79,5 +79,5 @@ protected void renderForeground(ListMergeModel.EntriesTableModel model, RelationMember member, int row, int col, boolean isSelected) { Color fgc = ConflictColors.FGCOLOR.get(); - if (col == 0 && model.isParticipatingInCurrentComparePair() && ! model.getListMergeModel().isFrozen()) { + if (col == 0 && model.isParticipatingInCurrentComparePair() && !model.getListMergeModel().isFrozen()) { fgc = ConflictColors.FGCOLOR_PARTICIPATING_IN_COMPARISON.get(); } Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java (revision 8444) @@ -113,5 +113,5 @@ String myValue = my.get(key); String theirValue = their.get(key); - if (myValue == null || theirValue == null || ! myValue.equals(theirValue)) { + if (myValue == null || theirValue == null || !myValue.equals(theirValue)) { tagMergeItems.add( new TagMergeItem(key, my, their) @@ -161,5 +161,5 @@ * @param decision the decision */ - public void decide(int [] rows, MergeDecisionType decision) { + public void decide(int[] rows, MergeDecisionType decision) { if (rows == null || rows.length == 0) return; Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java (revision 8444) @@ -13,5 +13,5 @@ public abstract class TagMergeTableCellRenderer extends JLabel implements TableCellRenderer { - protected abstract void renderKey(TagMergeItem item, boolean isSelected ); + protected abstract void renderKey(TagMergeItem item, boolean isSelected); protected abstract void renderValue(TagMergeItem item, boolean isSelected); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java (revision 8444) @@ -99,5 +99,5 @@ fireGotoNextDecision(); } - } else if ( e.getID() == KeyEvent.KEY_PRESSED && e.getKeyCode() == KeyEvent.VK_DELETE || e.getKeyCode() == KeyEvent.VK_BACK_SPACE) { + } else if (e.getID() == KeyEvent.KEY_PRESSED && e.getKeyCode() == KeyEvent.VK_DELETE || e.getKeyCode() == KeyEvent.VK_BACK_SPACE) { if (editorModel.getIndexOf(MultiValueDecisionType.KEEP_NONE) > 0) { editorModel.setSelectedItem(MultiValueDecisionType.KEEP_NONE); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java (revision 8444) @@ -62,5 +62,5 @@ public boolean isDecided() { - return ! UNDECIDED.equals(decision); + return !UNDECIDED.equals(decision); } Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (revision 8444) @@ -246,5 +246,5 @@ final RelationMember newMember = new RelationMember(decision.getRole(),newPrimitive); modifiedRelation.addMember(newMember); - isChanged |= ! member.equals(newMember); + isChanged |= !member.equals(newMember); break; case REMOVE: Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (revision 8444) @@ -71,5 +71,5 @@ @Override public int compare(String key1, String key2) { - if (decisions.get(key1).isDecided() && ! decisions.get(key2).isDecided()) + if (decisions.get(key1).isDecided() && !decisions.get(key2).isDecided()) return 1; else if (!decisions.get(key1).isDecided() && decisions.get(key2).isDecided()) Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (revision 8444) @@ -431,5 +431,5 @@ if (sel.isEmpty()) return; - if (sel.size() > 10 && ! AbstractInfoAction.confirmLaunchMultiple(sel.size())) + if (sel.size() > 10 && !AbstractInfoAction.confirmLaunchMultiple(sel.size())) return; String baseUrl = Main.getBaseBrowseUrl(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (revision 8444) @@ -203,5 +203,5 @@ @Override public void actionPerformed(ActionEvent arg0) { - if (! resolver.isResolvedCompletely()) { + if (!resolver.isResolvedCompletely()) { Object[] options = { tr("Close anyway"), Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java (revision 8444) @@ -252,10 +252,10 @@ @Override public String getColumnName(int column) { - String[] names = { /* translators notes must be in front */ + String[] names = {/* translators notes must be in front */ /* column header: enable filter */trc("filter", "E"), /* column header: hide filter */trc("filter", "H"), /* column header: filter text */trc("filter", "Text"), /* column header: inverted filter */trc("filter", "I"), - /* column header: filter mode */trc("filter", "M") }; + /* column header: filter mode */trc("filter", "M")}; return names[column]; } @@ -263,5 +263,5 @@ @Override public Class getColumnClass(int column) { - Class[] classes = { Boolean.class, Boolean.class, String.class, Boolean.class, String.class }; + Class[] classes = {Boolean.class, Boolean.class, String.class, Boolean.class, String.class}; return classes[column]; } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java (revision 8444) @@ -165,6 +165,6 @@ public LatLonDialog(Component parent, String title, String help) { - super(parent, title, new String[] { tr("Ok"), tr("Cancel") }); - setButtonIcons(new String[] { "ok", "cancel" }); + super(parent, title, new String[] {tr("Ok"), tr("Cancel")}); + setButtonIcons(new String[] {"ok", "cancel"}); configureContextsensitiveHelp(help, true); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 8444) @@ -141,7 +141,7 @@ */ private final void createVisibilityToggleShortcuts() { - final int[] k = { KeyEvent.VK_1, KeyEvent.VK_2, KeyEvent.VK_3, KeyEvent.VK_4, - KeyEvent.VK_5, KeyEvent.VK_6, KeyEvent.VK_7, KeyEvent.VK_8, - KeyEvent.VK_9, KeyEvent.VK_0 }; + final int[] k = { + KeyEvent.VK_1, KeyEvent.VK_2, KeyEvent.VK_3, KeyEvent.VK_4, KeyEvent.VK_5, + KeyEvent.VK_6, KeyEvent.VK_7, KeyEvent.VK_8, KeyEvent.VK_9, KeyEvent.VK_0}; for(int i=0; i < 10; i++) { @@ -410,5 +410,5 @@ @Override public void updateEnabledState() { - setEnabled(! getModel().getSelectedLayers().isEmpty()); + setEnabled(!getModel().getSelectedLayers().isEmpty()); } @@ -604,5 +604,5 @@ public void updateEnabledState() { if (layer == null) { - setEnabled(! getModel().getSelectedLayers().isEmpty()); + setEnabled(!getModel().getSelectedLayers().isEmpty()); } else { setEnabled(true); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 8444) @@ -440,5 +440,5 @@ boolean added = false; for (OsmPrimitive p: addedPrimitives) { - if (! (p instanceof Relation)) { + if (!(p instanceof Relation)) { continue; } @@ -474,5 +474,5 @@ Set removedRelations = new HashSet<>(); for (OsmPrimitive p: removedPrimitives) { - if (! (p instanceof Relation)) { + if (!(p instanceof Relation)) { continue; } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 8444) @@ -790,5 +790,5 @@ int relations = 0; for (OsmPrimitive o : sel) { - if (! o.isSelectable()) continue; // skip unselectable primitives + if (!o.isSelectable()) continue; // skip unselectable primitives if (o instanceof Way) { ways++; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 8444) @@ -804,5 +804,5 @@ */ public boolean isDialogInDefaultView() { - return isShowing && isDocked && (! isCollapsed); + return isShowing && isDocked && (!isCollapsed); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (revision 8444) @@ -338,5 +338,5 @@ } - public void selectPrimitivesOwnedBy(int [] rows) { + public void selectPrimitivesOwnedBy(int[] rows) { Set users= new HashSet<>(); for (int index: rows) { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (revision 8444) @@ -241,5 +241,5 @@ // ask if the whole set should be ignored if (asked == JOptionPane.DEFAULT_OPTION) { - String[] a = new String[] { tr("Whole group"), tr("Single elements"), tr("Nothing") }; + String[] a = new String[] {tr("Whole group"), tr("Single elements"), tr("Nothing")}; asked = JOptionPane.showOptionDialog(Main.parent, tr("Ignore whole group or individual elements?"), tr("Ignoring elements"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, null, Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java (revision 8444) @@ -259,5 +259,5 @@ @Override public void propertyChange(PropertyChangeEvent evt) { - if (! evt.getPropertyName().equals(ChangesetCacheManagerModel.CHANGESET_IN_DETAIL_VIEW_PROP)) + if (!evt.getPropertyName().equals(ChangesetCacheManagerModel.CHANGESET_IN_DETAIL_VIEW_PROP)) return; setCurrentChangeset((Changeset)evt.getNewValue()); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java (revision 8444) @@ -155,5 +155,5 @@ @Override public void propertyChange(PropertyChangeEvent evt) { - if (! evt.getPropertyName().equals(ChangesetCacheManagerModel.CHANGESET_IN_DETAIL_VIEW_PROP)) + if (!evt.getPropertyName().equals(ChangesetCacheManagerModel.CHANGESET_IN_DETAIL_VIEW_PROP)) return; setCurrentChangeset((Changeset)evt.getNewValue()); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java (revision 8444) @@ -122,5 +122,5 @@ Set changesets = new HashSet<>(); for (OsmPrimitive p: ds.allPrimitives()) { - if (p.getChangesetId() <=0 ) { + if (p.getChangesetId() <= 0) { continue; } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 8444) @@ -177,5 +177,5 @@ public void displayMessageIfInvalid() { if (cbUserRestriction.isSelected()) { - if (! pnlUserRestriction.isValidChangesetQuery()) { + if (!pnlUserRestriction.isValidChangesetQuery()) { pnlUserRestriction.displayMessageIfInvalid(); } @@ -200,5 +200,5 @@ ChangesetQuery query = new ChangesetQuery(); if (cbUserRestriction.isSelected()) { - if (! pnlUserRestriction.isValidChangesetQuery()) + if (!pnlUserRestriction.isValidChangesetQuery()) return null; pnlUserRestriction.fillInQuery(query); @@ -535,5 +535,5 @@ throw new IllegalStateException(tr("Current value ''{0}'' for user ID is not valid", tfUid.getText())); } else if (rbRestrictToUserName.isSelected()) { - if (! valUserName.isValid()) + if (!valUserName.isValid()) throw new IllegalStateException(tr("Cannot restrict the changeset query to the user name ''{0}''", tfUserName.getText())); query.forUser(tfUserName.getText()); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java (revision 8444) @@ -253,5 +253,5 @@ cbMyChangesetsOnly.setEnabled(false); } else { - if (! cbMyChangesetsOnly.isEnabled()) { + if (!cbMyChangesetsOnly.isEnabled()) { cbMyChangesetsOnly.setEnabled(true); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java (revision 8444) @@ -166,8 +166,7 @@ if (query.isRestrictedToPartiallyIdentifiedUser() && im.isCurrentUser(query.getUserName())) { // if we query changesets for the current user, make sure we query against - // its user id, not its user name. If necessary, determine the user id - // first. + // its user id, not its user name. If necessary, determine the user id first. // - if (im.isPartiallyIdentified() ) { + if (im.isPartiallyIdentified()) { fullyIdentifyCurrentUser(); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java (revision 8444) @@ -136,5 +136,5 @@ String path = url.getPath(); String query = url.getQuery(); - if (path == null || ! path.endsWith("/changesets")) return null; + if (path == null || !path.endsWith("/changesets")) return null; try { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 8444) @@ -159,5 +159,5 @@ (Map) tagData.getValueAt(row, 1), focusOnKey); editDialog.showDialog(); - if (editDialog.getValue() !=1 ) return; + if (editDialog.getValue() != 1) return; editDialog.performTagEdit(); } @@ -211,5 +211,5 @@ public void saveTagsIfNeeded() { if (PROPERTY_REMEMBER_TAGS.get() && !recentTags.isEmpty()) { - List c = new ArrayList<>( recentTags.size()*2 ); + List c = new ArrayList<>(recentTags.size()*2); for (Tag t: recentTags.keySet()) { c.add(t.getKey()); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (revision 8444) @@ -161,5 +161,5 @@ protected Dialog getParentDialog() { Component c = this; - while(c != null && ! (c instanceof Dialog)) { + while(c != null && !(c instanceof Dialog)) { c = c.getParent(); } @@ -186,5 +186,5 @@ public void run() { - TreePath [] selection = childTree.getSelectionPaths(); + TreePath[] selection = childTree.getSelectionPaths(); if (selection == null || selection.length == 0) return; // do not launch more than 10 relation editors in parallel @@ -250,10 +250,10 @@ protected void updateEnabledState() { - TreePath [] selection = childTree.getSelectionPaths(); + TreePath[] selection = childTree.getSelectionPaths(); setEnabled(selection != null && selection.length > 0); } public void run() { - TreePath [] selection = childTree.getSelectionPaths(); + TreePath[] selection = childTree.getSelectionPaths(); if (selection == null || selection.length == 0) return; @@ -398,5 +398,5 @@ protected void realRun() throws SAXException, IOException, OsmTransferException { try { - while(! relationsToDownload.isEmpty() && !canceled) { + while(!relationsToDownload.isEmpty() && !canceled) { Relation r = relationsToDownload.pop(); if (r.isNew()) { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 8444) @@ -1260,5 +1260,5 @@ protected boolean confirmClosingBecauseOfDirtyState() { - ButtonSpec [] options = new ButtonSpec[] { + ButtonSpec[] options = new ButtonSpec[] { new ButtonSpec( tr("Yes, create a conflict and close"), @@ -1394,5 +1394,5 @@ TagEditorModel tagModel = tagEditorPanel.getModel(); Relation snapshot = getRelationSnapshot(); - if ( (!memberTableModel.hasSameMembersAs(snapshot) || tagModel.isDirty()) + if ((!memberTableModel.hasSameMembersAs(snapshot) || tagModel.isDirty()) && !(snapshot == null && tagModel.getTags().isEmpty())) { //give the user a chance to save the changes @@ -1425,5 +1425,5 @@ protected int confirmClosingByCancel() { - ButtonSpec [] options = new ButtonSpec[] { + ButtonSpec[] options = new ButtonSpec[] { new ButtonSpec( tr("Yes, save the changes and close"), @@ -1569,5 +1569,5 @@ "
" + tr("Do you really want to apply the new role?") + ""; - String [] options = new String[] { + String[] options = new String[] { tr("Yes, apply it"), tr("No, do not apply") @@ -1595,5 +1595,5 @@ public void actionPerformed(ActionEvent e) { if (isEmptyRole()) { - if (! confirmSettingEmptyRole(memberTable.getSelectedRowCount())) + if (!confirmSettingEmptyRole(memberTable.getSelectedRowCount())) return; } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (revision 8444) @@ -106,5 +106,5 @@ public Dimension getPreferredSize(){ Container c = getParent(); - while(c != null && ! (c instanceof JViewport)) { + while(c != null && !(c instanceof JViewport)) { c = c.getParent(); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (revision 8444) @@ -73,5 +73,5 @@ * @throws IllegalArgumentException if child.getId() == 0 */ - public ParentRelationLoadingTask(Relation child, OsmDataLayer layer, boolean full, PleaseWaitProgressMonitor monitor ) { + public ParentRelationLoadingTask(Relation child, OsmDataLayer layer, boolean full, PleaseWaitProgressMonitor monitor) { super(tr("Download referring relations"), monitor, false /* don't ignore exception */); CheckParameterUtil.ensureValidPrimitiveId(child, "child"); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (revision 8444) @@ -117,5 +117,5 @@ super(Main.parent, "", - new String[] { tr("Apply Changes"), tr("Cancel")}, + new String[] {tr("Apply Changes"), tr("Cancel")}, false, false @@ -200,5 +200,5 @@ */ protected boolean isDirtyRelation() { - return ! relation.hasEqualSemanticAttributes(relationSnapshot); + return !relation.hasEqualSemanticAttributes(relationSnapshot); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (revision 8444) @@ -67,5 +67,5 @@ protected Dialog getParentDialog() { Component c = RelationTree.this; - while(c != null && ! (c instanceof Dialog)) { + while(c != null && !(c instanceof Dialog)) { c = c.getParent(); } @@ -90,5 +90,5 @@ TreePath path = event.getPath(); Relation parent = (Relation)event.getPath().getLastPathComponent(); - if (! parent.isIncomplete() || parent.isNew()) + if (!parent.isIncomplete() || parent.isNew()) // we don't load complete or new relations return; @@ -137,5 +137,5 @@ DataSetMerger visitor = new DataSetMerger(Main.main.getEditLayer().data, ds); visitor.merge(); - if (! visitor.getConflicts().isEmpty()) { + if (!visitor.getConflicts().isEmpty()) { Main.main.getEditLayer().getConflicts().add(visitor.getConflicts()); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTable.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTable.java (revision 8444) @@ -35,5 +35,5 @@ @Override public void mouseClicked(MouseEvent evt) { - if (! (SwingUtilities.isLeftMouseButton(evt) && evt.getClickCount() > 1)) + if (!(SwingUtilities.isLeftMouseButton(evt) && evt.getClickCount() > 1)) return; int row = rowAtPoint(evt.getPoint()); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java (revision 8444) @@ -229,5 +229,5 @@ if (oldSelectedRows.contains(s)) { - expandedPaths.add(new TreePath(new Object[] { rootNode, severityNode })); + expandedPaths.add(new TreePath(new Object[] {rootNode, severityNode})); } @@ -240,5 +240,5 @@ if (oldSelectedRows.contains(msgErrors.getKey())) { - expandedPaths.add(new TreePath(new Object[] { rootNode, severityNode, messageNode })); + expandedPaths.add(new TreePath(new Object[] {rootNode, severityNode, messageNode})); } @@ -257,5 +257,5 @@ severityNode.add(groupNode); if (oldSelectedRows.contains(bag.getKey())) { - expandedPaths.add(new TreePath(new Object[] { rootNode, severityNode, groupNode })); + expandedPaths.add(new TreePath(new Object[] {rootNode, severityNode, groupNode})); } } @@ -279,8 +279,7 @@ if (oldSelectedRows.contains(msgErrors.getKey())) { if (groupNode != null) { - expandedPaths.add(new TreePath(new Object[] { rootNode, severityNode, groupNode, - messageNode })); + expandedPaths.add(new TreePath(new Object[] {rootNode, severityNode, groupNode, messageNode})); } else { - expandedPaths.add(new TreePath(new Object[] { rootNode, severityNode, messageNode })); + expandedPaths.add(new TreePath(new Object[] {rootNode, severityNode, messageNode})); } } Index: /trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (revision 8444) @@ -286,5 +286,5 @@ } if (!LatLon.isValidLon(minlon) || !LatLon.isValidLon(maxlon) - || !LatLon.isValidLat(minlat) || ! LatLon.isValidLat(maxlat)) + || !LatLon.isValidLat(minlat) || !LatLon.isValidLat(maxlat)) return null; if (minlon > maxlon) Index: /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 8444) @@ -367,5 +367,5 @@ cbDownloadNotes.setSelected(Main.pref.getBoolean("download.notes", false)); cbNewLayer.setSelected(Main.pref.getBoolean("download.newlayer", false)); - cbStartup.setSelected( isAutorunEnabled() ); + cbStartup.setSelected(isAutorunEnabled()); int idx = Main.pref.getInteger("download.tab", 0); if (idx < 0 || idx > tpDownloadAreaSelectors.getTabCount()) { Index: /trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java (revision 8444) @@ -32,5 +32,5 @@ Color fgColor = UIManager.getColor("Table.foreground"); Font font = UIManager.getFont("Table.font"); - if (! model.hasTag(key)) { + if (!model.hasTag(key)) { text = tr("not present"); bgColor = BGCOLOR_DIFFERENCE; @@ -56,5 +56,5 @@ Color fgColor = UIManager.getColor("Table.foreground"); Font font = UIManager.getFont("Table.font"); - if (! model.hasTag(key)) { + if (!model.hasTag(key)) { text = tr("not present"); bgColor = BGCOLOR_DIFFERENCE; Index: /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java (revision 8444) @@ -73,5 +73,5 @@ for (Changeset cs: changesets) { if (canceled) return; - if (cs == null || cs.getId() <= 0 || ! cs.isOpen()) { + if (cs == null || cs.getId() <= 0 || !cs.isOpen()) { continue; } Index: /trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java (revision 8444) @@ -100,7 +100,7 @@ return; } - if (! (anObject instanceof Changeset)) return; + if (!(anObject instanceof Changeset)) return; Changeset cs = (Changeset)anObject; - if (cs.getId() == 0 || ! cs.isOpen()) return; + if (cs.getId() == 0 || !cs.isOpen()) return; Changeset candidate = getChangesetById(cs.getId()); if (candidate == null) return; Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 8444) @@ -410,5 +410,5 @@ @Override public void actionPerformed(ActionEvent e) { - if (! confirmSaveLayerInfosOK()) + if (!confirmSaveLayerInfosOK()) return; launchSafeAndUploadTask(); Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java (revision 8444) @@ -204,7 +204,7 @@ public boolean hasUnsavedData() { for (SaveLayerInfo info: layerInfo) { - if (info.isDoUploadToServer() && ! UploadOrSaveState.OK.equals(info.getUploadState())) + if (info.isDoUploadToServer() && !UploadOrSaveState.OK.equals(info.getUploadState())) return true; - if (info.isDoSaveToFile() && ! UploadOrSaveState.OK.equals(info.getSaveState())) + if (info.isDoSaveToFile() && !UploadOrSaveState.OK.equals(info.getSaveState())) return true; } Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java (revision 8444) @@ -242,5 +242,5 @@ } - public List getPrimitives(int [] indices) { + public List getPrimitives(int[] indices) { if (indices == null || indices.length == 0) return Collections.emptyList(); Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategy.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategy.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategy.java (revision 8444) @@ -88,5 +88,5 @@ UploadStrategy strategy = fromPreference(v); if (strategy == null) { - Main.warn(tr("Unexpected value for key ''{0}'' in preferences, got ''{1}''", "osm-server.upload-strategy", v )); + Main.warn(tr("Unexpected value for key ''{0}'' in preferences, got ''{1}''", "osm-server.upload-strategy", v)); return DEFAULT_UPLOAD_STRATEGY; } Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (revision 8444) @@ -330,5 +330,5 @@ lblMultiChangesetPoliciesHeader.setText(tr("There are multiple changesets necessary in order to upload {0} objects. Which strategy do you want to use?", numUploadedObjects)); - if (!rbFillOneChangeset.isSelected() && ! rbUseMultipleChangesets.isSelected()) { + if (!rbFillOneChangeset.isSelected() && !rbUseMultipleChangesets.isSelected()) { rbUseMultipleChangesets.setSelected(true); } Index: /trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java (revision 8444) @@ -234,7 +234,7 @@ Kernel kernel; if (sharpenLevel == 1) { - kernel = new Kernel(3, 3, new float[] { -0.25f, -0.5f, -0.25f, -0.5f, 4, -0.5f, -0.25f, -0.5f, -0.25f}); + kernel = new Kernel(3, 3, new float[] {-0.25f, -0.5f, -0.25f, -0.5f, 4, -0.5f, -0.25f, -0.5f, -0.25f}); } else { - kernel = new Kernel(3, 3, new float[] { -0.5f, -1, -0.5f, -1, 7, -1, -0.5f, -1, -0.5f}); + kernel = new Kernel(3, 3, new float[] {-0.5f, -1, -0.5f, -1, 7, -1, -0.5f, -1, -0.5f}); } BufferedImageOp op = new ConvolveOp(kernel, ConvolveOp.EDGE_NO_OP, null); Index: /trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java (revision 8444) @@ -232,5 +232,5 @@ notePoint.setLocation(notePoint.getX(), notePoint.getY() - NotesDialog.ICON_SMALL_SIZE / 2); double dist = clickPoint.distanceSq(notePoint); - if (minDistance > dist && clickPoint.distance(notePoint) < snapDistance ) { + if (minDistance > dist && clickPoint.distance(notePoint) < snapDistance) { minDistance = dist; closestNote = note; Index: /trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 8444) @@ -746,5 +746,5 @@ boolean zia = currentZoomLevel < this.getMaxZoomLvl(); if (Main.isDebugEnabled()) { - Main.debug("zoomIncreaseAllowed(): " + zia + " " + currentZoomLevel + " vs. " + this.getMaxZoomLvl() ); + Main.debug("zoomIncreaseAllowed(): " + zia + " " + currentZoomLevel + " vs. " + this.getMaxZoomLvl()); } return zia; @@ -1419,5 +1419,5 @@ List missedTiles = this.paintTileImages(g, ts, displayZoomLevel, null); - int[] otherZooms = { -1, 1, -2, 2, -3, -4, -5}; + int[] otherZooms = {-1, 1, -2, 2, -3, -4, -5}; for (int zoomOffset : otherZooms) { if (!autoZoom) { Index: /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (revision 8444) @@ -105,6 +105,6 @@ // these values correspond to the zoom levels used throughout OSM and are in meters/pixel from zoom level 0 to 18. // taken from http://wiki.openstreetmap.org/wiki/Zoom_levels - private static final Double[] snapLevels = { 156412.0, 78206.0, 39103.0, 19551.0, 9776.0, 4888.0, - 2444.0, 1222.0, 610.984, 305.492, 152.746, 76.373, 38.187, 19.093, 9.547, 4.773, 2.387, 1.193, 0.596 }; + private static final Double[] snapLevels = {156412.0, 78206.0, 39103.0, 19551.0, 9776.0, 4888.0, + 2444.0, 1222.0, 610.984, 305.492, 152.746, 76.373, 38.187, 19.093, 9.547, 4.773, 2.387, 1.193, 0.596}; public static final BooleanProperty PROP_ALPHA_CHANNEL = new BooleanProperty("imagery.wms.alpha_channel", true); @@ -369,9 +369,9 @@ public int getImageXIndex(double coord) { - return (int)Math.floor( ((coord - dx) * info.getPixelPerDegree()) / imageSize); + return (int)Math.floor(((coord - dx) * info.getPixelPerDegree()) / imageSize); } public int getImageYIndex(double coord) { - return (int)Math.floor( ((coord - dy) * info.getPixelPerDegree()) / imageSize); + return (int)Math.floor(((coord - dy) * info.getPixelPerDegree()) / imageSize); } @@ -573,5 +573,5 @@ } - if ( priority == -1 + if (priority == -1 || finishedRequests.contains(item) || processingRequests.contains(item)) { Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 8444) @@ -420,5 +420,5 @@ boolean isOk = false; - while (! isOk) { + while (!isOk) { int answer = JOptionPane.showConfirmDialog( Main.parent, panel, @@ -438,5 +438,5 @@ JOptionPane.showMessageDialog(Main.parent, tr("Error while parsing the date.\n" + "Please use the requested format"), - tr("Invalid date"), JOptionPane.ERROR_MESSAGE ); + tr("Invalid date"), JOptionPane.ERROR_MESSAGE); continue; } @@ -697,7 +697,7 @@ Main.parent, tr("Correlate images with GPX track"), - new String[] { tr("OK"), tr("Try Again") }). + new String[] {tr("OK"), tr("Try Again")}). setContent(tr("No images could be matched!")). - setButtonIcons(new String[] { "ok", "dialogs/refresh"}). + setButtonIcons(new String[] {"ok", "dialogs/refresh"}). showDialog().getValue() == 2) return AGAIN; @@ -743,5 +743,5 @@ } } - if (! boundingBoxedLayerFound) { + if (!boundingBoxedLayerFound) { BoundingXYVisitor bbox = new BoundingXYVisitor(); yLayer.visitBoundingBox(bbox); @@ -981,5 +981,5 @@ new ExtendedDialog(Main.parent, tr("Adjust timezone and offset"), - new String[] { tr("Close")}). + new String[] {tr("Close")}). setContent(p).setButtonIcons(new String[] {"ok"}).showDialog(); } @@ -1114,5 +1114,5 @@ if (complain) { JOptionPane.showMessageDialog(Main.parent, tr("You should select a GPX track"), - tr("No selected GPX track"), JOptionPane.ERROR_MESSAGE ); + tr("No selected GPX track"), JOptionPane.ERROR_MESSAGE); } return null; Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 8444) @@ -545,7 +545,7 @@ double dir = e.getExifImgDir(); // Rotate 90 degrees CCW - double headdir = ( dir < 90 ) ? dir + 270 : dir - 90; - double leftdir = ( headdir < 90 ) ? headdir + 270 : headdir - 90; - double rightdir = ( headdir > 270 ) ? headdir - 270 : headdir + 90; + double headdir = (dir < 90) ? dir + 270 : dir - 90; + double leftdir = (headdir < 90) ? headdir + 270 : headdir - 90; + double rightdir = (headdir > 270) ? headdir - 270 : headdir + 90; double ptx = p.x + Math.cos(Math.toRadians(headdir)) * arrowlength; Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (revision 8444) @@ -73,5 +73,5 @@ // Wait for the end of loading - while (! tracker.checkID(1, true)) { + while (!tracker.checkID(1, true)) { if (this.file != ImageDisplay.this.file) { // The file has changed @@ -290,5 +290,5 @@ @Override public void mouseDragged(MouseEvent e) { - if (! mouseIsDragging && selectedRect == null) + if (!mouseIsDragging && selectedRect == null) return; @@ -339,5 +339,5 @@ @Override public void mouseReleased(MouseEvent e) { - if (! mouseIsDragging && selectedRect == null) + if (!mouseIsDragging && selectedRect == null) return; @@ -479,5 +479,5 @@ g.setColor(Color.black); String loadingStr; - if (! errorLoading) { + if (!errorLoading) { loadingStr = tr("Loading {0}", file.getName()); } else { Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 8444) @@ -327,5 +327,5 @@ return; } - if (! isDialogShowing()) { + if (!isDialogShowing()) { setIsDocked(false); // always open a detached window when an image is clicked and dialog is closed showDialog(); Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (revision 8444) @@ -84,8 +84,9 @@ private static final int sl4 = 5; private static final int sl9 = 3; - private static final int[][] dir = { { +sl4, +ll0, +ll0, +sl4 }, { -sl9, +ll0, +sl9, +ll0 }, { -ll0, +sl4, -sl4, +ll0 }, - { -ll0, -sl9, -ll0, +sl9 }, { -sl4, -ll0, -ll0, -sl4 }, { +sl9, -ll0, -sl9, -ll0 }, - { +ll0, -sl4, +sl4, -ll0 }, { +ll0, +sl9, +ll0, -sl9 }, { +sl4, +ll0, +ll0, +sl4 }, - { -sl9, +ll0, +sl9, +ll0 }, { -ll0, +sl4, -sl4, +ll0 }, { -ll0, -sl9, -ll0, +sl9 } }; + private static final int[][] dir = { + {+sl4, +ll0, +ll0, +sl4}, {-sl9, +ll0, +sl9, +ll0}, {-ll0, +sl4, -sl4, +ll0}, + {-ll0, -sl9, -ll0, +sl9}, {-sl4, -ll0, -ll0, -sl4}, {+sl9, -ll0, -sl9, -ll0}, + {+ll0, -sl4, +sl4, -ll0}, {+ll0, +sl9, +ll0, -sl9}, {+sl4, +ll0, +ll0, +sl4}, + {-sl9, +ll0, +sl9, +ll0}, {-ll0, +sl4, -sl4, +ll0}, {-ll0, -sl9, -ll0, +sl9}}; private void setupColors() { Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 8444) @@ -91,5 +91,5 @@ // Legacy code - convert label from int to template engine expression - private static final IntegerProperty PROP_LABEL = new IntegerProperty("draw.rawgps.layer.wpt", 0 ); + private static final IntegerProperty PROP_LABEL = new IntegerProperty("draw.rawgps.layer.wpt", 0); private static String getDefaultLabelPattern() { switch (PROP_LABEL.get()) { @@ -188,5 +188,5 @@ Collection links = wpt.getCollection(GpxConstants.META_LINKS); if (links != null) { - for (GpxLink oneLink : links ) { + for (GpxLink oneLink : links) { uri = oneLink.uri; break; Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (revision 8444) @@ -150,5 +150,5 @@ } } - if (! mousePressedInButton) + if (!mousePressedInButton) return; mousePressed = true; @@ -158,5 +158,5 @@ } @Override public void mouseReleased(MouseEvent ev) { - if (ev.getButton() != MouseEvent.BUTTON1 || ! mousePressed) + if (ev.getButton() != MouseEvent.BUTTON1 || !mousePressed) return; mousePressed = false; @@ -266,5 +266,5 @@ public boolean synchronizeAudioMarkers(final AudioMarker startMarker) { syncAudioMarker = startMarker; - if (syncAudioMarker != null && ! data.contains(syncAudioMarker)) { + if (syncAudioMarker != null && !data.contains(syncAudioMarker)) { syncAudioMarker = null; } @@ -506,5 +506,5 @@ @Override public void actionPerformed(ActionEvent e) { - if (! AudioPlayer.paused()) { + if (!AudioPlayer.paused()) { JOptionPane.showMessageDialog( Main.parent, @@ -543,5 +543,5 @@ @Override public void actionPerformed(ActionEvent e) { - if (! AudioPlayer.paused()) { + if (!AudioPlayer.paused()) { JOptionPane.showMessageDialog( Main.parent, Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (revision 8444) @@ -65,5 +65,5 @@ null, -1.0, 0.0); enabled = Main.pref.getBoolean("marker.traceaudio", true); - if (! enabled) return; + if (!enabled) return; dropTolerance = Main.pref.getInteger("marker.playHeadDropTolerance", 50); Main.map.mapView.addMouseListener(new MouseAdapter() { @@ -111,5 +111,5 @@ */ private void endDrag(boolean reset) { - if (! wasPlaying || reset) { + if (!wasPlaying || reset) { try { AudioPlayer.pause(); } catch (Exception ex) { AudioPlayer.audioMalfunction(ex);} @@ -210,5 +210,5 @@ /* We found the closest marker: did we actually hit it? */ - if (ca != null && ! ca.containsPoint(startPoint)) { + if (ca != null && !ca.containsPoint(startPoint)) { ca = null; } @@ -277,5 +277,5 @@ */ public void animate() { - if (! enabled) return; + if (!enabled) return; jumpToMarker = true; if (timer == null) { Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java (revision 8444) @@ -175,5 +175,5 @@ Float f = toFloat(o); if (f != null) - return new float[] { f }; + return new float[] {f}; return null; } Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/RepeatImageElemStyle.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/RepeatImageElemStyle.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/RepeatImageElemStyle.java (revision 8444) @@ -36,5 +36,5 @@ float offset = c.get(REPEAT_IMAGE_OFFSET, 0f, Float.class); float spacing = c.get(REPEAT_IMAGE_SPACING, 0f, Float.class); - float phase = - c.get(REPEAT_IMAGE_PHASE, 0f, Float.class); + float phase = -c.get(REPEAT_IMAGE_PHASE, 0f, Float.class); LineImageAlignment align = LineImageAlignment.CENTER; Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java (revision 8444) @@ -156,5 +156,5 @@ } - return new TextElement(strategy, font, (int) xOffset, - (int) yOffset, color, haloRadius, haloColor); + return new TextElement(strategy, font, (int) xOffset, -(int) yOffset, color, haloRadius, haloColor); } Index: /trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java (revision 8444) @@ -126,9 +126,9 @@ OAuthParameters params = OAuthParameters.createDefault(apiUrl); return - ! tfConsumerKey.getText().equals(params.getConsumerKey()) - || ! tfConsumerSecret.getText().equals(params.getConsumerSecret()) - || ! tfRequestTokenURL.getText().equals(params.getRequestTokenUrl()) - || ! tfAccessTokenURL.getText().equals(params.getAccessTokenUrl()) - || ! tfAuthoriseURL.getText().equals(params.getAuthoriseUrl()); + !tfConsumerKey.getText().equals(params.getConsumerKey()) + || !tfConsumerSecret.getText().equals(params.getConsumerSecret()) + || !tfRequestTokenURL.getText().equals(params.getRequestTokenUrl()) + || !tfAccessTokenURL.getText().equals(params.getAccessTokenUrl()) + || !tfAuthoriseURL.getText().equals(params.getAuthoriseUrl()); } @@ -216,6 +216,6 @@ cbUseDefaults.setSelected(false); setChildComponentsEnabled(true); - tfConsumerKey.setText( parameters.getConsumerKey() == null ? "" : parameters.getConsumerKey()); - tfConsumerSecret.setText( parameters.getConsumerSecret() == null ? "" : parameters.getConsumerSecret()); + tfConsumerKey.setText(parameters.getConsumerKey() == null ? "" : parameters.getConsumerKey()); + tfConsumerSecret.setText(parameters.getConsumerSecret() == null ? "" : parameters.getConsumerSecret()); tfRequestTokenURL.setText(parameters.getRequestTokenUrl() == null ? "" : parameters.getRequestTokenUrl()); tfAccessTokenURL.setText(parameters.getAccessTokenUrl() == null ? "" : parameters.getAccessTokenUrl()); Index: /trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (revision 8444) @@ -219,5 +219,5 @@ public void build() { - if (! valAccessTokenKey.isValid() || !valAccessTokenSecret.isValid()) { + if (!valAccessTokenKey.isValid() || !valAccessTokenSecret.isValid()) { setAccessToken(null); } else { @@ -269,5 +269,5 @@ @Override public void propertyChange(PropertyChangeEvent evt) { - if (! evt.getPropertyName().equals(AbstractAuthorizationUI.ACCESS_TOKEN_PROP)) + if (!evt.getPropertyName().equals(AbstractAuthorizationUI.ACCESS_TOKEN_PROP)) return; updateEnabledState(); Index: /trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (revision 8444) @@ -228,5 +228,5 @@ for (String kvPair : kvPairs) { kvPair = kvPair.trim(); - String [] kv = kvPair.split("="); + String[] kv = kvPair.split("="); if (kv == null || kv.length != 2) { continue; Index: /trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java (revision 8444) @@ -39,5 +39,5 @@ * @throws IllegalArgumentException if parameters is null. */ - public RetrieveRequestTokenTask(Component parent, OAuthParameters parameters ) { + public RetrieveRequestTokenTask(Component parent, OAuthParameters parameters) { super(parent, tr("Retrieving OAuth Request Token..."), false /* don't ignore exceptions */); CheckParameterUtil.ensureParameterNotNull(parameters, "parameters"); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (revision 8444) @@ -84,5 +84,5 @@ // set the maximum width to the current screen. If the dialog is opened on a // smaller screen than before, this will reset the stored preference. - this.setMaximumSize( Toolkit.getDefaultToolkit().getScreenSize()); + this.setMaximumSize(Toolkit.getDefaultToolkit().getScreenSize()); } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 8444) @@ -310,5 +310,5 @@ final List toDownload = preference.getPluginsScheduledForUpdateOrDownload(); final PluginDownloadTask task; - if (toDownload != null && ! toDownload.isEmpty()) { + if (toDownload != null && !toDownload.isEmpty()) { task = new PluginDownloadTask(this, toDownload, tr("Download plugins")); } else { @@ -349,5 +349,5 @@ // if (requiresRestart) { - final ButtonSpec [] options = RestartAction.getButtonSpecs(); + final ButtonSpec[] options = RestartAction.getButtonSpecs(); if (0 == HelpAwareOptionPane.showOptionDialog( Main.parent, Index: /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 8444) @@ -542,5 +542,5 @@ return; if (canEnable && column == 0) { - data.get(row).active = ! data.get(row).active; + data.get(row).active = !data.get(row).active; } } @@ -999,5 +999,5 @@ } if (!messages.isEmpty()) { - ExtendedDialog dlg = new ExtendedDialog(Main.parent, tr("Warning"), new String [] { tr("Cancel"), tr("Continue anyway") }); + ExtendedDialog dlg = new ExtendedDialog(Main.parent, tr("Warning"), new String[] {tr("Cancel"), tr("Continue anyway")}); dlg.setButtonIcons(new Icon[] { ImageProvider.get("cancel"), @@ -1300,5 +1300,5 @@ if (line.startsWith("\t")) { Matcher m = Pattern.compile("^\t([^:]+): *(.+)$").matcher(line); - if (! m.matches()) { + if (!m.matches()) { Main.error(tr(getStr(I18nString.ILLEGAL_FORMAT_OF_ENTRY), url, line)); continue; Index: /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 8444) @@ -414,5 +414,5 @@ String res = parser.saveAction(act); // remove the button from toolbar preferences - t.remove( res ); + t.remove(res); Main.pref.putCollection("toolbar", t); Main.toolbar.refreshToolbarControl(); @@ -535,5 +535,5 @@ private class ActionTransferable implements Transferable { - private final DataFlavor[] flavors = new DataFlavor[] { ACTION_FLAVOR }; + private final DataFlavor[] flavors = new DataFlavor[] {ACTION_FLAVOR}; private final List actions; @@ -769,5 +769,5 @@ @Override - public int getSourceActions( JComponent c ){ + public int getSourceActions(JComponent c) { return TransferHandler.MOVE; } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java (revision 8444) @@ -59,5 +59,5 @@ // audioMenuVisible - audioMenuVisible.setSelected(! Main.pref.getBoolean("audio.menuinvisible")); + audioMenuVisible.setSelected(!Main.pref.getBoolean("audio.menuinvisible")); audioMenuVisible.setToolTipText(tr("Show or hide the audio menu entry on the main menu bar.")); audio.add(audioMenuVisible, GBC.eol().insets(0,0,0,0)); @@ -127,5 +127,5 @@ @Override public boolean ok() { - Main.pref.put("audio.menuinvisible", ! audioMenuVisible.isSelected()); + Main.pref.put("audio.menuinvisible", !audioMenuVisible.isSelected()); Main.pref.put("marker.traceaudio", markerAudioTraceVisible.isSelected()); Main.pref.put("marker.buttonlabels", markerButtonLabels.isSelected()); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java (revision 8444) @@ -242,5 +242,5 @@ panel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); JScrollPane scrollpane = new JScrollPane(colors); - scrollpane.setBorder(BorderFactory.createEmptyBorder( 0, 0, 0, 0 )); + scrollpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); panel.add(scrollpane, GBC.eol().fill(GBC.BOTH)); JPanel buttonPanel = new JPanel(new GridBagLayout()); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java (revision 8444) @@ -63,5 +63,5 @@ JScrollPane scrollpane = new JScrollPane(panel); - scrollpane.setBorder(BorderFactory.createEmptyBorder( 0, 0, 0, 0 )); + scrollpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); gui.getDisplayPreference().addSubTab(this, tr("GPS Points"), scrollpane); panel = new JPanel(new GridBagLayout()); @@ -166,5 +166,5 @@ panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH)); scrollpane = new JScrollPane(panel); - scrollpane.setBorder(BorderFactory.createEmptyBorder( 0, 0, 0, 0 )); + scrollpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); gui.getDisplayPreference().addSubTab(this, tr("OSM Data"), scrollpane); } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java (revision 8444) @@ -148,5 +148,5 @@ JScrollPane scrollpane = new JScrollPane(panel); - scrollpane.setBorder(BorderFactory.createEmptyBorder( 0, 0, 0, 0 )); + scrollpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); gui.getDisplayPreference().addSubTab(this, tr("Look and Feel"), scrollpane); } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 8444) @@ -181,5 +181,5 @@ } } - imageryProviders.activeModel.addRow(new String[] { server, url }); + imageryProviders.activeModel.addRow(new String[] {server, url}); } @@ -856,5 +856,5 @@ */ public OffsetsBookmarksModel() { - setColumnIdentifiers(new String[] { tr("Projection"), tr("Layer"), tr("Name"), tr("Easting"), tr("Northing"),}); + setColumnIdentifiers(new String[] {tr("Projection"), tr("Layer"), tr("Name"), tr("Easting"), tr("Northing")}); } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java (revision 8444) @@ -73,5 +73,5 @@ final JPanel panel = new JPanel(new GridBagLayout()); - panel.setBorder(BorderFactory.createEmptyBorder( 0, 0, 0, 0 )); + panel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); panel.add(sources, GBC.eol().fill(GBC.BOTH)); @@ -268,5 +268,5 @@ defPL2.description = tr("the main Potlatch 2 style"); - return Arrays.asList(new ExtendedSourceEntry[] { defJosmMapcss, defPL2 }); + return Arrays.asList(new ExtendedSourceEntry[] {defJosmMapcss, defPL2}); } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (revision 8444) @@ -166,5 +166,5 @@ final JPanel panel = new JPanel(new GridBagLayout()); - panel.setBorder(BorderFactory.createEmptyBorder( 0, 0, 0, 0 )); + panel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); panel.add(sortMenu, GBC.eol().insets(5,5,5,0)); sources = new TaggingPresetSourceEditor(); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (revision 8444) @@ -281,5 +281,5 @@ @Override public boolean ok() { - if (! pluginPreferencesActivated) + if (!pluginPreferencesActivated) return false; pnlPluginUpdatePolicy.rememberInPreferences(); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java (revision 8444) @@ -281,5 +281,5 @@ PluginInformation pi = entry.getKey(); boolean selected = entry.getValue(); - if (selected && ! currentActivePlugins.contains(pi.name)) { + if (selected && !currentActivePlugins.contains(pi.name)) { ret.add(pi); } @@ -300,5 +300,5 @@ continue; } - if (selectedPluginsMap.get(pi) == null || ! selectedPluginsMap.get(pi)) { + if (selectedPluginsMap.get(pi) == null || !selectedPluginsMap.get(pi)) { ret.add(pi); } @@ -340,5 +340,5 @@ public boolean isActivePluginsChanged() { Set newActivePlugins = getSelectedPluginNames(); - return ! newActivePlugins.equals(currentActivePlugins); + return !newActivePlugins.equals(currentActivePlugins); } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java (revision 8444) @@ -163,5 +163,5 @@ */ public ParameterInfoDialog() { - super(null, tr("Parameter information"), new String[] { tr("Close") }, false); + super(null, tr("Parameter information"), new String[] {tr("Close")}, false); setContent(build()); } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java (revision 8444) @@ -11,5 +11,5 @@ public class GaussKruegerProjectionChoice extends ListProjectionChoice { - private static String[] zones = { "2", "3", "4", "5" }; + private static String[] zones = {"2", "3", "4", "5"}; /** Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (revision 8444) @@ -313,5 +313,5 @@ } - projPanel.setBorder(BorderFactory.createEmptyBorder( 0, 0, 0, 0 )); + projPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); projPanel.setLayout(new GridBagLayout()); projPanel.add(new JLabel(tr("Projection method")), GBC.std().insets(5,5,0,5)); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/SingleProjectionChoice.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/SingleProjectionChoice.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/SingleProjectionChoice.java (revision 8444) @@ -49,5 +49,5 @@ @Override public String[] allCodes() { - return new String[] { code }; + return new String[] {code}; } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java (revision 8444) @@ -16,5 +16,5 @@ private static final String Reunion92Name = tr("Reunion RGR92"); private static final String Guyane92Name = tr("Guyane RGFG95"); - private static final String[] utmGeodesicsNames = { FortMarigotName, SainteAnneName, MartiniqueName, Reunion92Name, Guyane92Name}; + private static final String[] utmGeodesicsNames = {FortMarigotName, SainteAnneName, MartiniqueName, Reunion92Name, Guyane92Name}; private static final Integer FortMarigotEPSG = 2969; @@ -23,5 +23,5 @@ private static final Integer ReunionEPSG = 2975; private static final Integer GuyaneEPSG = 2972; - private static final Integer[] utmEPSGs = { FortMarigotEPSG, SainteAnneEPSG, MartiniqueEPSG, ReunionEPSG, GuyaneEPSG }; + private static final Integer[] utmEPSGs = {FortMarigotEPSG, SainteAnneEPSG, MartiniqueEPSG, ReunionEPSG, GuyaneEPSG }; /** @@ -68,5 +68,5 @@ @Override public Collection getPreferencesFromCode(String code) { - for (int i=0; i < utmEPSGs.length; i++ ) + for (int i=0; i < utmEPSGs.length; i++) if (("EPSG:" + utmEPSGs[i]).equals(code)) return Collections.singleton(Integer.toString(i+1)); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (revision 8444) @@ -30,9 +30,9 @@ import org.openstreetmap.josm.gui.oauth.OAuthAuthorizationWizard; import org.openstreetmap.josm.gui.oauth.TestAccessTokenTask; +import org.openstreetmap.josm.gui.widgets.JMultilineLabel; +import org.openstreetmap.josm.gui.widgets.JosmTextField; import org.openstreetmap.josm.io.OsmApi; import org.openstreetmap.josm.io.auth.CredentialsManager; import org.openstreetmap.josm.tools.ImageProvider; -import org.openstreetmap.josm.gui.widgets.JMultilineLabel; -import org.openstreetmap.josm.gui.widgets.JosmTextField; /** @@ -360,4 +360,7 @@ */ private class TestAuthorisationAction extends AbstractAction { + /** + * Constructs a new {@code TestAuthorisationAction}. + */ public TestAuthorisationAction() { putValue(NAME, tr("Test Access Token")); @@ -383,5 +386,5 @@ @Override public void propertyChange(PropertyChangeEvent evt) { - if (! evt.getPropertyName().equals(OsmApiUrlInputPanel.API_URL_PROP)) + if (!evt.getPropertyName().equals(OsmApiUrlInputPanel.API_URL_PROP)) return; setApiUrl((String)evt.getNewValue()); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java (revision 8444) @@ -343,5 +343,5 @@ tfProxySocksPort.setText(Main.pref.get(PROXY_SOCKS_PORT, "")); - if (pp.equals(ProxyPolicy.USE_SYSTEM_SETTINGS) && ! DefaultProxySelector.willJvmRetrieveSystemProxies()) { + if (pp.equals(ProxyPolicy.USE_SYSTEM_SETTINGS) && !DefaultProxySelector.willJvmRetrieveSystemProxies()) { Main.warn(tr("JOSM is configured to use proxies from the system setting, but the JVM is not configured to retrieve them. Resetting preferences to ''No proxy''")); pp = ProxyPolicy.NO_PROXY; Index: /trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTestsPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTestsPreference.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTestsPreference.java (revision 8444) @@ -85,6 +85,6 @@ GBC a = GBC.eol().insets(-5,0,0,0); a.anchor = GBC.EAST; - testPanel.add( new JLabel(tr("On demand")), GBC.std() ); - testPanel.add( new JLabel(tr("On upload")), a ); + testPanel.add(new JLabel(tr("On demand")), GBC.std()); + testPanel.add(new JLabel(tr("On upload")), a); allTests = OsmValidator.getTests(); Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java (revision 8444) @@ -59,5 +59,5 @@ // for (String key : model.getKeys()) { - if (! key.equals(currentTag.getName())) { + if (!key.equals(currentTag.getName())) { autoCompletionList.remove(key); } Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (revision 8444) @@ -250,5 +250,5 @@ * @param tagIndices a list of tag indices */ - public void deleteTagNames(int [] tagIndices) { + public void deleteTagNames(int[] tagIndices) { if (tags == null) return; @@ -268,5 +268,5 @@ * @param tagIndices the lit of tag indices */ - public void deleteTagValues(int [] tagIndices) { + public void deleteTagValues(int[] tagIndices) { if (tags == null) return; @@ -307,5 +307,5 @@ * @param tagIndices the list of tag indices */ - public void deleteTags(int [] tagIndices) { + public void deleteTags(int[] tagIndices) { if (tags == null) return; @@ -546,5 +546,5 @@ String oldName = tag.getName(); tag.setName(newName); - if (! newName.equals(oldName)) { + if (!newName.equals(oldName)) { setDirty(true); } @@ -564,5 +564,5 @@ String oldValue = tag.getValue(); tag.setValue(newValue); - if (! newValue.equals(oldValue)) { + if (!newValue.equals(oldValue)) { setDirty(true); } Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 8444) @@ -445,5 +445,5 @@ public Dimension getPreferredSize(){ Container c = getParent(); - while(c != null && ! (c instanceof JViewport)) { + while(c != null && !(c instanceof JViewport)) { c = c.getParent(); } @@ -537,11 +537,11 @@ if (c!=null) { c.requestFocusInWindow(); - if ( c instanceof JTextComponent ) { - ( (JTextComponent)c ).selectAll(); + if (c instanceof JTextComponent) { + ((JTextComponent)c).selectAll(); } } // there was a bug here - on older 1.6 Java versions Tab was not working // after such activation. In 1.7 it works OK, - // previous solution of usint awt.Robot was resetting mouse speed on Windows + // previous solution of using awt.Robot was resetting mouse speed on Windows } @@ -557,5 +557,5 @@ @Override - public boolean editCellAt(int row, int column, EventObject e){ + public boolean editCellAt(int row, int column, EventObject e) { // a snipped copied from the Java 1.5 implementation of JTable Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 8444) @@ -276,5 +276,5 @@ for (Role i : roles.roles) { if (i.memberExpression != null && i.memberExpression.match(osm) - && (i.types == null || i.types.isEmpty() || i.types.contains(TaggingPresetType.forPrimitive(osm)) )) { + && (i.types == null || i.types.isEmpty() || i.types.contains(TaggingPresetType.forPrimitive(osm)))) { return i.key; } @@ -334,6 +334,6 @@ super(Main.parent, title, showNewRelation? - new String[] { tr("Apply Preset"), tr("New relation"), tr("Cancel") }: - new String[] { tr("Apply Preset"), tr("Cancel") }, + new String[] {tr("Apply Preset"), tr("New relation"), tr("Cancel")} : + new String[] {tr("Apply Preset"), tr("Cancel")}, true); if (icon != null) Index: /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java (revision 8444) @@ -292,5 +292,5 @@ @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - setText( value == null ? "" : value.toString()); + setText(value == null ? "" : value.toString()); rememberOriginalValue(getText()); return this; Index: /trunk/src/org/openstreetmap/josm/gui/util/AdjustmentSynchronizer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/util/AdjustmentSynchronizer.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/util/AdjustmentSynchronizer.java (revision 8444) @@ -62,5 +62,5 @@ @Override public void adjustmentValueChanged(AdjustmentEvent e) { - if (! enabledMap.get(e.getAdjustable())) + if (!enabledMap.get(e.getAdjustable())) return; for (Adjustable a : synchronizedAdjustables) { @@ -78,5 +78,5 @@ protected void setParticipatingInSynchronizedScrolling(Adjustable adjustable, boolean isParticipating) { CheckParameterUtil.ensureParameterNotNull(adjustable, "adjustable"); - if (! synchronizedAdjustables.contains(adjustable)) + if (!synchronizedAdjustables.contains(adjustable)) throw new IllegalStateException(tr("Adjustable {0} not registered yet. Cannot set participation in synchronized adjustment.", adjustable)); @@ -93,5 +93,5 @@ */ protected boolean isParticipatingInSynchronizedScrolling(Adjustable adjustable) { - if (! synchronizedAdjustables.contains(adjustable)) + if (!synchronizedAdjustables.contains(adjustable)) throw new IllegalStateException(tr("Adjustable {0} not registered yet.", adjustable)); @@ -117,5 +117,5 @@ CheckParameterUtil.ensureParameterNotNull(view, "view"); - if (! synchronizedAdjustables.contains(adjustable)) { + if (!synchronizedAdjustables.contains(adjustable)) { participateInSynchronizedScrolling(adjustable); } Index: /trunk/src/org/openstreetmap/josm/gui/util/HighlightHelper.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/util/HighlightHelper.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/util/HighlightHelper.java (revision 8444) @@ -119,5 +119,5 @@ DataSet ds = Main.main.getCurrentDataSet(); if (ds!=null) { - highlightedPrimitives.addAll( ds.allNonDeletedPrimitives() ); + highlightedPrimitives.addAll(ds.allNonDeletedPrimitives()); } } Index: /trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java (revision 8444) @@ -97,5 +97,5 @@ } if (!LatLon.isValidLon(minlon) || !LatLon.isValidLon(maxlon) - || !LatLon.isValidLat(minlat) || ! LatLon.isValidLat(maxlat)) + || !LatLon.isValidLat(minlat) || !LatLon.isValidLat(maxlat)) return null; if (minlon > maxlon) Index: /trunk/src/org/openstreetmap/josm/gui/widgets/DateEditorWithSlider.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/DateEditorWithSlider.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/DateEditorWithSlider.java (revision 8444) @@ -43,5 +43,5 @@ public DateEditorWithSlider(String labelText) { super(new GridBagLayout()); - spinner = new JSpinner( new SpinnerDateModel() ); + spinner = new JSpinner(new SpinnerDateModel()); String pattern = ((SimpleDateFormat)DateUtils.getDateFormat(DateFormat.DEFAULT)).toPattern(); JSpinner.DateEditor timeEditor = new JSpinner.DateEditor(spinner,pattern); Index: /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java (revision 8444) @@ -388,5 +388,5 @@ @Override public AccessibleContext getAccessibleContext() { - if( accessibleContext == null ) { + if (accessibleContext == null) { accessibleContext = new AccessibleMultiSplitPane(); } Index: /trunk/src/org/openstreetmap/josm/io/imagery/HTMLGrabber.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/imagery/HTMLGrabber.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/io/imagery/HTMLGrabber.java (revision 8444) @@ -38,5 +38,5 @@ } - ProcessBuilder builder = new ProcessBuilder( cmdParams); + ProcessBuilder builder = new ProcessBuilder(cmdParams); Process browser; Index: /trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java (revision 8444) @@ -153,5 +153,5 @@ public static int random(int min, int max) { - return (int)(Math.random() * ((max+1)-min) ) + min; + return (int)(Math.random() * ((max+1)-min)) + min; } @@ -268,5 +268,5 @@ String contentType = conn.getHeaderField("Content-Type"); if (conn.getResponseCode() != 200 - || contentType != null && !contentType.startsWith("image") ) { + || contentType != null && !contentType.startsWith("image")) { String xml = readException(conn); try { @@ -302,5 +302,5 @@ try (BufferedReader br = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8))) { String line = null; - while( (line = br.readLine()) != null) { + while ((line = br.readLine()) != null) { // filter non-ASCII characters and control characters exception.append(line.replaceAll("[^\\p{Print}]", "")); Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 8444) @@ -117,5 +117,5 @@ */ public AddTagsDialog(String[][] tags, String senderName, Collection primitives) { - super(Main.parent, tr("Add tags to selected objects"), new String[] { tr("Add selected tags"), tr("Add all tags"), tr("Cancel")}, + super(Main.parent, tr("Add tags to selected objects"), new String[] {tr("Add selected tags"), tr("Add all tags"), tr("Cancel")}, false, true); @@ -213,5 +213,5 @@ if (!sender.isEmpty() && !trustedSenders.contains(sender)) { final JCheckBox c = new JCheckBox(); - c.setAction(new AbstractAction(tr("Accept all tags from {0} for this session", sender) ) { + c.setAction(new AbstractAction(tr("Accept all tags from {0} for this session", sender)) { @Override public void actionPerformed(ActionEvent e) { if (c.isSelected()) @@ -220,5 +220,5 @@ trustedSenders.remove(sender); } - } ); + }); tablePanel.add(c , GBC.eol().insets(20,10,0,0)); } @@ -274,5 +274,5 @@ for (String tag : tagSet) { // support a = b===c as "a"="b===c" - String [] pair = tag.split("\\s*=\\s*",2); + String[] pair = tag.split("\\s*=\\s*",2); keyValue[i][0] = pair[0]; keyValue[i][1] = pair.length<2 ? "": pair[1]; Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/DNSName.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/DNSName.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/DNSName.java (revision 8444) @@ -209,5 +209,5 @@ else if (thisName.endsWith(inName)) { int inNdx = thisName.lastIndexOf(inName); - if (thisName.charAt(inNdx-1) == '.' ) + if (thisName.charAt(inNdx-1) == '.') constraintType = NAME_WIDENS; else @@ -215,5 +215,5 @@ } else if (inName.endsWith(thisName)) { int ndx = inName.lastIndexOf(thisName); - if (inName.charAt(ndx-1) == '.' ) + if (inName.charAt(ndx-1) == '.') constraintType = NAME_NARROWS; else Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java (revision 8444) @@ -53,5 +53,5 @@ @Override public String[] getOptionalParams() { - return new String[] { "addtags" }; + return new String[] {"addtags"}; } Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java (revision 8444) @@ -39,5 +39,5 @@ @Override public String[] getOptionalParams() { - return new String[] { "title", "type", "cookies", "min_zoom", "max_zoom"}; + return new String[] {"title", "type", "cookies", "min_zoom", "max_zoom"}; } @@ -139,5 +139,5 @@ } })); - return new String[] { "/imagery?title=osm&type=tms&url=https://a.tile.openstreetmap.org/%7Bzoom%7D/%7Bx%7D/%7By%7D.png", + return new String[] {"/imagery?title=osm&type=tms&url=https://a.tile.openstreetmap.org/%7Bzoom%7D/%7Bx%7D/%7By%7D.png", "/imagery?title=landsat&type=wms&url=http://irs.gis-lab.info/?layers=landsat&SRS=%7Bproj%7D&WIDTH=%7Bwidth%7D&HEIGHT=%7Bheight%7D&BBOX=%7Bbbox%7D", "/imagery?title=...&type={"+types+"}&url=....[&cookies=...][&min_zoom=...][&max_zoom=...]"}; Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java (revision 8444) @@ -71,5 +71,5 @@ @Override public String[] getUsageExamples() { - return new String[] { "/import?url="+Main.getJOSMWebsite()+"/browser/josm/trunk/data_nodist/direction-arrows.osm" }; + return new String[] {"/import?url="+Main.getJOSMWebsite()+"/browser/josm/trunk/data_nodist/direction-arrows.osm"}; } Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java (revision 8444) @@ -68,5 +68,5 @@ @Override public String[] getMandatoryParams() { - return new String[] { "bottom", "top", "left", "right" }; + return new String[] {"bottom", "top", "left", "right"}; } Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/VersionHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/VersionHandler.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/VersionHandler.java (revision 8444) @@ -59,5 +59,5 @@ @Override public String[] getUsageExamples() { - return new String[] { "/version", "/version?jsonp=test"}; + return new String[] {"/version", "/version?jsonp=test"}; } } Index: /trunk/src/org/openstreetmap/josm/io/session/SessionReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/session/SessionReader.java (revision 8443) +++ /trunk/src/org/openstreetmap/josm/io/session/SessionReader.java (revision 8444) @@ -531,5 +531,5 @@ Main.parent, title, - new String[] { tr("Cancel"), tr("Skip layer and continue") } + new String[] {tr("Cancel"), tr("Skip layer and continue")} ); dlg.setButtonIcons(new String[] {"cancel", "dialogs/next"});