perfsonar development work

Author: nina
Date: 2009-06-17 01:59:18 -0400 (Wed, 17 Jun 2009)
New Revision: 5182

Modified:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointListTableModel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointsPanel.java
Log:
remove observers from MAEndpointList on panel close

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointListTableModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointListTableModel.java
  2009-06-16 15:49:23 UTC (rev 5181)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointListTableModel.java
  2009-06-17 05:59:18 UTC (rev 5182)
@@ -39,7 +39,8 @@
  */
 public class MAEndpointListTableModel extends AbstractTableModel implements 
Observer {
     protected MAEndpointList endpointList;
-    protected String[] columnNames = {"Use","Measurement archive","URL", 
"Schema","Status","Status explanation"};
+
+       protected String[] columnNames = {"Use","Measurement archive","URL", 
"Schema","Status","Status explanation"};
     /**
      * Comment for <code>serialVersionUID</code>
      */
@@ -161,4 +162,8 @@
             fireTableDataChanged();
 
     }
+    public MAEndpointList getEndpointList() {
+               return endpointList;
+       }
+    
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointsPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointsPanel.java
  2009-06-16 15:49:23 UTC (rev 5181)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointsPanel.java
  2009-06-17 05:59:18 UTC (rev 5182)
@@ -108,8 +108,18 @@
         super();
         addWidgets(endpoints,actions,statusColumn);
     }
-    
-   
+    /**
+     * Clean up observers 
+     */
+   @Override
+       protected void finalize() throws Throwable {
+          MAEndpointListTableModel model = ((MAEndpointListTableModel) 
dataTable.getModel());
+          if (model.getEndpointList() !=null) {
+               model.getEndpointList().deleteObserver(this);
+               model.getEndpointList().deleteObserver(model);
+          }
+          super.finalize();
+       }
 
         
     public void addWidgets(final MAEndpointList endpoints,PSUIAction[] 
actions, boolean statusColumn) {