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

Timestamp:

2015-10-07T23:30:22+02:00 (9 years ago)

Author:

simon04

Message:

fix #10071 - Read MapCSS style/rule name from meta selector

Location:

trunk/src/org/openstreetmap/josm/gui/preferences

Files:

• SourceEditor.java (modified) (3 diffs)
• map/MapPaintPreference.java (modified) (2 diffs)
• validator/ValidatorTagCheckerRulesPreference.java (modified) (2 diffs)

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

@@ -888 +888 @@
                     active = editEntryDialog.active();
                 }
-                activeSourcesModel.addSource(new SourceEntry(
+                final SourceEntry entry = new SourceEntry(
                         editEntryDialog.getURL(),
-                        null, editEntryDialog.getTitle(), active));
+                        null, editEntryDialog.getTitle(), active);
+                entry.title = getTitleForSourceEntry(entry);
+                activeSourcesModel.addSource(entry);
                 activeSourcesModel.fireTableDataChanged();
             }
@@ -951 +953 @@
                 if (e.title != null || !"".equals(editEntryDialog.getTitle())) {
                     e.title = editEntryDialog.getTitle();
-                    if ("".equals(e.title)) {
-                        e.title = null;
-                    }
+                    e.title = getTitleForSourceEntry(e);
                 }
                 e.url = editEntryDialog.getURL();
@@ -1657 +1657 @@
                 );
     }
+
+    protected String getTitleForSourceEntry(SourceEntry entry) {
+        return "".equals(entry.title) ? null : entry.title;
+    }
 }

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

@@ -21 +21 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
+import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
@@ -160 +161 @@
         }
 
+        @Override
+        protected String getTitleForSourceEntry(SourceEntry entry) {
+            final String title = getTitleFromSourceEntry(entry);
+            return title != null ? title : super.getTitleForSourceEntry(entry);
+        }
+    }
+
+    public static String getTitleFromSourceEntry(SourceEntry entry) {
+        try {
+            final MapCSSStyleSource css = new MapCSSStyleSource(entry);
+            css.loadStyleSource();
+            if (css.title != null && !css.title.isEmpty()) {
+                return css.title;
+            }
+        } catch (RuntimeException ignore) {
+        }
+        return null;
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java

@@ -25 +25 @@
 import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference;
 
 /**
@@ -114 +115 @@
             }
         }
+
+        @Override
+        protected String getTitleForSourceEntry(SourceEntry entry) {
+            final String title = MapPaintPreference.getTitleFromSourceEntry(entry);
+            return title != null ? title : super.getTitleForSourceEntry(entry);
+        }
     }