Changeset 8444 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2015-06-02T16:41:37+02:00 (9 years ago)

Author:

Don-vip

Message:

remove extra whitespaces

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• coor/LatLon.java (modified) (1 diff)
• imagery/ImageryLayerInfo.java (modified) (1 diff)
• osm/ChangesetCache.java (modified) (2 diffs)
• osm/DataSetMerger.java (modified) (4 diffs)
• osm/Node.java (modified) (1 diff)
• osm/OsmPrimitive.java (modified) (2 diffs)
• osm/Relation.java (modified) (1 diff)
• osm/TagCollection.java (modified) (6 diffs)
• osm/User.java (modified) (1 diff)
• osm/Way.java (modified) (1 diff)
• osm/visitor/paint/LineClip.java (modified) (2 diffs)
• osm/visitor/paint/MapRendererFactory.java (modified) (2 diffs)
• osm/visitor/paint/StyledMapRenderer.java (modified) (3 diffs)
• osm/visitor/paint/WireframeMapRenderer.java (modified) (1 diff)
• projection/datum/SevenParameterDatum.java (modified) (2 diffs)
• projection/proj/LambertConformalConic.java (modified) (2 diffs)
• projection/proj/LonLat.java (modified) (1 diff)
• projection/proj/Mercator.java (modified) (1 diff)
• projection/proj/SwissObliqueMercator.java (modified) (2 diffs)
• validation/PaintVisitor.java (modified) (1 diff)
• validation/tests/DuplicateRelation.java (modified) (2 diffs)
• validation/tests/OverlappingWays.java (modified) (1 diff)
• validation/tests/TagChecker.java (modified) (1 diff)
• validation/tests/UntaggedWay.java (modified) (2 diffs)
• validation/util/ValUtil.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -69 +69 @@
 
     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);
 
     /**

trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java

@@ -150 +150 @@
         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)) {

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

@@ -134 +134 @@
         DefaultChangesetCacheEvent e = new DefaultChangesetCacheEvent(this);
         remove(id, e);
-        if (! e.isEmpty()) {
+        if (!e.isEmpty()) {
             fireChangesetCacheEvent(e);
         }
@@ -160 +160 @@
             remove(cs.getId(), evt);
         }
-        if (! evt.isEmpty()) {
+        if (!evt.isEmpty()) {
             fireChangesetCacheEvent(evt);
         }

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

@@ -79 +79 @@
      */
     protected void mergePrimitive(OsmPrimitive source, Collection<? extends OsmPrimitive> candidates) {
-        if (!source.isNew() ) {
+        if (!source.isNew()) {
             // try to merge onto a matching primitive with the same defined id
             //
@@ -319 +319 @@
             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 +331 @@
                 }
             }
-        } 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 +362 @@
             //
             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

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

@@ -281 +281 @@
         if (!(other instanceof Node))
             return false;
-        if (! super.hasEqualSemanticAttributes(other))
+        if (!super.hasEqualSemanticAttributes(other))
             return false;
         Node n = (Node)other;

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

@@ -966 +966 @@
         } else if (referrers instanceof OsmPrimitive) {
             if (referrers != referrer) {
-                referrers = new OsmPrimitive[] { (OsmPrimitive)referrers, referrer };
+                referrers = new OsmPrimitive[] {(OsmPrimitive)referrers, referrer};
             }
         } else {
@@ -1144 +1144 @@
             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()));
 

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

@@ -292 +292 @@
         if (!(other instanceof Relation))
             return false;
-        if (! super.hasEqualSemanticAttributes(other))
+        if (!super.hasEqualSemanticAttributes(other))
             return false;
         Relation r = (Relation)other;

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

@@ -341 +341 @@
                 continue;
             }
-            if (! containsKey(key)) return false;
+            if (!containsKey(key)) return false;
         }
         return true;
@@ -399 +399 @@
         if (key == null) return false;
         Set<String> values = getTagsFor(key).getValues();
-        return values.size() == 1 && ! values.contains("");
+        return values.size() == 1 && !values.contains("");
     }
 
@@ -607 +607 @@
     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 +628 @@
     public void applyTo(Collection<? extends Tagged> 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 +645 @@
     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 +663 @@
     public void replaceTagsOf(Collection<? extends Tagged> 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) {

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

@@ -213 +213 @@
     @Override
     public boolean equals(Object obj) {
-        if (! (obj instanceof User))
+        if (!(obj instanceof User))
             return false;
         User other = (User) obj;

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

@@ -336 +336 @@
         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<getNodesCount();i++) {
-            if (! getNode(i).hasEqualSemanticAttributes(w.getNode(i)))
+        for (int i=0; i<getNodesCount(); i++) {
+            if (!getNode(i).hasEqualSemanticAttributes(w.getNode(i)))
                 return false;
         }

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/LineClip.java

@@ -60 +60 @@
      * @return true, if line is visible in the given clip region
      */
-    private boolean cohenSutherland( long x1, long y1, long x2, long y2, long xmin, long ymin, long xmax, long ymax) {
+    private boolean cohenSutherland(long x1, long y1, long x2, long y2, long xmin, long ymin, long xmax, long ymax) {
         int outcode0, outcode1, outcodeOut;
         boolean accept = false;
@@ -69 +69 @@
 
         do {
-            if ((outcode0 | outcode1) == 0 ) {
+            if ((outcode0 | outcode1) == 0) {
                 accept = true;
                 done = true;
-            } else if ( (outcode0 & outcode1) > 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;

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java

@@ -127 +127 @@
             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 +133 @@
         } else {
             Class<? extends AbstractMapRenderer> 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."));

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -591 +591 @@
                 x -= textWidth / 2;
             } else if (bs.hAlign == HorizontalTextAlignment.LEFT) {
-                x -= - box.x + 4 + textWidth;
+                x -= -box.x + 4 + textWidth;
             } else throw new AssertionError();
         }
@@ -643 +643 @@
                 break;
             case CENTER:
-                dy1 = - imgHeight / 2;
+                dy1 = -imgHeight / 2;
                 dy2 = imgHeight + dy1;
                 break;
@@ -1341 +1341 @@
 
                                     // 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;

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java

@@ -433 +433 @@
 
                 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);
             }

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

@@ -50 +50 @@
         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 +59 @@
         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});
     }
-
 }

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

@@ -153 +153 @@
     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 +168 @@
         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};
     }
 

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

@@ -30 +30 @@
     @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)};
     }
 }

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

@@ -32 +32 @@
     @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};
     }
-
 }

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

@@ -81 +81 @@
         double x = kR / 2 * log((1 + sin(bb)) / (1 - sin(bb)));
 
-        return new double[] { y, x };
+        return new double[] {y, x};
     }
 
@@ -107 +107 @@
             phi = 2 * atan(exp(s)) - PI / 2;
         }
-        return new double[] { phi, lambda };
+        return new double[] {phi, lambda};
     }
 }

trunk/src/org/openstreetmap/josm/data/validation/PaintVisitor.java

@@ -162 +162 @@
         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);

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

@@ -195 +195 @@
             if (duplicated.size() > 1) {
                 TestError testError = new TestError(this, Severity.ERROR, tr("Duplicated relations"), DUPLICATE_RELATION, duplicated);
-                errors.add( testError );
+                errors.add(testError);
             }
         }
@@ -202 +202 @@
             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);
             }
         }

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

@@ -69 +69 @@
     private boolean parentMultipolygonConcernsArea(OsmPrimitive p) {
         for (Relation r : OsmPrimitive.getFilteredList(p.getReferrers(), Relation.class)) {
-            if (r.concernsArea() ) {
+            if (r.concernsArea()) {
                 return true;
             }

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

@@ -248 +248 @@
 
         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));
     }
 

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

@@ -44 +44 @@
     public static final Set<String> 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 +56 @@
     public static final Set<String> 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");
     }
 

trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java

@@ -64 +64 @@
         if (!cellNodes.contains(cell)) {
             cellNodes.add(cell);
-            ways = cellWays.get( cell );
+            ways = cellWays.get(cell);
             if (ways == null) {
                 ways = new ArrayList<>();
@@ -157 +157 @@
         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?