JAL-1551 spotlessApply

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

diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java
index 0ccd6c2..0a9d35f 100755 (executable)
--- a/src/jalview/gui/AnnotationLabels.java
+++ b/src/jalview/gui/AnnotationLabels.java
@@ -422,15 +422,15 @@ 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.getNewickString()!=null && cm.getNewickString().length()>0)
+        if (cm != null && cm.hasTree())
         {
-          item = new JMenuItem("Show Matrix");
+          item = new JMenuItem("Show Tree for Matrix");
           item.addActionListener(new ActionListener()
           {
 
@@ -438,7 +438,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 +1123,8 @@ public class AnnotationLabels extends JPanel
         }
         olY = y;
         // look ahead to next annotation
-        for (nexAA=i+1; nexAA<aa.length && !aa[nexAA].visible; nexAA++)
+        for (nexAA = i + 1; nexAA < aa.length
+                && !aa[nexAA].visible; nexAA++)
           ;
         y += aa[i].height;
         if (clip)
@@ -1273,7 +1274,8 @@ public class AnnotationLabels extends JPanel
         {
           if (vertBar)
           {
-            g.drawLine(width-3, y + offset-fontHeight, width-3, (int)(y - 1.5*aa[i].height-offset-fontHeight));
+            g.drawLine(width - 3, y + offset - fontHeight, width - 3,
+                    (int) (y - 1.5 * aa[i].height - offset - fontHeight));
             // g.drawLine(20, y + offset, x - 20, y + offset);
 
           }