X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationLabels.java;h=7462bc802faf9b61bd3a0c86c0877ebbe3a9bb0f;hb=fdde9a078d7bdb46ed9fb7fe115ea83c84a19c81;hp=52a6066db16bd0b27de610615574664aa6938374;hpb=5f75f9bff16bce462ef737bacfadd3463366c5c0;p=jalview.git diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java index 52a6066..7462bc8 100755 --- a/src/jalview/gui/AnnotationLabels.java +++ b/src/jalview/gui/AnnotationLabels.java @@ -422,13 +422,14 @@ public class AnnotationLabels extends JPanel consclipbrd.addActionListener(this); pop.add(consclipbrd); } - if (aa[selectedRow].graph == AlignmentAnnotation.CONTACT_MAP + if (aa[selectedRow].graph == AlignmentAnnotation.CONTACT_MAP && PAEContactMatrix.PAEMATRIX .equals(aa[selectedRow].getCalcId())) { final PAEContactMatrix cm = (PAEContactMatrix) av .getContactMatrix(aa[selectedRow]); - if (cm!=null && cm.getNewick()!=null && cm.getNewick().length()>0) + if (cm != null && cm.getNewick() != null + && cm.getNewick().length() > 0) { item = new JMenuItem("Show Tree for Matrix"); item.addActionListener(new ActionListener() @@ -438,7 +439,7 @@ public class AnnotationLabels extends JPanel public void actionPerformed(ActionEvent e) { - ap.alignFrame.showContactMapTree(aa[selectedRow],cm); + ap.alignFrame.showContactMapTree(aa[selectedRow], cm); } }); @@ -1123,7 +1124,8 @@ public class AnnotationLabels extends JPanel } olY = y; // look ahead to next annotation - for (nexAA=i+1; nexAA