Merge commit 'ab43013b7e357b84b4abade0dba949668dfb2a0e' into develop

[jalview.git] / src / jalview / appletgui / ExtJmol.java

diff --git a/src/jalview/appletgui/ExtJmol.java b/src/jalview/appletgui/ExtJmol.java
index 4746932..1f0686e 100644 (file)
--- a/src/jalview/appletgui/ExtJmol.java
+++ b/src/jalview/appletgui/ExtJmol.java
@@ -20,14 +20,6 @@
  */
 package jalview.appletgui;
 
-import java.awt.Container;
-import java.util.BitSet;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.jmol.api.JmolAppConsoleInterface;
-import org.jmol.api.JmolViewer;
-
 import jalview.api.AlignmentViewPanel;
 import jalview.api.FeatureRenderer;
 import jalview.api.SequenceRenderer;
@@ -35,6 +27,15 @@ import jalview.datamodel.PDBEntry;
 import jalview.datamodel.SequenceI;
 import jalview.ext.jmol.JalviewJmolBinding;
 
+import java.awt.Container;
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.List;
+import java.util.Vector;
+
+import org.jmol.api.JmolAppConsoleInterface;
+import org.jmol.api.JmolViewer;
+
 /**
  * bind an alignment view to an external Jmol instance.
  * 
@@ -57,9 +58,8 @@ public class ExtJmol extends JalviewJmolBinding
   public ExtJmol(JmolViewer viewer, AlignmentPanel alignPanel,
           SequenceI[][] seqs)
   {
-    super(alignPanel.getStructureSelectionManager(), viewer);
+    super(alignPanel.getStructureSelectionManager(), seqs, viewer);
     ap = alignPanel;
-    this.sequence = seqs;
     notifyFileLoaded(null, null, null, null, 0);
   }
 
@@ -78,7 +78,7 @@ public class ExtJmol extends JalviewJmolBinding
   public FeatureRenderer getFeatureRenderer(AlignmentViewPanel alignment)
   {
     AlignmentPanel ap = (AlignmentPanel) alignment;
-    if (ap.av.showSequenceFeatures)
+    if (ap.av.isShowSequenceFeatures())
     {
       return ap.getFeatureRenderer();
     }
@@ -125,8 +125,8 @@ public class ExtJmol extends JalviewJmolBinding
 
   public void refreshPdbEntries()
   {
-    Vector pdbe = new Vector();
-    Hashtable fileids = new Hashtable();
+    List<PDBEntry> pdbe = new ArrayList<PDBEntry>();
+    List<String> fileids = new ArrayList<String>();
     SequenceI[] sq = ap.av.getAlignment().getSequencesArray();
     for (int s = 0; s < sq.length; s++)
     {
@@ -136,18 +136,23 @@ public class ExtJmol extends JalviewJmolBinding
         for (int pe = 0, peSize = pdbids.size(); pe < peSize; pe++)
         {
           PDBEntry pentry = (PDBEntry) pdbids.elementAt(pe);
-          if (!fileids.containsKey(pentry.getId()))
+          if (!fileids.contains(pentry.getId()))
           {
-            pdbe.addElement(pentry);
+            pdbe.add(pentry);
+          }
+          else
+          {
+            fileids.add(pentry.getId());
           }
         }
       }
     }
-    pdbentry = new PDBEntry[pdbe.size()];
+    PDBEntry[] newEntries = new PDBEntry[pdbe.size()];
     for (int pe = 0; pe < pdbe.size(); pe++)
     {
-      pdbentry[pe] = (PDBEntry) pdbe.elementAt(pe);
+      newEntries[pe] = pdbe.get(pe);
     }
+    setPdbentry(newEntries);
   }
 
   @Override
@@ -172,19 +177,7 @@ public class ExtJmol extends JalviewJmolBinding
   protected void releaseUIResources()
   {
     ap = null;
-    if (console != null)
-    {
-      try
-      {
-        console.setVisible(false);
-      } catch (Error e)
-      {
-      } catch (Exception x)
-      {
-      }
-      ;
-      console = null;
-    }
+    closeConsole();
 
   }