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
Merge branch 'codereviews/JAL-1990_IProgressIndicator_jalview.structure' into patch...
[jalview.git]
/
src
/
jalview
/
appletgui
/
ExtJmol.java
diff --git
a/src/jalview/appletgui/ExtJmol.java
b/src/jalview/appletgui/ExtJmol.java
index
3966536
..
89228d5
100644
(file)
--- a/
src/jalview/appletgui/ExtJmol.java
+++ b/
src/jalview/appletgui/ExtJmol.java
@@
-26,6
+26,7
@@
import jalview.api.SequenceRenderer;
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 java.awt.Container;
import jalview.io.DataSourceType;
import java.awt.Container;
@@
-65,6
+66,13
@@
public class ExtJmol extends JalviewJmolBinding
}
@Override
}
@Override
+ protected IProgressIndicator getIProgressIndicator()
+ {
+ // no progress indicators on applet (could access javascript for this)
+ return null;
+ }
+
+ @Override
public void updateColours(Object source)
{
public void updateColours(Object source)
{
@@
-92,6
+100,7
@@
public class ExtJmol extends JalviewJmolBinding
}
}
}
}
+
@Override
public SequenceRenderer getSequenceRenderer(AlignmentViewPanel alignment)
{
@Override
public SequenceRenderer getSequenceRenderer(AlignmentViewPanel alignment)
{
@@
-137,8
+146,8
@@
public class ExtJmol extends JalviewJmolBinding
@Override
public void refreshPdbEntries()
{
@Override
public void refreshPdbEntries()
{
- List<PDBEntry> pdbe = new ArrayList<PDBEntry>();
- List<String> fileids = new ArrayList<String>();
+ List<PDBEntry> pdbe = new ArrayList<>();
+ List<String> fileids = new ArrayList<>();
SequenceI[] sq = ap.av.getAlignment().getSequencesArray();
for (int s = 0; s < sq.length; s++)
{
SequenceI[] sq = ap.av.getAlignment().getSequencesArray();
for (int s = 0; s < sq.length; s++)
{