Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/data/imagery/GeorefImage.java

Timestamp:

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

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

File:

• trunk/src/org/openstreetmap/josm/data/imagery/GeorefImage.java (modified) (8 diffs)

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

@@ -37 +37 @@
     private int yIndex;
 
-    private static final Color transparentColor = new Color(0,0,0,0);
+    private static final Color transparentColor = new Color(0, 0, 0, 0);
     private Color fadeColor = transparentColor;
 
@@ -118 +118 @@
             return false;
 
-        if(!(this.xIndex == xIndex && this.yIndex == yIndex))
+        if (!(this.xIndex == xIndex && this.yIndex == yIndex))
             return false;
 
@@ -130 +130 @@
 
         // This happens if you zoom outside the world
-        if(width == 0 || height == 0)
+        if (width == 0 || height == 0)
             return false;
 
@@ -141 +141 @@
         }
 
-        BufferedImage img = reImg == null?null:reImg.get();
-        if(img != null && img.getWidth() == width && img.getHeight() == height && fadeColor.equals(newFadeColor)) {
+        BufferedImage img = reImg == null ? null : reImg.get();
+        if (img != null && img.getWidth() == width && img.getHeight() == height && fadeColor.equals(newFadeColor)) {
             g.drawImage(img, x, y, null);
             return true;
@@ -152 +152 @@
 
         try {
-            if(img != null) {
+            if (img != null) {
                 img.flush();
             }
@@ -163 +163 @@
             // traditional rendering is as fast at these zoom levels, so it's no loss.
             // Also prevent caching if we're out of memory soon
-            if(width > 2000 || height > 2000 || width*height*multipl > freeMem) {
+            if (width > 2000 || height > 2000 || width*height*multipl > freeMem) {
                 fallbackDraw(g, getImage(), x, y, width, height, alphaChannel);
             } else {
                 // We haven't got a saved resized copy, so resize and cache it
-                img = new BufferedImage(width, height, alphaChannel?BufferedImage.TYPE_INT_ARGB:BufferedImage.TYPE_3BYTE_BGR);
+                img = new BufferedImage(width, height, alphaChannel ? BufferedImage.TYPE_INT_ARGB : BufferedImage.TYPE_3BYTE_BGR);
                 img.getGraphics().drawImage(getImage(),
                         0, 0, width, height, // dest
@@ -179 +179 @@
                 reImg = new SoftReference<>(img);
             }
-        } catch(Exception e) {
+        } catch (Exception e) {
             fallbackDraw(g, getImage(), x, y, width, height, alphaChannel);
         }
@@ -216 +216 @@
     private void writeObject(ObjectOutputStream out) throws IOException {
         out.writeObject(state);
-        if(getImage() == null) {
+        if (getImage() == null) {
             out.writeBoolean(false);
             out.writeObject(null);