X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAppletJmol.java;h=c9ff8210962f97bfe7d729d9b1378191a2d75335;hb=3ab582bfeeab1563bedf60e97994e63e672d2e31;hp=4e173ef0e3b33c8391452b368f64fd99eecab531;hpb=db93a1adcbe0a4eaaf06e0a70ade0d6c5c1961c3;p=jalview.git diff --git a/src/jalview/appletgui/AppletJmol.java b/src/jalview/appletgui/AppletJmol.java index 4e173ef..c9ff821 100644 --- a/src/jalview/appletgui/AppletJmol.java +++ b/src/jalview/appletgui/AppletJmol.java @@ -60,12 +60,9 @@ import java.awt.event.KeyListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.util.ArrayList; -import java.util.Hashtable; import java.util.List; import java.util.Vector; -import org.jmol.util.Logger; - public class AppletJmol extends EmbmenuFrame implements // StructureListener, KeyListener, ActionListener, ItemListener @@ -271,7 +268,6 @@ public class AppletJmol extends EmbmenuFrame implements jmb.allocateViewer(renderPanel, true, ap.av.applet.getName() + "_jmol_", ap.av.applet.getDocumentBase(), ap.av.applet.getCodeBase(), "-applet", scriptWindow, null); - Logger.setLogLevel(Logger.LEVEL_WARN); } catch (Exception e) { System.err @@ -293,11 +289,8 @@ public class AppletJmol extends EmbmenuFrame implements closeViewer(); } }); - if (pdbentry.getProperty() == null) - { - pdbentry.setProperty(new Hashtable()); - pdbentry.getProperty().put("protocol", protocol); - } + pdbentry.setProperty("protocol", protocol); + if (pdbentry.getFile() != null) { // import structure data from pdbentry.getFile based on given protocol