Changeset 22854 in osm for applications/editors/josm/plugins

Timestamp:

2010-08-29T13:36:49+02:00 (14 years ago)

Author:

bastik

Message:

fixed josm bug 4822 - Loading WMS layer from file throws exception

Location:

applications/editors/josm/plugins/wmsplugin/src/wmsplugin

Files:

• GeorefImage.java (modified) (4 diffs)
• WMSLayer.java (modified) (1 diff)

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/GeorefImage.java

@@ -25 +25 @@
         public enum State { IMAGE, NOT_IN_CACHE, FAILED};
 
-        private final WMSLayer layer;
+        private WMSLayer layer;
         private State state;
 
@@ -170 +170 @@
 
         private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+                state = (State) in.readObject();
                 boolean hasImage = in.readBoolean();
                 if (hasImage)
@@ -180 +181 @@
 
         private void writeObject(ObjectOutputStream out) throws IOException {
+                out.writeObject(state);
                 if(getImage() == null) {
                         out.writeBoolean(false);
@@ -215 +217 @@
                 return yIndex;
         }
+        
+        public void setLayer(WMSLayer layer) {
+            this.layer = layer;
+        }
 }

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java

@@ -640 +640 @@
                                 ois.close();
                                 fis.close();
+                            for (GeorefImage[] imgs : images) {
+                                for (GeorefImage img : imgs) {
+                                    if (img != null) {
+                                                img.setLayer(WMSLayer.this);
+                                    }
+                                }
+                            }
                                 settingsChanged = true;
                                 mv.repaint();