JAL-3949 Complete new abstracted logging framework in jalview.log. Updated log calls...

[jalview.git] / src / jalview / gui / StructureViewer.java

diff --git a/src/jalview/gui/StructureViewer.java b/src/jalview/gui/StructureViewer.java
index 617706a..40f9ae1 100644 (file)
--- a/src/jalview/gui/StructureViewer.java
+++ b/src/jalview/gui/StructureViewer.java
@@ -80,6 +80,7 @@ public class StructureViewer
     return sv;
   }
 
+  
   @Override
   public String toString()
   {
@@ -89,7 +90,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 +180,7 @@ public class StructureViewer
     }
     else
     {
-      Cache.log.error(UNKNOWN_VIEWER_TYPE + getViewerType().toString());
+      Cache.error(UNKNOWN_VIEWER_TYPE + getViewerType().toString());
     }
     return sview;
   }
@@ -323,7 +328,7 @@ public class StructureViewer
     }
     else
     {
-      Cache.log.error(UNKNOWN_VIEWER_TYPE + getViewerType().toString());
+      Cache.error(UNKNOWN_VIEWER_TYPE + getViewerType().toString());
     }
     return sview;
   }
@@ -361,11 +366,12 @@ public class StructureViewer
       viewer = new PymolViewer(viewerData, alignPanel, sessionFile, vid);
       break;
     default:
-      Cache.log.error(UNKNOWN_VIEWER_TYPE + type.toString());
+      Cache.error(UNKNOWN_VIEWER_TYPE + type.toString());
     }
     return viewer;
   }
 
+
   public boolean isBusy()
   {
     if (sview != null)