Merge branch 'develop' into features/JAL-2446NCList
[jalview.git] / src / jalview / gui / AlignmentPanel.java
index fc687b4..25f44c5 100644 (file)
@@ -72,8 +72,7 @@ import javax.swing.SwingUtilities;
  * @version $Revision: 1.161 $
  */
 public class AlignmentPanel extends GAlignmentPanel implements
-        AdjustmentListener, Printable, AlignmentViewPanel,
-        ViewportListenerI
+        AdjustmentListener, Printable, AlignmentViewPanel, ViewportListenerI
 {
   public AlignViewport av;
 
@@ -159,8 +158,8 @@ public class AlignmentPanel extends GAlignmentPanel implements
         // is initialised
         if (av.getWrapAlignment())
         {
-          int widthInRes = getSeqPanel().seqCanvas
-                  .getWrappedCanvasWidth(getSeqPanel().seqCanvas.getWidth());
+          int widthInRes = getSeqPanel().seqCanvas.getWrappedCanvasWidth(
+                  getSeqPanel().seqCanvas.getWidth());
           vpRanges.setViewportWidth(widthInRes);
         }
         else
@@ -169,7 +168,7 @@ public class AlignmentPanel extends GAlignmentPanel implements
                   / av.getCharWidth();
           int heightInSeq = getSeqPanel().seqCanvas.getHeight()
                   / av.getCharHeight();
-          
+
           vpRanges.setViewportWidth(widthInRes);
           vpRanges.setViewportHeight(heightInSeq);
         }
@@ -228,10 +227,10 @@ public class AlignmentPanel extends GAlignmentPanel implements
     // to prevent drawing old image
     FontMetrics fm = getFontMetrics(av.getFont());
 
-    scalePanelHolder.setPreferredSize(new Dimension(10, av.getCharHeight()
-            + fm.getDescent()));
-    idSpaceFillerPanel1.setPreferredSize(new Dimension(10, av
-            .getCharHeight() + fm.getDescent()));
+    scalePanelHolder.setPreferredSize(
+            new Dimension(10, av.getCharHeight() + fm.getDescent()));
+    idSpaceFillerPanel1.setPreferredSize(
+            new Dimension(10, av.getCharHeight() + fm.getDescent()));
 
     getIdPanel().getIdCanvas().gg = null;
     getSeqPanel().seqCanvas.img = null;
@@ -291,8 +290,8 @@ public class AlignmentPanel extends GAlignmentPanel implements
   {
     Container c = new Container();
 
-    FontMetrics fm = c.getFontMetrics(new Font(av.font.getName(),
-            Font.ITALIC, av.font.getSize()));
+    FontMetrics fm = c.getFontMetrics(
+            new Font(av.font.getName(), Font.ITALIC, av.font.getSize()));
 
     AlignmentI al = av.getAlignment();
     int i = 0;
@@ -333,8 +332,8 @@ public class AlignmentPanel extends GAlignmentPanel implements
       }
     }
 
-    return new Dimension(maxwidth < 0 ? idWidth : Math.min(maxwidth,
-            idWidth), 12);
+    return new Dimension(
+            maxwidth < 0 ? idWidth : Math.min(maxwidth, idWidth), 12);
   }
 
   /**
@@ -576,8 +575,8 @@ public class AlignmentPanel extends GAlignmentPanel implements
        */
       if (annotationHeight + alignmentHeight > availableHeight)
       {
-        annotationHeight = Math.min(annotationHeight, availableHeight - 2
-                * rowHeight);
+        annotationHeight = Math.min(annotationHeight,
+                availableHeight - 2 * rowHeight);
       }
     }
     else
@@ -587,8 +586,8 @@ public class AlignmentPanel extends GAlignmentPanel implements
     }
     hscroll.addNotify();
 
-    annotationScroller.setPreferredSize(new Dimension(annotationScroller
-            .getWidth(), annotationHeight));
+    annotationScroller.setPreferredSize(
+            new Dimension(annotationScroller.getWidth(), annotationHeight));
 
     Dimension e = idPanel.getSize();
     alabels.setSize(new Dimension(e.width, annotationHeight));
@@ -638,8 +637,8 @@ public class AlignmentPanel extends GAlignmentPanel implements
       else
       {
         int widthInRes = (canvasWidth / av.getCharWidth()) - 1;
-        int heightInSeq = (getSeqPanel().seqCanvas.getHeight() / av
-                .getCharHeight()) - 1;
+        int heightInSeq = (getSeqPanel().seqCanvas.getHeight()
+                / av.getCharHeight()) - 1;
 
         vpRanges.setViewportWidth(widthInRes);
         vpRanges.setViewportHeight(heightInSeq);
@@ -651,7 +650,6 @@ public class AlignmentPanel extends GAlignmentPanel implements
     repaint();
   }
 
-
   /**
    * Adjust row/column scrollers to show a visible position in the alignment.
    * 
@@ -683,7 +681,8 @@ public class AlignmentPanel extends GAlignmentPanel implements
       if (av.hasHiddenColumns())
       {
         // reset the width to exclude hidden columns
-        width = av.getAlignment().getHiddenColumns().findColumnPosition(width);
+        width = av.getAlignment().getHiddenColumns()
+                .findColumnPosition(width);
       }
 
       hextent = getSeqPanel().seqCanvas.getWidth() / av.getCharWidth();
@@ -825,13 +824,13 @@ public class AlignmentPanel extends GAlignmentPanel implements
       {
         @Override
         public void run()
-      {
+        {
           // When updating scrolling to use ViewportChange events, this code
           // could not be validated and it is not clear if it is now being
           // called. Log warning here in case it is called and unforeseen
           // problems occur
-          Cache.log
-                  .warn("Unexpected path through code: Wrapped jar file opened with wrap alignment set in preferences");
+          Cache.log.warn(
+                  "Unexpected path through code: Wrapped jar file opened with wrap alignment set in preferences");
 
           // scroll to start of panel
           vpRanges.setStartRes(0);
@@ -986,7 +985,8 @@ public class AlignmentPanel extends GAlignmentPanel implements
      * Get the horizontal offset to where we draw the sequences.
      * This is idWidth if using a single Graphics context, else zero.
      */
-    final int alignmentGraphicsOffset = idGraphics != alignmentGraphics ? 0 : idWidth;
+    final int alignmentGraphicsOffset = idGraphics != alignmentGraphics ? 0
+            : idWidth;
 
     FontMetrics fm = getFontMetrics(av.getFont());
     int charHeight = av.getCharHeight();
@@ -1023,8 +1023,7 @@ public class AlignmentPanel extends GAlignmentPanel implements
       endSeq = alignmentHeight;
     }
 
-    int pagesHigh = ((alignmentHeight / totalSeq) + 1)
-            * pageHeight;
+    int pagesHigh = ((alignmentHeight / totalSeq) + 1) * pageHeight;
 
     if (av.isShowAnnotation())
     {
@@ -1037,8 +1036,7 @@ public class AlignmentPanel extends GAlignmentPanel implements
     {
       return Printable.NO_SUCH_PAGE;
     }
-    final int alignmentDrawnHeight = (endSeq - startSeq) * charHeight
-            + 3;
+    final int alignmentDrawnHeight = (endSeq - startSeq) * charHeight + 3;
 
     /*
      * draw the Scale at horizontal offset, then reset to top left (0, 0)
@@ -1087,9 +1085,7 @@ public class AlignmentPanel extends GAlignmentPanel implements
       if (av.isRightAlignIds())
       {
         fm = idGraphics.getFontMetrics();
-        xPos = idWidth
-                - fm.stringWidth(displayId)
-                - 4;
+        xPos = idWidth - fm.stringWidth(displayId) - 4;
       }
 
       idGraphics.drawString(displayId, xPos,
@@ -1125,7 +1121,8 @@ public class AlignmentPanel extends GAlignmentPanel implements
        * draw the annotations starting at 
        * (idOffset, alignmentHeight) from (0, scaleHeight)
        */
-      alignmentGraphics.translate(alignmentGraphicsOffset, alignmentDrawnHeight);
+      alignmentGraphics.translate(alignmentGraphicsOffset,
+              alignmentDrawnHeight);
       getAnnotationPanel().renderer.drawComponent(getAnnotationPanel(), av,
               alignmentGraphics, -1, startRes, endRes + 1);
     }
@@ -1179,8 +1176,8 @@ public class AlignmentPanel extends GAlignmentPanel implements
               .findColumnPosition(maxwidth) - 1;
     }
 
-    int resWidth = getSeqPanel().seqCanvas.getWrappedCanvasWidth(pwidth
-            - idWidth);
+    int resWidth = getSeqPanel().seqCanvas
+            .getWrappedCanvasWidth(pwidth - idWidth);
 
     int totalHeight = cHeight * (maxwidth / resWidth + 1);
 
@@ -1217,16 +1214,13 @@ public class AlignmentPanel extends GAlignmentPanel implements
       }
       if (labels != null)
       {
-        pg.translate(-3,
-                ypos + (av.getAlignment().getHeight() * av.getCharHeight()));
+        pg.translate(-3, ypos
+                + (av.getAlignment().getHeight() * av.getCharHeight()));
 
         pg.setFont(av.getFont());
         labels.drawComponent(pg, idWidth);
-        pg.translate(
-                +3,
-                -ypos
-                        - (av.getAlignment().getHeight() * av
-                                .getCharHeight()));
+        pg.translate(+3, -ypos
+                - (av.getAlignment().getHeight() * av.getCharHeight()));
       }
 
       ypos += cHeight;
@@ -1276,8 +1270,8 @@ public class AlignmentPanel extends GAlignmentPanel implements
       return calculateIdWidth(-1).width + 4;
     }
     Integer idwidth = null;
-    if (onscreen
-            || (idwidth = Cache.getIntegerProperty("FIGURE_FIXEDIDWIDTH")) == null)
+    if (onscreen || (idwidth = Cache
+            .getIntegerProperty("FIGURE_FIXEDIDWIDTH")) == null)
     {
       int w = getIdPanel().getWidth();
       return (w > 0 ? w : calculateIdWidth().width + 4);
@@ -1289,15 +1283,15 @@ public class AlignmentPanel extends GAlignmentPanel implements
   {
     int boarderBottomOffset = 5;
     long pSessionId = System.currentTimeMillis();
-    headless = (System.getProperty("java.awt.headless") != null && System
-            .getProperty("java.awt.headless").equals("true"));
+    headless = (System.getProperty("java.awt.headless") != null
+            && System.getProperty("java.awt.headless").equals("true"));
     if (alignFrame != null && !headless)
     {
       if (file != null)
       {
-        alignFrame.setProgressBar(MessageManager.formatMessage(
-                "status.saving_file", new Object[] { type.getLabel() }),
-                pSessionId);
+        alignFrame.setProgressBar(MessageManager
+                .formatMessage("status.saving_file", new Object[]
+                { type.getLabel() }), pSessionId);
       }
     }
     try
@@ -1324,9 +1318,9 @@ public class AlignmentPanel extends GAlignmentPanel implements
         }
 
         im = new jalview.util.ImageMaker(this, type, imageAction,
-                aDimension.getWidth(), aDimension.getHeight()
-                        + boarderBottomOffset, file, imageTitle,
-                alignFrame, pSessionId, headless);
+                aDimension.getWidth(),
+                aDimension.getHeight() + boarderBottomOffset, file,
+                imageTitle, alignFrame, pSessionId, headless);
         Graphics graphics = im.getGraphics();
         if (av.getWrapAlignment())
         {
@@ -1342,8 +1336,8 @@ public class AlignmentPanel extends GAlignmentPanel implements
         {
           if (graphics != null)
           {
-            printUnwrapped(aDimension.getWidth(), aDimension.getHeight(),
-                    0, graphics, graphics);
+            printUnwrapped(aDimension.getWidth(), aDimension.getHeight(), 0,
+                    graphics, graphics);
             im.writeImage();
           }
         }
@@ -1388,9 +1382,8 @@ public class AlignmentPanel extends GAlignmentPanel implements
         // this duplicates the calculation in getWrappedHeight but adjusts for
         // offscreen idWith
         width = alignFrame.getWidth() - vscroll.getPreferredSize().width
-                - alignFrame.getInsets().left
-                - alignFrame.getInsets().right - getVisibleIdWidth()
-                + getVisibleIdWidth(false);
+                - alignFrame.getInsets().left - alignFrame.getInsets().right
+                - getVisibleIdWidth() + getVisibleIdWidth(false);
       }
       else
       {
@@ -1888,7 +1881,7 @@ public class AlignmentPanel extends GAlignmentPanel implements
 
   @Override
   /**
-   * Property change event fired when a change is made to the viewport ranges 
+   * Property change event fired when a change is made to the viewport ranges
    * object associated with this alignment panel's viewport
    */
   public void propertyChange(PropertyChangeEvent evt)