X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationLabels.java;fp=src%2Fjalview%2Fgui%2FAnnotationLabels.java;h=b553f5644c999d949dfb30db5d4332d28bfc32ce;hb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;hp=a5b07163b4fc50357c3b7470680a4845b20c35b4;hpb=1889827c44c51f6353fe8619e5d44b421158af23;p=jalview.git

diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java
index a5b0716..b553f56 100755
--- a/src/jalview/gui/AnnotationLabels.java
+++ b/src/jalview/gui/AnnotationLabels.java
@@ -534,7 +534,8 @@ public class AnnotationLabels extends JPanel implements MouseListener,
       return;
     }
 
-    JPopupMenu pop = new JPopupMenu(MessageManager.getString("label.annotations"));
+    JPopupMenu pop = new JPopupMenu(
+            MessageManager.getString("label.annotations"));
     JMenuItem item = new JMenuItem(ADDNEW);
     item.addActionListener(this);
     pop.add(item);
@@ -825,11 +826,14 @@ public class AnnotationLabels extends JPanel implements MouseListener,
   }
 
   /**
-   * Draw the full set of annotation Labels for the alignment at the given cursor
+   * Draw the full set of annotation Labels for the alignment at the given
+   * cursor
+   * 
+   * @param g
+   *          Graphics2D instance (needed for font scaling)
+   * @param width
+   *          Width for scaling labels
    * 
-   * @param g Graphics2D instance (needed for font scaling)
-   * @param width Width for scaling labels
-   *          
    */
   public void drawComponent(Graphics g, int width)
   {
@@ -837,12 +841,18 @@ public class AnnotationLabels extends JPanel implements MouseListener,
   }
 
   private final boolean debugRedraw = false;
+
   /**
-   * Draw the full set of annotation Labels for the alignment at the given cursor
+   * Draw the full set of annotation Labels for the alignment at the given
+   * cursor
    * 
-   * @param g Graphics2D instance (needed for font scaling)
-   * @param clip - true indicates that only current visible area needs to be rendered
-   * @param width Width for scaling labels         
+   * @param g
+   *          Graphics2D instance (needed for font scaling)
+   * @param clip
+   *          - true indicates that only current visible area needs to be
+   *          rendered
+   * @param width
+   *          Width for scaling labels
    */
   public void drawComponent(Graphics g, boolean clip, int width)
   {
@@ -861,7 +871,7 @@ public class AnnotationLabels extends JPanel implements MouseListener,
 
     g.translate(0, scrollOffset);
     g.setColor(Color.black);
-    
+
     AlignmentAnnotation[] aa = av.getAlignment().getAlignmentAnnotation();
     int fontHeight = g.getFont().getSize();
     int y = 0;
@@ -871,18 +881,20 @@ public class AnnotationLabels extends JPanel implements MouseListener,
     Font baseFont = g.getFont();
     FontMetrics baseMetrics = fm;
     int ofontH = fontHeight;
-    int sOffset=0;
+    int sOffset = 0;
     int visHeight = 0;
-    int[] visr = (ap!=null && ap.annotationPanel!=null) ? ap.annotationPanel.getVisibleVRange() : null;
-    if (clip && visr!=null){ 
-      sOffset = visr[0]; 
+    int[] visr = (ap != null && ap.annotationPanel != null) ? ap.annotationPanel
+            .getVisibleVRange() : null;
+    if (clip && visr != null)
+    {
+      sOffset = visr[0];
       visHeight = visr[1];
     }
-    boolean visible = true,before=false,after=false;
+    boolean visible = true, before = false, after = false;
     if (aa != null)
     {
       hasHiddenRows = false;
-      int olY=0;
+      int olY = 0;
       for (int i = 0; i < aa.length; i++)
       {
         visible = true;
@@ -891,33 +903,39 @@ public class AnnotationLabels extends JPanel implements MouseListener,
           hasHiddenRows = true;
           continue;
         }
-        olY=y;
+        olY = y;
         y += aa[i].height;
-        if (clip) {if (y<sOffset)
+        if (clip)
         {
-          if (!before)
+          if (y < sOffset)
           {
-            if (debugRedraw) {
-              System.out.println("before vis: "+i);
+            if (!before)
+            {
+              if (debugRedraw)
+              {
+                System.out.println("before vis: " + i);
+              }
+              before = true;
             }
-          before=true;
+            // don't draw what isn't visible
+            continue;
           }
-          // don't draw what isn't visible
-          continue;
-        }
-        if (olY>visHeight)
-        {
-
-          if (!after)
+          if (olY > visHeight)
           {
-            if (debugRedraw) {
-              System.out.println("Scroll offset: "+sOffset+" after vis: "+i);
+
+            if (!after)
+            {
+              if (debugRedraw)
+              {
+                System.out.println("Scroll offset: " + sOffset
+                        + " after vis: " + i);
+              }
+              after = true;
             }
-          after=true;
+            // don't draw what isn't visible
+            continue;
           }
-          // don't draw what isn't visible
-          continue;
-        }}
+        }
         g.setColor(Color.black);
 
         offset = -aa[i].height / 2;
@@ -935,7 +953,8 @@ public class AnnotationLabels extends JPanel implements MouseListener,
         if (aa[i].graphGroup > -1)
         {
           int groupSize = 0;
-          // TODO: JAL-1291 revise rendering model so the graphGroup map is computed efficiently for all visible labels
+          // TODO: JAL-1291 revise rendering model so the graphGroup map is
+          // computed efficiently for all visible labels
           for (int gg = 0; gg < aa.length; gg++)
           {
             if (aa[gg].graphGroup == aa[i].graphGroup)
@@ -1014,7 +1033,8 @@ public class AnnotationLabels extends JPanel implements MouseListener,
     if (!av.wrapAlignment && ((aa == null) || (aa.length < 1)))
     {
       g.drawString(MessageManager.getString("label.right_click"), 2, 8);
-      g.drawString(MessageManager.getString("label.to_add_annotation"), 2, 18);
+      g.drawString(MessageManager.getString("label.to_add_annotation"), 2,
+              18);
     }
   }
 }