Changeset 3848 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java

Timestamp:

2011-02-02T23:03:00+01:00 (13 years ago)

Author:

bastiK

Message:

Experimental mapcss support. All *.java files in the gui/mappaint/mapcss/parser folder are generated from the javacc source file MapCSSParser.jj in the same folder. The generated code sums up to 2700 lines, there is no further build dependency.

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java (modified) (5 diffs)

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

@@ -21 +21 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.preferences.SourceEditor.ExtendedSourceEntry;
@@ -30 +28 @@
     private SourceEditor sources;
     private JCheckBox enableIconDefault;
-    private JCheckBox enableDefault;
     private JComboBox styleCombo = new JComboBox();
 
@@ -40 +37 @@
 
     public void addGui(final PreferenceTabbedPane gui) {
-        enableDefault = new JCheckBox(tr("Enable built-in defaults"),
-                Main.pref.getBoolean("mappaint.style.enable-defaults", true));
         enableIconDefault = new JCheckBox(tr("Enable built-in icon defaults"),
                 Main.pref.getBoolean("mappaint.icon.enable-defaults", true));
@@ -168 +163 @@
 
     public boolean ok() {
-        Boolean restart = Main.pref.put("mappaint.style.enable-defaults", enableDefault.isSelected());
+        Boolean restart = false;
         if(Main.pref.put("mappaint.icon.enable-defaults", enableIconDefault.isSelected())) {
             restart = true;
@@ -178 +173 @@
         && Main.isDisplayingMapView())
         {
-          for(OsmDataLayer l : Main.map.mapView.getLayersOfType(OsmDataLayer.class))
-          {
-            for(OsmPrimitive osm : l.data.allPrimitives())
-            {
-              osm.clearCached();
-            }
-          }
+            MapPaintStyles.getStyles().clearCached();
         }
         return restart;