Changeset 29819 in osm

Timestamp:

2013-08-03T11:50:12+02:00 (11 years ago)

Author:

hind

Message:

Support for CommandLine asynchronous commands

Location:

applications/editors/josm/plugins/CommandLine/src/CommandLine

Files:

• Command.java (modified) (1 diff)
• CommandLine.java (modified) (1 diff)
• Loader.java (modified) (3 diffs)

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

@@ -26 +26 @@
     public int currentParameterNum;
     public boolean tracks;
-
-    public Command () { parameters = new ArrayList<Parameter>(); optParameters = new ArrayList<Parameter>(); currentParameterNum = 0; tracks = false; icon = ""; }
+    public boolean asynchronous;
+
+    public Command () { parameters = new ArrayList<Parameter>(); optParameters = new ArrayList<Parameter>(); currentParameterNum = 0; tracks = false; asynchronous = false; icon = ""; }
 
     public boolean loadObject(Object obj) {

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

@@ -558 +558 @@
                 }
                 Utils.close(osmWriter);
+                synchronized (syncObj) {
+                    if (currentCommand.asynchronous) {
+                        tp.running = false;
+                        syncObj.notifyAll();
+                    }
+                }
             }
         });

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

@@ -85 +85 @@
                                         if (Value.equals("bbox"))
                                                 currentCommand.tracks = true;
-                                }
-                                else if (Name.equals("icon")) {
+                                } else if (Name.equals("icon")) {
                                         currentCommand.icon = Value;
+                                } else if (Name.equals("asynchronous")) {
+                                        currentCommand.asynchronous = Value.equals("true") ? true : false;
                                 }
                         }
@@ -126 +127 @@
         }
 
-        @Override
+        @Override
         public void characters(char ch[], int start, int length) 
         {
@@ -167 +168 @@
         }
 
-        @Override
+        @Override
         public void warning(SAXParseException ex) {
-          System.err.println("Warning in command xml file " + currentFile + ": " + ex.getMessage());
+                System.err.println("Warning in command xml file " + currentFile + ": " + ex.getMessage());
         }
 
-        @Override
+        @Override
         public void error(SAXParseException ex) {
-          System.err.println("Error in command xml file " + currentFile + ": " + ex.getMessage());
+                System.err.println("Error in command xml file " + currentFile + ": " + ex.getMessage());
         }
 
-        @Override
+        @Override
         public void fatalError(SAXParseException ex) throws SAXException {
-          System.err.println("Error in command xml file " + currentFile + ": " + ex.getMessage());
-          throw ex;
+                System.err.println("Error in command xml file " + currentFile + ": " + ex.getMessage());
+                throw ex;
         }
 }