Changeset 3943 in josm for trunk

Timestamp:

2011-03-02T17:20:51+01:00 (13 years ago)

Author:

bastiK

Message:

fixed #6040 - JOSM doesn't display mappaint colours and style for newly created multipolygons (any more)

Location:

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

Files:

• OsmPrimitive.java (modified) (3 diffs)
• Relation.java (modified) (5 diffs)
• Way.java (modified) (3 diffs)

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

@@ -305 +305 @@
        get/set functions calling this implicitely is preferred, so we can have
        transparent cache handling in the future. */
-    public void clearCached()
+    public void clearCachedStyle()
     {
         mappaintStyle = null;
@@ -1167 +1167 @@
 
     private void keysChangedImpl(Map<String, String> originalKeys) {
-        clearCached();
+        clearCachedStyle();
         updateDirectionFlags();
         updateTagged();
@@ -1367 +1367 @@
             setChangesetId(other.changesetId);
         }
-        clearCached();
+        clearCachedStyle();
     }
 

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

@@ -41 +41 @@
         boolean locked = writeLock();
         try {
-            for (RelationMember rm:this.members) {
+            for (RelationMember rm : this.members) {
                 rm.getMember().removeReferrer(this);
+                rm.getMember().clearCachedStyle();
             }
 
@@ -50 +51 @@
                 this.members = new RelationMember[0];
             }
-            for (RelationMember rm:this.members) {
+            for (RelationMember rm : this.members) {
                 rm.getMember().addReferrer(this);
+                rm.getMember().clearCachedStyle();
             }
 
@@ -79 +81 @@
             members = newMembers;
             member.getMember().addReferrer(this);
+            member.getMember().clearCachedStyle();
             fireMembersChanged();
         } finally {
@@ -94 +97 @@
             members = newMembers;
             member.getMember().addReferrer(this);
+            member.getMember().clearCachedStyle();
             fireMembersChanged();
         } finally {
@@ -113 +117 @@
             if (originalMember.getMember() != member.getMember()) {
                 member.getMember().addReferrer(this);
+                member.getMember().clearCachedStyle();
                 originalMember.getMember().removeReferrer(this);
+                originalMember.getMember().clearCachedStyle();
                 fireMembersChanged();
             }

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

@@ -62 +62 @@
             }
 
-            clearCached();
+            clearCachedStyle();
             fireNodesChanged();
         } finally {
@@ -323 +323 @@
             if (isIncomplete())
                 throw new IllegalStateException(tr("Cannot add node {0} to incomplete way {1}.", n.getId(), getId()));
-            clearCached();
+            clearCachedStyle();
             n.addReferrer(this);
             Node[] newNodes = new Node[nodes.length + 1];
@@ -352 +352 @@
                 throw new IllegalStateException(tr("Cannot add node {0} to incomplete way {1}.", n.getId(), getId()));
 
-            clearCached();
+            clearCachedStyle();
             n.addReferrer(this);
             Node[] newNodes = new Node[nodes.length + 1];