Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.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/gui/layer/WMSLayer.java (modified) (26 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

@@ -239 +239 @@
     }
 
-    public boolean hasAutoDownload(){
+    public boolean hasAutoDownload() {
         return autoDownloadEnabled;
     }
@@ -265 +265 @@
             int maxY = getImageYIndex(maxEn.north());
 
-            for (int x=minX; x<=maxX; x++) {
-                for (int y=minY; y<=maxY; y++) {
+            for (int x = minX; x <= maxX; x++) {
+                for (int y = minY; y <= maxY; y++) {
                     requestedTiles.add(new Point(x, y));
                 }
@@ -300 +300 @@
             }
         }
-        for(int x = 0; x<dax; ++x) {
-            for(int y = 0; y<day; ++y) {
+        for (int x = 0; x < dax; ++x) {
+            for (int y = 0; y < day; ++y) {
                 if (images[x][y] == null) {
-                    images[x][y]= new GeorefImage(this);
+                    images[x][y] = new GeorefImage(this);
                 }
             }
@@ -314 +314 @@
 
     @Override public String getToolTipText() {
-        if(autoDownloadEnabled)
+        if (autoDownloadEnabled)
             return tr("WMS layer ({0}), automatically downloading in zoom {1}", getName(), resolutionText);
         else
@@ -321 +321 @@
 
     private int modulo(int a, int b) {
-        return a % b >= 0 ? a%b : a%b+b;
+        return a % b >= 0 ? a % b : a % b+b;
     }
 
@@ -331 +331 @@
     @Override
     public void paint(Graphics2D g, final MapView mv, Bounds b) {
-        if(info.getUrl() == null || (usesInvalidUrl && !isInvalidUrlConfirmed)) return;
+        if (info.getUrl() == null || (usesInvalidUrl && !isInvalidUrlConfirmed)) return;
 
         if (autoResolutionEnabled && !Utils.equalsEpsilon(getBestZoom(), mv.getDist100Pixel())) {
@@ -340 +340 @@
 
         ProjectionBounds bounds = mv.getProjectionBounds();
-        bminx= getImageXIndex(bounds.minEast);
-        bminy= getImageYIndex(bounds.minNorth);
-        bmaxx= getImageXIndex(bounds.maxEast);
-        bmaxy= getImageYIndex(bounds.maxNorth);
-
-        leftEdge = (int)(bounds.minEast * getPPD());
-        bottomEdge = (int)(bounds.minNorth * getPPD());
+        bminx = getImageXIndex(bounds.minEast);
+        bminy = getImageYIndex(bounds.minNorth);
+        bmaxx = getImageXIndex(bounds.maxEast);
+        bmaxy = getImageYIndex(bounds.maxNorth);
+
+        leftEdge = (int) (bounds.minEast * getPPD());
+        bottomEdge = (int) (bounds.minNorth * getPPD());
 
         if (zoomIsTooBig()) {
-            for(int x = 0; x<images.length; ++x) {
-                for(int y = 0; y<images[0].length; ++y) {
+            for (int x = 0; x < images.length; ++x) {
+                for (int y = 0; y < images[0].length; ++y) {
                     GeorefImage image = images[x][y];
                     image.paint(g, mv, image.getXIndex(), image.getYIndex(), leftEdge, bottomEdge);
@@ -369 +369 @@
 
     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);
     }
 
     public int getImageX(int imageIndex) {
-        return (int)(imageIndex * imageSize * (getPPD() / info.getPixelPerDegree()) + dx * getPPD());
+        return (int) (imageIndex * imageSize * (getPPD() / info.getPixelPerDegree()) + dx * getPPD());
     }
 
     public int getImageY(int imageIndex) {
-        return (int)(imageIndex * imageSize * (getPPD() / info.getPixelPerDegree()) + dy * getPPD());
+        return (int) (imageIndex * imageSize * (getPPD() / info.getPixelPerDegree()) + dy * getPPD());
     }
 
@@ -442 +442 @@
     }
 
-    protected void downloadAndPaintVisible(Graphics g, final MapView mv, boolean real){
+    protected void downloadAndPaintVisible(Graphics g, final MapView mv, boolean real) {
 
         int newDax = dax;
@@ -461 +461 @@
         }
 
-        for(int x = bminx; x<=bmaxx; ++x) {
-            for(int y = bminy; y<=bmaxy; ++y){
-                images[modulo(x,dax)][modulo(y,day)].changePosition(x, y);
+        for (int x = bminx; x <= bmaxx; ++x) {
+            for (int y = bminy; y <= bmaxy; ++y) {
+                images[modulo(x, dax)][modulo(y, day)].changePosition(x, y);
             }
         }
@@ -470 +470 @@
         Set<ProjectionBounds> areaToCache = new HashSet<>();
 
-        for(int x = bminx; x<=bmaxx; ++x) {
-            for(int y = bminy; y<=bmaxy; ++y){
-                GeorefImage img = images[modulo(x,dax)][modulo(y,day)];
+        for (int x = bminx; x <= bmaxx; ++x) {
+            for (int y = bminy; y <= bmaxy; ++y) {
+                GeorefImage img = images[modulo(x, dax)][modulo(y, day)];
                 if (!img.paint(g, mv, x, y, leftEdge, bottomEdge)) {
                     addRequest(new WMSRequest(x, y, info.getPixelPerDegree(), real, true));
@@ -487 +487 @@
     }
 
-    @Override public void visitBoundingBox(BoundingXYVisitor v) {
-        for(int x = 0; x<dax; ++x) {
-            for(int y = 0; y<day; ++y)
-                if(images[x][y].getImage() != null){
+    @Override
+    public void visitBoundingBox(BoundingXYVisitor v) {
+        for (int x = 0; x < dax; ++x) {
+            for (int y = 0; y < day; ++y)
+                if (images[x][y].getImage() != null) {
                     v.visit(images[x][y].getMin());
                     v.visit(images[x][y].getMax());
@@ -497 +498 @@
     }
 
-    @Override public Action[] getMenuEntries() {
+    @Override
+    public Action[] getMenuEntries() {
         return new Action[]{
                 LayerListDialog.getInstance().createActivateLayerAction(this),
@@ -665 +667 @@
         try {
             for (WMSRequest request: finishedRequests) {
-                GeorefImage img = images[modulo(request.getXIndex(),dax)][modulo(request.getYIndex(),day)];
+                GeorefImage img = images[modulo(request.getXIndex(), dax)][modulo(request.getYIndex(), day)];
                 if (img.equalPosition(request.getXIndex(), request.getYIndex())) {
                     WMSException we = request.getException();
@@ -684 +686 @@
             super(tr("Download visible tiles"));
         }
+
         @Override
         public void actionPerformed(ActionEvent ev) {
@@ -708 +711 @@
         // the snapLevels, which are in meters per pixel. It works, though.
         double dist = Main.map.mapView.getDist100Pixel();
-        for(int i = snapLevels.length-2; i >= 0; i--) {
-            if(snapLevels[i+1]/3 + snapLevels[i]*2/3 > dist)
+        for (int i = snapLevels.length-2; i >= 0; i--) {
+            if (snapLevels[i+1]/3 + snapLevels[i]*2/3 > dist)
                 return snapLevels[i+1];
         }
@@ -724 +727 @@
      */
     private static void updateResolutionSetting(WMSLayer layer, boolean snap) {
-        if(snap) {
+        if (snap) {
             layer.resolution = getBestZoom();
             layer.resolutionText = MapView.getDistText(layer.resolution);
@@ -751 +754 @@
         // prevents some flickering when zooming with auto-resolution enabled
         // and instead gradually updates each tile.
-        if(!snap) {
-            for(int x = 0; x<layer.dax; ++x) {
-                for(int y = 0; y<layer.day; ++y) {
+        if (!snap) {
+            for (int x = 0; x < layer.dax; ++x) {
+                for (int y = 0; y < layer.day; ++y) {
                     layer.images[x][y].changePosition(-1, -1);
                 }
@@ -800 +803 @@
             super(tr("Reload erroneous tiles"));
         }
+
         @Override
         public void actionPerformed(ActionEvent ev) {
@@ -808 +812 @@
             for (int x = 0; x < dax; ++x) {
                 for (int y = 0; y < day; ++y) {
-                    GeorefImage img = images[modulo(x,dax)][modulo(y,day)];
-                    if(img.getState() == State.FAILED){
+                    GeorefImage img = images[modulo(x, dax)][modulo(y, day)];
+                    if (img.getState() == State.FAILED) {
                         addRequest(new WMSRequest(img.getXIndex(), img.getYIndex(), info.getPixelPerDegree(), true, false));
                     }
@@ -824 +828 @@
             super(tr("Alpha channel"));
         }
+
         @Override
         public void actionPerformed(ActionEvent ev) {
@@ -900 +905 @@
             super(tr("Set WMS Bookmark"));
         }
+
         @Override
         public void actionPerformed(ActionEvent ev) {
@@ -930 +936 @@
                 for (int x = 0; x < dax; ++x) {
                     for (int y = 0; y < day; ++y) {
-                        GeorefImage img = images[modulo(x,dax)][modulo(y,day)];
-                        if(img.getState() == State.NOT_IN_CACHE){
+                        GeorefImage img = images[modulo(x, dax)][modulo(y, day)];
+                        if (img.getState() == State.NOT_IN_CACHE) {
                             addRequest(new WMSRequest(img.getXIndex(), img.getYIndex(), info.getPixelPerDegree(), false, true));
                         }
@@ -982 +988 @@
             grabbers.clear();
             grabberThreads.clear();
-            for (int i=0; i<threadCount; i++) {
+            for (int i = 0; i < threadCount; i++) {
                 WMSGrabber grabber = getGrabber(i == 0 && threadCount > 1);
                 grabbers.add(grabber);
@@ -1014 +1020 @@
                 || event.getKey().equals(PROP_OVERLAP_EAST.getKey())
                 || event.getKey().equals(PROP_OVERLAP_NORTH.getKey())) {
-            for (int i=0; i<images.length; i++) {
-                for (int k=0; k<images[i].length; k++) {
+            for (int i = 0; i < images.length; i++) {
+                for (int k = 0; k < images[i].length; k++) {
                     images[i][k] = new GeorefImage(this);
                 }
@@ -1111 +1117 @@
         imageSize = in.readInt();
         info.setPixelPerDegree(in.readDouble());
-        doSetName((String)in.readObject());
-        info.setExtendedUrl((String)in.readObject());
-        images = (GeorefImage[][])in.readObject();
+        doSetName((String) in.readObject());
+        info.setExtendedUrl((String) in.readObject());
+        images = (GeorefImage[][]) in.readObject();
 
         for (GeorefImage[] imgs : images) {