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-2320 added getViewer() method to return Chimera or Jmol panel
[jalview.git]
/
src
/
jalview
/
gui
/
AppJmolBinding.java
diff --git
a/src/jalview/gui/AppJmolBinding.java
b/src/jalview/gui/AppJmolBinding.java
index
1c54a5e
..
ffa34f8
100644
(file)
--- a/
src/jalview/gui/AppJmolBinding.java
+++ b/
src/jalview/gui/AppJmolBinding.java
@@
-21,6
+21,7
@@
package jalview.gui;
import jalview.api.AlignmentViewPanel;
package jalview.gui;
import jalview.api.AlignmentViewPanel;
+import jalview.api.structures.JalviewStructureDisplayI;
import jalview.bin.Cache;
import jalview.datamodel.PDBEntry;
import jalview.datamodel.SequenceI;
import jalview.bin.Cache;
import jalview.datamodel.PDBEntry;
import jalview.datamodel.SequenceI;
@@
-113,6
+114,7
@@
public class AppJmolBinding extends JalviewJmolBinding
// appJmolWindow.repaint();
javax.swing.SwingUtilities.invokeLater(new Runnable()
{
// appJmolWindow.repaint();
javax.swing.SwingUtilities.invokeLater(new Runnable()
{
+ @Override
public void run()
{
appJmolWindow.updateTitleAndMenus();
public void run()
{
appJmolWindow.updateTitleAndMenus();
@@
-121,6
+123,7
@@
public class AppJmolBinding extends JalviewJmolBinding
});
}
});
}
+ @Override
public void updateColours(Object source)
{
AlignmentPanel ap = (AlignmentPanel) source;
public void updateColours(Object source)
{
AlignmentPanel ap = (AlignmentPanel) source;
@@
-144,6
+147,7
@@
public class AppJmolBinding extends JalviewJmolBinding
// msWalltime);
}
// msWalltime);
}
+ @Override
public void showUrl(String url)
{
showUrl(url, "jmol");
public void showUrl(String url)
{
showUrl(url, "jmol");
@@
-205,4
+209,10
@@
public class AppJmolBinding extends JalviewJmolBinding
// TODO Auto-generated method stub
return null;
}
// TODO Auto-generated method stub
return null;
}
+
+ @Override
+ public JalviewStructureDisplayI getViewer()
+ {
+ return appJmolWindow;
+ }
}
}