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
JAL-1551 JAL-962 formatting and code change ripples from changing HiddenColumns ...
[jalview.git]
/
src
/
jalview
/
gui
/
AlignFrame.java
diff --git
a/src/jalview/gui/AlignFrame.java
b/src/jalview/gui/AlignFrame.java
index
b19e54f
..
235deda
100644
(file)
--- a/
src/jalview/gui/AlignFrame.java
+++ b/
src/jalview/gui/AlignFrame.java
@@
-1767,20
+1767,17
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
return;
}
return;
}
- Vector hiddenColumns = null;
+ ArrayList<int[]> hiddenColumns = null;
if (viewport.hasHiddenColumns())
{
if (viewport.hasHiddenColumns())
{
- hiddenColumns = new Vector();
+ hiddenColumns = new ArrayList<int[]>();
int hiddenOffset = viewport.getSelectionGroup().getStartRes(), hiddenCutoff = viewport
.getSelectionGroup().getEndRes();
int hiddenOffset = viewport.getSelectionGroup().getStartRes(), hiddenCutoff = viewport
.getSelectionGroup().getEndRes();
- for (int i = 0; i < viewport.getColumnSelection().getHiddenColumns()
- .size(); i++)
+ for (int[] region : viewport.getColumnSelection().getHiddenColumns())
{
{
- int[] region = (int[]) viewport.getColumnSelection()
- .getHiddenColumns().elementAt(i);
if (region[0] >= hiddenOffset && region[1] <= hiddenCutoff)
{
if (region[0] >= hiddenOffset && region[1] <= hiddenCutoff)
{
- hiddenColumns.addElement(new int[]
+ hiddenColumns.add(new int[]
{ region[0] - hiddenOffset, region[1] - hiddenOffset });
}
}
{ region[0] - hiddenOffset, region[1] - hiddenOffset });
}
}
@@
-2107,10
+2104,9
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
if (Desktop.jalviewClipboard != null
&& Desktop.jalviewClipboard[2] != null)
{
if (Desktop.jalviewClipboard != null
&& Desktop.jalviewClipboard[2] != null)
{
- Vector hc = (Vector) Desktop.jalviewClipboard[2];
- for (int i = 0; i < hc.size(); i++)
+ List<int[]> hc = (List<int[]>) Desktop.jalviewClipboard[2];
+ for (int[] region : hc)
{
{
- int[] region = (int[]) hc.elementAt(i);
af.viewport.hideColumns(region[0], region[1]);
}
}
af.viewport.hideColumns(region[0], region[1]);
}
}
@@
-2167,10
+2163,9
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
if (Desktop.jalviewClipboard != null
&& Desktop.jalviewClipboard[2] != null)
{
if (Desktop.jalviewClipboard != null
&& Desktop.jalviewClipboard[2] != null)
{
- Vector hc = (Vector) Desktop.jalviewClipboard[2];
- for (int i = 0; i < hc.size(); i++)
+ List<int[]> hc = (List<int[]>) Desktop.jalviewClipboard[2];
+ for (int region[] : hc)
{
{
- int[] region = (int[]) hc.elementAt(i);
af.viewport.hideColumns(region[0], region[1]);
}
}
af.viewport.hideColumns(region[0], region[1]);
}
}