Changeset 2186 in josm

Timestamp:

2009-09-23T21:27:58+02:00 (15 years ago)

Author:

jttt

Message:

Fix #3549

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/RelationMember.java (modified) (1 diff)
• gui/layer/GeoImageLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java

@@ -10 +10 @@
 
     /**
-     * 
+     *
      */
-    private String role;
+    private final String role;
 
     /**
-     * 
+     *
      */
-    private OsmPrimitive member;
+    private final OsmPrimitive member;
 
     /**

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

@@ -223 +223 @@
         }
 
+
         public synchronized boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) {
             if ((infoflags & ImageObserver.ALLBITS) != 0) {
@@ -229 +230 @@
                 loadImage();
                 notifyAll();
+            } else if ((infoflags & ImageObserver.ERROR) != 0) {
+                currentEntry.scaledImage = new BufferedImage(1, 1, BufferedImage.TYPE_BYTE_BINARY);
+                currentEntry = null;
             }
             return true;