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-3048 refactored Desktop->File->Open to use jalview.utils.dialogrunner.DialogRunner
[jalview.git]
/
src
/
jalview
/
appletgui
/
AppletJmolBinding.java
diff --git
a/src/jalview/appletgui/AppletJmolBinding.java
b/src/jalview/appletgui/AppletJmolBinding.java
index
8ddff52
..
2f61b24
100644
(file)
--- a/
src/jalview/appletgui/AppletJmolBinding.java
+++ b/
src/jalview/appletgui/AppletJmolBinding.java
@@
-24,6
+24,7
@@
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 jalview.io.DataSourceType;
import jalview.structure.StructureSelectionManager;
@@
-54,15
+55,7
@@
class AppletJmolBinding extends JalviewJmolBinding
public jalview.api.FeatureRenderer getFeatureRenderer(
AlignmentViewPanel alignment)
{
public jalview.api.FeatureRenderer getFeatureRenderer(
AlignmentViewPanel alignment)
{
- AlignmentPanel alignPanel = (AlignmentPanel) alignment;
- if (alignPanel.av.isShowSequenceFeatures())
- {
- return alignPanel.getFeatureRenderer();
- }
- else
- {
- return null;
- }
+ return appletJmolBinding.ap.getFeatureRenderer();
}
@Override
}
@Override
@@
-118,8
+111,8
@@
class AppletJmolBinding extends JalviewJmolBinding
{
try
{
{
try
{
- appletJmolBinding.ap.av.applet.getAppletContext().showDocument(
- new java.net.URL(url), "jmol");
+ appletJmolBinding.ap.av.applet.getAppletContext()
+ .showDocument(new java.net.URL(url), "jmol");
} catch (java.net.MalformedURLException ex)
{
}
} catch (java.net.MalformedURLException ex)
{
}
@@
-191,4
+184,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;
+ }
}
}