Changeset 33893 in osm

Timestamp:

2017-11-25T01:42:32+01:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 13007

Location:

applications/editors/josm/plugins/rasterfilters

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/rasterfilters/RasterFiltersPlugin.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/rasterfilters/preferences/FiltersDownloader.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/rasterfilters/preferences/RasterFiltersPreferences.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/rasterfilters/values/SliderValue.java (modified) (2 diffs)

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

@@ -10 +10 @@
         
         <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-        <property name="plugin.main.version" value="12782" />
-        <property name="plugin.version" value="1.0.2"/>
+        <property name="plugin.main.version" value="13007" />
+        <property name="plugin.version" value="1.0.3"/>
 
     <property name="plugin.icon" value="images/josm_filters_48.png"/>

applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/RasterFiltersPlugin.java

@@ -44 +44 @@
         Logging.debug("Loading RasterFiltersPlugin");
 
-        File file = new File(getPluginDir());
+        File file = getPluginDirs().getUserDataDirectory(false);
         if (file.mkdir()) {
 
@@ -58 +58 @@
         }
 
-        FiltersDownloader.setPluginDir(getPluginDir());
+        FiltersDownloader.setPluginDir(file);
     }
 

applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/preferences/FiltersDownloader.java

@@ -49 +49 @@
  */
 public class FiltersDownloader implements ActionListener {
-    private static volatile String pluginDir;
+    private static volatile File pluginDir;
 
     public static Set<JsonObject> filtersMeta = new HashSet<>();
     public static Set<String> filterTitles = new TreeSet<>();
-    public static Set<URL> binariesLocalUrls = new HashSet<>();
+    public static List<URL> binariesLocalUrls = new ArrayList<>();
     public static ClassLoader loader;
     public static Map<String, String> urlsMap = new HashMap<>();
@@ -312 +312 @@
     }
 
-    public static void setPluginDir(String dir) {
+    public static void setPluginDir(File dir) {
         pluginDir = dir;
     }
@@ -327 +327 @@
 
         String localFile = null;
-        File plugin = new File(pluginDir);
+        File plugin = pluginDir;
         Logging.debug("plugin dir" + plugin.getAbsolutePath());
 

applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/preferences/RasterFiltersPreferences.java

@@ -4 +4 @@
 import java.awt.GridBagLayout;
 import java.util.List;
+import java.util.Objects;
 
 import javax.json.JsonObject;
@@ -90 +91 @@
             String paramName = meta.getString("name");
             paramName = "rasterfilters." + paramName;
-            Main.pref.put(paramName, temp.isNeedToDownload());
+            Main.pref.putBoolean(paramName, temp.isNeedToDownload());
         }
 
@@ -244 +245 @@
     @Override
     public String toString() {
-        return "name: " + getName() + "\nDescription: " + getDescription()
-                + "\nMeta: " + getMeta();
+        return "name: " + getName() + "\nDescription: " + getDescription() + "\nMeta: " + getMeta();
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, meta, description);
     }
 

applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/values/SliderValue.java

@@ -4 +4 @@
  * @author Nipel-Crumple
  */
-public class SliderValue<Number> implements Value<Number> {
+public class SliderValue<T> implements Value<T> {
 
     private String parameterName;
-    private Number value;
+    private T value;
 
-    public SliderValue(String parameterName, Number value) {
+    public SliderValue(String parameterName, T value) {
         this.value = value;
         this.parameterName = parameterName;
@@ -15 +15 @@
 
     @Override
-    public Number getValue() {
+    public T getValue() {
         return value;
     }
 
     @Override
-    public void setValue(Number value) {
+    public void setValue(T value) {
         this.value = value;
     }