X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fjmol%2FJalviewJmolBinding.java;h=848eb75f85f4beb2141fe10ebaa4f394188a45a6;hb=304e64fb34b32659be1bbfd39fb4e15b2f79586e;hp=903d9b7c53faed57f0b58f2490c44f61758de5d2;hpb=61ff8fb4efa315c35149c9d11850d99e3d00c441;p=jalview.git diff --git a/src/jalview/ext/jmol/JalviewJmolBinding.java b/src/jalview/ext/jmol/JalviewJmolBinding.java index 903d9b7..848eb75 100644 --- a/src/jalview/ext/jmol/JalviewJmolBinding.java +++ b/src/jalview/ext/jmol/JalviewJmolBinding.java @@ -32,7 +32,6 @@ import java.util.StringTokenizer; import java.util.Vector; import javax.swing.SwingUtilities; - import org.jmol.adapter.smarter.SmarterJmolAdapter; import org.jmol.api.JmolAppConsoleInterface; import org.jmol.api.JmolSelectionListener; @@ -60,13 +59,13 @@ import jalview.structure.StructureSelectionManager; import jalview.structures.models.AAStructureBindingModel; import jalview.ws.dbsources.Pdb; import javajs.util.BS; - public abstract class JalviewJmolBinding extends AAStructureBindingModel implements JmolStatusListener, JmolSelectionListener, ComponentListener { private String lastMessage; + /* * when true, try to search the associated datamodel for sequences that are * associated with any unknown structures in the Jmol view. @@ -137,6 +136,7 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel { return null; } + String cmd = command.getCommand(); jmolHistory(false); if (lastCommand == null || !lastCommand.equals(cmd)) @@ -186,6 +186,7 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel return null; } + /** * map between index of model filename returned from getPdbFile and the first * index of models from this file in the viewer. Note - this is not trimmed - @@ -297,6 +298,7 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel jmolScript(cmd.toString()); jmolHistory(true); + } private boolean debug = true; @@ -782,6 +784,7 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel setLoadingFromArchive(false); } + protected IProgressIndicator getIProgressIndicator() { return null; @@ -825,6 +828,7 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel } + public void showHelp() { showUrl("http://wiki.jmol.org"