Changeset 12966 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor

Timestamp:

2017-10-09T17:14:50+02:00 (7 years ago)

Author:

bastiK

Message:

use RenderingHelper in MapCSSRendererTest; move getBackgroundColor() from PaintColors to ElemStyles (no longer global) (see #15273)

Location:

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint

Files:

• PaintColors.java (modified) (3 diffs)
• StyledMapRenderer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java

@@ -5 +5 @@
 
 import java.awt.Color;
-import java.util.List;
-import java.util.Optional;
 
 import org.openstreetmap.josm.data.preferences.CachingProperty;
 import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
-import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.MapPaintSylesUpdateListener;
-import org.openstreetmap.josm.gui.mappaint.StyleSource;
 
 /**
@@ -91 +87 @@
     private final CachingProperty<Color> property;
 
-    private static volatile Color backgroundColorCache;
-
-    private static final MapPaintSylesUpdateListener STYLE_OVERRIDE_LISTENER = new MapPaintSylesUpdateListener() {
-        //TODO: Listen to wireframe map mode changes.
-        @Override
-        public void mapPaintStylesUpdated() {
-            backgroundColorCache = null;
-        }
-
-        @Override
-        public void mapPaintStyleEntryUpdated(int idx) {
-            mapPaintStylesUpdated();
-        }
-    };
-
-    static {
-        MapPaintStyles.addMapPaintSylesUpdateListener(STYLE_OVERRIDE_LISTENER);
-    }
-
     PaintColors(String name, Color defaultColor) {
         baseProperty = new ColorProperty(name, defaultColor);
@@ -138 +115 @@
      */
     public static Color getBackgroundColor() {
-        if (backgroundColorCache != null)
-            return backgroundColorCache;
-        List<StyleSource> sources = MapPaintStyles.getStyles().getStyleSources();
-        for (StyleSource s : sources) {
-            if (!s.active) {
-                continue;
-            }
-            Color backgroundColorOverride = s.getBackgroundColorOverride();
-            if (backgroundColorOverride != null) {
-                backgroundColorCache = backgroundColorOverride;
-            }
-        }
-        return Optional.ofNullable(backgroundColorCache).orElseGet(BACKGROUND::get);
+        return MapPaintStyles.getStyles().getBackgroundColor();
     }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -1372 +1372 @@
         super.getColors();
         this.highlightColorTransparent = new Color(highlightColor.getRed(), highlightColor.getGreen(), highlightColor.getBlue(), 100);
-        this.backgroundColor = PaintColors.getBackgroundColor();
+        this.backgroundColor = styles.getBackgroundColor();
     }