Changeset 15707 in osm for applications/editors/josm/plugins/openvisible

Timestamp:

2009-06-06T22:25:31+02:00 (16 years ago)

Author:

stoecker

Message:

lots of updates due to josm changes

Location:

applications/editors/josm/plugins/openvisible

Files:

• build.xml (modified) (1 diff)
• src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java (modified) (2 diffs)

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

@@ -26 +26 @@
                 <attribute name="Plugin-Dependencies" value="jgrapht-jdk1.5"/>
                 <attribute name="Plugin-Description" value="Allows opening gpx/osm files that intersect the currently visible screen area"/>
-                <attribute name="Plugin-Mainversion" value="1465"/>
+                <attribute name="Plugin-Mainversion" value="1646"/>
                 <attribute name="Plugin-Stage" value="50"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>

applications/editors/josm/plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java

@@ -29 +29 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
+import org.openstreetmap.josm.io.GpxImporter;
 import org.openstreetmap.josm.io.GpxReader;
+import org.openstreetmap.josm.io.OsmImporter;
 import org.openstreetmap.josm.io.OsmReader;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -100 +102 @@
     private void openAsData(File file) throws SAXException, IOException, FileNotFoundException {
         String fn = file.getName();
-        if (ExtensionFileFilter.filters[ExtensionFileFilter.OSM].acceptName(fn)) {
+        if (new OsmImporter().acceptFile(file)) {
             DataSet dataSet = OsmReader.parseDataSet(new FileInputStream(file), null, Main.pleaseWaitDlg);
-            OsmDataLayer layer = new OsmDataLayer(dataSet, file.getName(), file);
+            OsmDataLayer layer = new OsmDataLayer(dataSet, fn, file);
             Main.main.addLayer(layer);
         }
         else
-            JOptionPane.showMessageDialog(Main.parent, fn+": "+tr("Unknown file extension: {0}", fn.substring(file.getName().lastIndexOf('.')+1)));
+            JOptionPane.showMessageDialog(Main.parent, fn+": "+tr("Unknown file extension: {0}", fn.substring(fn.lastIndexOf('.')+1)));
     }
 
     private void openFileAsGpx(File file) throws SAXException, IOException, FileNotFoundException {
         String fn = file.getName();
-        if (ExtensionFileFilter.filters[ExtensionFileFilter.GPX].acceptName(fn)) {
+        if (new GpxImporter().acceptFile(file)) {
             GpxReader r = null;
             if (file.getName().endsWith(".gpx.gz")) {