Changeset 29817 in osm for applications/editors/josm/plugins/CommandLine/src

Timestamp:

2013-08-03T10:00:02+02:00 (11 years ago)

Author:

hind

Message:

Incorrect parameters transferring fix
Synchronous result waiting
EDT violation fix

File:

• applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLine.java (modified) (8 diffs)

applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLine.java

@@ -43 +43 @@
 import javax.swing.JTextField;
 import javax.swing.JToolBar;
+import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
@@ -238 +239 @@
     }
 
-    protected void printHistory(String text) {
-        historyField.setText(text);
+    protected void printHistory(final String text) {
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                historyField.setText(text);
+            }
+        });
     }
 
@@ -478 +484 @@
         // redirect child process's stderr to JOSM stderr
         new Thread(new Runnable() {
-            @Override
             public void run() {
                 try {
@@ -497 +502 @@
         // Write stdin stream
         Thread osmWriteThread = new Thread(new Runnable() {
-            @Override
             public void run() {
                 BBox bbox = null;
@@ -516 +520 @@
                         bbox.addPrimitive(primitive, 0.0);
                 }
+                osmWriter.writeNodes(new SubclassFilteredCollection<OsmPrimitive, Node>(contents, OsmPrimitive.nodePredicate));
+                osmWriter.writeWays(new SubclassFilteredCollection<OsmPrimitive, Way>(contents, OsmPrimitive.wayPredicate));
+                osmWriter.writeRelations(new SubclassFilteredCollection<OsmPrimitive, Relation>(contents, OsmPrimitive.relationPredicate));
+                osmWriter.footer();
+                osmWriter.flush();
+
                 for (Parameter parameter : parameters) {
                     if (!parameter.isOsm())
                         continue;
+                    contents = new ArrayList<OsmPrimitive>();
+                    osmWriter.header();
                     pObjects = parameter.getParameterObjects();
                     for (OsmPrimitive primitive : pObjects) {
@@ -527 +539 @@
                             bbox.addPrimitive(primitive, 0.0);
                     }
-                }
-                osmWriter.writeNodes(new SubclassFilteredCollection<OsmPrimitive, Node>(contents, OsmPrimitive.nodePredicate));
-                osmWriter.writeWays(new SubclassFilteredCollection<OsmPrimitive, Way>(contents, OsmPrimitive.wayPredicate));
-                osmWriter.writeRelations(new SubclassFilteredCollection<OsmPrimitive, Relation>(contents, OsmPrimitive.relationPredicate));
-                osmWriter.footer();
-                osmWriter.flush();
+                    osmWriter.writeNodes(new SubclassFilteredCollection<OsmPrimitive, Node>(contents, OsmPrimitive.nodePredicate));
+                    osmWriter.writeWays(new SubclassFilteredCollection<OsmPrimitive, Way>(contents, OsmPrimitive.wayPredicate));
+                    osmWriter.writeRelations(new SubclassFilteredCollection<OsmPrimitive, Relation>(contents, OsmPrimitive.relationPredicate));
+                    osmWriter.footer();
+                    osmWriter.flush();
+                }
+
                 if (tracks) {
                     final GpxWriter gpxWriter = new GpxWriter(printWriter);
@@ -545 +558 @@
                 }
                 Utils.close(osmWriter);
-                synchronized (syncObj) {
-                    tp.running = false;
-                    syncObj.notifyAll();
-                }
             }
         });
 
         // Read stdout stream
-        final OsmToCmd osmToCmd = new OsmToCmd(this, Main.main.getCurrentDataSet());
+        final DataSet currentDataSet = Main.main.getCurrentDataSet();
+        final CommandLine that = this;
         Thread osmParseThread = new Thread(new Runnable() {
-            @Override
             public void run() {
                 try {
+                    final OsmToCmd osmToCmd = new OsmToCmd(that, currentDataSet);
                     String commandName = currentCommand.name;
                     //HashMap<Long, Long> inexiDMap = new HashMap<Long, Long>();
@@ -564 +574 @@
                     final List<org.openstreetmap.josm.command.Command> cmdlist = osmToCmd.getCommandList();
                     if (!cmdlist.isEmpty()) {
-                        SequenceCommand cmd = new SequenceCommand(commandName, cmdlist);
-                        Main.main.undoRedo.add(cmd);
+                        final SequenceCommand cmd = new SequenceCommand(commandName, cmdlist);
+                        SwingUtilities.invokeLater(new Runnable() {
+                            @Override
+                            public void run() {
+                                Main.main.undoRedo.add(cmd);
+                            }
+                        });
                     }
                 }