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

Timestamp:

2017-07-31T21:41:56+02:00 (7 years ago)

Author:

bastiK

Message:

move SearchSettingsActionParameter class to better place

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• ActionParameter.java (modified) (2 diffs)
• search/SearchAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/ActionParameter.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.actions;
-
-import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
 
 /**
@@ -76 +74 @@
         }
     }
-
-    public static class SearchSettingsActionParameter extends ActionParameter<SearchSetting> {
-
-        public SearchSettingsActionParameter(String name) {
-            super(name);
-        }
-
-        @Override
-        public Class<SearchSetting> getType() {
-            return SearchSetting.class;
-        }
-
-        @Override
-        public SearchSetting readFromString(String s) {
-            return SearchSetting.readFromString(s);
-        }
-
-        @Override
-        public String writeToString(SearchSetting value) {
-            if (value == null)
-                return "";
-            return value.writeToString();
-        }
-    }
 }

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -43 +43 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ActionParameter;
-import org.openstreetmap.josm.actions.ActionParameter.SearchSettingsActionParameter;
 import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.actions.JosmAction;
@@ -999 +998 @@
 
     /**
+     * {@link ActionParameter} implementation with {@link SearchSetting} as value type.
+     * @since 12547 (moved from {@link ActionParameter})
+     */
+    public static class SearchSettingsActionParameter extends ActionParameter<SearchSetting> {
+
+        public SearchSettingsActionParameter(String name) {
+            super(name);
+        }
+
+        @Override
+        public Class<SearchSetting> getType() {
+            return SearchSetting.class;
+        }
+
+        @Override
+        public SearchSetting readFromString(String s) {
+            return SearchSetting.readFromString(s);
+        }
+
+        @Override
+        public String writeToString(SearchSetting value) {
+            if (value == null)
+                return "";
+            return value.writeToString();
+        }
+    }
+
+    /**
      * Refreshes the enabled state
      *