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

pdavidc · pdavidc · commit 580e0409287b · 2017-01-12T14:06:47.000-08:00
diff --git a/src/gov/nasa/worldwind/render/AbstractSurfaceObject.java b/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  ********************************//
     //**************************************************************//
diff --git a/src/gov/nasa/worldwind/render/AbstractSurfaceShape.java b/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/>
diff --git a/src/gov/nasa/worldwind/render/SurfaceIcon.java b/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)
diff --git a/src/gov/nasa/worldwind/render/SurfaceIcons.java b/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)
diff --git a/src/gov/nasa/worldwind/render/SurfaceText.java b/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();
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public void setLocation(LatLon location)`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`this.location = location;`
`84`		`- this.onPropertyChanged();`
	`84`	`+ this.onShapeChanged();`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`/**`
`@@ -112,7 +112,7 @@ public Vec4 getLocationOffset()`
`112`	`112`	`public void setLocationOffset(Vec4 locationOffset)`
`113`	`113`	`{`
`114`	`114`	`this.locationOffset = locationOffset; // can be null`
`115`		`- this.onPropertyChanged();`
	`115`	`+ this.onShapeChanged();`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`/**`
`@@ -145,7 +145,7 @@ public void setImageSource(Object imageSource)`
`145`	`145`
`146`	`146`	`this.imageSource = imageSource;`
`147`	`147`	`this.texture = null;`
`148`		`- this.onPropertyChanged();`
	`148`	`+ this.onShapeChanged();`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`/**`
`@@ -172,7 +172,7 @@ public void setUseMipMaps(boolean useMipMaps)`
`172`	`172`	`{`
`173`	`173`	`this.useMipMaps = useMipMaps;`
`174`	`174`	`this.texture = null;`
`175`		`- this.onPropertyChanged();`
	`175`	`+ this.onShapeChanged();`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`/**`
`@@ -202,7 +202,7 @@ public void setScale(double scale)`
`202`	`202`	`throw new IllegalArgumentException(message);`
`203`	`203`	`}`
`204`	`204`	`this.scale = scale;`
`205`		`- this.onPropertyChanged();`
	`205`	`+ this.onShapeChanged();`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`/**`
`@@ -224,7 +224,7 @@ public Angle getHeading()`
`224`	`224`	`public void setHeading(Angle heading)`
`225`	`225`	`{`
`226`	`226`	`this.heading = heading; // can be null`
`227`		`- this.onPropertyChanged();`
	`227`	`+ this.onShapeChanged();`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`/**`
`@@ -281,7 +281,7 @@ public double getMinSize()`
`281`	`281`	`public void setMinSize(double sizeInMeter)`
`282`	`282`	`{`
`283`	`283`	`this.minSize = sizeInMeter;`
`284`		`- this.onPropertyChanged();`
	`284`	`+ this.onShapeChanged();`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`/**`
`@@ -312,7 +312,7 @@ public double getMaxSize()`
`312`	`312`	`public void setMaxSize(double sizeInMeter)`
`313`	`313`	`{`
`314`	`314`	`this.maxSize = sizeInMeter;`
`315`		`- this.onPropertyChanged();`
	`315`	`+ this.onShapeChanged();`
`316`	`316`	`}`
`317`	`317`
`318`	`318`	`/**`
`@@ -344,7 +344,7 @@ public void setColor(Color color)`
`344`	`344`	`throw new IllegalArgumentException(message);`
`345`	`345`	`}`
`346`	`346`	`this.color = color;`
`347`		`- this.onPropertyChanged();`
	`347`	`+ this.onShapeChanged();`
`348`	`348`	`}`
`349`	`349`
`350`	`350`	`protected boolean isMaintainAppearance()`
`@@ -436,18 +436,6 @@ public void drawGeographic(DrawContext dc, SurfaceTileDrawContext sdc)`
`436`	`436`	`}`
`437`	`437`	`}`
`438`	`438`
`439`		`- protected void onPropertyChanged()`
`440`		`- {`
`441`		`- this.updateModifiedTime();`
`442`		`- this.clearCaches();`
`443`		`- }`
`444`		`-`
`445`		`- @Override`
`446`		`- protected void clearCaches()`
`447`		`- {`
`448`		`- super.clearCaches();`
`449`		`- }`
`450`		`-`
`451`	`439`	`protected List<Sector> computeSectors(DrawContext dc)`
`452`	`440`	`{`
`453`	`441`	`if (this.location == null)`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public Iterable<? extends LatLon> getLocations()`
`37`	`37`	`public void setLocations(Iterable<? extends LatLon> newLocations)`
`38`	`38`	`{`
`39`	`39`	`this.locations = newLocations;`
`40`		`- this.onPropertyChanged();`
	`40`	`+ this.onShapeChanged();`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`protected List<Sector> computeSectors(DrawContext dc)`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public void setText(CharSequence text)`
`123`	`123`
`124`	`124`	`this.text = text;`
`125`	`125`	`this.textBounds = null; // Need to recompute bounds`
`126`		`- this.updateModifiedTime();`
	`126`	`+ this.onShapeChanged();`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`/** {@inheritDoc} */`
`@@ -150,7 +150,7 @@ public void setPosition(Position position)`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`this.location = position;`
`153`		`- this.updateModifiedTime();`
	`153`	`+ this.onShapeChanged();`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`/** {@inheritDoc} */`
`@@ -174,7 +174,7 @@ public void setFont(Font font)`
`174`	`174`	`{`
`175`	`175`	`this.font = font;`
`176`	`176`	`this.textBounds = null; // Need to recompute bounds`
`177`		`- this.updateModifiedTime();`
	`177`	`+ this.onShapeChanged();`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`
`@@ -197,7 +197,7 @@ public void setColor(Color color)`
`197`	`197`	`if (!color.equals(this.color))`
`198`	`198`	`{`
`199`	`199`	`this.color = color;`
`200`		`- this.updateModifiedTime();`
	`200`	`+ this.onShapeChanged();`
`201`	`201`	`}`
`202`	`202`	`}`
`203`	`203`
`@@ -220,7 +220,7 @@ public void setBackgroundColor(Color background)`
`220`	`220`	`if (bgColor == null \|\| !bgColor.equals(background))`
`221`	`221`	`{`
`222`	`222`	`this.bgColor = background;`
`223`		`- this.updateModifiedTime();`
	`223`	`+ this.onShapeChanged();`
`224`	`224`	`}`
`225`	`225`	`}`
`226`	`226`
`@@ -271,7 +271,7 @@ public void setOffset(Offset offset)`
`271`	`271`	`if (!offset.equals(this.offset))`
`272`	`272`	`{`
`273`	`273`	`this.offset = offset;`
`274`		`- this.updateModifiedTime();`
	`274`	`+ this.onShapeChanged();`
`275`	`275`	`}`
`276`	`276`	`}`
`277`	`277`