Changeset 29922 in osm for applications

Timestamp:

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

Author:

pieren

Message:

#9052 add load/save sessions feature

Location:

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

Files:

• CacheControl.java (modified) (2 diffs)
• CadastrePlugin.java (modified) (3 diffs)
• CadastreSessionExporter.java (added)
• CadastreSessionImporter.java (added)
• WMSLayer.java (modified) (5 diffs)

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

@@ -146 +146 @@
             fis = new FileInputStream(file);
             ois = new ObjectInputStream(fis);
-            successfulRead = wmsLayer.read(ois, currentLambertZone);
+            successfulRead = wmsLayer.read(file, ois, currentLambertZone);
         } catch (Exception ex) {
             ex.printStackTrace(System.out);
@@ -195 +195 @@
                         ObjectOutputStream oos = new ObjectOutputStream(
                                 new BufferedOutputStream(new FileOutputStream(file)));
-                        wmsLayer.write(oos);
+                        wmsLayer.write(file, oos);
                         for (int i=0; i < size; i++) {
                             oos.writeObject(imagesToSave.get(i));

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

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.io.session.SessionWriter.registerSessionLayerExporter;
+import static org.openstreetmap.josm.io.session.SessionReader.registerSessionLayerImporter;
 
 import java.awt.event.ActionEvent;
@@ -138 +140 @@
  *                 - workaround on address help tool when switching to full screen
  *                 - improvement when clicking on existing node address street in mode relation
- *                 - option to simplify raster images in 2 bits colors (like images served in the past).                   
+ *                 - option to simplify raster images in 2 bits colors (like images served in the past).
+ * 2.6 10-Sep-2013 - add JOSM "sessions" feature support (list of layers stored in a file)                   
  */
 public class CadastrePlugin extends Plugin {
@@ -208 +211 @@
 
         UploadAction.registerUploadHook(new CheckSourceUploadHook());
+        
+        registerSessionLayerExporter(WMSLayer.class , CadastreSessionExporter.class);
+        registerSessionLayerImporter("cadastre-fr", CadastreSessionImporter.class);
 
     }

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();