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-2422 highlight ChimeraX selection (ChimeraX-1.0-rc-2020.05.21 +)
[jalview.git]
/
src
/
ext
/
edu
/
ucsf
/
rbvi
/
strucviz2
/
ChimeraManager.java
diff --git
a/src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java
b/src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java
index
6bb3b71
..
31f5dc8
100644
(file)
--- a/
src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java
+++ b/
src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java
@@
-32,8
+32,6
@@
*/
package ext.edu.ucsf.rbvi.strucviz2;
*/
package ext.edu.ucsf.rbvi.strucviz2;
-import jalview.ws.HttpClientUtils;
-
import java.awt.Color;
import java.io.BufferedReader;
import java.io.File;
import java.awt.Color;
import java.io.BufferedReader;
import java.io.File;
@@
-54,6
+52,7
@@
import org.slf4j.LoggerFactory;
import ext.edu.ucsf.rbvi.strucviz2.StructureManager.ModelType;
import ext.edu.ucsf.rbvi.strucviz2.port.ListenerThreads;
import ext.edu.ucsf.rbvi.strucviz2.StructureManager.ModelType;
import ext.edu.ucsf.rbvi.strucviz2.port.ListenerThreads;
+import jalview.ws.HttpClientUtils;
/**
* This object maintains the Chimera communication information.
/**
* This object maintains the Chimera communication information.
@@
-439,14
+438,6
@@
public class ChimeraManager
{
List<String> selectedResidues = new ArrayList<>();
{
List<String> selectedResidues = new ArrayList<>();
- /*
- * skip for now if ChimeraX - request times out
- */
- if (isChimeraX)
- {
- return selectedResidues;
- }
-
// in fact 'listinfo' (undocumented) works in ChimeraX
String command = (isChimeraX
? "info"
// in fact 'listinfo' (undocumented) works in ChimeraX
String command = (isChimeraX
? "info"