Multiple Views

[jalview.git] / src / jalview / gui / PaintRefresher.java

diff --git a/src/jalview/gui/PaintRefresher.java b/src/jalview/gui/PaintRefresher.java
index e05f44d..7c155b7 100755 (executable)
--- a/src/jalview/gui/PaintRefresher.java
+++ b/src/jalview/gui/PaintRefresher.java
@@ -1,6 +1,6 @@
 /*\r
  * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
  *\r
  * This program is free software; you can redistribute it and/or\r
  * modify it under the terms of the GNU General Public License\r
@@ -33,7 +33,7 @@ import java.util.*;
  */\r
 public class PaintRefresher\r
 {\r
-    static Hashtable components = new Hashtable();\r
+    static Hashtable components;\r
 \r
     /**\r
      * DOCUMENT ME!\r
@@ -41,57 +41,90 @@ public class PaintRefresher
      * @param comp DOCUMENT ME!\r
      * @param al DOCUMENT ME!\r
      */\r
-    public static void Register(Component comp, AlignmentI al)\r
+    public static void Register(Component comp, String seqSetId)\r
     {\r
-        if (components.containsKey(al))\r
+      if (components == null)\r
+        components = new Hashtable();\r
+\r
+        if (components.containsKey(seqSetId))\r
         {\r
-            Vector comps = (Vector) components.get(al);\r
-            comps.addElement(comp);\r
+            Vector comps = (Vector) components.get(seqSetId);\r
+            if(!comps.contains(comp))\r
+              comps.addElement(comp);\r
         }\r
         else\r
         {\r
             Vector vcoms = new Vector();\r
             vcoms.addElement(comp);\r
-            components.put(al, vcoms);\r
+            components.put(seqSetId, vcoms);\r
         }\r
     }\r
 \r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param al DOCUMENT ME!\r
-     */\r
-    public static void Refresh(AlignmentI al)\r
+    public static void RemoveComponent(Component comp)\r
     {\r
-        Refresh(null, al);\r
+      if (components == null)\r
+        return;\r
+\r
+      Enumeration en = components.keys();\r
+      while(en.hasMoreElements())\r
+      {\r
+        String id = en.nextElement().toString();\r
+        Vector comps = (Vector) components.get(id);\r
+        comps.remove(comp);\r
+        if(comps.size()==0)\r
+        {\r
+          components.remove(id);\r
+        }\r
+      }\r
     }\r
 \r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param c DOCUMENT ME!\r
-     * @param al DOCUMENT ME!\r
-     */\r
-    public static void Refresh(Component c, AlignmentI al)\r
+    public static void Refresh(Component source, String id)\r
+    {\r
+      Refresh( source, id,  null, null);\r
+    }\r
+\r
+    public static void Refresh(Component source, String id,\r
+                                    SequenceI removeSeq,\r
+                                    SequenceI addSeq)\r
     {\r
-        Component temp;\r
-        Vector coms = (Vector) components.get(al);\r
-        Enumeration e = coms.elements();\r
+      if (components == null)\r
+        return;\r
+\r
+      Component comp;\r
+      Vector comps = (Vector) components.get(id);\r
+\r
+      if(comps==null)\r
+      {\r
+        return;\r
+      }\r
+\r
+      Enumeration e = comps.elements();\r
+      while (e.hasMoreElements())\r
+      {\r
+        comp = (Component) e.nextElement();\r
 \r
-        while (e.hasMoreElements())\r
+        if(comp==source)\r
+          continue;\r
+\r
+        if (!comp.isValid())\r
+        {\r
+          comps.removeElement(comp);\r
+        }\r
+        else if(comp instanceof AlignmentPanel)\r
         {\r
-            temp = (Component) e.nextElement();\r
-\r
-            if (!temp.isValid())\r
-            {\r
-                coms.removeElement(temp);\r
-            }\r
-            else if (temp == c)\r
-            {\r
-                continue;\r
-            }\r
-            else\r
-                temp.repaint();\r
+          AlignmentPanel ap = (AlignmentPanel)comp;\r
+          if(addSeq!=null)\r
+            ap.av.alignment.addSequence(addSeq);\r
+          if(removeSeq!=null)\r
+            ap.av.alignment.deleteSequence(removeSeq);\r
+\r
+         // if(source instanceof AlignmentPanel)\r
+          //  ap.av.alignment.setGroups(\r
+         //       ((AlignmentPanel)source).av.alignment.getGroups() );\r
+\r
         }\r
+        comp.repaint();\r
+      }\r
+\r
     }\r
 }\r