X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FStructureViewer.java;h=5effa1a9c19ef37feb8d4aaaf719887c66ad8106;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=40f9ae1cca5bbd9dc444011c808a4a474a18aeee;hpb=a1984b1c8c273ed33c7ce9283039f4027dcae2de;p=jalview.git diff --git a/src/jalview/gui/StructureViewer.java b/src/jalview/gui/StructureViewer.java index 40f9ae1..5effa1a 100644 --- a/src/jalview/gui/StructureViewer.java +++ b/src/jalview/gui/StructureViewer.java @@ -29,6 +29,7 @@ import java.util.Map.Entry; import jalview.api.structures.JalviewStructureDisplayI; import jalview.bin.Cache; +import jalview.bin.Console; import jalview.datamodel.PDBEntry; import jalview.datamodel.SequenceI; import jalview.datamodel.StructureViewerModel; @@ -63,7 +64,8 @@ public class StructureViewer * * @param structureSelectionManager */ - public StructureViewer(StructureSelectionManager structureSelectionManager) + public StructureViewer( + StructureSelectionManager structureSelectionManager) { ssm = structureSelectionManager; } @@ -80,7 +82,6 @@ public class StructureViewer return sv; } - @Override public String toString() { @@ -90,9 +91,10 @@ public class StructureViewer } return "New View"; } + /** * - * @return ViewerType for currently configured structure viewer + * @return ViewerType for currently configured structure viewer */ public static ViewerType getViewerType() { @@ -130,10 +132,10 @@ public class StructureViewer Map seqsForPdbs = getSequencesForPdbs(pdbs, seqs); - PDBEntry[] pdbsForFile = seqsForPdbs.keySet().toArray( - new PDBEntry[seqsForPdbs.size()]); - SequenceI[][] theSeqs = seqsForPdbs.values().toArray( - new SequenceI[seqsForPdbs.size()][]); + PDBEntry[] pdbsForFile = seqsForPdbs.keySet() + .toArray(new PDBEntry[seqsForPdbs.size()]); + SequenceI[][] theSeqs = seqsForPdbs.values() + .toArray(new SequenceI[seqsForPdbs.size()][]); if (sview != null) { sview.setAlignAddedStructures(superposeAdded); @@ -180,7 +182,7 @@ public class StructureViewer } else { - Cache.error(UNKNOWN_VIEWER_TYPE + getViewerType().toString()); + Console.error(UNKNOWN_VIEWER_TYPE + getViewerType().toString()); } return sview; } @@ -328,7 +330,7 @@ public class StructureViewer } else { - Cache.error(UNKNOWN_VIEWER_TYPE + getViewerType().toString()); + Console.error(UNKNOWN_VIEWER_TYPE + getViewerType().toString()); } return sview; } @@ -366,12 +368,11 @@ public class StructureViewer viewer = new PymolViewer(viewerData, alignPanel, sessionFile, vid); break; default: - Cache.error(UNKNOWN_VIEWER_TYPE + type.toString()); + Console.error(UNKNOWN_VIEWER_TYPE + type.toString()); } return viewer; } - public boolean isBusy() { if (sview != null)