X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAppletJmol.java;h=6665ec839ef4e440bc202ab58ee9d2de1477b92e;hb=4f30214e8098748469c6a4269ac2ed6c5750e4b0;hp=89a912f9907f9575fbe0f09affe1c8dd9e44ad9a;hpb=2ab7b9b152018bb808693218ad88dc3778166492;p=jalview.git diff --git a/src/jalview/appletgui/AppletJmol.java b/src/jalview/appletgui/AppletJmol.java index 89a912f..6665ec8 100644 --- a/src/jalview/appletgui/AppletJmol.java +++ b/src/jalview/appletgui/AppletJmol.java @@ -20,25 +20,6 @@ */ package jalview.appletgui; -import jalview.bin.JalviewLite; -import jalview.datamodel.AlignmentI; -import jalview.datamodel.PDBEntry; -import jalview.datamodel.SequenceI; -import jalview.io.DataSourceType; -import jalview.io.FileParse; -import jalview.io.StructureFile; -import jalview.schemes.BuriedColourScheme; -import jalview.schemes.HelixColourScheme; -import jalview.schemes.HydrophobicColourScheme; -import jalview.schemes.PurinePyrimidineColourScheme; -import jalview.schemes.StrandColourScheme; -import jalview.schemes.TaylorColourScheme; -import jalview.schemes.TurnColourScheme; -import jalview.schemes.UserColourScheme; -import jalview.schemes.ZappoColourScheme; -import jalview.structure.StructureSelectionManager; -import jalview.util.MessageManager; - import java.awt.BorderLayout; import java.awt.CheckboxMenuItem; import java.awt.Color; @@ -64,6 +45,25 @@ import java.util.ArrayList; import java.util.List; import java.util.Vector; +import jalview.bin.JalviewLite; +import jalview.datamodel.AlignmentI; +import jalview.datamodel.PDBEntry; +import jalview.datamodel.SequenceI; +import jalview.io.DataSourceType; +import jalview.io.FileParse; +import jalview.io.StructureFile; +import jalview.schemes.BuriedColourScheme; +import jalview.schemes.HelixColourScheme; +import jalview.schemes.HydrophobicColourScheme; +import jalview.schemes.PurinePyrimidineColourScheme; +import jalview.schemes.StrandColourScheme; +import jalview.schemes.TaylorColourScheme; +import jalview.schemes.TurnColourScheme; +import jalview.schemes.UserColourScheme; +import jalview.schemes.ZappoColourScheme; +import jalview.structure.StructureSelectionManager; +import jalview.util.MessageManager; + public class AppletJmol extends EmbmenuFrame implements // StructureListener, KeyListener, ActionListener, ItemListener @@ -335,7 +335,7 @@ public class AppletJmol extends EmbmenuFrame implements } FileParse fp = new FileParse(pdbentry.getFile(), protocol); fp.mark(); - // reader = new MCview.PDBfile(fp); + // reader = new mc_view.PDBfile(fp); // could set ID, etc. // if (!reader.isValid()) // { @@ -411,7 +411,7 @@ public class AppletJmol extends EmbmenuFrame implements void closeViewer() { - jmb.closeViewer(); + jmb.closeViewer(true); jmb = null; this.setVisible(false); }