X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fjavascript%2FMouseOverStructureListener.java;h=c1d3a402deb39cd02dff981c906f119db8266229;hb=362f2db1b01f3562784864a1d6ac5f7b9be0a18a;hp=2f28820d980063cca2ea01acefcf1f6d6783283a;hpb=57dc00f8b62b404e14bd7e689ecc510ab24aeecf;p=jalview.git

diff --git a/src/jalview/javascript/MouseOverStructureListener.java b/src/jalview/javascript/MouseOverStructureListener.java
index 2f28820..c1d3a40 100644
--- a/src/jalview/javascript/MouseOverStructureListener.java
+++ b/src/jalview/javascript/MouseOverStructureListener.java
@@ -113,7 +113,7 @@ public class MouseOverStructureListener extends JSFunctionExec implements
   {
     final Object source = srce;
     StructureSelectionManager ssm = StructureSelectionManager
-            .getStructureSelectionManager();
+            .getStructureSelectionManager(jvlite);
     // if (jvlite.debug)
     // {
     // ssm.reportMapping();
@@ -160,23 +160,28 @@ public class MouseOverStructureListener extends JSFunctionExec implements
       final String[] colcommands = JmolCommands.getColourBySequenceCommand(
               ssm, modelSet, sequence, sr, fr,
               ((AlignmentViewPanel) source).getAlignment());
+      if (colcommands==null)
+      {
+        // 
+        return;
+      }
       String mclass,mhandle;
       if (jvlite.isJsMessageSetChanged(mclass="colourstruct",mhandle=((jalview.appletgui.AlignmentPanel) source).av
               .getViewId(), colcommands)) {
       jvlite.setJsMessageSet(mclass, mhandle , colcommands);
       // and notify javascript handler
-      String st[] = new String[0];
+      String st[] = new String[]
+                                                  {
+              "colourstruct",
+              ""
+                      + ((jalview.appletgui.AlignmentPanel) source).av
+                              .getViewId(), ""+colcommands.length, ""+(colcommands[0]!=null ? colcommands[0].length() : 0)};
       try
       {
         executeJavascriptFunction(
                 true,
-                _listenerfn,
-                st = new String[]
-                {
-                    "colourstruct",
-                    ""
-                            + ((jalview.appletgui.AlignmentPanel) source).av
-                                    .getViewId(), ""+colcommands.length, "" });
+                _listenerfn,st
+);
       } catch (Exception ex)
       {
         System.err.println("Couldn't execute callback with "
@@ -243,9 +248,15 @@ public class MouseOverStructureListener extends JSFunctionExec implements
     return _listenerfn;
   }
 
+  public void finalise()
+  {
+    jvlite=null;
+    super.finalize();
+  }
   @Override
   public void releaseReferences(Object svl)
   {
+    
     // TODO Auto-generated method stub
 
   }