Changeset 25044 in osm

Timestamp:

2011-01-13T21:45:45+01:00 (14 years ago)

Author:

hind

Message:

Icons with menu and panel support for CommandLine plugin

Location:

applications/editors/josm

Files:

• dist/CommandLine.jar (modified) ( previous)
• plugins/CommandLine/build.xml (modified) (1 diff)
• plugins/CommandLine/src/CommandLine/Command.java (modified) (3 diffs)
• plugins/CommandLine/src/CommandLine/CommandAction.java (added)
• plugins/CommandLine/src/CommandLine/CommandLine.java (modified) (9 diffs)
• plugins/CommandLine/src/CommandLine/Loader.java (modified) (2 diffs)

applications/editors/josm/plugins/CommandLine/build.xml

@@ -3 +3 @@
 
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="Initial commit" />
+    <property name="commit.message" value="Icons with menu and panel support" />
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="3751" />

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

@@ -2 +2 @@
  *      Command.java
  *      
- *      Copyright 2010 Hind <foxhind@gmail.com>
+ *      Copyright 2011 Hind <foxhind@gmail.com>
  *      
  */
@@ -22 +22 @@
         public String name;                                             // Command name
         public String run;                                              // Executable file with arguments ("nya.exe {arg1} {arg2} ... {argn}")
+        public String icon;                                             // Icon file name
         public ArrayList<Parameter> parameters; // Required parameters list
         public ArrayList<Parameter> optParameters;      // Optional parameters list
@@ -27 +28 @@
         public boolean tracks;
         
-        public Command () {     parameters = new ArrayList<Parameter>(); optParameters = new ArrayList<Parameter>(); currentParameterNum = 0; tracks = false; }
+        public Command () {     parameters = new ArrayList<Parameter>(); optParameters = new ArrayList<Parameter>(); currentParameterNum = 0; tracks = false; icon = ""; }
 
         public boolean loadObject(Object obj) {

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

@@ -2 +2 @@
  *      CommandLine.java
  *      
- *      Copyright 2010 Hind <foxhind@gmail.com>
+ *      Copyright 2011 Hind <foxhind@gmail.com>
  *      
  *      This program is free software; you can redistribute it and/or modify
@@ -22 +22 @@
 package CommandLine;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.marktr;
 
 import java.awt.BorderLayout;
@@ -43 +45 @@
 import java.util.regex.*;
 import javax.swing.JTextField;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
 
 import org.openstreetmap.josm.Main;
@@ -76 +80 @@
         private Mode mode;
         private ArrayList<Command> commands;
+        private JMenu commandMenu;
         protected Command currentCommand;
         protected String commandSymbol;
-        private History history;
-        private MapFrame currentMapFrame;
-        private MapMode previousMode;
+        protected History history;
+        protected MapFrame currentMapFrame;
+        protected MapMode previousMode;
 
         public CommandLine(PluginInformation info) {
@@ -104 +109 @@
                                                                 Command command = findCommand(commandText, true);
                                                                 if (command != null) {
-                                                                        currentCommand = command;
-                                                                        currentCommand.resetLoading();
-                                                                        parseSelection(Main.main.getCurrentDataSet().getSelected());
-                                                                        previousMode = Main.map.mapMode;
-                                                                        if (currentCommand.currentParameterNum < currentCommand.parameters.size())
-                                                                                setMode(Mode.SELECTION);
-                                                                        else
-                                                                                runTool();
+                                                                        startCommand(command);
                                                                 }
                                                                 else
@@ -193 +191 @@
                 };
 
-                MainMenu.add(Main.main.menu.toolsMenu, new CommandLineAction(this));
+                if ( Main.main.menu != null ) {
+                        commandMenu = Main.main.menu.addMenu(marktr("Commands") , KeyEvent.VK_C, Main.main.menu.defaultMenuPos, ht("/Plugin/CommandLine"));
+                        MainMenu.add(Main.main.menu.toolsMenu, new CommandLineAction(this));
+                }
                 loadCommands();
                 setMode(Mode.IDLE);
+        }
+
+        public void startCommand(String commandName) {
+                Command command = findCommand(commandName, true);
+                if (command != null) {
+                        startCommand(command);
+                }
+        }
+
+        protected void startCommand(Command command) {
+                if (Main.map == null)
+                        return;
+                DataSet ds = Main.main.getCurrentDataSet();
+                if (ds == null)
+                        return;
+                currentCommand = command;
+                currentCommand.resetLoading();
+                parseSelection(ds.getSelected());
+                if (!(Main.map.mapMode instanceof AnyAction || Main.map.mapMode instanceof DummyAction || Main.map.mapMode instanceof LengthAction || Main.map.mapMode instanceof NodeAction || Main.map.mapMode instanceof PointAction || Main.map.mapMode instanceof RelationAction || Main.map.mapMode instanceof WayAction)) {
+                        previousMode = Main.map.mapMode;
+                }
+                if (currentCommand.currentParameterNum < currentCommand.parameters.size())
+                        setMode(Mode.SELECTION);
+                else
+                        runTool();
         }
 
@@ -209 +235 @@
                 Loader loader = new Loader(getPluginDir());
                 commands = loader.load(); // lol
+
+                for (Command command : commands) {
+                        commandMenu.add(new CommandAction(command, this));
+                }
         }
 
@@ -227 +257 @@
         }
         
-        private void setMode(Mode targetMode) {
+        protected void setMode(Mode targetMode) {
                 DataSet currentDataSet = Main.main.getCurrentDataSet();
                 if (currentDataSet != null) {
@@ -295 +325 @@
         public void endInput() {
                 setMode(Mode.IDLE);
-                //System.out.print(String.valueOf());
                 Main.map.selectMapMode(previousMode);
                 Main.map.mapView.repaint();

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

@@ -2 +2 @@
  *        Loader.java
  *        
- *        Copyright 2010 Hind <foxhind@gmail.com>
+ *        Copyright 2011 Hind <foxhind@gmail.com>
  *        
  */
@@ -79 +79 @@
                                 else if (Name.equals("run"))
                                         currentCommand.run = Value;
-                                else if (Name.equals("tracks"))
+                                else if (Name.equals("tracks")) {
                                         if (Value.equals("bbox"))
                                                 currentCommand.tracks = true;
+                                }
+                                else if (Name.equals("icon")) {
+                                        currentCommand.icon = Value;
+                                }
                         }
                 }