Changeset 30670 in osm

Timestamp:

2014-09-23T11:46:57+02:00 (10 years ago)

Author:

donvip

Message:

[josm_commandline] code cleanup

File:

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

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

@@ -101 +101 @@
                             if (commandText.isEmpty()) {
                                 commandText = history.getLastItem();
-                            }
-                            else {
+                            } else {
                                 history.addItem(commandText);
                             }
@@ -108 +107 @@
                             if (command != null) {
                                 startCommand(command);
+                            } else {
+                                setMode(Mode.IDLE);
                             }
-                            else
-                                setMode(Mode.IDLE);
                             break;
                         case SELECTION:
@@ -189 +188 @@
         };
 
-        if ( Main.main.menu != null ) {
+        if (Main.main.menu != null) {
             commandMenu = Main.main.menu.addMenu(marktr("Commands") , KeyEvent.VK_O, Main.main.menu.getDefaultMenuPos(), ht("/Plugin/CommandLine"));
             MainMenu.add(commandMenu, new CommandLineAction(this));
@@ -259 +258 @@
                     return commands.get(i);
                 }
-            }
-            else {
-                if ( commands.get(i).name.toLowerCase().startsWith( text.toLowerCase() ) && text.length() > 1 ) {
-                    return commands.get(i);
-                }
+            } else if ( commands.get(i).name.toLowerCase().startsWith( text.toLowerCase() ) && text.length() > 1 ) {
+                return commands.get(i);
             }
         }
@@ -340 +336 @@
                 Layer olayer = Main.map.mapView.getActiveLayer();
                 if (olayer != null) {
-                    if (olayer instanceof ImageryLayer) {
-                    }
-                    else {
+                    if (!(olayer instanceof ImageryLayer)) {
                         List<ImageryLayer> imageryLayers = Main.map.mapView.getLayersOfType(ImageryLayer.class);
                         if (imageryLayers.size() == 1) {
@@ -404 +398 @@
                     setMode(Mode.SELECTION);
                 }
-            }
-            else {
+            } else {
                 runTool();
             }
-        }
-        else {
+        } else {
             Main.info("Invalid argument");
             endInput();
@@ -424 +416 @@
         if (ok) {
             currentCommand.nextParameter();
-        }
-        else {
+        } else {
             currentCommand.resetLoading();
         }
@@ -463 +454 @@
             debugstr.append(s + " ");
         debugstr.append("\n");
-        System.out.print(debugstr.toString());
+        Main.info(debugstr.toString());
 
         final ToolProcess tp = new ToolProcess();
@@ -469 +460 @@
             tp.process = builder.start();
         } catch (final IOException e) {
-            e.printStackTrace();
             synchronized (debugstr) {
-                System.out.print(
+                Main.error(
                         tr("Error executing the script: ") +
                         debugstr.toString() + e.getMessage() + "\n" + e.getStackTrace());
@@ -577 +567 @@
                     final OsmToCmd osmToCmd = new OsmToCmd(that, currentDataSet);
                     String commandName = currentCommand.name;
-                    //HashMap<Long, Long> inexiDMap = new HashMap<Long, Long>();
                     final InputStream inputStream = tp.process.getInputStream();
                     osmToCmd.parseStream(inputStream);
@@ -590 +579 @@
                         });
                     }
-                }
-                catch (Exception e) {}
+                } catch (Exception e) {
+                }
                 finally {
                     synchronized (syncObj) {