Changeset 10145 in josm for trunk

Timestamp:

2016-04-15T09:42:16+02:00 (9 years ago)

Author:

bastiK

Message:

see #12598 - make DividedScale truely immutable (patch by michael2402)

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• DividedScale.java (modified) (2 diffs)
• StyleCache.java (modified) (3 diffs)

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

@@ -118 +118 @@
      * @param upper upper bound
      */
-    protected void putImpl(T o, double lower, double upper) {
+    private void putImpl(T o, double lower, double upper) {
         int i = 0;
         while (bd.get(i) < lower) {
@@ -164 +164 @@
     }
 
+    /**
+     * Runs a consistency test.
+     * @throws AssertionError When an invariant is broken.
+     */
     public void consistencyTest() {
         if (bd.size() < 2) throw new AssertionError(bd);

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

@@ -9 +9 @@
 /**
  * Caches styles for a single primitive.
+ * <p>
+ * This object is immutable.
  */
 public final class StyleCache {
@@ -31 +33 @@
     }
 
+    /**
+     * Creates a new copy of this style cache with a new entry added.
+     * @param o The style to cache.
+     * @param r The range the style is for.
+     * @param selected The style list we should use (selected/unselected)
+     * @return The new object.
+     */
     public StyleCache put(StyleElementList o, Range r, boolean selected) {
         StyleCache s = new StyleCache(this);
@@ -37 +46 @@
         DividedScale<StyleElementList> ds = s.states[idx];
         if (ds == null) {
-            ds = s.states[idx] = new DividedScale<>();
+            ds = new DividedScale<>();
         }
-        ds.putImpl(o, r.getLower(), r.getUpper());
-        ds.consistencyTest();
+        s.states[idx] = ds.put(o, r);
         s.intern();
         return s;