X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationLabels.java;h=c0b80220630010b800ed272611a32a0d6ecbaf46;hb=15a7fb10aaf9537b51a4412229dfdabd681c4d0f;hp=a4be664e3797a3d5c8427dce3c15b5302908ebf0;hpb=e3f8c52e98012a263e444ce8a105b1731a62c4a8;p=jalview.git
diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java
index a4be664..c0b8022 100755
--- a/src/jalview/gui/AnnotationLabels.java
+++ b/src/jalview/gui/AnnotationLabels.java
@@ -369,7 +369,9 @@ public class AnnotationLabels
if (aa.description != null && !aa.description.equals("New description"))
{
- desc.append(aa.description+"
");
+ desc.append(aa.description);
+ if(aa.hasScore)
+ desc.append("
");
}
if(aa.hasScore())
{
@@ -401,20 +403,19 @@ public class AnnotationLabels
AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation();
+ JPopupMenu pop = new JPopupMenu("Annotations");
+ JMenuItem item = new JMenuItem(ADDNEW);
+ item.addActionListener(this);
+
if ( (aa == null) || (aa.length == 0))
{
- JPopupMenu pop = new JPopupMenu("Annotations");
- JMenuItem item = new JMenuItem(ADDNEW);
+ item = new JMenuItem(SHOWALL);
item.addActionListener(this);
pop.add(item);
pop.show(this, evt.getX(), evt.getY());
-
return;
}
- JPopupMenu pop = new JPopupMenu("Annotations");
- JMenuItem item = new JMenuItem(ADDNEW);
- item.addActionListener(this);
pop.add(item);
item = new JMenuItem(EDITNAME);
item.addActionListener(this);
@@ -432,7 +433,7 @@ public class AnnotationLabels
item.addActionListener(this);
pop.add(item);
// annotation object should be typed
- if (aa[selectedRow] == ap.av.consensus)
+ if (selectedRow