git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
todo JAL-1104 : functions to refactor
[jalview.git]
/
src
/
jalview
/
appletgui
/
ScalePanel.java
diff --git
a/src/jalview/appletgui/ScalePanel.java
b/src/jalview/appletgui/ScalePanel.java
index
cb9c4e1
..
8fe6e30
100755
(executable)
--- a/
src/jalview/appletgui/ScalePanel.java
+++ b/
src/jalview/appletgui/ScalePanel.java
@@
-60,7
+60,7
@@
public class ScalePanel extends Panel implements MouseMotionListener,
int x = (evt.getX() / av.getCharWidth()) + av.getStartRes();
final int res;
int x = (evt.getX() / av.getCharWidth()) + av.getStartRes();
final int res;
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
res = av.getColumnSelection().adjustForHiddenColumns(x);
}
{
res = av.getColumnSelection().adjustForHiddenColumns(x);
}
@@
-122,7
+122,7
@@
public class ScalePanel extends Panel implements MouseMotionListener,
{
av.hideColumns(res, res);
if (av.getSelectionGroup() != null
{
av.hideColumns(res, res);
if (av.getSelectionGroup() != null
- && av.getSelectionGroup().getSize() == av.alignment
+ && av.getSelectionGroup().getSize() == av.getAlignment()
.getHeight())
{
av.setSelectionGroup(null);
.getHeight())
{
av.setSelectionGroup(null);
@@
-150,9
+150,9
@@
public class ScalePanel extends Panel implements MouseMotionListener,
av.getColumnSelection().addElement(res);
SequenceGroup sg = new SequenceGroup();
av.getColumnSelection().addElement(res);
SequenceGroup sg = new SequenceGroup();
- for (int i = 0; i < av.alignment.getSequences().size(); i++)
+ for (int i = 0; i < av.getAlignment().getSequences().size(); i++)
{
{
- sg.addSequence(av.alignment.getSequenceAt(i), false);
+ sg.addSequence(av.getAlignment().getSequenceAt(i), false);
}
sg.setStartRes(res);
}
sg.setStartRes(res);
@@
-182,12
+182,12
@@
public class ScalePanel extends Panel implements MouseMotionListener,
int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
- if (res > av.alignment.getWidth())
+ if (res > av.getAlignment().getWidth())
{
{
- res = av.alignment.getWidth() - 1;
+ res = av.getAlignment().getWidth() - 1;
}
}
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
res = av.getColumnSelection().adjustForHiddenColumns(res);
}
{
res = av.getColumnSelection().adjustForHiddenColumns(res);
}
@@
-225,14
+225,14
@@
public class ScalePanel extends Panel implements MouseMotionListener,
res = 0;
}
res = 0;
}
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
res = av.getColumnSelection().adjustForHiddenColumns(res);
}
{
res = av.getColumnSelection().adjustForHiddenColumns(res);
}
- if (res > av.alignment.getWidth())
+ if (res > av.getAlignment().getWidth())
{
{
- res = av.alignment.getWidth() - 1;
+ res = av.getAlignment().getWidth() - 1;
}
if (res < min)
}
if (res < min)
@@
-307,7
+307,7
@@
public class ScalePanel extends Panel implements MouseMotionListener,
public void mouseMoved(MouseEvent evt)
{
public void mouseMoved(MouseEvent evt)
{
- if (!av.hasHiddenColumns)
+ if (!av.hasHiddenColumns())
{
return;
}
{
return;
}
@@
-360,7
+360,7
@@
public class ScalePanel extends Panel implements MouseMotionListener,
for (int i = 0; i < cs.size(); i++)
{
int sel = cs.columnAt(i);
for (int i = 0; i < cs.size(); i++)
{
int sel = cs.columnAt(i);
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
sel = av.getColumnSelection().findColumnPosition(sel);
}
{
sel = av.getColumnSelection().findColumnPosition(sel);
}
@@
-417,7
+417,7
@@
public class ScalePanel extends Panel implements MouseMotionListener,
}
}
}
}
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
gg.setColor(Color.blue);
int res;
{
gg.setColor(Color.blue);
int res;