Changeset 33392 in osm for applications/editors/josm

Timestamp:

2017-06-13T22:06:05+02:00 (7 years ago)

Author:

donvip

Message:

fix #josm14728 - fix NPE

Location:

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr

Files:

• CadastreGrabber.java (modified) (2 diffs)
• GeorefImage.java (modified) (2 diffs)
• ImageModifier.java (modified) (3 diffs)
• RasterImageModifier.java (modified) (2 diffs)
• VectorImageModifier.java (modified) (3 diffs)

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

@@ -32 +32 @@
                 url = getURLVector(lambertMin, lambertMax);
             BufferedImage img = grab(url);
+            if (img == null)
+                throw new OsmTransferException(url.toString());
             ImageModifier imageModified;
             if (wmsLayer.isRaster())
@@ -37 +39 @@
             else
                 imageModified = new VectorImageModifier(img, false);
-            return new GeorefImage(imageModified.bufferedImage, lambertMin, lambertMax, wmsLayer);
+            return new GeorefImage(imageModified.getBufferedImage(), lambertMin, lambertMax, wmsLayer);
         } catch (MalformedURLException e) {
             throw (IOException) new IOException(tr("CadastreGrabber: Illegal url.")).initCause(e);

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

@@ -17 +17 @@
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.util.Objects;
 
 import javax.imageio.ImageIO;
@@ -46 +47 @@
 
     public GeorefImage(BufferedImage img, EastNorth min, EastNorth max, WMSLayer wmsLayer) {
-        image = img;
-
-        this.min = min;
-        this.max = max;
+        image = Objects.requireNonNull(img);
+
+        this.min = Objects.requireNonNull(min);
+        this.max = Objects.requireNonNull(max);
         this.orgRaster[0] = min;
         this.orgRaster[1] = new EastNorth(min.east(), max.north());

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

@@ -8 +8 @@
 import java.awt.image.DataBuffer;
 import java.awt.image.IndexColorModel;
+import java.util.Objects;
 
 public abstract class ImageModifier {
@@ -17 +18 @@
     protected int parcelColor = Color.RED.getRGB();
 
-    public BufferedImage bufferedImage;
+    protected BufferedImage bufferedImage;
 
     public static int[] cRoofColors = new int[] {-197380, -592138};
@@ -160 +161 @@
     }
 
+    /**
+     * Returns the buffered image.
+     * @return the buffered image
+     */
+    public final BufferedImage getBufferedImage() {
+        return bufferedImage;
+    }
+
+    /**
+     * Sets the buffered image.
+     * @param bufferedImage the buffered image
+     */
+    protected final void setBufferedImage(BufferedImage bufferedImage) {
+        this.bufferedImage = Objects.requireNonNull(bufferedImage);
+    }
 }

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

@@ -18 +18 @@
 
     public RasterImageModifier(BufferedImage bi) {
-        bufferedImage = bi;
+        setBufferedImage(bi);
         transparencyEnabled = Main.pref.getBoolean("cadastrewms.backgroundTransparent");
         if (transparencyEnabled)
@@ -84 +84 @@
                 }
             }
-            bufferedImage = bi;
+            setBufferedImage(bi);
         }
         return;

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

@@ -24 +24 @@
 
     public VectorImageModifier(BufferedImage bi, boolean monocolor) {
-        bufferedImage = bi;
+        setBufferedImage(bi);
         if (Main.pref.getBoolean("cadastrewms.backgroundTransparent"))
             makeTransparent();
@@ -32 +32 @@
             invertGrey();
         if (monocolor)
-            bufferedImage = convert8(convert4(bufferedImage));
+            setBufferedImage(convert8(convert4(bufferedImage)));
     }
 
@@ -107 +107 @@
             IndexColorModel icm2 = new IndexColorModel(colorModel.getPixelSize(), size, reds, greens, blues,
                     backgroundPixel);
-            bufferedImage = new BufferedImage(icm2, raster, bufferedImage.isAlphaPremultiplied(), null);
+            setBufferedImage(new BufferedImage(icm2, raster, bufferedImage.isAlphaPremultiplied(), null));
         }
         return;