Changeset 906 in josm

Timestamp:

2008-09-02T18:22:40+02:00 (16 years ago)

Author:

stoecker

Message:

added generic mirroring Input stream, replace validator specific one soon

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/preferences/PluginPreference.java (modified) (1 diff)
• gui/tagging/TaggingPreset.java (modified) (6 diffs)
• io/MirroredInputStream.java (added)

trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java

@@ -171 +171 @@
                 // refresh description
                 PluginDownloader.downloadDescription();
+                refreshPluginPanel(gui);
 
                 Set<PluginDescription> toUpdate = new HashSet<PluginDescription>();

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -9 +9 @@
 import java.awt.event.ActionEvent;
 import java.io.BufferedReader;
-import java.io.FileInputStream;
+import java.io.InputStreamReader;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
-import java.net.URL;
 import java.util.Collection;
 import java.util.HashMap;
@@ -22 +19 @@
 import java.util.List;
 import java.util.Set;
-import java.util.StringTokenizer;
 
 import javax.swing.AbstractAction;
@@ -40 +36 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
+import org.openstreetmap.josm.io.MirroredInputStream;
 import org.openstreetmap.josm.gui.QuadStateCheckBox;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetMenu;
@@ -326 +323 @@
          */
         public Collection<Class<?>> types;
-        private List<Item> data = new LinkedList<Item>();
+        public List<Item> data = new LinkedList<Item>();
         private static HashMap<String,String> lastValue = new HashMap<String,String>();
 
@@ -386 +383 @@
         }
 
-        public static List<TaggingPreset> readAll(InputStream inStream) throws SAXException {
-                BufferedReader in = null;
-                try {
-                        in = new BufferedReader(new InputStreamReader(inStream, "UTF-8"));
-                } catch (UnsupportedEncodingException e) {
-                        e.printStackTrace();
-                        in = new BufferedReader(new InputStreamReader(inStream));
-                }
+        private static List<TaggingPreset> readAll(BufferedReader in) throws SAXException {
                 XmlObjectParser parser = new XmlObjectParser();
                 parser.mapOnStart("item", TaggingPreset.class);
@@ -441 +431 @@
                 String allTaggingPresets = Main.pref.get("taggingpreset.sources");
                 
-                if (Main.pref.getBoolean("taggingpreset.enable-defaults", true)) {
-                        InputStream in = Main.class.getResourceAsStream("/presets/presets.xml");
+                if (Main.pref.getBoolean("taggingpreset.enable-defaults", true))
+                {
+                        allTaggingPresets = "resource://presets/presets.xml"
+                        + (allTaggingPresets != null ? ";"+allTaggingPresets : "");
+                }
+                
+                for(String source : allTaggingPresets.split(";"))
+                {
                         try {
-                                allPresets.addAll(TaggingPreset.readAll(in));
-                        } catch (SAXException x) {
-                                JOptionPane.showMessageDialog(Main.parent, tr("Error parsing presets.xml: ")+x.getMessage());
-                        }
-                }
-                
-                StringTokenizer st = new StringTokenizer(allTaggingPresets, ";");
-                while (st.hasMoreTokens()) {
-                        InputStream in = null;
-                        String source = st.nextToken();
-                        try {
-                                if (source.startsWith("http") || source.startsWith("ftp") || source.startsWith("file"))
-                                        in = new URL(source).openStream();
-                                else if (source.startsWith("resource://")) 
-                                        in = Main.class.getResourceAsStream(source.substring("resource:/".length()));
-                                else
-                                        in = new FileInputStream(source);
-                                allPresets.addAll(TaggingPreset.readAll(in));
-                                in.close();
+                                MirroredInputStream s = new MirroredInputStream(source);
+                                InputStreamReader r;
+                                try
+                                {
+                                        r = new InputStreamReader(s, "UTF-8");
+                                }
+                                catch (UnsupportedEncodingException e)
+                                {
+                                        r = new InputStreamReader(s);
+                                }
+                                allPresets.addAll(TaggingPreset.readAll(new BufferedReader(r)));
                         } catch (IOException e) {
                                 e.printStackTrace();