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 from develop: Most of the changes
[jalview.git]
/
src
/
jalview
/
appletgui
/
AppletJmolBinding.java
diff --git
a/src/jalview/appletgui/AppletJmolBinding.java
b/src/jalview/appletgui/AppletJmolBinding.java
index
8ddff52
..
f1c494e
100644
(file)
--- a/
src/jalview/appletgui/AppletJmolBinding.java
+++ b/
src/jalview/appletgui/AppletJmolBinding.java
@@
-32,7
+32,7
@@
import java.util.Map;
import org.jmol.api.JmolAppConsoleInterface;
import org.jmol.console.AppletConsole;
import org.jmol.api.JmolAppConsoleInterface;
import org.jmol.console.AppletConsole;
-import org.jmol.java.BS;
+import javajs.util.BS;
class AppletJmolBinding extends JalviewJmolBinding
{
class AppletJmolBinding extends JalviewJmolBinding
{
@@
-54,15
+54,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
+110,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)
{
}
@@
-181,14
+173,12
@@
class AppletJmolBinding extends JalviewJmolBinding
@Override
public int[] resizeInnerPanel(String data)
{
@Override
public int[] resizeInnerPanel(String data)
{
- // TODO Auto-generated method stub
return null;
}
@Override
public Map<String, Object> getJSpecViewProperty(String arg0)
{
return null;
}
@Override
public Map<String, Object> getJSpecViewProperty(String arg0)
{
- // TODO Auto-generated method stub
return null;
}
}
return null;
}
}