X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjavascript%2FJsSelectionSender.java;h=7b30d3e7224a8b87c0dd312f2b1fe424f5bd4d30;hb=eb3e681d6e82ccdd5d312d1981dfb306e7f479f0;hp=dc08b59f30dafac4a7d08f0b205b4b25fe87991c;hpb=8d44c38e7028bcce53c0370dec67baa5d8d209c9;p=jalview.git diff --git a/src/jalview/javascript/JsSelectionSender.java b/src/jalview/javascript/JsSelectionSender.java index dc08b59..7b30d3e 100644 --- a/src/jalview/javascript/JsSelectionSender.java +++ b/src/jalview/javascript/JsSelectionSender.java @@ -23,11 +23,12 @@ package jalview.javascript; import jalview.appletgui.AlignFrame; import jalview.bin.JalviewLite; import jalview.datamodel.ColumnSelection; +import jalview.datamodel.HiddenColumns; import jalview.datamodel.SequenceGroup; import jalview.structure.SelectionSource; -public class JsSelectionSender extends JSFunctionExec implements - jalview.structure.SelectionListener, JsCallBack +public class JsSelectionSender extends JSFunctionExec + implements jalview.structure.SelectionListener, JsCallBack { AlignFrame _af; @@ -44,9 +45,10 @@ 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); + // jalview.bin.Console.errPrintln("Testing selection event relay to + // jsfunction:"+_listener); try { String setid = ""; @@ -63,8 +65,8 @@ 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(); + int strt = 0, end = (src == null) ? -1 + : src.alignPanel.av.getAlignment().getWidth(); if (seqsel != null && seqsel.getSize() > 0) { seqs = new String[seqsel.getSize()]; @@ -104,19 +106,21 @@ public class JsSelectionSender extends JSFunctionExec implements ; } - System.err.println("Relaying selection to jsfunction:" + _listener); + jalview.bin.Console + .errPrintln("Relaying selection to jsfunction:" + _listener); executeJavascriptFunction(_listener, - new Object[] { src, setid, jvlite.arrayToSeparatorList(seqs), + 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 '" + jalview.bin.Console.errPrintln( + "Jalview Javascript exec error: Couldn't send selection message using function '" + _listener + "'"); ex.printStackTrace(); if (ex instanceof netscape.javascript.JSException) { - System.err.println("Javascript Exception: " + jalview.bin.Console.errPrintln("Javascript Exception: " + ((netscape.javascript.JSException) ex).getCause() .toString()); }