git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2136 merged and resolved conflicts with 80edaa84d6d9beac9f0d2c71b50b7b56fd393427
[jalview.git]
/
src
/
jalview
/
appletgui
/
AppletJmolBinding.java
diff --git
a/src/jalview/appletgui/AppletJmolBinding.java
b/src/jalview/appletgui/AppletJmolBinding.java
index
684d357
..
d18d193
100644
(file)
--- a/
src/jalview/appletgui/AppletJmolBinding.java
+++ b/
src/jalview/appletgui/AppletJmolBinding.java
@@
-24,6
+24,8
@@
import jalview.api.AlignmentViewPanel;
import jalview.datamodel.PDBEntry;
import jalview.datamodel.SequenceI;
import jalview.ext.jmol.JalviewJmolBinding;
import jalview.datamodel.PDBEntry;
import jalview.datamodel.SequenceI;
import jalview.ext.jmol.JalviewJmolBinding;
+import jalview.gui.IProgressIndicator;
+import jalview.io.DataSourceType;
import jalview.structure.StructureSelectionManager;
import java.awt.Container;
import jalview.structure.StructureSelectionManager;
import java.awt.Container;
@@
-43,7
+45,7
@@
class AppletJmolBinding extends JalviewJmolBinding
public AppletJmolBinding(AppletJmol appletJmol,
StructureSelectionManager sSm, PDBEntry[] pdbentry,
public AppletJmolBinding(AppletJmol appletJmol,
StructureSelectionManager sSm, PDBEntry[] pdbentry,
- SequenceI[][] seq, String protocol)
+ SequenceI[][] seq, DataSourceType protocol)
{
super(sSm, pdbentry, seq, protocol);
appletJmolBinding = appletJmol;
{
super(sSm, pdbentry, seq, protocol);
appletJmolBinding = appletJmol;
@@
-196,4
+198,11
@@
class AppletJmolBinding extends JalviewJmolBinding
// TODO Auto-generated method stub
return null;
}
// TODO Auto-generated method stub
return null;
}
+
+ @Override
+ protected IProgressIndicator getIProgressIndicator()
+ {
+ // no progress indicators on the applet
+ return null;
+ }
}
}