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 branch 'features/JAL-2465_No-mapping_Jmol-structures-loaded-via-url' into develop
[jalview.git]
/
src
/
jalview
/
gui
/
StructureViewerBase.java
diff --git
a/src/jalview/gui/StructureViewerBase.java
b/src/jalview/gui/StructureViewerBase.java
index
e37627d
..
e73ce07
100644
(file)
--- a/
src/jalview/gui/StructureViewerBase.java
+++ b/
src/jalview/gui/StructureViewerBase.java
@@
-919,7
+919,7
@@
public abstract class StructureViewerBase extends GStructureViewer
{
// TODO: cope with multiple PDB files in view
in = new BufferedReader(
{
// TODO: cope with multiple PDB files in view
in = new BufferedReader(
- new FileReader(getBinding().getPdbFile()[0]));
+ new FileReader(getBinding().getStructureFiles()[0]));
File outFile = chooser.getSelectedFile();
PrintWriter out = new PrintWriter(new FileOutputStream(outFile));
File outFile = chooser.getSelectedFile();
PrintWriter out = new PrintWriter(new FileOutputStream(outFile));
@@
-991,7
+991,7
@@
public abstract class StructureViewerBase extends GStructureViewer
* enable 'Superpose with' if more than one mapped structure
*/
viewSelectionMenu.setEnabled(false);
* enable 'Superpose with' if more than one mapped structure
*/
viewSelectionMenu.setEnabled(false);
- if (getBinding().getPdbFile().length > 1
+ if (getBinding().getStructureFiles().length > 1
&& getBinding().getSequence().length > 1)
{
viewSelectionMenu.setEnabled(true);
&& getBinding().getSequence().length > 1)
{
viewSelectionMenu.setEnabled(true);