Changeset 17397 in osm for applications/editors/josm

Timestamp:

2009-08-31T09:48:53+02:00 (15 years ago)

Author:

guggis

Message:

fixed saving/loading wms layer
improved file filter defaults for .wms files

Location:

applications/editors/josm/plugins/wmsplugin

Files:

• build.xml (modified) (1 diff)
• src/wmsplugin/GeorefImage.java (modified) (2 diffs)
• src/wmsplugin/WMSLayer.java (modified) (10 diffs)
• src/wmsplugin/WMSPlugin.java (modified) (4 diffs)
• src/wmsplugin/io (added)
• src/wmsplugin/io/WMSLayerExporter.java (added)
• src/wmsplugin/io/WMSLayerImporter.java (added)

applications/editors/josm/plugins/wmsplugin/build.xml

@@ -32 +32 @@
     <property name="ant.build.javac.target" value="1.5"/>
         <property name="commit.message"         value="fixing JOSM issue #3186" />
-        <property name="josm.reference.release" value="2012" />
+        <property name="josm.reference.release" value="2020" />
         
     <target name="init">

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

@@ -144 +144 @@
         max = (EastNorth) in.readObject();
         min = (EastNorth) in.readObject();
-        image = (BufferedImage) ImageIO.read(ImageIO.createImageInputStream(in));
+        boolean hasImage = in.readBoolean();
+        if (hasImage)
+                image = (BufferedImage) ImageIO.read(ImageIO.createImageInputStream(in));
+        else {
+                in.readObject(); // read null from input stream
+                image = null;
+        }
     }
 
@@ -150 +156 @@
         out.writeObject(max);
         out.writeObject(min);
-        if(image == null)
+        if(image == null) {
+                out.writeBoolean(false);
             out.writeObject(null);
-        else
+        } else {
+                out.writeBoolean(true);
             ImageIO.write(image, "png", ImageIO.createImageOutputStream(out));
+        }
     }
 

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

@@ -1 +1 @@
 package wmsplugin;
 
-import org.openstreetmap.josm.io.CacheFiles;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -35 +34 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.io.CacheFiles;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -61 +61 @@
         protected String baseURL;
         protected String cookies;
-        protected final int serializeFormatVersion = 4;
+        protected final int serializeFormatVersion = 5;
 
         private ExecutorService executor = null;
@@ -212 +212 @@
                                 startstop,
                                 alphaChannel,
-                                new JMenuItem(new changeResolutionAction()),
-                                new JMenuItem(new reloadErrorTilesAction()),
-                                new JMenuItem(new downloadAction()),
+                                new JMenuItem(new ChangeResolutionAction()),
+                                new JMenuItem(new ReloadErrorTilesAction()),
+                                new JMenuItem(new DownloadAction()),
                                 new JSeparator(),
                                 new JMenuItem(new LayerListPopup.InfoAction(this))
@@ -230 +230 @@
         }
 
-        public class downloadAction extends AbstractAction {
-                public downloadAction() {
+        public class DownloadAction extends AbstractAction {
+                public DownloadAction() {
                         super(tr("Download visible tiles"));
                 }
@@ -239 +239 @@
         }
 
-        public class changeResolutionAction extends AbstractAction {
-                public changeResolutionAction() {
+        public class ChangeResolutionAction extends AbstractAction {
+                public ChangeResolutionAction() {
                         super(tr("Change resolution"));
                 }
@@ -251 +251 @@
         }
 
-        public class reloadErrorTilesAction extends AbstractAction {
-                public reloadErrorTilesAction() {
+        public class ReloadErrorTilesAction extends AbstractAction {
+                public ReloadErrorTilesAction() {
                         super(tr("Reload erroneous tiles"));
                 }
@@ -294 +294 @@
                 }
         }
-
+        
         public class SaveWmsAction extends AbstractAction {
                 public SaveWmsAction() {
@@ -302 +302 @@
                         File f = SaveActionBase.createAndOpenSaveFileChooser(
                                         tr("Save WMS layer"), ".wms");
-                        try
-                        {
-                                FileOutputStream fos = new FileOutputStream(f);
-                                ObjectOutputStream oos = new ObjectOutputStream(fos);
-                                oos.writeInt(serializeFormatVersion);
-                                oos.writeInt(dax);
-                                oos.writeInt(day);
-                                oos.writeInt(ImageSize);
-                                oos.writeDouble(pixelPerDegree);
-                                oos.writeObject(getName());
-                                oos.writeObject(baseURL);
-                                oos.writeObject(images);
-                                oos.close();
-                                fos.close();
-                        }
-                        catch (Exception ex) {
+                        try {
+                                if (f != null) {
+                                        ObjectOutputStream oos = new ObjectOutputStream(
+                                                        new FileOutputStream(f)
+                                        );
+                                        oos.writeInt(serializeFormatVersion);
+                                        oos.writeInt(dax);
+                                        oos.writeInt(day);
+                                        oos.writeInt(ImageSize);
+                                        oos.writeDouble(pixelPerDegree);
+                                        oos.writeObject(getName());
+                                        oos.writeObject(baseURL);
+                                        oos.writeObject(images);
+                                        oos.close();
+                                }
+                        } catch (Exception ex) {
                                 ex.printStackTrace(System.out);
                         }
@@ -329 +329 @@
                 public void actionPerformed(ActionEvent ev) {
                         JFileChooser fc = DiskAccessAction.createAndOpenFileChooser(true,
-                                        false, tr("Load WMS layer"));
+                                        false, tr("Load WMS layer"), "wms");
                         if(fc == null) return;
                         File f = fc.getSelectedFile();

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

@@ -24 +24 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.ProjectionBounds;
@@ -35 +36 @@
 import org.openstreetmap.josm.plugins.Plugin;
 
+import wmsplugin.io.WMSLayerExporter;
+import wmsplugin.io.WMSLayerImporter;
+
 public class WMSPlugin extends Plugin {
     static CacheFiles cache = new CacheFiles("wmsplugin");
@@ -46 +50 @@
     // remember state of menu item to restore on changed preferences
     static private boolean menuEnabled = false;
+    
+    protected void initExporterAndImporter() {
+        ExtensionFileFilter.exporters.add(new WMSLayerExporter());
+        ExtensionFileFilter.importers.add(new WMSLayerImporter());
+    }
 
     public WMSPlugin() {
@@ -51 +60 @@
         cache.setExpire(CacheFiles.EXPIRE_MONTHLY, false);
         cache.setMaxSize(70, false);
+        initExporterAndImporter();
     }