Changeset 29762 in osm for applications/editors

Timestamp:

2013-07-18T20:49:34+02:00 (11 years ago)

Author:

akks

Message:

'[josm_tagging_preset_tester] #josm8853: listen for list selection, support standalone mode (ant run)'

Location:

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

Files:

• build.xml (modified) (2 diffs)
• nbproject (added)
• nbproject/project.xml (added)
• src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java (modified) (6 diffs)

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

@@ -26 +26 @@
 -->
 <project name="tagging-preset-tester" default="dist" basedir=".">
-    <property name="commit.message" value="[josm_tagging_preset_tester] fix #josm8853: use preset seach panel in the plugin instead of the compbobox"/>
-    <property name="plugin.main.version" value="6071"/>
+    <property name="commit.message" value="[josm_tagging_preset_tester] #josm8853: listen for list selection, support standalone mode (ant run)"/>
+    <property name="plugin.main.version" value="6072"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>
@@ -42 +42 @@
             <compilerarg value="-Xlint:unchecked"/>
         </javac>
+    </target>
+    <target name="run" depends="install">
+        <echo message="creating ${plugin.jar}"/>
+        <java classpath="${josm};${plugin.jar}" classname="org.openstreetmap.josm.plugins.taggingpresettester.TaggingPresetTester"/>
     </target>
     <target name="dist" depends="compile,revision">

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

@@ -6 +6 @@
 import java.awt.Dimension;
 import java.awt.GridBagLayout;
-import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -15 +14 @@
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
-import javax.swing.JComboBox;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
@@ -21 +19 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
@@ -52 +51 @@
             return;
         Collection<OsmPrimitive> x;
-        if (Main.main.hasEditLayer()) {
+        if (Main.main!=null && Main.main.hasEditLayer()) {
             x = Main.main.getCurrentDataSet().getSelected();
         } else {
@@ -75 +74 @@
         panel.add(taggingPresets, GBC.std(0,0).fill(GBC.BOTH));
         panel.add(taggingPresetPanel, GBC.std(1,0).fill(GBC.BOTH));
-        taggingPresets.setClickListener(new ActionListener(){
+        taggingPresets.addSelectionListener(new ActionListener(){
             @Override
             public void actionPerformed(ActionEvent e) {
-                reselect();
+                if (taggingPresets.getSelectedPreset()!=null)
+                    reselect();
             }
         });
@@ -105 +105 @@
             args = new String[]{c.getSelectedFile().getPath()};
         }
-        JFrame f = new TaggingPresetTester(args);
-        f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        if (args!=null) {
+            Main.pref = new Preferences();
+            System.out.println("Opening file "+args[0]);
+            JFrame f = new TaggingPresetTester(args);
+            f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+            f.setVisible(true);
+        }
     }