Improvements for managing PropertyChangeListeners associated with the WorldWindow. Maintains fix for null pointer exception found when setting some Java Look and Feels and using the WorldWindowGLJPanel.

Zach Glueckert · Zach Glueckert · commit 4eab629b36de · 2016-07-12T16:00:12.000-04:00
diff --git a/src/gov/nasa/worldwind/awt/WorldWindowGLCanvas.java b/src/gov/nasa/worldwind/awt/WorldWindowGLCanvas.java
@@ -67,6 +67,7 @@ public WorldWindowGLCanvas()
         {
             this.wwd = ((WorldWindowGLDrawable) WorldWind.createConfigurationComponent(AVKey.WORLD_WINDOW_CLASS_NAME));
             this.wwd.initDrawable(this);
+            this.wwd.addPropertyChangeListener(this);
             this.wwd.initGpuResourceCache(WorldWindowImpl.createGpuResourceCache());
             this.createView();
             this.createDefaultInputHandler();
@@ -101,6 +102,7 @@ public WorldWindowGLCanvas(WorldWindow shareWith)
         {
             this.wwd = ((WorldWindowGLDrawable) WorldWind.createConfigurationComponent(AVKey.WORLD_WINDOW_CLASS_NAME));
             this.wwd.initDrawable(this);
+            this.wwd.addPropertyChangeListener(this);
             if (shareWith != null)
                 this.wwd.initGpuResourceCache(shareWith.getGpuResourceCache());
             else
@@ -140,6 +142,7 @@ public WorldWindowGLCanvas(WorldWindow shareWith, java.awt.GraphicsDevice device
         {
             this.wwd = ((WorldWindowGLDrawable) WorldWind.createConfigurationComponent(AVKey.WORLD_WINDOW_CLASS_NAME));
             this.wwd.initDrawable(this);
+            this.wwd.addPropertyChangeListener(this);
             if (shareWith != null)
                 this.wwd.initGpuResourceCache(shareWith.getGpuResourceCache());
             else
@@ -203,6 +206,9 @@ public WorldWindowGLCanvas(WorldWindow shareWith, java.awt.GraphicsDevice device
 
     public void propertyChange(PropertyChangeEvent evt)
     {
+        if(this.wwd == evt.getSource())
+            this.firePropertyChange(evt);
+
         //noinspection StringEquality
         if (evt.getPropertyName() == WorldWind.SHUTDOWN_EVENT)
             this.shutdown();
@@ -408,28 +414,24 @@ public Object removeKey(String key)
     public synchronized void addPropertyChangeListener(PropertyChangeListener listener)
     {
         super.addPropertyChangeListener(listener);
-        this.wwd.addPropertyChangeListener(listener);
     }
 
     @Override
     public synchronized void addPropertyChangeListener(String propertyName, PropertyChangeListener listener)
     {
         super.addPropertyChangeListener(propertyName, listener);
-        this.wwd.addPropertyChangeListener(propertyName, listener);
     }
 
     @Override
     public synchronized void removePropertyChangeListener(PropertyChangeListener listener)
     {
         super.removePropertyChangeListener(listener);
-        this.wwd.removePropertyChangeListener(listener);
     }
 
     @Override
     public synchronized void removePropertyChangeListener(String propertyName, PropertyChangeListener listener)
     {
         super.removePropertyChangeListener(propertyName, listener);
-        this.wwd.removePropertyChangeListener(propertyName, listener);
     }
 
     @Override
diff --git a/src/gov/nasa/worldwind/awt/WorldWindowGLJPanel.java b/src/gov/nasa/worldwind/awt/WorldWindowGLJPanel.java
@@ -66,6 +66,7 @@ public WorldWindowGLJPanel()
         {
             this.wwd = ((WorldWindowGLDrawable) WorldWind.createConfigurationComponent(AVKey.WORLD_WINDOW_CLASS_NAME));
             this.wwd.initDrawable(this);
+            this.wwd.addPropertyChangeListener(this);
             this.wwd.initGpuResourceCache(WorldWindowImpl.createGpuResourceCache());
             this.createView();
             this.createDefaultInputHandler();
@@ -100,6 +101,7 @@ public WorldWindowGLJPanel(WorldWindow shareWith)
         {
             this.wwd = ((WorldWindowGLDrawable) WorldWind.createConfigurationComponent(AVKey.WORLD_WINDOW_CLASS_NAME));
             this.wwd.initDrawable(this);
+            this.wwd.addPropertyChangeListener(this);
             if (shareWith != null)
                 this.wwd.initGpuResourceCache(shareWith.getGpuResourceCache());
             else
@@ -143,6 +145,7 @@ public WorldWindowGLJPanel(WorldWindow shareWith, GLCapabilities capabilities,
         {
             this.wwd = ((WorldWindowGLDrawable) WorldWind.createConfigurationComponent(AVKey.WORLD_WINDOW_CLASS_NAME));
             this.wwd.initDrawable(this);
+            this.wwd.addPropertyChangeListener(this);
             if (shareWith != null)
                 this.wwd.initGpuResourceCache(shareWith.getGpuResourceCache());
             else
@@ -162,6 +165,9 @@ public WorldWindowGLJPanel(WorldWindow shareWith, GLCapabilities capabilities,
 
     public void propertyChange(PropertyChangeEvent evt)
     {
+        if(this.wwd == evt.getSource())
+            this.firePropertyChange(evt);
+
         //noinspection StringEquality
         if (evt.getPropertyName() == WorldWind.SHUTDOWN_EVENT)
             this.shutdown();
@@ -367,29 +373,24 @@ public Object removeKey(String key)
     public synchronized void addPropertyChangeListener(PropertyChangeListener listener)
     {
         super.addPropertyChangeListener(listener);
-        if (wwd != null) // defensive condition for NPE that happens when (for example) setting a swing look/feel
-            this.wwd.addPropertyChangeListener(listener);
     }
 
     @Override
     public synchronized void addPropertyChangeListener(String propertyName, PropertyChangeListener listener)
     {
         super.addPropertyChangeListener(propertyName, listener);
-        this.wwd.addPropertyChangeListener(propertyName, listener);
     }
 
     @Override
     public synchronized void removePropertyChangeListener(PropertyChangeListener listener)
     {
         super.removePropertyChangeListener(listener);
-        this.wwd.removePropertyChangeListener(listener);
     }
 
     @Override
     public synchronized void removePropertyChangeListener(String propertyName, PropertyChangeListener listener)
     {
         super.removePropertyChangeListener(listener);
-        this.wwd.removePropertyChangeListener(listener);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ public WorldWindowGLCanvas()`
`67`	`67`	`{`
`68`	`68`	`this.wwd = ((WorldWindowGLDrawable) WorldWind.createConfigurationComponent(AVKey.WORLD_WINDOW_CLASS_NAME));`
`69`	`69`	`this.wwd.initDrawable(this);`
	`70`	`+ this.wwd.addPropertyChangeListener(this);`
`70`	`71`	`this.wwd.initGpuResourceCache(WorldWindowImpl.createGpuResourceCache());`
`71`	`72`	`this.createView();`
`72`	`73`	`this.createDefaultInputHandler();`
`@@ -101,6 +102,7 @@ public WorldWindowGLCanvas(WorldWindow shareWith)`
`101`	`102`	`{`
`102`	`103`	`this.wwd = ((WorldWindowGLDrawable) WorldWind.createConfigurationComponent(AVKey.WORLD_WINDOW_CLASS_NAME));`
`103`	`104`	`this.wwd.initDrawable(this);`
	`105`	`+ this.wwd.addPropertyChangeListener(this);`
`104`	`106`	`if (shareWith != null)`
`105`	`107`	`this.wwd.initGpuResourceCache(shareWith.getGpuResourceCache());`
`106`	`108`	`else`
`@@ -140,6 +142,7 @@ public WorldWindowGLCanvas(WorldWindow shareWith, java.awt.GraphicsDevice device`
`140`	`142`	`{`
`141`	`143`	`this.wwd = ((WorldWindowGLDrawable) WorldWind.createConfigurationComponent(AVKey.WORLD_WINDOW_CLASS_NAME));`
`142`	`144`	`this.wwd.initDrawable(this);`
	`145`	`+ this.wwd.addPropertyChangeListener(this);`
`143`	`146`	`if (shareWith != null)`
`144`	`147`	`this.wwd.initGpuResourceCache(shareWith.getGpuResourceCache());`
`145`	`148`	`else`
`@@ -203,6 +206,9 @@ public WorldWindowGLCanvas(WorldWindow shareWith, java.awt.GraphicsDevice device`
`203`	`206`
`204`	`207`	`public void propertyChange(PropertyChangeEvent evt)`
`205`	`208`	`{`
	`209`	`+ if(this.wwd == evt.getSource())`
	`210`	`+ this.firePropertyChange(evt);`
	`211`	`+`
`206`	`212`	`//noinspection StringEquality`
`207`	`213`	`if (evt.getPropertyName() == WorldWind.SHUTDOWN_EVENT)`
`208`	`214`	`this.shutdown();`
`@@ -408,28 +414,24 @@ public Object removeKey(String key)`
`408`	`414`	`public synchronized void addPropertyChangeListener(PropertyChangeListener listener)`
`409`	`415`	`{`
`410`	`416`	`super.addPropertyChangeListener(listener);`
`411`		`- this.wwd.addPropertyChangeListener(listener);`
`412`	`417`	`}`
`413`	`418`
`414`	`419`	`@Override`
`415`	`420`	`public synchronized void addPropertyChangeListener(String propertyName, PropertyChangeListener listener)`
`416`	`421`	`{`
`417`	`422`	`super.addPropertyChangeListener(propertyName, listener);`
`418`		`- this.wwd.addPropertyChangeListener(propertyName, listener);`
`419`	`423`	`}`
`420`	`424`
`421`	`425`	`@Override`
`422`	`426`	`public synchronized void removePropertyChangeListener(PropertyChangeListener listener)`
`423`	`427`	`{`
`424`	`428`	`super.removePropertyChangeListener(listener);`
`425`		`- this.wwd.removePropertyChangeListener(listener);`
`426`	`429`	`}`
`427`	`430`
`428`	`431`	`@Override`
`429`	`432`	`public synchronized void removePropertyChangeListener(String propertyName, PropertyChangeListener listener)`
`430`	`433`	`{`
`431`	`434`	`super.removePropertyChangeListener(propertyName, listener);`
`432`		`- this.wwd.removePropertyChangeListener(propertyName, listener);`
`433`	`435`	`}`
`434`	`436`
`435`	`437`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ public WorldWindowGLJPanel()`
`66`	`66`	`{`
`67`	`67`	`this.wwd = ((WorldWindowGLDrawable) WorldWind.createConfigurationComponent(AVKey.WORLD_WINDOW_CLASS_NAME));`
`68`	`68`	`this.wwd.initDrawable(this);`
	`69`	`+ this.wwd.addPropertyChangeListener(this);`
`69`	`70`	`this.wwd.initGpuResourceCache(WorldWindowImpl.createGpuResourceCache());`
`70`	`71`	`this.createView();`
`71`	`72`	`this.createDefaultInputHandler();`
`@@ -100,6 +101,7 @@ public WorldWindowGLJPanel(WorldWindow shareWith)`
`100`	`101`	`{`
`101`	`102`	`this.wwd = ((WorldWindowGLDrawable) WorldWind.createConfigurationComponent(AVKey.WORLD_WINDOW_CLASS_NAME));`
`102`	`103`	`this.wwd.initDrawable(this);`
	`104`	`+ this.wwd.addPropertyChangeListener(this);`
`103`	`105`	`if (shareWith != null)`
`104`	`106`	`this.wwd.initGpuResourceCache(shareWith.getGpuResourceCache());`
`105`	`107`	`else`
`@@ -143,6 +145,7 @@ public WorldWindowGLJPanel(WorldWindow shareWith, GLCapabilities capabilities,`
`143`	`145`	`{`
`144`	`146`	`this.wwd = ((WorldWindowGLDrawable) WorldWind.createConfigurationComponent(AVKey.WORLD_WINDOW_CLASS_NAME));`
`145`	`147`	`this.wwd.initDrawable(this);`
	`148`	`+ this.wwd.addPropertyChangeListener(this);`
`146`	`149`	`if (shareWith != null)`
`147`	`150`	`this.wwd.initGpuResourceCache(shareWith.getGpuResourceCache());`
`148`	`151`	`else`
`@@ -162,6 +165,9 @@ public WorldWindowGLJPanel(WorldWindow shareWith, GLCapabilities capabilities,`
`162`	`165`
`163`	`166`	`public void propertyChange(PropertyChangeEvent evt)`
`164`	`167`	`{`
	`168`	`+ if(this.wwd == evt.getSource())`
	`169`	`+ this.firePropertyChange(evt);`
	`170`	`+`
`165`	`171`	`//noinspection StringEquality`
`166`	`172`	`if (evt.getPropertyName() == WorldWind.SHUTDOWN_EVENT)`
`167`	`173`	`this.shutdown();`
`@@ -367,29 +373,24 @@ public Object removeKey(String key)`
`367`	`373`	`public synchronized void addPropertyChangeListener(PropertyChangeListener listener)`
`368`	`374`	`{`
`369`	`375`	`super.addPropertyChangeListener(listener);`
`370`		`- if (wwd != null) // defensive condition for NPE that happens when (for example) setting a swing look/feel`
`371`		`- this.wwd.addPropertyChangeListener(listener);`
`372`	`376`	`}`
`373`	`377`
`374`	`378`	`@Override`
`375`	`379`	`public synchronized void addPropertyChangeListener(String propertyName, PropertyChangeListener listener)`
`376`	`380`	`{`
`377`	`381`	`super.addPropertyChangeListener(propertyName, listener);`
`378`		`- this.wwd.addPropertyChangeListener(propertyName, listener);`
`379`	`382`	`}`
`380`	`383`
`381`	`384`	`@Override`
`382`	`385`	`public synchronized void removePropertyChangeListener(PropertyChangeListener listener)`
`383`	`386`	`{`
`384`	`387`	`super.removePropertyChangeListener(listener);`
`385`		`- this.wwd.removePropertyChangeListener(listener);`
`386`	`388`	`}`
`387`	`389`
`388`	`390`	`@Override`
`389`	`391`	`public synchronized void removePropertyChangeListener(String propertyName, PropertyChangeListener listener)`
`390`	`392`	`{`
`391`	`393`	`super.removePropertyChangeListener(listener);`
`392`		`- this.wwd.removePropertyChangeListener(listener);`
`393`	`394`	`}`
`394`	`395`
`395`	`396`	`@Override`