Changeset 32556 in osm for applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/GeorefImage.java

Timestamp:

2016-07-04T14:18:17+02:00 (9 years ago)

Author:

donvip

Message:

checkstyle

File:

• applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/GeorefImage.java (modified) (14 diffs)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/GeorefImage.java

@@ -1 @@
-// License: GPL. v2 and later. Copyright 2008-2009 by Pieren <pieren3@gmail.com> and others
+// License: GPL. For details, see LICENSE file.
 package cadastre_fr;
 
@@ -44 +44 @@
     private double pixelPerEast;
     private double pixelPerNorth;
-    
 
     public GeorefImage(BufferedImage img, EastNorth min, EastNorth max, WMSLayer wmsLayer) {
         image = img;
- 
+
         this.min = min;
         this.max = max;
@@ -81 +80 @@
      */
     private EastNorthBound computeNewBounding(EastNorth p1, EastNorth p2, EastNorth p3, EastNorth p4) {
-        EastNorth pt[] = new EastNorth[4];
+        EastNorth[] pt = new EastNorth[4];
         pt[0] = p1;
         pt[1] = p2;
@@ -90 +89 @@
         double highestEast = Double.MIN_VALUE;
         double highestNorth = Double.MIN_VALUE;
-        for(int i=0; i<=3; i++) {
+        for (int i = 0; i <= 3; i++) {
             smallestEast = Math.min(pt[i].east(), smallestEast);
             smallestNorth = Math.min(pt[i].north(), smallestNorth);
@@ -111 +110 @@
 
         // apply offsets defined manually when vector images are translated manually (not saved in cache)
-        double dx=0, dy=0;
-        if (wmsLayer!=null) {
+        double dx = 0, dy = 0;
+        if (wmsLayer != null) {
             dx = wmsLayer.deltaEast;
             dy = wmsLayer.deltaNorth;
@@ -131 +130 @@
             } else {
                 Point[] croppedPoint = new Point[5];
-                for (int i=0; i<4; i++)
+                for (int i = 0; i < 4; i++) {
                     croppedPoint[i] = nc.getPoint(
                             new EastNorth(orgCroppedRaster[i].east()+dx, orgCroppedRaster[i].north()+dy));
+                }
                 croppedPoint[4] = croppedPoint[0];
-                for (int i=0; i<4; i++) {
+                for (int i = 0; i < 4; i++) {
                     g.setColor(Color.green);
                     g.drawLine(croppedPoint[i].x, croppedPoint[i].y, croppedPoint[i+1].x, croppedPoint[i+1].y);
@@ -173 +173 @@
     /**
      * Make all pixels masked by the given georefImage transparent in this image
-     *
-     * @param georefImage
      */
     public void withdraw(GeorefImage georefImage) {
@@ -189 +187 @@
             int heightYMaskPixel = Math.abs((int) ((maxMaskNorth - minMaskNorth) / pxPerNorth));
             Graphics g = image.getGraphics();
-            for (int x = minXMaskPixel; x < minXMaskPixel + widthXMaskPixel; x++)
-                for (int y = minYMaskPixel; y < minYMaskPixel + heightYMaskPixel; y++)
+            for (int x = minXMaskPixel; x < minXMaskPixel + widthXMaskPixel; x++) {
+                for (int y = minYMaskPixel; y < minYMaskPixel + heightYMaskPixel; y++) {
                     image.setRGB(x, y, VectorImageModifier.cadastreBackgroundTransp);
+                }
+            }
             g.dispose();
         }
@@ -222 +222 @@
         if (WMSLayer.currentFormat >= 4) {
             imageOriginalHeight = in.readInt();
-            imageOriginalWidth =  in.readInt();
-        }
-        image = (BufferedImage) ImageIO.read(ImageIO.createImageInputStream(in));
+            imageOriginalWidth = in.readInt();
+        }
+        image = ImageIO.read(ImageIO.createImageInputStream(in));
         updatePixelPer();
     }
@@ -285 +285 @@
         min = new EastNorth(min.east() + dx, min.north() + dy);
         max = new EastNorth(max.east() + dx, max.north() + dy);
-        for (int i=0; i<4; i++) {
+        for (int i = 0; i < 4; i++) {
             orgRaster[i] = new EastNorth(orgRaster[i].east() + dx, orgRaster[i].north() + dy);
             orgCroppedRaster[i] = new EastNorth(orgCroppedRaster[i].east() + dx, orgCroppedRaster[i].north() + dy);
         }
     }
-    
+
     /**
      * Change this image scale by moving the min,max coordinates around an anchor
-     * @param anchor
-     * @param proportion
      */
     public void scale(EastNorth anchor, double proportion) {
         min = anchor.interpolate(min, proportion);
         max = anchor.interpolate(max, proportion);
-        for (int i=0; i<4; i++) {
+        for (int i = 0; i < 4; i++) {
             orgRaster[i] = anchor.interpolate(orgRaster[i], proportion);
             orgCroppedRaster[i] = anchor.interpolate(orgCroppedRaster[i], proportion);
@@ -316 +314 @@
             return;
         // rotate the bounding boxes coordinates first
-        for (int i=0; i<4; i++) {
+        for (int i = 0; i < 4; i++) {
             orgRaster[i] = orgRaster[i].rotate(anchor, delta_ang);
             orgCroppedRaster[i] = orgCroppedRaster[i].rotate(anchor, delta_ang);
@@ -323 +321 @@
         double sin = Math.abs(Math.sin(angle+delta_ang)), cos = Math.abs(Math.cos(angle+delta_ang));
         int w = imageOriginalWidth, h = imageOriginalHeight;
-        int neww = (int)Math.floor(w*cos+h*sin);
-        int newh = (int)Math.floor(h*cos+w*sin);
+        int neww = (int) Math.floor(w*cos+h*sin);
+        int newh = (int) Math.floor(h*cos+w*sin);
         GraphicsConfiguration gc = getDefaultConfiguration();
         BufferedImage result = gc.createCompatibleImage(neww, newh, image.getTransparency());
@@ -336 +334 @@
         min = enb.min;
         max = enb.max;
-        angle+=delta_ang;
+        angle += delta_ang;
     }
 
@@ -346 +344 @@
     public void crop(EastNorth adj1, EastNorth adj2) {
         // s1 and s2 have 0,0 at top, left where all EastNorth coord. have 0,0 at bottom, left
-        int sx1 = (int)((adj1.getX() - min.getX())*getPixelPerEast());
-        int sy1 = (int)((max.getY() - adj2.getY())*getPixelPerNorth());
-        int sx2 = (int)((adj2.getX() - min.getX())*getPixelPerEast());
-        int sy2 = (int)((max.getY() - adj1.getY())*getPixelPerNorth());
+        int sx1 = (int) ((adj1.getX() - min.getX())*getPixelPerEast());
+        int sy1 = (int) ((max.getY() - adj2.getY())*getPixelPerNorth());
+        int sx2 = (int) ((adj2.getX() - min.getX())*getPixelPerEast());
+        int sy2 = (int) ((max.getY() - adj1.getY())*getPixelPerNorth());
         int newWidth = Math.abs(sx2 - sx1);
         int newHeight = Math.abs(sy2 - sy1);