From 15335b83310784537f6c1b9c20d2c1ea2f57bcfc Mon Sep 17 00:00:00 2001 From: gmungoc Date: Wed, 16 Sep 2015 10:26:54 +0100 Subject: [PATCH] JAL-1859 revert to resolving full path to PDB file --- src/jalview/javascript/MouseOverStructureListener.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/jalview/javascript/MouseOverStructureListener.java b/src/jalview/javascript/MouseOverStructureListener.java index 7f833e7..176c881 100644 --- a/src/jalview/javascript/MouseOverStructureListener.java +++ b/src/jalview/javascript/MouseOverStructureListener.java @@ -90,14 +90,13 @@ public class MouseOverStructureListener extends JSFunctionExec implements { for (int i = 0; i < modelSet.length; i++) { - // ? leave file names 'as is' to match StructureMapping.pdbfile - // modelSet[i] = resolveModelFile(modelSet[i]); + modelSet[i] = resolveModelFile(modelSet[i]); } } } /** - * Returns the first out of file, file prefixed by document base, or file + * Returns the first out of: file, file prefixed by document base, or file * prefixed by codebase which can be resolved to a valid URL. If none can, * returns the input parameter value. * @@ -105,6 +104,7 @@ public class MouseOverStructureListener extends JSFunctionExec implements */ public String resolveModelFile(String file) { + // TODO reuse JalviewLite.LoadingThread.addProtocol instead if (isValidUrl(file)) { return file; -- 1.7.10.2