X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FStructureViewer.java;h=ad412b09e5c4037c77e81dca9af6c0c37bdbac79;hb=392bd8b22b29e49caab9d8053ac3cf0989f77fe4;hp=617706a9b73752f41e4b3c19b0dbb7d20d6d8517;hpb=7720585dc8cc56cdad2486b330ed37ddd0133531;p=jalview.git diff --git a/src/jalview/gui/StructureViewer.java b/src/jalview/gui/StructureViewer.java index 617706a..ad412b0 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; @@ -80,6 +81,7 @@ public class StructureViewer return sv; } + @Override public String toString() { @@ -89,7 +91,11 @@ public class StructureViewer } return "New View"; } - public ViewerType getViewerType() + /** + * + * @return ViewerType for currently configured structure viewer + */ + public static ViewerType getViewerType() { String viewType = Cache.getDefault(Preferences.STRUCTURE_DISPLAY, ViewerType.JMOL.name()); @@ -175,7 +181,7 @@ public class StructureViewer } else { - Cache.log.error(UNKNOWN_VIEWER_TYPE + getViewerType().toString()); + Console.error(UNKNOWN_VIEWER_TYPE + getViewerType().toString()); } return sview; } @@ -323,7 +329,7 @@ public class StructureViewer } else { - Cache.log.error(UNKNOWN_VIEWER_TYPE + getViewerType().toString()); + Console.error(UNKNOWN_VIEWER_TYPE + getViewerType().toString()); } return sview; } @@ -361,11 +367,12 @@ public class StructureViewer viewer = new PymolViewer(viewerData, alignPanel, sessionFile, vid); break; default: - Cache.log.error(UNKNOWN_VIEWER_TYPE + type.toString()); + Console.error(UNKNOWN_VIEWER_TYPE + type.toString()); } return viewer; } + public boolean isBusy() { if (sview != null)