X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FAppletJmolBinding.java;h=650693de64e05a56eb2451b474953516277036ef;hb=0616883e9c584c0f8600cfec79d9bf50cde337a4;hp=3750c207603e68f762dc23231c371ee8c0b37026;hpb=6ff6b518cb8befa795ffd2d8942fc29aa7febb72;p=jalview.git
diff --git a/src/jalview/appletgui/AppletJmolBinding.java b/src/jalview/appletgui/AppletJmolBinding.java
index 3750c20..650693d 100644
--- a/src/jalview/appletgui/AppletJmolBinding.java
+++ b/src/jalview/appletgui/AppletJmolBinding.java
@@ -1,19 +1,22 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.appletgui;
@@ -37,16 +40,18 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
*/
private AppletJmol appletJmolBinding;
- public AppletJmolBinding(AppletJmol appletJmol, StructureSelectionManager sSm, PDBEntry[] pdbentry,
+ public AppletJmolBinding(AppletJmol appletJmol,
+ StructureSelectionManager sSm, PDBEntry[] pdbentry,
SequenceI[][] seq, String[][] chains, String protocol)
{
super(sSm, pdbentry, seq, chains, protocol);
appletJmolBinding = appletJmol;
}
- public jalview.api.FeatureRenderer getFeatureRenderer(AlignmentViewPanel alignment)
+ public jalview.api.FeatureRenderer getFeatureRenderer(
+ AlignmentViewPanel alignment)
{
- AlignmentPanel ap = (AlignmentPanel)alignment;
+ AlignmentPanel ap = (AlignmentPanel) alignment;
if (appletJmolBinding.ap.av.showSequenceFeatures)
{
if (appletJmolBinding.fr == null)
@@ -63,9 +68,10 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
return appletJmolBinding.fr;
}
- public jalview.api.SequenceRenderer getSequenceRenderer(AlignmentViewPanel alignment)
+ public jalview.api.SequenceRenderer getSequenceRenderer(
+ AlignmentViewPanel alignment)
{
- return new SequenceRenderer(((AlignmentPanel)alignment).av);
+ return new SequenceRenderer(((AlignmentPanel) alignment).av);
}
public void sendConsoleEcho(String strEcho)
@@ -118,8 +124,7 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
{
jmolpopup = new JmolPopup();
- jmolpopup.initialize(viewer, translateLocale, menuName,
- asPopup);
+ jmolpopup.initialize(viewer, translateLocale, menuName, asPopup);
}
public void notifyScriptTermination(String strStatus, int msWalltime)
@@ -149,7 +154,10 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
protected JmolAppConsoleInterface createJmolConsole(JmolViewer viewer2,
Container consolePanel, String buttonsToShow)
{
- return new AppletConsole(viewer2, consolePanel);
+ // return new org.jmol.console.AppletConsole(viewer2, consolePanel);
+ JmolAppConsoleInterface appc = new org.jmol.console.AppletConsole()
+ .getAppConsole(viewer2);
+ return appc;
}
@Override
@@ -176,10 +184,11 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
public void releaseReferences(Object svl)
{
}
+
@Override
public void resizeInnerPanel(String data)
{
// TODO Auto-generated method stub
-
+
}
}