X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjavascript%2FJsSelectionSender.java;h=c2a963e4997167126ce561e93386823d20cab0ce;hb=7047b076a62df177047ceb16c3611efe020bdd76;hp=326c2598e93f5780a85974d1219345272f030279;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git
diff --git a/src/jalview/javascript/JsSelectionSender.java b/src/jalview/javascript/JsSelectionSender.java
index 326c259..c2a963e 100644
--- a/src/jalview/javascript/JsSelectionSender.java
+++ b/src/jalview/javascript/JsSelectionSender.java
@@ -1,33 +1,34 @@
-/*******************************************************************************
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, 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
+public class JsSelectionSender extends JSFunctionExec
+ implements jalview.structure.SelectionListener, JsCallBack
{
AlignFrame _af;
@@ -44,13 +45,13 @@ 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);
+ // System.err.println("Testing selection event relay to
+ // jsfunction:"+_listener);
try
{
String setid = "";
- String viewid = "";
AlignFrame src = _af;
if (source != null)
{
@@ -62,12 +63,10 @@ public class JsSelectionSender extends JSFunctionExec implements
}
}
- String[] seqs = new String[]
- {};
- String[] cols = new String[]
- {};
- int strt = 0, end = (src == null) ? -1 : src.alignPanel.av
- .getAlignment().getWidth();
+ 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)
{
seqs = new String[seqsel.getSize()];
@@ -79,24 +78,21 @@ public class JsSelectionSender extends JSFunctionExec implements
{
strt = seqsel.getStartRes();
}
- if (end==-1 || end > seqsel.getEndRes())
+ if (end == -1 || end > seqsel.getEndRes())
{
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,14 +107,14 @@ public class JsSelectionSender extends JSFunctionExec implements
}
System.err.println("Relaying selection to jsfunction:" + _listener);
- executeJavascriptFunction( _listener,
- new Object[]
- { src, setid, jvlite.arrayToSeparatorList(seqs),
- jvlite.arrayToSeparatorList(cols) });
+ executeJavascriptFunction(_listener,
+ new Object[]
+ { src, setid, jvlite.arrayToSeparatorList(seqs),
+ jvlite.arrayToSeparatorList(cols) });
} catch (Exception ex)
{
- System.err
- .println("Jalview Javascript exec error: Couldn't send selection message using function '"
+ System.err.println(
+ "Jalview Javascript exec error: Couldn't send selection message using function '"
+ _listener + "'");
ex.printStackTrace();
if (ex instanceof netscape.javascript.JSException)
@@ -131,7 +127,6 @@ public class JsSelectionSender extends JSFunctionExec implements
}
}
-
@Override
public AlignFrame getAlignFrame()
{