Changeset 11493 in josm for trunk/src


Ignore:
Timestamp:
2017-01-25T14:12:07+01:00 (3 years ago)
Author:
Don-vip
Message:

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

Location:
trunk/src/org/openstreetmap/josm
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

    r11386 r11493  
    463463
    464464    /**
     465     * remove a style source; only accessed from MapPaintStyles
     466     * @param style style source to remove
     467     * @return {@code true} if this list contained the specified element
     468     */
     469    boolean remove(StyleSource style) {
     470        return styleSources.remove(style);
     471    }
     472
     473    /**
    465474     * set the style sources; only accessed from MapPaintStyles
    466475     * @param sources new style sources
  • trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

    r11401 r11493  
    290290
    291291    private static StyleSource fromSourceEntry(SourceEntry entry) {
     292        if (entry.url == null && entry instanceof MapCSSStyleSource) {
     293            return (MapCSSStyleSource) entry;
     294        }
    292295        Set<String> mimes = new HashSet<>(Arrays.asList(MapCSSStyleSource.MAPCSS_STYLE_MIME_TYPES.split(", ")));
    293296        try (CachedFile cf = new CachedFile(entry.url).setHttpAccept(Utils.join(", ", mimes))) {
     
    419422        styles.add(source);
    420423        loadStyleForFirstTime(source);
     424        refreshStyles();
     425        return source;
     426    }
     427
     428    /**
     429     * Remove a map paint style.
     430     * @param entry map paint style
     431     * @since 11493
     432     */
     433    public static void removeStyle(SourceEntry entry) {
     434        StyleSource source = fromSourceEntry(entry);
     435        if (styles.remove(source)) {
     436            refreshStyles();
     437        }
     438    }
     439
     440    private static void refreshStyles() {
    421441        MapPaintPrefHelper.INSTANCE.put(styles.getStyleSources());
    422442        fireMapPaintSylesUpdated();
     
    425445            Main.map.mapView.repaint();
    426446        }
    427         return source;
    428447    }
    429448
  • trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java

    r10611 r11493  
    272272        public Map<String, String> serialize(SourceEntry entry) {
    273273            Map<String, String> res = new HashMap<>();
    274             res.put("url", entry.url);
     274            res.put("url", entry.url == null ? "" : entry.url);
    275275            res.put("title", entry.title == null ? "" : entry.title);
    276276            res.put("active", Boolean.toString(entry.active));
  • trunk/src/org/openstreetmap/josm/io/CachedFile.java

    r11386 r11493  
    207207        File file = getFile();
    208208        if (file == null) {
    209             if (name.startsWith("resource://")) {
     209            if (name != null && name.startsWith("resource://")) {
    210210                InputStream is = getClass().getResourceAsStream(
    211211                        name.substring("resource:/".length()));
     
    273273            }
    274274        } catch (MalformedURLException e) {
    275             if (name.startsWith("resource://")) {
     275            if (name == null || name.startsWith("resource://")) {
    276276                return null;
    277277            } else if (name.startsWith("josmdir://")) {
  • trunk/src/org/openstreetmap/josm/tools/Utils.java

    r11435 r11493  
    11661166     */
    11671167    public static boolean isLocalUrl(String url) {
    1168         if (url.startsWith("http://") || url.startsWith("https://") || url.startsWith("resource://"))
     1168        if (url == null || url.startsWith("http://") || url.startsWith("https://") || url.startsWith("resource://"))
    11691169            return false;
    11701170        return true;
Note: See TracChangeset for help on using the changeset viewer.