This small fix solves a NPE in cases in which a look&feel has been set. (#10)

moovida · zglueck · commit 7c57ba54c8ee · 2016-07-07T09:34:12.000-04:00
* fix for case with theme set, which was causing a NPE

* code format and documentation
diff --git a/src/gov/nasa/worldwind/awt/WorldWindowGLJPanel.java b/src/gov/nasa/worldwind/awt/WorldWindowGLJPanel.java
@@ -367,7 +367,8 @@ public Object removeKey(String key)
     public synchronized void addPropertyChangeListener(PropertyChangeListener listener)
     {
         super.addPropertyChangeListener(listener);
-        this.wwd.addPropertyChangeListener(listener);
+        if (wwd != null) // defensive condition for NPE that happens when (for example) setting a swing look/feel
+            this.wwd.addPropertyChangeListener(listener);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,8 @@ public Object removeKey(String key)`
`367`	`367`	`public synchronized void addPropertyChangeListener(PropertyChangeListener listener)`
`368`	`368`	`{`
`369`	`369`	`super.addPropertyChangeListener(listener);`
`370`		`- this.wwd.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);`
`371`	`372`	`}`
`372`	`373`
`373`	`374`	`@Override`