From: amwaterhouse <Andrew Waterhouse>
Date: Tue, 23 Aug 2005 16:06:20 +0000 (+0000)
Subject: Dont make new frame reference in Buildwebservicemenu
X-Git-Tag: Release_2_04~12
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=125a33430b29fd5885e87777f8b03d9d0d156c80;p=jalview.git

Dont make new frame reference in Buildwebservicemenu
---

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index c1d383e..541c9e1 100755
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -97,11 +97,9 @@ public class AlignFrame
   /* Set up intrinsic listeners for dynamically generated GUI bits. */
   private void addServiceListeners()
   {
-
-    final AlignFrame thisFrame = this;
     final java.beans.PropertyChangeListener thisListener;
     // Do this once to get current state
-    thisFrame.BuildWebServiceMenu();
+    BuildWebServiceMenu();
     Desktop.discoverer.addPropertyChangeListener(
         thisListener = new java.beans.PropertyChangeListener()
     {
@@ -111,7 +109,7 @@ public class AlignFrame
         if (evt.getPropertyName().equals("services"))
         {
           // System.out.println("Rebuilding web service menu");
-          thisFrame.BuildWebServiceMenu();
+          BuildWebServiceMenu();
         }
       }
     });
@@ -123,6 +121,7 @@ public class AlignFrame
       {
         // System.out.println("deregistering discoverer listener");
         Desktop.discoverer.removePropertyChangeListener(thisListener);
+        closeMenuItem_actionPerformed(null);
       }
       ;
     });
@@ -348,6 +347,7 @@ public class AlignFrame
   {
     try
     {
+      PaintRefresher.components.remove(viewport.alignment);
       this.setClosed(true);
     }
     catch (Exception ex)