X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjavascript%2FJsSelectionSender.java;h=dc08b59f30dafac4a7d08f0b205b4b25fe87991c;hb=refs%2Fheads%2Freleases%2FRelease_2_10_0_Branch;hp=6302ef2ffb6052c697f94221f97eb5a247a852b2;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git

diff --git a/src/jalview/javascript/JsSelectionSender.java b/src/jalview/javascript/JsSelectionSender.java
index 6302ef2..dc08b59 100644
--- a/src/jalview/javascript/JsSelectionSender.java
+++ b/src/jalview/javascript/JsSelectionSender.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -50,7 +50,6 @@ public class JsSelectionSender extends JSFunctionExec implements
     try
     {
       String setid = "";
-      String viewid = "";
       AlignFrame src = _af;
       if (source != null)
       {
@@ -62,10 +61,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 +81,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 +105,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)
     {