X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationChooser.java;h=ad5e57443e756f83d6adbd1c378e5a07f5f21c7a;hb=678fc0aaa829b3c433845ecb9bbebe7c8fd0fee5;hp=84883d7266fa3e1376f995bde2f7527d4868a8bc;hpb=106a3890f956e2aa7780b2985f4326655912a558;p=jalview.git

diff --git a/src/jalview/gui/AnnotationChooser.java b/src/jalview/gui/AnnotationChooser.java
index 84883d7..ad5e574 100644
--- a/src/jalview/gui/AnnotationChooser.java
+++ b/src/jalview/gui/AnnotationChooser.java
@@ -20,11 +20,6 @@
  */
 package jalview.gui;
 
-import jalview.datamodel.AlignmentAnnotation;
-import jalview.datamodel.AlignmentI;
-import jalview.datamodel.SequenceGroup;
-import jalview.util.MessageManager;
-
 import java.awt.BorderLayout;
 import java.awt.Checkbox;
 import java.awt.CheckboxGroup;
@@ -45,6 +40,11 @@ import javax.swing.JInternalFrame;
 import javax.swing.JLayeredPane;
 import javax.swing.JPanel;
 
+import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.SequenceGroup;
+import jalview.util.MessageManager;
+
 /**
  * A panel that allows the user to select which sequence-associated annotation
  * rows to show or hide.
@@ -195,14 +195,7 @@ public class AnnotationChooser extends JPanel
   {
     setAnnotationVisibility(true);
 
-    // copied from AnnotationLabel.actionPerformed (after show/hide row)...
-    // TODO should drive this functionality into AlignmentPanel
     ap.updateAnnotation();
-    // this.ap.annotationPanel.adjustPanelHeight();
-    // this.ap.alabels.setSize(this.ap.alabels.getSize().width,
-    // this.ap.annotationPanel.getSize().height);
-    // this.ap.validate();
-    this.ap.paintAlignment(true, false);
   }
 
   /**
@@ -229,11 +222,6 @@ public class AnnotationChooser extends JPanel
       }
     }
     ap.updateAnnotation();
-    // // this.ap.annotationPanel.adjustPanelHeight();
-    // this.ap.alabels.setSize(this.ap.alabels.getSize().width,
-    // this.ap.annotationPanel.getSize().height);
-    // this.ap.validate();
-    this.ap.paintAlignment(true, false);
   }
 
   /**
@@ -249,9 +237,7 @@ public class AnnotationChooser extends JPanel
   {
     setAnnotationVisibility(false);
 
-    this.ap.updateAnnotation();
-    // this.ap.annotationPanel.adjustPanelHeight();
-    this.ap.paintAlignment(true, false);
+    ap.updateAnnotation();
   }
 
   /**
@@ -616,6 +602,7 @@ public class AnnotationChooser extends JPanel
   private void showFrame()
   {
     frame = new JInternalFrame();
+    frame.setFrameIcon(WindowIcons.annotationIcon);
     frame.setContentPane(this);
     frame.setLayer(JLayeredPane.PALETTE_LAYER);
     Desktop.addInternalFrame(frame,