X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Frbvi%2Fchimera%2FJalviewChimeraBinding.java;fp=src%2Fjalview%2Fext%2Frbvi%2Fchimera%2FJalviewChimeraBinding.java;h=b954677ffeb53d3500fe8e344c14e3fefdc98b18;hb=954039bbfbde3648ac4c795277e788e49be5181b;hp=870c4fe621b3d68eae08b2a9e03da55b13a62ca2;hpb=a737e315f94a3e9dff12f1f3ed657cdf8ee52882;p=jalview.git diff --git a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java index 870c4fe..b954677 100644 --- a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java +++ b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java @@ -289,7 +289,7 @@ public abstract class JalviewChimeraBinding extends AAStructureBindingModel */ public void closeViewer(boolean closeChimera) { - getSsm().removeStructureViewerListener(this, this.getPdbFile()); + getSsm().removeStructureViewerListener(this, this.getStructureFiles()); if (closeChimera) { viewer.exitChimera(); @@ -340,7 +340,7 @@ public abstract class JalviewChimeraBinding extends AAStructureBindingModel int[] _refStructure, HiddenColumns[] _hiddenCols) { StringBuilder allComs = new StringBuilder(128); - String[] files = getPdbFile(); + String[] files = getStructureFiles(); if (!waitForFileLoad(files)) { @@ -577,7 +577,7 @@ public abstract class JalviewChimeraBinding extends AAStructureBindingModel * to the Chimera command 'list models type molecule', see * ChimeraManager.getModelList(). */ - List maps = chimeraMaps.get(getPdbFile()[pdbfnum]); + List maps = chimeraMaps.get(getStructureFiles()[pdbfnum]); boolean hasSubModels = maps != null && maps.size() > 1; return "#" + String.valueOf(pdbfnum) + (hasSubModels ? ".1" : ""); } @@ -745,7 +745,7 @@ public abstract class JalviewChimeraBinding extends AAStructureBindingModel // //////////////////////////////// // /StructureListener @Override - public synchronized String[] getPdbFile() + public synchronized String[] getStructureFiles() { if (viewer == null) { @@ -1100,7 +1100,7 @@ public abstract class JalviewChimeraBinding extends AAStructureBindingModel // TODO refactor as required to pull up to an interface AlignmentI alignment = avp.getAlignment(); - String[] files = getPdbFile(); + String[] files = getStructureFiles(); if (files == null) { return 0;