Corrected SurfaceText handling of cached extent. Fixes and closes #28.

Author: pdavidc

src/gov/nasa/worldwind/render/AbstractSurfaceObject.java

@@ -299,6 +299,13 @@ protected void clearCaches()
         this.extentCache.clear();
     }
 
+    /* Updates this SurfaceObject's modified time and clears its internal caches. */
+    protected void onShapeChanged()
+    {
+        this.updateModifiedTime();
+        this.clearCaches();
+    }
+
     //**************************************************************//
     //********************  Extent  ********************************//
     //**************************************************************//

src/gov/nasa/worldwind/render/AbstractSurfaceShape.java

@@ -603,12 +603,6 @@ public void combine(CombineContext cc)
     protected abstract void doMoveTo(Position oldReferencePosition, Position newReferencePosition);
     protected abstract void doMoveTo(Globe globe, Position oldReferencePosition, Position newReferencePosition);
 
-    protected void onShapeChanged()
-    {
-        this.updateModifiedTime();
-        this.clearCaches();
-    }
-
     /**
      * {@inheritDoc}
      * <p/>

src/gov/nasa/worldwind/render/SurfaceIcon.java

@@ -81,7 +81,7 @@ public void setLocation(LatLon location)
         }
 
         this.location = location;
-        this.onPropertyChanged();
+        this.onShapeChanged();
     }
 
     /**
@@ -112,7 +112,7 @@ public Vec4 getLocationOffset()
     public void setLocationOffset(Vec4 locationOffset)
     {
         this.locationOffset = locationOffset; // can be null
-        this.onPropertyChanged();
+        this.onShapeChanged();
     }
 
     /**
@@ -145,7 +145,7 @@ public void setImageSource(Object imageSource)
 
         this.imageSource = imageSource;
         this.texture = null;
-        this.onPropertyChanged();
+        this.onShapeChanged();
     }
 
     /**
@@ -172,7 +172,7 @@ public void setUseMipMaps(boolean useMipMaps)
     {
         this.useMipMaps = useMipMaps;
         this.texture = null;
-        this.onPropertyChanged();
+        this.onShapeChanged();
     }
 
     /**
@@ -202,7 +202,7 @@ public void setScale(double scale)
             throw new IllegalArgumentException(message);
         }
         this.scale = scale;
-        this.onPropertyChanged();
+        this.onShapeChanged();
     }
 
     /**
@@ -224,7 +224,7 @@ public Angle getHeading()
     public void setHeading(Angle heading)
     {
         this.heading = heading;  // can be null
-        this.onPropertyChanged();
+        this.onShapeChanged();
     }
 
     /**
@@ -281,7 +281,7 @@ public double getMinSize()
     public void setMinSize(double sizeInMeter)
     {
         this.minSize = sizeInMeter;
-        this.onPropertyChanged();
+        this.onShapeChanged();
     }
 
     /**
@@ -312,7 +312,7 @@ public double getMaxSize()
     public void setMaxSize(double sizeInMeter)
     {
         this.maxSize = sizeInMeter;
-        this.onPropertyChanged();
+        this.onShapeChanged();
     }
 
     /**
@@ -344,7 +344,7 @@ public void setColor(Color color)
             throw new IllegalArgumentException(message);
         }
         this.color = color;
-        this.onPropertyChanged();
+        this.onShapeChanged();
     }
 
     protected boolean isMaintainAppearance()
@@ -436,18 +436,6 @@ public void drawGeographic(DrawContext dc, SurfaceTileDrawContext sdc)
         }
     }
 
-    protected void onPropertyChanged()
-    {
-        this.updateModifiedTime();
-        this.clearCaches();
-    }
-
-    @Override
-    protected void clearCaches()
-    {
-        super.clearCaches();
-    }
-
     protected List<Sector> computeSectors(DrawContext dc)
     {
         if (this.location == null)

src/gov/nasa/worldwind/render/SurfaceIcons.java

@@ -37,7 +37,7 @@ public Iterable<? extends LatLon> getLocations()
     public void setLocations(Iterable<? extends LatLon> newLocations)
     {
         this.locations = newLocations;
-        this.onPropertyChanged();
+        this.onShapeChanged();
     }
 
     protected List<Sector> computeSectors(DrawContext dc)

src/gov/nasa/worldwind/render/SurfaceText.java

@@ -123,7 +123,7 @@ public void setText(CharSequence text)
 
         this.text = text;
         this.textBounds = null; // Need to recompute bounds
-        this.updateModifiedTime();
+        this.onShapeChanged();
     }
 
     /** {@inheritDoc} */
@@ -150,7 +150,7 @@ public void setPosition(Position position)
         }
 
         this.location = position;
-        this.updateModifiedTime();
+        this.onShapeChanged();
     }
 
     /** {@inheritDoc} */
@@ -174,7 +174,7 @@ public void setFont(Font font)
         {
             this.font = font;
             this.textBounds = null; // Need to recompute bounds
-            this.updateModifiedTime();
+            this.onShapeChanged();
         }
     }
 
@@ -197,7 +197,7 @@ public void setColor(Color color)
         if (!color.equals(this.color))
         {
             this.color = color;
-            this.updateModifiedTime();
+            this.onShapeChanged();
         }
     }
 
@@ -220,7 +220,7 @@ public void setBackgroundColor(Color background)
         if (bgColor == null || !bgColor.equals(background))
         {
             this.bgColor = background;
-            this.updateModifiedTime();
+            this.onShapeChanged();
         }
     }
 
@@ -271,7 +271,7 @@ public void setOffset(Offset offset)
         if (!offset.equals(this.offset))
         {
             this.offset = offset;
-            this.updateModifiedTime();
+            this.onShapeChanged();
         }
     }