X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjavascript%2FJsSelectionSender.java;h=fdf8b58aad7fafb1551a445e980cd40874cea65d;hb=f51f5302101389c1ffd7ed8bba0b79705b289a70;hp=8e11699be8f53a58380262a8cd6828f4ce64c778;hpb=59d682209891099d46b960509907c79e3fb276fe;p=jalview.git
diff --git a/src/jalview/javascript/JsSelectionSender.java b/src/jalview/javascript/JsSelectionSender.java
index 8e11699..fdf8b58 100644
--- a/src/jalview/javascript/JsSelectionSender.java
+++ b/src/jalview/javascript/JsSelectionSender.java
@@ -1,30 +1,31 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.javascript;
-import java.net.URL;
import jalview.appletgui.AlignFrame;
-import jalview.appletgui.AlignViewport;
import jalview.bin.JalviewLite;
import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.HiddenColumns;
import jalview.datamodel.SequenceGroup;
import jalview.structure.SelectionSource;
-import netscape.javascript.JSObject;
public class JsSelectionSender extends JSFunctionExec implements
jalview.structure.SelectionListener, JsCallBack
@@ -44,13 +45,12 @@ public class JsSelectionSender extends JSFunctionExec implements
@Override
public void selection(SequenceGroup seqsel, ColumnSelection colsel,
- SelectionSource source)
+ HiddenColumns hidden, SelectionSource source)
{
// System.err.println("Testing selection event relay to jsfunction:"+_listener);
try
{
String setid = "";
- String viewid = "";
AlignFrame src = _af;
if (source != null)
{
@@ -62,10 +62,8 @@ public class JsSelectionSender extends JSFunctionExec implements
}
}
- String[] seqs = new String[]
- {};
- String[] cols = new String[]
- {};
+ String[] seqs = new String[] {};
+ String[] cols = new String[] {};
int strt = 0, end = (src == null) ? -1 : src.alignPanel.av
.getAlignment().getWidth();
if (seqsel != null && seqsel.getSize() > 0)
@@ -84,19 +82,16 @@ public class JsSelectionSender extends JSFunctionExec implements
end = seqsel.getEndRes();
}
}
- if (colsel != null && colsel.size() > 0)
+ if (colsel != null && !colsel.isEmpty())
{
if (end == -1)
{
end = colsel.getMax() + 1;
}
cols = new String[colsel.getSelected().size()];
- int d = 0, r = -1;
for (int i = 0; i < cols.length; i++)
{
- cols[i] = ""
- + (1 + ((Integer) colsel.getSelected().elementAt(i))
- .intValue());
+ cols[i] = "" + (1 + colsel.getSelected().get(i).intValue());
}
}
else
@@ -111,10 +106,8 @@ public class JsSelectionSender extends JSFunctionExec implements
}
System.err.println("Relaying selection to jsfunction:" + _listener);
- executeJavascriptFunction(
- _listener,
- new Object[]
- { src, setid, jvlite.arrayToSeparatorList(seqs),
+ executeJavascriptFunction(_listener,
+ new Object[] { src, setid, jvlite.arrayToSeparatorList(seqs),
jvlite.arrayToSeparatorList(cols) });
} catch (Exception ex)
{