Changeset 11493 in josm for trunk/src/org

Timestamp:

2017-01-25T14:12:07+01:00 (7 years ago)

Author:

Don-vip

Message:

see #12627, see #14289 - add non regression unit tests

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/mappaint/ElemStyles.java (modified) (1 diff)
• gui/mappaint/MapPaintStyles.java (modified) (3 diffs)
• gui/preferences/map/MapPaintPreference.java (modified) (1 diff)
• io/CachedFile.java (modified) (2 diffs)
• tools/Utils.java (modified) (1 diff)

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

@@ -463 +463 @@
 
     /**
+     * remove a style source; only accessed from MapPaintStyles
+     * @param style style source to remove
+     * @return {@code true} if this list contained the specified element
+     */
+    boolean remove(StyleSource style) {
+        return styleSources.remove(style);
+    }
+
+    /**
      * set the style sources; only accessed from MapPaintStyles
      * @param sources new style sources

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

@@ -290 +290 @@
 
     private static StyleSource fromSourceEntry(SourceEntry entry) {
+        if (entry.url == null && entry instanceof MapCSSStyleSource) {
+            return (MapCSSStyleSource) entry;
+        }
         Set<String> mimes = new HashSet<>(Arrays.asList(MapCSSStyleSource.MAPCSS_STYLE_MIME_TYPES.split(", ")));
         try (CachedFile cf = new CachedFile(entry.url).setHttpAccept(Utils.join(", ", mimes))) {
@@ -419 +422 @@
         styles.add(source);
         loadStyleForFirstTime(source);
+        refreshStyles();
+        return source;
+    }
+
+    /**
+     * Remove a map paint style.
+     * @param entry map paint style
+     * @since 11493
+     */
+    public static void removeStyle(SourceEntry entry) {
+        StyleSource source = fromSourceEntry(entry);
+        if (styles.remove(source)) {
+            refreshStyles();
+        }
+    }
+
+    private static void refreshStyles() {
         MapPaintPrefHelper.INSTANCE.put(styles.getStyleSources());
         fireMapPaintSylesUpdated();
@@ -425 +445 @@
             Main.map.mapView.repaint();
         }
-        return source;
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java

@@ -272 +272 @@
         public Map<String, String> serialize(SourceEntry entry) {
             Map<String, String> res = new HashMap<>();
-            res.put("url", entry.url);
+            res.put("url", entry.url == null ? "" : entry.url);
             res.put("title", entry.title == null ? "" : entry.title);
             res.put("active", Boolean.toString(entry.active));

trunk/src/org/openstreetmap/josm/io/CachedFile.java

@@ -207 +207 @@
         File file = getFile();
         if (file == null) {
-            if (name.startsWith("resource://")) {
+            if (name != null && name.startsWith("resource://")) {
                 InputStream is = getClass().getResourceAsStream(
                         name.substring("resource:/".length()));
@@ -273 +273 @@
             }
         } catch (MalformedURLException e) {
-            if (name.startsWith("resource://")) {
+            if (name == null || name.startsWith("resource://")) {
                 return null;
             } else if (name.startsWith("josmdir://")) {

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -1166 +1166 @@
      */
     public static boolean isLocalUrl(String url) {
-        if (url.startsWith("http://") || url.startsWith("https://") || url.startsWith("resource://"))
+        if (url == null || url.startsWith("http://") || url.startsWith("https://") || url.startsWith("resource://"))
             return false;
         return true;