JAL-1824 updated caching procedure for pdb entries. Also refactored getPDBEntry metho...

[jalview.git] / test / jalview / ext / rbvi / chimera / JalviewChimeraView.java

diff --git a/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java b/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java
index 0c5d7fa..4bfabb3 100644 (file)
--- a/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java
+++ b/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java
@@ -56,15 +56,15 @@ public class JalviewChimeraView
       {
         dsq = dsq.getDatasetSequence();
       }
-      if (dsq.getPDBId() != null && dsq.getPDBId().size() > 0)
+      if (dsq.getAllPDBEntries() != null && dsq.getAllPDBEntries().size() > 0)
       {
-        for (int q = 0; q < dsq.getPDBId().size(); q++)
+        for (int q = 0; q < dsq.getAllPDBEntries().size(); q++)
         {
           final StructureViewer structureViewer = new StructureViewer(af
                   .getViewport().getStructureSelectionManager());
           structureViewer.setViewerType(ViewerType.JMOL);
           JalviewStructureDisplayI jmolViewer = structureViewer
-                  .viewStructures(dsq.getPDBId().elementAt(q),
+                  .viewStructures(dsq.getAllPDBEntries().elementAt(q),
                           new SequenceI[]
                   { sq }, af.getCurrentView().getAlignPanel());
           /*
@@ -100,15 +100,15 @@ public class JalviewChimeraView
       {
         dsq = dsq.getDatasetSequence();
       }
-      if (dsq.getPDBId() != null && dsq.getPDBId().size() > 0)
+      if (dsq.getAllPDBEntries() != null && dsq.getAllPDBEntries().size() > 0)
       {
-        for (int q = 0; q < dsq.getPDBId().size(); q++)
+        for (int q = 0; q < dsq.getAllPDBEntries().size(); q++)
         {
           final StructureViewer structureViewer = new StructureViewer(af
                   .getViewport().getStructureSelectionManager());
           structureViewer.setViewerType(ViewerType.CHIMERA);
           JalviewStructureDisplayI chimeraViewer = structureViewer
-                  .viewStructures(dsq.getPDBId().elementAt(q),
+                  .viewStructures(dsq.getAllPDBEntries().elementAt(q),
                           new SequenceI[]
                           { sq }, af.getCurrentView().getAlignPanel());
           /*