Changeset 3707 in josm for trunk/src/org/openstreetmap

Timestamp:

2010-12-08T11:02:25+01:00 (14 years ago)

Author:

bastiK

Message:

Added remotecontrol plugin to josm core. This plugin was initially written by Frederik Ramm (frederik) and incorporates code taken from YWMS plugin by frsantos. Major contributions by Bodo Meissner (bomm) and stephankn. Note: The code has been added, but is not "active" yet (RemoteControl.on == false). This is because wmsplugin and imagery plugin has not been adapted to this change. They are about to be integrated as well, so this adaption is not necessary.

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/OsmValidator.java (modified) (6 diffs)
• data/validation/tests/TagChecker.java (modified) (2 diffs)
• data/validation/util/ValUtil.java (modified) (2 diffs)
• gui/MainApplication.java (modified) (2 diffs)
• gui/preferences/PreferenceTabbedPane.java (modified) (3 diffs)
• gui/preferences/RemoteControlPreference.java (added)
• gui/tagging/TaggingPreset.java (modified) (4 diffs)
• gui/util/GuiHelper.java (added)
• io/remotecontrol (added)
• io/remotecontrol/PermissionPref.java (added)
• io/remotecontrol/PermissionPrefWithDefault.java (added)
• io/remotecontrol/RemoteControl.java (added)
• io/remotecontrol/RemoteControlHttpServer.java (added)
• io/remotecontrol/RequestProcessor.java (added)
• io/remotecontrol/handler (added)
• io/remotecontrol/handler/AddNodeHandler.java (added)
• io/remotecontrol/handler/ImportHandler.java (added)
• io/remotecontrol/handler/LoadAndZoomHandler.java (added)
• io/remotecontrol/handler/RequestHandler.java (added)
• io/remotecontrol/handler/VersionHandler.java (added)

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -46 +46 @@
 import org.openstreetmap.josm.data.validation.tests.UntaggedWay;
 import org.openstreetmap.josm.data.validation.tests.WronglyOrderedWays;
-import org.openstreetmap.josm.data.validation.util.ValUtil;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
-import org.openstreetmap.josm.gui.dialogs.ValidatorDialog;
 import org.openstreetmap.josm.gui.layer.ValidatorLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -66 +64 @@
     /** The validate action */
     public ValidateAction validateAction = new ValidateAction();
-
-    /** The validation dialog */
-    ValidatorDialog validationDialog;
 
     /** Grid detail, multiplier of east,north values for valuable cell sizing */
@@ -103 +98 @@
 
     public OsmValidator() {
-        checkPluginDir();
+        checkValidatorDir();
         initializeGridDetail();
         initializeTests(getTests());
@@ -110 +105 @@
 
     /**
+     * Returns the plugin's directory of the plugin
+     *
+     * @return The directory of the plugin
+     */
+    public static String getValidatorDir()
+    {
+        return Main.pref.getPreferencesDir() + "validator/";
+    }
+
+    /**
      * Check if plugin directory exists (store ignored errors file)
      */
-    private void checkPluginDir() {
+    private void checkValidatorDir() {
         try {
-            File pathDir = new File(ValUtil.getPluginDir());
+            File pathDir = new File(getValidatorDir());
             if (!pathDir.exists()) {
                 pathDir.mkdirs();
@@ -127 +132 @@
         if (Main.pref.getBoolean(ValidatorPreference.PREF_USE_IGNORE, true)) {
             try {
-                final BufferedReader in = new BufferedReader(new FileReader(ValUtil.getPluginDir() + "ignorederrors"));
+                final BufferedReader in = new BufferedReader(new FileReader(getValidatorDir() + "ignorederrors"));
                 for (String line = in.readLine(); line != null; line = in.readLine()) {
                     ignoredErrors.add(line);
@@ -149 +154 @@
     public static void saveIgnoredErrors() {
         try {
-            final PrintWriter out = new PrintWriter(new FileWriter(ValUtil.getPluginDir() + "ignorederrors"), false);
+            final PrintWriter out = new PrintWriter(new FileWriter(getValidatorDir() + "ignorederrors"), false);
             for (String e : ignoredErrors) {
                 out.println(e);

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -48 +48 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.validation.OsmValidator;
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.data.validation.util.Entities;
-import org.openstreetmap.josm.data.validation.util.ValUtil;
 import org.openstreetmap.josm.gui.preferences.ValidatorPreference;
 import org.openstreetmap.josm.gui.preferences.TaggingPresetPreference;
@@ -199 +199 @@
         for (String source : sources.split(";")) {
             try {
-                MirroredInputStream s = new MirroredInputStream(source, ValUtil.getPluginDir(), -1);
+                MirroredInputStream s = new MirroredInputStream(source, OsmValidator.getValidatorDir(), -1);
                 InputStreamReader r;
                 try {

trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java

@@ -10 +10 @@
 import java.util.Set;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
@@ -22 +21 @@
 public class ValUtil
 {
-    /**
-     * Returns the plugin's directory of the plugin
-     *
-     * @return The directory of the plugin
-     */
-    public static String getPluginDir()
-    {
-        return Main.pref.getPreferencesDir() + "validator/";
-    }
-
     /**
      * Returns the start and end cells of a way.

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

@@ -39 +39 @@
 import org.openstreetmap.josm.io.auth.CredentialsManagerFactory;
 import org.openstreetmap.josm.io.auth.DefaultAuthenticator;
+import org.openstreetmap.josm.io.remotecontrol.RemoteControl;
 import org.openstreetmap.josm.plugins.PluginHandler;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -220 +221 @@
         monitor.worked(1);
 
+        if (RemoteControl.on && RemoteControl.PROP_REMOTECONTROL_ENABLED.get()) {
+            RemoteControl.start();
+        }
+
         monitor.indeterminateSubTask(tr("Creating main GUI"));
         JFrame mainFrame = new JFrame(tr("Java OpenStreetMap Editor"));

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

@@ -26 +26 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.io.remotecontrol.RemoteControl;
 import org.openstreetmap.josm.plugins.PluginDownloadTask;
 import org.openstreetmap.josm.plugins.PluginHandler;
@@ -226 +227 @@
             PreferenceSetting setting = factory.createPreferenceSetting();
             if (setting != null) {
-                settings.add(factory.createPreferenceSetting());
+                settings.add(setting);
             }
         }
@@ -277 +278 @@
         settingsFactory.add(new ShortcutPreference.Factory());
         settingsFactory.add(new ValidatorPreference.Factory());
+        if (RemoteControl.on) {
+            settingsFactory.add(new RemoteControlPreference.Factory());
+        }
 
         PluginHandler.getPreferenceSetting(settingsFactory);

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -7 +7 @@
 
 import java.awt.Component;
-import java.awt.Container;
 import java.awt.GridBagLayout;
 import java.awt.Image;
@@ -61 +60 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPritority;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.MirroredInputStream;
 import org.openstreetmap.josm.tools.GBC;
@@ -896 +896 @@
         p.add(items, GBC.eol().fill());
         if (selected.size() == 0 && !supportsRelation()) {
-            setEnabledRec(items, false);
+            GuiHelper.setEnabledRec(items, false);
         }
 
@@ -904 +904 @@
 
         return p;
-    }
-
-    /**
-     * setEnabled() does not propagate to child elements, so we need this workaround.
-     */
-    static void setEnabledRec(Container root, boolean enabled) {
-        root.setEnabled(enabled);
-        Component children[] = root.getComponents();
-        for(int i = 0; i < children.length; i++) {
-            if(children[i] instanceof Container) {
-                setEnabledRec((Container)children[i], enabled);
-            } else {
-                children[i].setEnabled(enabled);
-            }
-        }
     }