Changeset 13636 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2018-04-15T18:58:21+02:00 (6 years ago)

Author:

Don-vip

Message:

extract style methods to a new Stylable interface

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified) (4 diffs)

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

@@ -105 +105 @@
     }
 
+    /**
+     * Returns the background color.
+     * @return the background color
+     */
     public Color getBackgroundColor() {
         if (backgroundColorCache != null)
@@ -144 +148 @@
     public Pair<StyleElementList, Range> getStyleCacheWithRange(OsmPrimitive osm, double scale, NavigatableComponent nc) {
         if (!osm.isCachedStyleUpToDate() || scale <= 0) {
-            osm.mappaintStyle = StyleCache.EMPTY_STYLECACHE;
+            osm.setCachedStyle(StyleCache.EMPTY_STYLECACHE);
         } else {
-            Pair<StyleElementList, Range> lst = osm.mappaintStyle.getWithRange(scale, osm.isSelected());
+            Pair<StyleElementList, Range> lst = osm.getCachedStyle().getWithRange(scale, osm.isSelected());
             if (lst.a != null)
                 return lst;
@@ -191 +195 @@
             }
         }
-        StyleCache style = osm.mappaintStyle != null ? osm.mappaintStyle : StyleCache.EMPTY_STYLECACHE;
+        StyleCache style = osm.getCachedStyle() != null ? osm.getCachedStyle() : StyleCache.EMPTY_STYLECACHE;
         try {
-            osm.mappaintStyle = style.put(p.a, p.b, osm.isSelected());
+            osm.setCachedStyle(style.put(p.a, p.b, osm.isSelected()));
         } catch (RangeViolatedError e) {
             throw new AssertionError("Range violated: " + e.getMessage()
-                    + " (object: " + osm.getPrimitiveId() + ", current style: "+osm.mappaintStyle
+                    + " (object: " + osm.getPrimitiveId() + ", current style: "+osm.getCachedStyle()
                     + ", scale: " + scale + ", new stylelist: " + p.a + ", new range: " + p.b + ')', e);
         }
@@ -462 +466 @@
     }
 
+    /**
+     * Determines whether multipolygons must be drawn.
+     * @return whether multipolygons must be drawn.
+     */
     public boolean isDrawMultipolygon() {
         return drawMultipolygon;
     }
 
+    /**
+     * Sets whether multipolygons must be drawn.
+     * @param drawMultipolygon whether multipolygons must be drawn
+     */
     public void setDrawMultipolygon(boolean drawMultipolygon) {
         this.drawMultipolygon = drawMultipolygon;