Changeset 21280 in osm for applications/editors/josm

Timestamp:

2010-05-15T14:41:06+02:00 (15 years ago)

Author:

stoecker

Message:

fixed a lot

Location:

applications/editors/josm/plugins/tagging-preset-tester

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java (modified) (3 diffs)

applications/editors/josm/plugins/tagging-preset-tester/build.xml

@@ -29 +29 @@
 
         <property name="commit.message" value="Changed the constructor signature of the plugin main class" />
-        <property name="plugin.main.version" value="2830" />
+        <property name="plugin.main.version" value="3250" />
 
 

applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java

@@ -12 +12 @@
 import java.io.BufferedReader;
 import java.net.URL;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -27 +28 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
-import org.openstreetmap.josm.plugins.PluginInformation;
 import org.xml.sax.SAXException;
 
@@ -38 +38 @@
 
     public void reload() {
-        Vector<TaggingPreset> allPresets = new Vector<TaggingPreset>();
-        for (String source : args) {
-            InputStream in = null;
-            try {
-                if (source.startsWith("http") || source.startsWith("ftp") || source.startsWith("file"))
-                    in = new URL(source).openStream();
-                else
-                    in = new FileInputStream(source);
-                allPresets.addAll(TaggingPreset.readAll(new BufferedReader(new InputStreamReader(in))));
-            } catch (IOException e) {
-                e.printStackTrace();
-                JOptionPane.showMessageDialog(null, tr("Could not read tagging preset source: {0}",source));
-            } catch (SAXException e) {
-                e.printStackTrace();
-                JOptionPane.showMessageDialog(null, tr("Error parsing {0}: {1}",source,e.getMessage()));
-            }
-
-            try {
-                if (in != null)
-                    in.close();
-            } catch (IOException e) {
-            }
-        }
+        Vector<TaggingPreset> allPresets = new Vector<TaggingPreset>(TaggingPreset.readAll(Arrays.asList(args)));
         taggingPresets.setModel(new DefaultComboBoxModel(allPresets));
     }
@@ -78 +56 @@
     }
    
-    public TaggingPresetTester(PluginInformation info) {
-        this(new String[]{});
-    }
-    
     public TaggingPresetTester(String[] args) {
         super(tr("Tagging Preset Tester"));

applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java

@@ -5 +5 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.util.Collection;
+import java.util.Collections;
 
 import javax.swing.JOptionPane;
@@ -11 +13 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.MainMenu;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset;
+import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -29 +33 @@
     }
 
+    public TaggingPresetTesterAction(PluginInformation info) {
+        this();
+    }
+
     public void actionPerformed(ActionEvent e) {
-        String taggingPresetSources = Main.pref.get("taggingpreset.sources");
-        if (taggingPresetSources.equals("")) {
+        Collection<String> coll = TaggingPreset.getPresetSources();
+
+        if (coll.size() == 0) {
             JOptionPane.showMessageDialog(Main.parent, tr("You have to specify tagging preset sources in the preferences first."));
             return;
         }
-        String[] args = taggingPresetSources.split(";");
-        new TaggingPresetTester(args);
+
+        String[] taggingPresetSources = new String [coll.size()];
+        coll.toArray(taggingPresetSources);
+        new TaggingPresetTester(taggingPresetSources);
     }
 }