Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

Timestamp:

2015-06-20T23:42:21+02:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (35 diffs)

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

@@ -149 +149 @@
             int yCurrent0 = current.y - (int) Math.round(offset * dxNext / lenNext);
 
-            if (idx==0) {
+            if (idx == 0) {
                 ++idx;
                 prev = current;
@@ -172 +172 @@
                 int m = dxNext*(yCurrent0 - yPrev0) - dyNext*(xCurrent0 - xPrev0);
 
-                int cx = xPrev0 + (int) Math.round((double)m * dxPrev / det);
-                int cy = yPrev0 + (int) Math.round((double)m * dyPrev / det);
+                int cx = xPrev0 + (int) Math.round((double) m * dxPrev / det);
+                int cy = yPrev0 + (int) Math.round((double) m * dyPrev / det);
                 ++idx;
                 prev = current;
@@ -238 +238 @@
     }
 
-    private static Map<Font,Boolean> IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG = new HashMap<>();
+    private static Map<Font, Boolean> IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG = new HashMap<>();
 
     /**
@@ -335 +335 @@
         super(g, nc, isInactiveMode);
 
-        if (nc!=null) {
+        if (nc != null) {
             Component focusOwner = FocusManager.getCurrentManager().getFocusOwner();
             useWiderHighlight = !(focusOwner instanceof AbstractButton || focusOwner == nc);
@@ -364 +364 @@
         g.draw(path);
 
-        if(!isInactiveMode && useStrokes && dashes != null) {
+        if (!isInactiveMode && useStrokes && dashes != null) {
             g.setColor(dashedColor);
             g.setStroke(dashes);
@@ -486 +486 @@
                 final double h = pb.height - nb.getHeight();
 
-                final int x2 = pb.x + (int)(w/2.0);
-                final int y2 = pb.y + (int)(h/2.0);
+                final int x2 = pb.x + (int) (w/2.0);
+                final int y2 = pb.y + (int) (h/2.0);
 
                 final int nbw = (int) nb.getWidth();
@@ -498 +498 @@
                 if (!labelOK) {
                     // if center position (C) is not inside osm shape, try naively some other positions as follows:
-                    final int x1 = pb.x + (int)(  w/4.0);
-                    final int x3 = pb.x + (int)(3*w/4.0);
-                    final int y1 = pb.y + (int)(  h/4.0);
-                    final int y3 = pb.y + (int)(3*h/4.0);
+                    final int x1 = pb.x + (int)   (w/4.0);
+                    final int x3 = pb.x + (int) (3*w/4.0);
+                    final int y1 = pb.y + (int)   (h/4.0);
+                    final int y3 = pb.y + (int) (3*h/4.0);
                     // +-----------+
                     // |  5  1  6  |
@@ -526 +526 @@
                 if (labelOK) {
                     Font defaultFont = g.getFont();
-                    int x = (int)(centeredNBounds.getMinX() - nb.getMinX());
-                    int y = (int)(centeredNBounds.getMinY() - nb.getMinY());
+                    int x = (int) (centeredNBounds.getMinX() - nb.getMinX());
+                    int y = (int) (centeredNBounds.getMinY() - nb.getMinY());
                     displayText(null, name, x, y, osm.isDisabled(), text);
                     g.setFont(defaultFont);
@@ -707 +707 @@
     @Override
     public void drawNode(Node n, Color color, int size, boolean fill) {
-        if(size <= 0 && !n.isHighlighted())
+        if (size <= 0 && !n.isHighlighted())
             return;
 
         Point p = nc.getPoint(n);
 
-        if(n.isHighlighted()) {
+        if (n.isHighlighted()) {
             drawPointHighlight(p, size);
         }
@@ -737 +737 @@
 
         final int w = img.getWidth(), h = img.getHeight();
-        if(n.isHighlighted()) {
+        if (n.isHighlighted()) {
             drawPointHighlight(p, Math.max(w, h));
         }
@@ -768 +768 @@
         int radius = s.size / 2;
 
-        if(n.isHighlighted()) {
+        if (n.isHighlighted()) {
             drawPointHighlight(p, s.size);
         }
@@ -861 +861 @@
      */
     private void drawPathHighlight(GeneralPath path, BasicStroke line) {
-        if(path == null)
+        if (path == null)
             return;
         g.setColor(highlightColorTransparent);
         float w = line.getLineWidth() + highlightLineWidth;
-        if (useWiderHighlight) w+=widerHighlight;
-        while(w >= line.getLineWidth()) {
+        if (useWiderHighlight) w += widerHighlight;
+        while (w >= line.getLineWidth()) {
             g.setStroke(new BasicStroke(w, line.getEndCap(), line.getLineJoin(), line.getMiterLimit()));
             g.draw(path);
@@ -879 +879 @@
         g.setColor(highlightColorTransparent);
         int s = size + highlightPointRadius;
-        if (useWiderHighlight) s+=widerHighlight;
-        while(s >= size) {
+        if (useWiderHighlight) s += widerHighlight;
+        while (s >= size) {
             int r = (int) Math.floor(s/2d);
             g.fillRoundRect(p.x-r, p.y-r, s, s, r, r);
@@ -890 +890 @@
         // rotate image with direction last node in from to, and scale down image to 16*16 pixels
         Image smallImg = ImageProvider.createRotatedImage(img, angle, new Dimension(16, 16));
-        int w = smallImg.getWidth(null), h=smallImg.getHeight(null);
-        g.drawImage(smallImg, (int)(pVia.x+vx+vx2)-w/2, (int)(pVia.y+vy+vy2)-h/2, nc);
+        int w = smallImg.getWidth(null), h = smallImg.getHeight(null);
+        g.drawImage(smallImg, (int) (pVia.x+vx+vx2)-w/2, (int) (pVia.y+vy+vy2)-h/2, nc);
 
         if (selected) {
             g.setColor(isInactiveMode ? inactiveColor : relationSelectedColor);
-            g.drawRect((int)(pVia.x+vx+vx2)-w/2-2,(int)(pVia.y+vy+vy2)-h/2-2, w+4, h+4);
+            g.drawRect((int) (pVia.x+vx+vx2)-w/2-2, (int) (pVia.y+vy+vy2)-h/2-2, w+4, h+4);
         }
     }
@@ -906 +906 @@
         /* find the "from", "via" and "to" elements */
         for (RelationMember m : r.getMembers()) {
-            if(m.getMember().isIncomplete())
+            if (m.getMember().isIncomplete())
                 return;
             else {
-                if(m.isWay()) {
+                if (m.isWay()) {
                     Way w = m.getWay();
-                    if(w.getNodesCount() < 2) {
+                    if (w.getNodesCount() < 2) {
                         continue;
                     }
@@ -917 +917 @@
                     switch(m.getRole()) {
                     case "from":
-                        if(fromWay == null) {
+                        if (fromWay == null) {
                             fromWay = w;
                         }
                         break;
                     case "to":
-                        if(toWay == null) {
+                        if (toWay == null) {
                             toWay = w;
                         }
                         break;
                     case "via":
-                        if(via == null) {
+                        if (via == null) {
                             via = w;
                         }
                     }
-                } else if(m.isNode()) {
+                } else if (m.isNode()) {
                     Node n = m.getNode();
-                    if("via".equals(m.getRole()) && via == null) {
+                    if ("via".equals(m.getRole()) && via == null) {
                         via = n;
                     }
@@ -944 +944 @@
 
         Node viaNode;
-        if(via instanceof Node) {
+        if (via instanceof Node) {
             viaNode = (Node) via;
-            if(!fromWay.isFirstLastNode(viaNode))
+            if (!fromWay.isFirstLastNode(viaNode))
                 return;
         } else {
@@ -955 +955 @@
 
             String onewayviastr = viaWay.get("oneway");
-            if(onewayviastr != null) {
-                if("-1".equals(onewayviastr)) {
+            if (onewayviastr != null) {
+                if ("-1".equals(onewayviastr)) {
                     onewayvia = Boolean.TRUE;
                     Node tmp = firstNode;
@@ -969 +969 @@
             }
 
-            if(fromWay.isFirstLastNode(firstNode)) {
+            if (fromWay.isFirstLastNode(firstNode)) {
                 viaNode = firstNode;
             } else if (!onewayvia && fromWay.isFirstLastNode(lastNode)) {
@@ -979 +979 @@
         /* find the "direct" nodes before the via node */
         Node fromNode;
-        if(fromWay.firstNode() == via) {
+        if (fromWay.firstNode() == via) {
             fromNode = fromWay.getNode(1);
         } else {
@@ -992 +992 @@
            away from the "via" node along the first segment of the "from" way)
          */
-        double distanceFromVia=14;
+        double distanceFromVia = 14;
         double dx = pFrom.x >= pVia.x ? pFrom.x - pVia.x : pVia.x - pFrom.x;
         double dy = pFrom.y >= pVia.y ? pFrom.y - pVia.y : pVia.y - pFrom.y;
@@ -1007 +1007 @@
         double vy = distanceFromVia * Math.sin(fromAngle);
 
-        if(pFrom.x < pVia.x) {
+        if (pFrom.x < pVia.x) {
             vx = -vx;
         }
-        if(pFrom.y < pVia.y) {
+        if (pFrom.y < pVia.y) {
             vy = -vy;
         }
@@ -1018 +1018 @@
            90degrees away from the first segment of the "from" way)
          */
-        double distanceFromWay=10;
+        double distanceFromWay = 10;
         double vx2 = 0;
         double vy2 = 0;
         double iconAngle = 0;
 
-        if(pFrom.x >= pVia.x && pFrom.y >= pVia.y) {
-            if(!leftHandTraffic) {
+        if (pFrom.x >= pVia.x && pFrom.y >= pVia.y) {
+            if (!leftHandTraffic) {
                 vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg - 90));
                 vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg - 90));
@@ -1033 +1033 @@
             iconAngle = 270+fromAngleDeg;
         }
-        if(pFrom.x < pVia.x && pFrom.y >= pVia.y) {
-            if(!leftHandTraffic) {
+        if (pFrom.x < pVia.x && pFrom.y >= pVia.y) {
+            if (!leftHandTraffic) {
                 vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg));
                 vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg));
@@ -1043 +1043 @@
             iconAngle = 90-fromAngleDeg;
         }
-        if(pFrom.x < pVia.x && pFrom.y < pVia.y) {
-            if(!leftHandTraffic) {
+        if (pFrom.x < pVia.x && pFrom.y < pVia.y) {
+            if (!leftHandTraffic) {
                 vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg + 90));
                 vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg + 90));
@@ -1053 +1053 @@
             iconAngle = 90+fromAngleDeg;
         }
-        if(pFrom.x >= pVia.x && pFrom.y < pVia.y) {
-            if(!leftHandTraffic) {
+        if (pFrom.x >= pVia.x && pFrom.y < pVia.y) {
+            if (!leftHandTraffic) {
                 vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg + 180));
                 vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg + 180));
@@ -1096 +1096 @@
             poly.addPoint(p.x, p.y);
 
-            if(lastPoint != null) {
+            if (lastPoint != null) {
                 dx = p.x - lastPoint.x;
                 dy = p.y - lastPoint.y;
@@ -1149 +1149 @@
             double bestDistanceToCenter = Double.MAX_VALUE;
             double bestQuality = -1;
-            for (int i=0; i<longHalfSegmentStart.size(); i++) {
+            for (int i = 0; i < longHalfSegmentStart.size(); i++) {
                 double start = longHalfSegmentStart.get(i);
                 double end = longHalfSegmentEnd.get(i);
@@ -1215 +1215 @@
         GlyphVector gv = text.font.layoutGlyphVector(frc, chars, 0, chars.length, dirFlag);
 
-        for (int i=0; i<gv.getNumGlyphs(); ++i) {
+        for (int i = 0; i < gv.getNumGlyphs(); ++i) {
             Rectangle2D rect = gv.getGlyphLogicalBounds(i).getBounds2D();
             double t = tStart + offsetSign * (rect.getX() + rect.getWidth()/2) / pathLength;
@@ -1271 +1271 @@
                     continue;
                 }
-                if(highlightSegs == null) {
+                if (highlightSegs == null) {
                     highlightSegs = new GeneralPath();
                 }
@@ -1333 +1333 @@
 
                             while (dist < segmentLength) {
-                                for (int i=0; i<2; ++i) {
+                                for (int i = 0; i < 2; ++i) {
                                     float onewaySize = i == 0 ? 3f : 2f;
                                     GeneralPath onewayPath = i == 0 ? onewayArrowsCasing : onewayArrows;
@@ -1361 +1361 @@
             lastPoint = p;
         }
-        if(way.isHighlighted()) {
+        if (way.isHighlighted()) {
             drawPathHighlight(path, line);
         }
@@ -1499 +1499 @@
             MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().lock();
             try {
-                for (int i = from; i<to; i++) {
+                for (int i = from; i < to; i++) {
                     OsmPrimitive osm = input.get(i);
                     if (osm.isDrawable()) {
@@ -1601 +1601 @@
             final int noBuckets = (prims.size() + bucketsize - 1) / bucketsize;
             final boolean singleThread = THREAD_POOL.a == 1 || noBuckets == 1;
-            for (int i=0; i<noBuckets; i++) {
+            for (int i = 0; i < noBuckets; i++) {
                 int from = i*bucketsize;
                 int to = Math.min((i+1)*bucketsize, prims.size());
@@ -1636 +1636 @@
             highlightWaySegments = data.getHighlightedWaySegments();
 
-            long timeStart=0, timePhase1=0, timeFinished;
+            long timeStart = 0, timePhase1 = 0, timeFinished;
             if (Main.isTraceEnabled()) {
                 timeStart = System.currentTimeMillis();