Changeset 9948 in osm

Timestamp:

2008-08-18T16:32:47+02:00 (16 years ago)

Author:

stoecker

Message:

updated code to current JOSM state

Location:

applications/editors/josm/plugins

Files:

• build.xml (modified) (2 diffs)
• pluginmanager (modified) (1 prop)
• pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginHelper.java (modified) (1 diff)
• pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/SiteDescription.java (modified) (2 diffs)
• pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/SiteDescriptionParser.java (modified) (2 diffs)
• tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java (modified) (3 diffs)

applications/editors/josm/plugins/build.xml

@@ -24 +24 @@
     <ant        dir="osmarender"        antfile="build.xml"     target="dist"/>
     <ant        dir="plastic_laf"       antfile="build.xml"     target="dist"/>
+    <ant        dir="pluginmanager"     antfile="build.xml"     target="dist"/> 
     <ant        dir="slippymap"         antfile="build.xml"     target="dist"/>
+    <ant        dir="tagging-preset-tester"     antfile="build.xml"     target="dist"/>
     <ant        dir="utilsplugin"       antfile="build.xml"     target="dist"/>
     <ant        dir="validator"         antfile="build.xml"     target="dist"/>
@@ -34 +36 @@
     <ant        dir="grid"              antfile="build.xml"     target="dist"/>
     <ant        dir="navigator"         antfile="build.xml"     target="dist"/>
-    <ant        dir="pluginmanager"     antfile="build.xml"     target="dist"/> 
     <ant        dir="surveyor"          antfile="build.xml"     target="dist"/>
-    <ant        dir="tagging-preset-tester"     antfile="build.xml"     target="dist"/>
     <ant        dir="waypoints"         antfile="build.xml"     target="dist"/>
   </target>

applications/editors/josm/plugins/pluginmanager

@@ -2 +2 @@
 bin
 josm-site.xml
+build

@@ -2 +2 @@
 bin
 josm-site.xml
+build

applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginHelper.java

@@ -32 +32 @@
         registerMenu("edit", Main.main.menu.editMenu);
         registerMenu("tools", Main.main.menu.toolsMenu);
-        registerMenu("connection", Main.main.menu.connectionMenu);
-        registerMenu("layer", Main.main.menu.layerMenu);
+//        registerMenu("connection", Main.main.menu.connectionMenu);
+//        registerMenu("layer", Main.main.menu.layerMenu);
         registerMenu("help", Main.main.menu.helpMenu);
         

applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/SiteDescription.java

@@ -13 +13 @@
 import java.util.List;
 
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
 import org.openstreetmap.josm.plugins.PluginInformation;
+
+import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
@@ -88 +93 @@
 //            parser.setVariableHelper(varHelper);
             parser.setVariableHelper(PluginHelper.getInstance().getVariableHelper());
-            parser.parse(in);
+            SAXParserFactory.newInstance().newSAXParser().parse(new InputSource(in), parser);
             //System.out.println("site describes plugins: " + plugins);
         } catch (SAXException e) {
             e.printStackTrace();
-        } finally {        
+        } catch (ParserConfigurationException e1) {
+            e1.printStackTrace(); // broken SAXException chaining
+        }
+        finally {
             in.close();
         }
-        
+
         // check if the plugins are already installed:
         PluginHelper helper = PluginHelper.getInstance();

applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/SiteDescriptionParser.java

@@ -12 +12 @@
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
-
-import uk.co.wilson.xml.MinML2;
+import org.xml.sax.helpers.DefaultHandler;
 
 /**
@@ -19 +18 @@
  *
  */
-public class SiteDescriptionParser extends MinML2 {
+public class SiteDescriptionParser extends DefaultHandler {
     private SiteDescription siteDescription;
     private PluginDescription pluginDescription;

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

@@ -8 +8 @@
 import java.io.InputStream;
 import java.net.URL;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Vector;
 
@@ -19 +21 @@
 import javax.swing.JPanel;
 
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.tagging.TaggingCellRenderer;
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
@@ -64 +67 @@
                 if (preset == null)
                         return;
-                JPanel p = preset.createPanel();
+                Collection<OsmPrimitive> x = Collections.emptySet();
+                JPanel p = preset.createPanel(x);
                 p.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
                 if (p != null)

@@ -2 +2 @@
 bin
 josm-site.xml
+build