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-2136 merged develop into branch to fix build failure
[jalview.git]
/
src
/
jalview
/
appletgui
/
ExtJmol.java
diff --git
a/src/jalview/appletgui/ExtJmol.java
b/src/jalview/appletgui/ExtJmol.java
index
cb99f87
..
7a48770
100644
(file)
--- a/
src/jalview/appletgui/ExtJmol.java
+++ b/
src/jalview/appletgui/ExtJmol.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 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.
*
@@
-26,15
+26,18
@@
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 java.util.ArrayList;
import java.awt.Container;
import java.util.ArrayList;
-import java.util.BitSet;
import java.util.List;
import java.util.List;
+import java.util.Map;
import java.util.Vector;
import org.jmol.api.JmolAppConsoleInterface;
import java.util.Vector;
import org.jmol.api.JmolAppConsoleInterface;
-import org.jmol.api.JmolViewer;
+import org.jmol.java.BS;
+import org.jmol.viewer.Viewer;
/**
* bind an alignment view to an external Jmol instance.
/**
* bind an alignment view to an external Jmol instance.
@@
-47,15
+50,15
@@
public class ExtJmol extends JalviewJmolBinding
private AlignmentPanel ap;
private AlignmentPanel ap;
- protected ExtJmol(jalview.appletgui.AlignFrame alframe,
- PDBEntry[] pdbentry, SequenceI[][] seq, String[][] chains,
- String protocol)
+ protected ExtJmol(AlignFrame alframe,
+ PDBEntry[] pdbentry, SequenceI[][] seq,
+ DataSourceType protocol)
{
super(alframe.alignPanel.getStructureSelectionManager(), pdbentry, seq,
{
super(alframe.alignPanel.getStructureSelectionManager(), pdbentry, seq,
- chains, protocol);
+ protocol);
}
}
- public ExtJmol(JmolViewer viewer, AlignmentPanel alignPanel,
+ public ExtJmol(Viewer viewer, AlignmentPanel alignPanel,
SequenceI[][] seqs)
{
super(alignPanel.getStructureSelectionManager(), seqs, viewer);
SequenceI[][] seqs)
{
super(alignPanel.getStructureSelectionManager(), seqs, viewer);
@@
-63,6
+66,14
@@
public class ExtJmol extends JalviewJmolBinding
notifyFileLoaded(null, null, null, null, 0);
}
notifyFileLoaded(null, null, null, null, 0);
}
+ @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)
{
@@
-70,17
+81,19
@@
public class ExtJmol extends JalviewJmolBinding
}
}
+ @Override
public void showUrl(String arg0)
{
showUrl(arg0, "jmol");
}
public void showUrl(String arg0)
{
showUrl(arg0, "jmol");
}
+ @Override
public FeatureRenderer getFeatureRenderer(AlignmentViewPanel alignment)
{
public FeatureRenderer getFeatureRenderer(AlignmentViewPanel alignment)
{
- AlignmentPanel ap = (AlignmentPanel) alignment;
- if (ap.av.isShowSequenceFeatures())
+ AlignmentPanel alignPanel = (AlignmentPanel) alignment;
+ if (alignPanel.av.isShowSequenceFeatures())
{
{
- return ap.getFeatureRenderer();
+ return alignPanel.getFeatureRenderer();
}
else
{
}
else
{
@@
-88,41
+101,50
@@
public class ExtJmol extends JalviewJmolBinding
}
}
}
}
+
+ @Override
public SequenceRenderer getSequenceRenderer(AlignmentViewPanel alignment)
{
return ((AlignmentPanel) alignment).getSequenceRenderer();
}
public SequenceRenderer getSequenceRenderer(AlignmentViewPanel alignment)
{
return ((AlignmentPanel) alignment).getSequenceRenderer();
}
+ @Override
public void notifyScriptTermination(String strStatus, int msWalltime)
{
// ignore
}
public void notifyScriptTermination(String strStatus, int msWalltime)
{
// ignore
}
+ @Override
public void sendConsoleEcho(String strEcho)
{
// ignore
}
public void sendConsoleEcho(String strEcho)
{
// ignore
}
+ @Override
public void sendConsoleMessage(String strStatus)
{
// ignore
}
public void sendConsoleMessage(String strStatus)
{
// ignore
}
+ @Override
public void showUrl(String url, String target)
{
ap.alignFrame.showURL(url, target);
}
public void showUrl(String url, String target)
{
ap.alignFrame.showURL(url, target);
}
+ @Override
public void refreshGUI()
{
// ignore
}
public void refreshGUI()
{
// ignore
}
- public void selectionChanged(BitSet arg0)
+ @Override
+ public void selectionChanged(BS arg0)
{
System.out.println(arg0);
}
{
System.out.println(arg0);
}
+ @Override
public void refreshPdbEntries()
{
List<PDBEntry> pdbe = new ArrayList<PDBEntry>();
public void refreshPdbEntries()
{
List<PDBEntry> pdbe = new ArrayList<PDBEntry>();
@@
-130,12
+152,12
@@
public class ExtJmol extends JalviewJmolBinding
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++)
{
- Vector pdbids = sq[s].getPDBId();
+ Vector<PDBEntry> pdbids = sq[s].getAllPDBEntries();
if (pdbids != null)
{
for (int pe = 0, peSize = pdbids.size(); pe < peSize; pe++)
{
if (pdbids != null)
{
for (int pe = 0, peSize = pdbids.size(); pe < peSize; pe++)
{
- PDBEntry pentry = (PDBEntry) pdbids.elementAt(pe);
+ PDBEntry pentry = pdbids.elementAt(pe);
if (!fileids.contains(pentry.getId()))
{
pdbe.add(pentry);
if (!fileids.contains(pentry.getId()))
{
pdbe.add(pentry);
@@
-166,7
+188,7
@@
public class ExtJmol extends JalviewJmolBinding
}
@Override
}
@Override
- protected JmolAppConsoleInterface createJmolConsole(JmolViewer viewer2,
+ protected JmolAppConsoleInterface createJmolConsole(
Container consolePanel, String buttonsToShow)
{
// TODO Auto-generated method stub
Container consolePanel, String buttonsToShow)
{
// TODO Auto-generated method stub
@@
-188,4
+210,11
@@
public class ExtJmol extends JalviewJmolBinding
}
}
+ @Override
+ public Map<String, Object> getJSpecViewProperty(String arg0)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
}