X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewPanel.java;h=bd9e241663206b59a162b78b2a93852abdf69b8e;hb=20dd6fc13a9d903dc580939e7f2722bc9b043c4f;hp=bed9de1e113bd1c1422f6ca916022a3c55a6c638;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java index bed9de1..bd9e241 100755 --- a/src/jalview/gui/OverviewPanel.java +++ b/src/jalview/gui/OverviewPanel.java @@ -20,12 +20,20 @@ */ package jalview.gui; +import jalview.datamodel.SequenceI; import jalview.renderer.AnnotationRenderer; -import java.awt.*; -import java.awt.event.*; -import java.awt.image.*; -import javax.swing.*; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.event.ComponentAdapter; +import java.awt.event.ComponentEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.MouseMotionAdapter; +import java.awt.image.BufferedImage; + +import javax.swing.JPanel; /** * DOCUMENT ME! @@ -135,7 +143,7 @@ public class OverviewPanel extends JPanel implements Runnable @Override public void mouseDragged(MouseEvent evt) { - if (!av.wrapAlignment) + if (!av.getWrapAlignment()) { // TODO: feature: jv2.5 detect shift drag and update selection from // it. @@ -151,7 +159,7 @@ public class OverviewPanel extends JPanel implements Runnable @Override public void mousePressed(MouseEvent evt) { - if (!av.wrapAlignment) + if (!av.getWrapAlignment()) { boxX = evt.getX(); boxY = evt.getY(); @@ -284,7 +292,9 @@ public class OverviewPanel extends JPanel implements Runnable int lastcol = -1, lastrow = -1; int color = Color.white.getRGB(); int row, col; - jalview.datamodel.SequenceI seq; + SequenceI seq; + final boolean hasHiddenRows = av.hasHiddenRows(), hasHiddenCols = av + .hasHiddenColumns(); boolean hiddenRow = false; for (row = 0; row < sequencesHeight; row++) { @@ -302,7 +312,7 @@ public class OverviewPanel extends JPanel implements Runnable lastrow = (int) (row * sampleRow); hiddenRow = false; - if (av.hasHiddenRows()) + if (hasHiddenRows) { seq = av.getAlignment().getHiddenSequences() .getHiddenSequence(lastrow); @@ -355,7 +365,7 @@ public class OverviewPanel extends JPanel implements Runnable } if (hiddenRow - || (av.hasHiddenColumns() && !av.getColumnSelection() + || (hasHiddenCols && !av.getColumnSelection() .isVisible(lastcol))) { color = new Color(color).darker().darker().getRGB();