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-2177 Jmol update from: Jmol-14.2.14_2015.06.11 to Jmol-14.6.4_2016.10.26
[jalview.git]
/
src
/
jalview
/
appletgui
/
AppletJmolBinding.java
diff --git
a/src/jalview/appletgui/AppletJmolBinding.java
b/src/jalview/appletgui/AppletJmolBinding.java
index
6c30eed
..
ea3d3fa
100644
(file)
--- a/
src/jalview/appletgui/AppletJmolBinding.java
+++ b/
src/jalview/appletgui/AppletJmolBinding.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-29,8
+29,6
@@
import jalview.structure.StructureSelectionManager;
import java.awt.Container;
import java.util.Map;
import java.awt.Container;
import java.util.Map;
-import javajs.awt.Dimension;
-
import org.jmol.api.JmolAppConsoleInterface;
import org.jmol.console.AppletConsole;
import org.jmol.java.BS;
import org.jmol.api.JmolAppConsoleInterface;
import org.jmol.console.AppletConsole;
import org.jmol.java.BS;
@@
-113,12
+111,14
@@
class AppletJmolBinding extends JalviewJmolBinding
appletJmolBinding.updateTitleAndMenus();
}
appletJmolBinding.updateTitleAndMenus();
}
+ @Override
public void updateColours(Object source)
{
AlignmentPanel ap = (AlignmentPanel) source;
colourBySequence(ap);
}
public void updateColours(Object source)
{
AlignmentPanel ap = (AlignmentPanel) source;
colourBySequence(ap);
}
+ @Override
public void showUrl(String url)
{
try
public void showUrl(String url)
{
try
@@
-143,6
+143,7
@@
class AppletJmolBinding extends JalviewJmolBinding
// do nothing.
}
// do nothing.
}
+ @Override
public void selectionChanged(BS arg0)
{
// TODO Auto-generated method stub
public void selectionChanged(BS arg0)
{
// TODO Auto-generated method stub
@@
-183,7
+184,7
@@
class AppletJmolBinding extends JalviewJmolBinding
}
@Override
}
@Override
- public Dimension resizeInnerPanel(String data)
+ public int[] resizeInnerPanel(String data)
{
// TODO Auto-generated method stub
return null;
{
// TODO Auto-generated method stub
return null;