Changeset 26991 in osm

Timestamp:

2011-10-30T23:41:51+01:00 (13 years ago)

Author:

stoecker

Message:

fix build

Location:

applications/editors/josm/plugins/surveyor

Files:

• build.xml (modified) (1 diff)
• src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java (modified) (1 diff)

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

@@ -32 +32 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4394"/>
+    <property name="plugin.main.version" value="4549"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java

@@ -129 +129 @@
 
         SurveyorComponent surveyorComponent = null;
-        try {
-            parser.start(in);
-            List<SurveyorActionDescription> actions = new ArrayList<SurveyorActionDescription>();
-            while(parser.hasNext()) {
-                Object object = parser.next();
-                if (object instanceof SurveyorComponent) {
-                    System.out.println("SurveyorComponent " + object);
-                    surveyorComponent = (SurveyorComponent) object;
-                } else if (object instanceof ButtonDescription) {
-                    System.out.println("ButtonDescription " + object);
-                    ((ButtonDescription)object).setActions(actions);
-                    surveyorComponent.addButton(((ButtonDescription)object));
-                    actions.clear();
-                } else if (object instanceof SurveyorActionDescription) {
-                    System.out.println("SurveyorActionDescription " + object);
-                    actions.add((SurveyorActionDescription)object);
-                } else {
-                    System.err.println("unknown " + object);
-                }
+        parser.start(in);
+        List<SurveyorActionDescription> actions = new ArrayList<SurveyorActionDescription>();
+        while(parser.hasNext()) {
+            Object object = parser.next();
+            if (object instanceof SurveyorComponent) {
+                System.out.println("SurveyorComponent " + object);
+                surveyorComponent = (SurveyorComponent) object;
+            } else if (object instanceof ButtonDescription) {
+                System.out.println("ButtonDescription " + object);
+                ((ButtonDescription)object).setActions(actions);
+                surveyorComponent.addButton(((ButtonDescription)object));
+                actions.clear();
+            } else if (object instanceof SurveyorActionDescription) {
+                System.out.println("SurveyorActionDescription " + object);
+                actions.add((SurveyorActionDescription)object);
+            } else {
+                System.err.println("unknown " + object);
             }
-        } catch (SAXException e) {
-            e.printStackTrace();
         }
-
-//        SurveyorComponent surveyorComponent = new SurveyorComponent();
-//        surveyorComponent.setGridSize(3,3);
-//        surveyorComponent.addButton(new ButtonDescription("Tunnel", "T", "images/symbols/tunnel.png", "ConsolePrinterAction", ButtonType.SINGLE));
-//        surveyorComponent.addButton(new ButtonDescription("Bridge", "B", null, "ConsolePrinterAction", ButtonType.TOGGLE));
-//        surveyorComponent.addButton(new ButtonDescription("Motorway", "M", null, "ConsolePrinterAction", null));
-//        surveyorComponent.addButton(new ButtonDescription("Primary", "P", null, "ConsolePrinterAction", null));
-//        surveyorComponent.addButton(new ButtonDescription("Secondary", "S", null, "ConsolePrinterAction", null));
-//        surveyorComponent.addButton(new ButtonDescription("Unclassified", "U", null, "ConsolePrinterAction", null));
-//        surveyorComponent.addButton(new ButtonDescription("Residential", "R", null, "ConsolePrinterAction", null));
-//        surveyorComponent.addButton(new ButtonDescription("Parking", "P", "images/symbols/parking.png", "ConsolePrinterAction", null));
 
         JFrame frame = new JFrame();