Always check PropertyChangeSupport for null

src/eva2/gui/AbstractListSelectionEditor.java

@@ -150,11 +150,13 @@ public abstract class AbstractListSelectionEditor extends JPanel implements Prop
     }
 
     public void addPropertyChangeListener(PropertyChangeListener l) {
+        if (m_Support == null) m_Support = new PropertyChangeSupport(this);
         m_Support.addPropertyChangeListener(l);
     }
 
     public void removePropertyChangeListener(PropertyChangeListener l) {
-        m_Support.removePropertyChangeListener(l);
+        if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+    	m_Support.removePropertyChangeListener(l);
     }
     
     /** Returns true since the Object can be shown

src/eva2/gui/BigStringEditor.java

@@ -168,17 +168,14 @@ public class BigStringEditor implements PropertyEditor {
     return  m_Panel;
   }
 
-  /**
+  public void addPropertyChangeListener(PropertyChangeListener l) {
-   *
+	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
-   */
+	  m_Support.addPropertyChangeListener(l);
-  public void addPropertyChangeListener (PropertyChangeListener l) {
-    m_Support.addPropertyChangeListener(l);
   }
-  /**
+
-   *
+  public void removePropertyChangeListener(PropertyChangeListener l) {
-   */
+	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
-  public void removePropertyChangeListener (PropertyChangeListener l) {
+	  m_Support.removePropertyChangeListener(l);
-    m_Support.removePropertyChangeListener(l);
   }
 
   /**

src/eva2/gui/GenericArrayEditor.java

@@ -472,16 +472,14 @@ implements PropertyEditor {
 	public Component getCustomEditor() {
 		return this;
 	}
-	/**
+	
-	 *
-	 */
 	public void addPropertyChangeListener(PropertyChangeListener l) {
+		if (m_Support == null) m_Support = new PropertyChangeSupport(this);
 		m_Support.addPropertyChangeListener(l);
 	}
-	/**
+
-	 *
-	 */
 	public void removePropertyChangeListener(PropertyChangeListener l) {
+		if (m_Support == null) m_Support = new PropertyChangeSupport(this);
 		m_Support.removePropertyChangeListener(l);
 	}
 

src/eva2/gui/GenericDoubleArrayEditor.java

@@ -215,18 +215,14 @@ public class GenericDoubleArrayEditor extends JPanel implements PropertyEditor {
         return null;
     }
 
-    /**
-     *
-     */
     public void addPropertyChangeListener(PropertyChangeListener l) {
-        m_Support.addPropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.addPropertyChangeListener(l);
     }
 
-    /**
-     *
-     */
     public void removePropertyChangeListener(PropertyChangeListener l) {
-        m_Support.removePropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.removePropertyChangeListener(l);
     }
 
     /** This is used to hook an action listener to the ok button

src/eva2/gui/GenericEpsilonConstraintEditor.java

@@ -182,18 +182,14 @@ public class GenericEpsilonConstraintEditor extends JPanel implements PropertyEd
         return null;
     }
 
-    /**
-     *
-     */
     public void addPropertyChangeListener(PropertyChangeListener l) {
-        m_Support.addPropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.addPropertyChangeListener(l);
     }
 
-    /**
-     *
-     */
     public void removePropertyChangeListener(PropertyChangeListener l) {
-        m_Support.removePropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.removePropertyChangeListener(l);
     }
 
     /** This is used to hook an action listener to the ok button

src/eva2/gui/GenericEpsilonThresholdEditor.java

@@ -199,18 +199,14 @@ public class GenericEpsilonThresholdEditor extends JPanel implements PropertyEdi
         return null;
     }
 
-    /**
-     *
-     */
     public void addPropertyChangeListener(PropertyChangeListener l) {
-        m_Support.addPropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.addPropertyChangeListener(l);
     }
 
-    /**
-     *
-     */
     public void removePropertyChangeListener(PropertyChangeListener l) {
-        m_Support.removePropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.removePropertyChangeListener(l);
     }
 
     /** This is used to hook an action listener to the ok button

src/eva2/gui/GenericFilePathEditor.java

@@ -76,18 +76,14 @@ public class GenericFilePathEditor extends JPanel implements PropertyEditor {
         return null;
     }
 
-    /**
-     *
-     */
     public void addPropertyChangeListener(PropertyChangeListener l) {
-        m_Support.addPropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.addPropertyChangeListener(l);
     }
 
-    /**
-     *
-     */
     public void removePropertyChangeListener(PropertyChangeListener l) {
-        m_Support.removePropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.removePropertyChangeListener(l);
     }
 
     /** Returns true since the Object can be shown

src/eva2/gui/GenericIntArrayEditor.java

@@ -161,18 +161,14 @@ public class GenericIntArrayEditor extends JPanel implements PropertyEditor {
         return null;
     }
 
-    /**
-     *
-     */
     public void addPropertyChangeListener(PropertyChangeListener l) {
-        m_Support.addPropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.addPropertyChangeListener(l);
     }
 
-    /**
-     *
-     */
     public void removePropertyChangeListener(PropertyChangeListener l) {
-        m_Support.removePropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.removePropertyChangeListener(l);
     }
 
     /** This is used to hook an action listener to the ok button

src/eva2/gui/GenericObjectEditor.java

@@ -490,13 +490,15 @@ public class GenericObjectEditor implements PropertyEditor {
 			m_EditorComponent = new GOEPanel(m_Object, m_Backup, m_Support, this);
 		m_EditorComponent.m_okBut.setEnabled(false);
 	}
-	public void addPropertyChangeListener(PropertyChangeListener l) {
+	  public void addPropertyChangeListener(PropertyChangeListener l) {
-		m_Support.addPropertyChangeListener(l);
+		  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
-	}
+		  m_Support.addPropertyChangeListener(l);
+	  }
 
-	public void removePropertyChangeListener(PropertyChangeListener l) {
+	  public void removePropertyChangeListener(PropertyChangeListener l) {
-		m_Support.removePropertyChangeListener(l);
+		  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
-	}
+		  m_Support.removePropertyChangeListener(l);
+	  }
 	/**
 	 *
 	 */

src/eva2/gui/GenericOptimizationObjectivesEditor.java

@@ -364,11 +364,13 @@ public class GenericOptimizationObjectivesEditor extends JPanel implements Prope
     /********************************* java.beans.PropertyChangeListener *************************/
 
     public void addPropertyChangeListener(PropertyChangeListener l) {
-        m_Support.addPropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.addPropertyChangeListener(l);
     }
 
     public void removePropertyChangeListener(PropertyChangeListener l) {
-        m_Support.removePropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.removePropertyChangeListener(l);
     }
     /** This will wait for the GenericObjectEditor to finish
      * editing an object.

src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java

@@ -430,11 +430,13 @@ public class GenericOptimizationObjectivesWithParamEditor extends JPanel impleme
     /********************************* java.beans.PropertyChangeListener *************************/
 
     public void addPropertyChangeListener(PropertyChangeListener l) {
-        m_Support.addPropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.addPropertyChangeListener(l);
     }
 
     public void removePropertyChangeListener(PropertyChangeListener l) {
-        m_Support.removePropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.removePropertyChangeListener(l);
     }
     /** This will wait for the GenericObjectEditor to finish
      * editing an object.

src/eva2/gui/GenericRemoteServersEditor.java

@@ -397,18 +397,14 @@ public class GenericRemoteServersEditor extends JPanel implements PropertyEditor
         return null;
     }
 
-    /**
-     *
-     */
     public void addPropertyChangeListener(PropertyChangeListener l) {
-        m_Support.addPropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.addPropertyChangeListener(l);
     }
 
-    /**
-     *
-     */
     public void removePropertyChangeListener(PropertyChangeListener l) {
-        m_Support.removePropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.removePropertyChangeListener(l);
     }
 
     /** This is used to hook an action listener to the ok button

src/eva2/gui/GenericWeigthedLPTchebycheffEditor.java

@@ -206,18 +206,14 @@ public class GenericWeigthedLPTchebycheffEditor extends JPanel implements Proper
         return null;
     }
 
-    /**
-     *
-     */
     public void addPropertyChangeListener(PropertyChangeListener l) {
-        m_Support.addPropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.addPropertyChangeListener(l);
     }
 
-    /**
-     *
-     */
     public void removePropertyChangeListener(PropertyChangeListener l) {
-        m_Support.removePropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.removePropertyChangeListener(l);
     }
 
     /** This is used to hook an action listener to the ok button

src/eva2/gui/MultiLineStringEditor.java

@@ -59,10 +59,14 @@ public class MultiLineStringEditor implements PropertyEditor {
   // This code uses the PropertyChangeSupport class to maintain a list of
   // listeners interested in the edits we make to the value.
   protected PropertyChangeSupport listeners = new PropertyChangeSupport(this);
+  
   public void addPropertyChangeListener(PropertyChangeListener l) {
-    listeners.addPropertyChangeListener(l);
+	  if (listeners == null) listeners = new PropertyChangeSupport(this);
+	  listeners.addPropertyChangeListener(l);
   }
+
   public void removePropertyChangeListener(PropertyChangeListener l) {
-    listeners.removePropertyChangeListener(l);
+	  if (listeners == null) listeners = new PropertyChangeSupport(this);
+	  listeners.removePropertyChangeListener(l);
   }
 }

src/eva2/gui/PropertySelectableList.java

@@ -104,11 +104,13 @@ public class PropertySelectableList<T> implements java.io.Serializable {
 //		m_Support.firePropertyChange("PropertySelectableList", null, this);
 //	}
 	
-    public void addPropertyChangeListener(PropertyChangeListener l) {
+	  public void addPropertyChangeListener(PropertyChangeListener l) {
-        m_Support.addPropertyChangeListener(l);
+		  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
-    }
+		  m_Support.addPropertyChangeListener(l);
+	  }
 
-    public void removePropertyChangeListener(PropertyChangeListener l) {
+	  public void removePropertyChangeListener(PropertyChangeListener l) {
-        m_Support.removePropertyChangeListener(l);
+		  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
-    }
+		  m_Support.removePropertyChangeListener(l);
+	  }
 }

src/eva2/gui/PropertySheetPanel.java

@@ -110,18 +110,14 @@ public class PropertySheetPanel extends JPanel implements PropertyChangeListener
         m_support.addPropertyChangeListener(this);
     }
 
-    /** Adds a PropertyChangeListener.
-     * @param l a value of type 'PropertyChangeListener'
-     */
     public void addPropertyChangeListener(PropertyChangeListener l) {
-        if (m_support!=null) m_support.addPropertyChangeListener(l);
+  	  if (m_support == null) m_support = new PropertyChangeSupport(this);
+  	  m_support.addPropertyChangeListener(l);
     }
 
-    /** Removes a PropertyChangeListener.
-     * @param l a value of type 'PropertyChangeListener'
-     */
     public void removePropertyChangeListener(PropertyChangeListener l) {
-    	 if (m_support!=null) m_support.removePropertyChangeListener(l);
+  	  if (m_support == null) m_support = new PropertyChangeSupport(this);
+  	  m_support.removePropertyChangeListener(l);
     }
     
     /**

src/eva2/gui/StatisticsEditor.java

@@ -120,17 +120,14 @@ public class StatisticsEditor implements PropertyEditor {
     return  m_Panel;
   }
 
-  /**
+  public void addPropertyChangeListener(PropertyChangeListener l) {
-   *
+	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
-   */
+	  m_Support.addPropertyChangeListener(l);
-  public void addPropertyChangeListener (PropertyChangeListener l) {
-    m_Support.addPropertyChangeListener(l);
   }
-  /**
+
-   *
+  public void removePropertyChangeListener(PropertyChangeListener l) {
-   */
+	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
-  public void removePropertyChangeListener (PropertyChangeListener l) {
+	  m_Support.removePropertyChangeListener(l);
-    m_Support.removePropertyChangeListener(l);
   }
 }
 

src/eva2/server/go/operators/crossover/PropertyCrossoverMixerEditor.java

@@ -426,11 +426,13 @@ public class PropertyCrossoverMixerEditor extends JPanel implements PropertyEdit
     /********************************* java.beans.PropertyChangeListener *************************/
 
     public void addPropertyChangeListener(PropertyChangeListener l) {
-        m_Support.addPropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.addPropertyChangeListener(l);
     }
 
     public void removePropertyChangeListener(PropertyChangeListener l) {
-        m_Support.removePropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.removePropertyChangeListener(l);
     }
     /** This will wait for the GenericObjectEditor to finish
      * editing an object.

src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java

@@ -401,11 +401,13 @@ public class PropertyMutationMixerEditor extends JPanel implements PropertyEdito
     /********************************* java.beans.PropertyChangeListener *************************/
 
     public void addPropertyChangeListener(PropertyChangeListener l) {
-        m_Support.addPropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.addPropertyChangeListener(l);
     }
 
     public void removePropertyChangeListener(PropertyChangeListener l) {
-        m_Support.removePropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.removePropertyChangeListener(l);
     }
     /** This will wait for the GenericObjectEditor to finish
      * editing an object.

src/eva2/server/go/tools/AbstractObjectEditor.java

@@ -41,11 +41,13 @@ public abstract class AbstractObjectEditor implements PropertyEditor, java.beans
     /********************************* java.beans.PropertyChangeListener *************************/
 
     public void addPropertyChangeListener(PropertyChangeListener l) {
-        m_Support.addPropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.addPropertyChangeListener(l);
     }
 
     public void removePropertyChangeListener(PropertyChangeListener l) {
-        m_Support.removePropertyChangeListener(l);
+  	  if (m_Support == null) m_Support = new PropertyChangeSupport(this);
+  	  m_Support.removePropertyChangeListener(l);
     }
     /** This will wait for the GenericObjectEditor to finish
      * editing an object.