Changeset 14118 in josm for trunk/src/org

Timestamp:

2018-08-11T00:27:34+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - new package cli to avoid circular package dependencies

Location:

trunk/src/org/openstreetmap/josm

Files:

• cli (added)
• cli/CLIModule.java (moved) (moved from trunk/src/org/openstreetmap/josm/CLIModule.java ) (2 diffs)
• cli/package-info.java (added)
• data/projection/ProjectionCLI.java (modified) (1 diff)
• gui/MainApplication.java (modified) (2 diffs)
• gui/mappaint/RenderingCLI.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/cli/CLIModule.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm;
+package org.openstreetmap.josm.cli;
 
 /**
@@ -24 +24 @@
      */
     void processArguments(String[] argArray);
-
 }

trunk/src/org/openstreetmap/josm/data/projection/ProjectionCLI.java

@@ -15 +15 @@
 import java.util.function.Function;
 
-import org.openstreetmap.josm.CLIModule;
+import org.openstreetmap.josm.cli.CLIModule;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;

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

@@ -70 +70 @@
 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 +84 @@
 import org.openstreetmap.josm.actions.mapmode.DrawAction;
 import org.openstreetmap.josm.actions.search.SearchAction;
+import org.openstreetmap.josm.cli.CLIModule;
 import org.openstreetmap.josm.command.DeleteCommand;
 import org.openstreetmap.josm.command.SplitWayCommand;

trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java

@@ -21 +21 @@
 
 import org.openstreetmap.gui.jmapviewer.OsmMercator;
-import org.openstreetmap.josm.CLIModule;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.cli.CLIModule;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.ProjectionBounds;