Changeset 13420 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2018-02-12T23:19:49+01:00 (6 years ago)

Author:

bastiK

Message:

fixed #11607 - RangeViolatedError: the new range must be within a single subrange

Location:

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

Files:

• DataSet.java (modified) (2 diffs)
• OsmPrimitive.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -200 +200 @@
     private final ConflictCollection conflicts = new ConflictCollection();
 
+    private short mappaintCacheIdx = 1;
+
     /**
      * Constructs a new {@code DataSet}.
@@ -1380 +1382 @@
         return null;
     }
+
+    /**
+     * Returns mappaint cache index for this DataSet.
+     *
+     * If the {@link OsmPrimitive#mappaintCacheIdx} is not equal to the DataSet mappaint
+     * cache index, this means the cache for that primitive is out of date.
+     * @return mappaint cache index
+     * @since 13420
+     */
+    public short getMappaintCacheIndex() {
+        return mappaintCacheIdx;
+    }
+
+    /**
+     * Clear the mappaint cache for this DataSet.
+     * @since 13420
+     */
+    public void clearMappaintCache() {
+        mappaintCacheIdx++;
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -204 +204 @@
 
     /**
+     * Check if the cached style for this primitive is up to date.
+     * @return true if the cached style for this primitive is up to date
+     * @since 13420
+     */
+    public final boolean isCachedStyleUpToDate() {
+        return mappaintStyle != null && mappaintCacheIdx == dataSet.getMappaintCacheIndex();
+    }
+
+    /**
+     * Declare that the cached style for this primitive is up to date.
+     * @since 13420
+     */
+    public final void declareCachedStyleUpToDate() {
+        this.mappaintCacheIdx = dataSet.getMappaintCacheIndex();
+    }
+
+    /**
      * Returns mappaint cache index.
      * @return mappaint cache index
-     */
+     * @deprecated no longer supported (see also {@link #isCachedStyleUpToDate()})
+     */
+    @Deprecated
     public final short getMappaintCacheIdx() {
         return mappaintCacheIdx;
@@ -214 +233 @@
      * Sets the mappaint cache index.
      * @param mappaintCacheIdx mappaint cache index
-     */
+     * @deprecated no longer supported (see also {@link #declareCachedStyleUpToDate()})
+     */
+    @Deprecated
     public final void setMappaintCacheIdx(short mappaintCacheIdx) {
         this.mappaintCacheIdx = mappaintCacheIdx;