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

Timestamp:

2013-09-10T21:04:07+02:00 (13 years ago)

Author:

pieren

Message:

#9052 add load/save sessions feature

File:

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

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

@@ -15 +15 @@
 import java.awt.image.ImageObserver;
 import java.io.EOFException;
+import java.io.File;
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -131 +132 @@
     public void destroy() {
         // if the layer is currently saving the images in the cache, wait until it's finished
-        grabThread.cancel();
+        if(grabThread != null)
+                        grabThread.cancel();
         grabThread = null;
         super.destroy();
@@ -439 +441 @@
      * @throws IOException
      */
-    public void write(ObjectOutputStream oos) throws IOException {
+    public void write(File associatedFile, ObjectOutputStream oos) throws IOException {
         currentFormat = this.serializeFormatVersion;
+        setAssociatedFile(associatedFile);
         oos.writeInt(this.serializeFormatVersion);
         oos.writeObject(this.location);    // String
@@ -467 +470 @@
      * @throws ClassNotFoundException
      */
-    public boolean read(ObjectInputStream ois, int currentLambertZone) throws IOException, ClassNotFoundException {
+    public boolean read(File associatedFile, ObjectInputStream ois, int currentLambertZone) throws IOException, ClassNotFoundException {
         currentFormat = ois.readInt();;
         if (currentFormat < 2) {
@@ -478 +481 @@
         this.lambertZone = ois.readInt();
         this.setRaster(ois.readBoolean());
+        setAssociatedFile(associatedFile);
         if (currentFormat >= 4)
             ois.readBoolean();