Check if colos are null

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

diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java
index 26cba7a..3f7b5ad 100755 (executable)
--- a/src/jalview/gui/AnnotationLabels.java
+++ b/src/jalview/gui/AnnotationLabels.java
@@ -6,6 +6,7 @@ import java.awt.event.*;
 import java.awt.*;\r
 import java.awt.image.*;\r
 import jalview.datamodel.*;\r
+import jalview.io.FormatAdapter;\r
 \r
 public class AnnotationLabels extends JPanel implements MouseListener, MouseMotionListener, ActionListener\r
 {\r
@@ -14,10 +15,11 @@ public class AnnotationLabels extends JPanel implements MouseListener, MouseMoti
   AlignmentPanel ap ;\r
   boolean resizing = false;\r
   int oldY, mouseX;\r
-  static String ADDNEW = "Add new row";\r
-  static String HIDE = "Hide this row";\r
-  static String DELETE = "Delete this row";\r
-  static String SHOWALL="Show all hidden rows";\r
+  static String ADDNEW = "Add New Row";\r
+  static String HIDE = "Hide This Row";\r
+  static String DELETE = "Delete This Row";\r
+  static String SHOWALL="Show All Hidden Rows";\r
+  static String OUTPUT_TEXT="Show Values In Textbox";\r
   int selectedRow = 0;\r
   int scrollOffset = 0;\r
 \r
@@ -72,6 +74,12 @@ public class AnnotationLabels extends JPanel implements MouseListener, MouseMoti
    else if(evt.getActionCommand().equals(HIDE))\r
    {\r
      aa[selectedRow].visible = false;\r
+     if(aa[selectedRow].label.equals("Conservation"))\r
+       ap.av.showConservation = false;\r
+     if(aa[selectedRow].label.equals("Quality"))\r
+       ap.av.showQuality = false;\r
+     if(aa[selectedRow].label.equals("Consensus"))\r
+       ap.av.showIdentity = false;\r
    }\r
    else if(evt.getActionCommand().equals(DELETE))\r
    {\r
@@ -82,6 +90,12 @@ public class AnnotationLabels extends JPanel implements MouseListener, MouseMoti
        for(int i=0; i<aa.length; i++)\r
          aa[i].visible = true;\r
    }\r
+   else if(evt.getActionCommand().equals(OUTPUT_TEXT))\r
+   {\r
+     CutAndPasteTransfer cap = new CutAndPasteTransfer();\r
+     Desktop.addInternalFrame(cap, ap.alignFrame.getTitle()+" - "+ aa[selectedRow].label, 500, 100);\r
+     cap.setText( aa[selectedRow].toString() );\r
+   }\r
 \r
    ap.annotationPanel.adjustPanelHeight();\r
    ap.repaint();\r
@@ -92,9 +106,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, MouseMoti
   {\r
     int y = evt.getY() - scrollOffset;\r
 \r
-    if (SwingUtilities.isRightMouseButton(evt))\r
-    {\r
-       AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation();\r
+      AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation();\r
        if(aa==null || aa.length==0)\r
        {\r
             JPopupMenu pop = new JPopupMenu("Annotations");\r
@@ -132,9 +144,10 @@ public class AnnotationLabels extends JPanel implements MouseListener, MouseMoti
       item = new JMenuItem(SHOWALL);\r
       item.addActionListener(this);\r
       pop.add(item);\r
+      item = new JMenuItem(OUTPUT_TEXT);\r
+      item.addActionListener(this);\r
+      pop.add(item);\r
       pop.show(this, evt.getX(), evt.getY());\r
-      return;\r
-    }\r
 \r
     oldY = evt.getY();\r
   }\r