Changeset 12792 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2017-09-08T22:02:38+02:00 (7 years ago)

Author:

bastiK

Message:

closes #15273, see #15229, see #15182 - add command line interface module for projections

• run josm project --help to see the options
• extracts parser from LatLon and CustomProjection into LatLonParser

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainApplication.java (modified) (9 diffs)
• ProgramArguments.java (modified) (1 diff)
• dialogs/LatLonDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -34 +34 @@
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -61 +62 @@
 import org.jdesktop.swinghelper.debug.CheckThreadViolationRepaintManager;
 import org.openstreetmap.gui.jmapviewer.FeatureAdapter;
+import org.openstreetmap.josm.CLIModule;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.DeleteAction;
@@ -85 +87 @@
 import org.openstreetmap.josm.data.osm.UserInfo;
 import org.openstreetmap.josm.data.osm.search.SearchMode;
+import org.openstreetmap.josm.data.projection.ProjectionCLI;
 import org.openstreetmap.josm.data.projection.datum.NTV2GridShiftFileSource;
 import org.openstreetmap.josm.data.projection.datum.NTV2GridShiftFileWrapper;
@@ -163 +166 @@
      * Command-line arguments used to run the application.
      */
-    private static final List<String> COMMAND_LINE_ARGS = new ArrayList<>();
+    private static List<String> commandLineArgs;
 
     /**
@@ -230 +233 @@
         public void layerAdded(LayerAddEvent e) {
             // Do nothing
+        }
+    };
+
+    private static final List<CLIModule> cliModules = new ArrayList<>();
+
+    /**
+     * Default JOSM command line interface.
+     * <p>
+     * Runs JOSM and performs some action, depending on the options and positional
+     * arguments.
+     */
+    public static final CLIModule JOSM_CLI_MODULE = new CLIModule() {
+        @Override
+        public String getActionKeyword() {
+            return "runjosm";
+        }
+
+        @Override
+        public void processArguments(String[] argArray) {
+            ProgramArguments args = null;
+            // construct argument table
+            try {
+                args = new ProgramArguments(argArray);
+            } catch (IllegalArgumentException e) {
+                System.err.println(e.getMessage());
+                System.exit(1);
+            }
+            mainJOSM(args);
         }
     };
@@ -256 +287 @@
         }
     };
+
+    static {
+        registerCLIModue(JOSM_CLI_MODULE);
+        registerCLIModue(ProjectionCLI.INSTANCE);
+    }
+
+    /**
+     * Register a command line interface module.
+     * @param module the module
+     * @since 12792
+     */
+    public static void registerCLIModue(CLIModule module) {
+        cliModules.add(module);
+    }
 
     /**
@@ -488 +533 @@
      */
     public static List<String> getCommandLineArgs() {
-        return Collections.unmodifiableList(COMMAND_LINE_ARGS);
+        return Collections.unmodifiableList(commandLineArgs);
     }
 
@@ -766 +811 @@
     public static void main(final String[] argArray) {
         I18n.init();
-
-        ProgramArguments args = null;
-        // construct argument table
-        try {
-            args = new ProgramArguments(argArray);
-        } catch (IllegalArgumentException e) {
-            System.err.println(e.getMessage());
-            System.exit(1);
-            return;
-        }
+        commandLineArgs = Arrays.asList(Arrays.copyOf(argArray, argArray.length));
+
+        if (argArray.length > 0) {
+            String moduleStr = argArray[0];
+            for (CLIModule module : cliModules) {
+                if (Objects.equals(moduleStr, module.getActionKeyword())) {
+                   String[] argArrayCdr = Arrays.copyOfRange(argArray, 1, argArray.length);
+                   module.processArguments(argArrayCdr);
+                   return;
+                }
+            }
+        }
+        // no module specified, use default (josm)
+        JOSM_CLI_MODULE.processArguments(argArray);
+    }
+
+    /**
+     * Main method to run the JOSM GUI.
+     * @param args program arguments
+     */
+    public static void mainJOSM(ProgramArguments args) {
 
         if (!GraphicsEnvironment.isHeadless()) {
@@ -821 +877 @@
             return;
         }
-
-        COMMAND_LINE_ARGS.addAll(Arrays.asList(argArray));
 
         boolean skipLoadingPlugins = args.hasOption(Option.SKIP_PLUGINS);

trunk/src/org/openstreetmap/josm/gui/ProgramArguments.java

@@ -113 +113 @@
      */
     private void buildCommandLineArgumentMap(String... args) {
-        LongOpt[] los = Stream.of(Option.values()).map(Option::toLongOpt).toArray(i -> new LongOpt[i]);
+        LongOpt[] los = Stream.of(Option.values()).map(Option::toLongOpt).toArray(LongOpt[]::new);
 
         Getopt g = new Getopt("JOSM", args, "hv", los);

trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java

@@ -27 +27 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.coor.conversion.CoordinateFormatManager;
+import org.openstreetmap.josm.data.coor.conversion.LatLonParser;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.util.WindowGeometry;
@@ -245 +246 @@
         LatLon latLon;
         try {
-            latLon = LatLon.parse(tfLatLon.getText());
+            latLon = LatLonParser.parse(tfLatLon.getText());
             if (!LatLon.isValidLat(latLon.lat()) || !LatLon.isValidLon(latLon.lon())) {
                 latLon = null;