Changeset 30495 in osm for applications/editors/josm/plugins/canvec_helper

Timestamp:

2014-06-14T14:05:38+02:00 (10 years ago)

Author:

bastik

Message:

update to [josm7248]

Location:

applications/editors/josm/plugins/canvec_helper

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/canvec_helper/CanVecTile.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/canvec_helper/CanvecLayer.java (modified) (3 diffs)

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

@@ -4 +4 @@
     <property name="commit.message" value="JOSM/Canvec_helper: fixed a crash caused by osm directory being renamed to OSM"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7001"/>
+    <property name="plugin.main.version" value="7248"/>
     
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanVecTile.java

@@ -13 +13 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.io.IllegalDataException;
-import org.openstreetmap.josm.io.MirroredInputStream;
+import org.openstreetmap.josm.io.CachedFile;
 import java.awt.Graphics2D;
 import java.awt.Polygon;
@@ -183 +183 @@
                 File download_path = new File(layer.plugin_self.getPluginDir() + File.separator);
                 download_path.mkdir();
-                MirroredInputStream tile_zip;
-                tile_zip = new MirroredInputStream(getDownloadUrl(),download_path.toString());
+                CachedFile tile_zip = new CachedFile(getDownloadUrl()).setDestDir(download_path.toString());
                 return new ZipFile(tile_zip.getFile());
         }

applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecLayer.java

@@ -9 +9 @@
 import java.awt.Toolkit;
 import java.io.BufferedReader;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.IOException;
@@ -27 +28 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.io.MirroredInputStream;
+import org.openstreetmap.josm.io.CachedFile;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -51 +52 @@
                         long start = System.currentTimeMillis();
                         Pattern p = Pattern.compile("(\\d\\d\\d)([A-Z]\\d\\d).*");
-                        MirroredInputStream index = new MirroredInputStream("http://ftp2.cits.rncan.gc.ca/OSM/pub/ZippedOsm.txt");
+                        InputStream index = new CachedFile("http://ftp2.cits.rncan.gc.ca/OSM/pub/ZippedOsm.txt").getInputStream();
                         BufferedReader br = new BufferedReader(new InputStreamReader(index));
                         String line;