From: j.procter@dundee.ac.uk <jprocter@lifesci-14319.dyn.lifesci.dundee.ac.uk>
Date: Tue, 22 Jul 2014 20:09:36 +0000 (+0100)
Subject: Merge branch 'features/JAL-1333' into Release_2_8_2_Branch
X-Git-Tag: Release_2_8_2b1^2~58
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5776f8fbf1b6c23caec6cd23d76902d228119332;hp=5e57181bca4cbbdd3ff8f7f67aaa7bd22ffc710b;p=jalview.git

Merge branch 'features/JAL-1333' into Release_2_8_2_Branch
---

diff --git a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
index fcf89af..11aa5c0 100644
--- a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
+++ b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
@@ -20,7 +20,6 @@
  */
 package jalview.ext.rbvi.chimera;
 
-import static org.junit.Assert.assertTrue;
 import jalview.api.AlignmentViewPanel;
 import jalview.api.FeatureRenderer;
 import jalview.api.SequenceRenderer;
@@ -39,14 +38,9 @@ import jalview.structure.StructureSelectionManager;
 import jalview.structures.models.SequenceStructureBindingModel;
 
 import java.awt.Color;
-import java.awt.Container;
 import java.awt.event.ComponentEvent;
-import java.awt.event.ComponentListener;
 import java.io.File;
-import java.net.URL;
-import java.security.AccessControlException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -54,19 +48,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 
-import org.jmol.adapter.smarter.SmarterJmolAdapter;
-import org.jmol.api.JmolAppConsoleInterface;
-import org.jmol.api.JmolSelectionListener;
-import org.jmol.api.JmolStatusListener;
-import org.jmol.api.JmolViewer;
-import org.jmol.constant.EnumCallback;
-import org.jmol.popup.JmolPopup;
-
 import ext.edu.ucsf.rbvi.strucviz2.ChimeraManager;
 import ext.edu.ucsf.rbvi.strucviz2.ChimeraModel;
 import ext.edu.ucsf.rbvi.strucviz2.StructureManager;
 import ext.edu.ucsf.rbvi.strucviz2.StructureManager.ModelType;
-import sun.rmi.runtime.Log;
 
 public abstract class JalviewChimeraBinding extends
         SequenceStructureBindingModel implements StructureListener,