X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjavascript%2FMouseOverStructureListener.java;h=874bfd30d36257f4a3e00303f065c8183e542206;hb=3d0101179759ef157b088ea135423cd909512d9f;hp=f9d5dd0ba7fc40dcd2537b1e7e18bc9ccb18d306;hpb=59d682209891099d46b960509907c79e3fb276fe;p=jalview.git
diff --git a/src/jalview/javascript/MouseOverStructureListener.java b/src/jalview/javascript/MouseOverStructureListener.java
index f9d5dd0..874bfd3 100644
--- a/src/jalview/javascript/MouseOverStructureListener.java
+++ b/src/jalview/javascript/MouseOverStructureListener.java
@@ -1,25 +1,25 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.javascript;
-import java.awt.Color;
-import java.util.ArrayList;
-
import jalview.api.AlignmentViewPanel;
import jalview.api.FeatureRenderer;
import jalview.api.SequenceRenderer;
@@ -27,10 +27,15 @@ import jalview.appletgui.AlignFrame;
import jalview.bin.JalviewLite;
import jalview.datamodel.SequenceI;
import jalview.ext.jmol.JmolCommands;
+import jalview.structure.AtomSpec;
import jalview.structure.StructureListener;
import jalview.structure.StructureMapping;
import jalview.structure.StructureMappingcommandSet;
import jalview.structure.StructureSelectionManager;
+import jalview.util.HttpUtils;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* Propagate events involving PDB structures associated with sequences to a
@@ -65,8 +70,8 @@ import jalview.structure.StructureSelectionManager;
* @author Jim Procter (jprocter)
*
*/
-public class MouseOverStructureListener extends JSFunctionExec implements
- JsCallBack, StructureListener
+public class MouseOverStructureListener extends JSFunctionExec
+ implements JsCallBack, StructureListener
{
String _listenerfn;
@@ -83,54 +88,49 @@ public class MouseOverStructureListener extends JSFunctionExec implements
{
for (int i = 0; i < modelSet.length; i++)
{
- // resolve a real filename
- try
- {
- if (new java.net.URL(modelSet[i]).openConnection() != null)
- {
- continue;
- }
- } catch (Exception x)
- {
- }
- ;
- try
- {
- String db = jvlite.getDocumentBase().toString();
- db = db.substring(0, db.lastIndexOf("/"));
- if (new java.net.URL(db + "/" + modelSet[i]).openConnection() != null)
- {
- modelSet[i] = db + "/" + modelSet[i];
- continue;
- }
- } catch (Exception x)
- {
- }
- ;
- try
- {
- if (new java.net.URL(jvlite.getCodeBase() + modelSet[i])
- .openConnection() != null)
- {
- modelSet[i] = jvlite.getCodeBase() + modelSet[i];
- continue;
- }
- } catch (Exception x)
- {
- }
- ;
-
+ modelSet[i] = resolveModelFile(modelSet[i]);
}
}
}
+ /**
+ * 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.
+ *
+ * @param file
+ */
+ public String resolveModelFile(String file)
+ {
+ // TODO reuse JalviewLite.LoadingThread.addProtocol instead
+ if (HttpUtils.isValidUrl(file))
+ {
+ return file;
+ }
+
+ String db = jvlite.getDocumentBase().toString();
+ db = db.substring(0, db.lastIndexOf("/"));
+ String docBaseFile = db + "/" + file;
+ if (HttpUtils.isValidUrl(docBaseFile))
+ {
+ return docBaseFile;
+ }
+
+ String cb = jvlite.getCodeBase() + file;
+ if (HttpUtils.isValidUrl(cb))
+ {
+ return cb;
+ }
+
+ return file;
+ }
+
@Override
- public String[] getPdbFile()
+ public String[] getStructureFiles()
{
return modelSet;
}
- @Override
public void mouseOverStructure(int atomIndex, String strInfo)
{
@@ -141,24 +141,27 @@ public class MouseOverStructureListener extends JSFunctionExec implements
}
@Override
- public void highlightAtom(int atomIndex, int pdbResNum, String chain,
- String pdbId)
+ public void highlightAtoms(List atoms)
{
- String[] st = new String[0];
- try
+ for (AtomSpec atom : atoms)
{
- executeJavascriptFunction(_listenerfn, st = new String[]
- { "mouseover", "" + pdbId, "" + chain, "" + (pdbResNum),
- "" + atomIndex });
- } catch (Exception ex)
- {
- System.err.println("Couldn't execute callback with " + _listenerfn
- + " using args { " + st[0] + ", " + st[1] + ", " + st[2]
- + "," + st[3] + "\n");
- ex.printStackTrace();
-
+ try
+ {
+ // TODO is this right? StructureSelectionManager passes pdbFile as the
+ // field that is interpreted (in 2.8.2) as pdbId?
+ // JBPComment: yep - this is right! the Javascript harness uses the
+ // absolute pdbFile URI to locate the PDB file in the external viewer
+ executeJavascriptFunction(_listenerfn,
+ new String[]
+ { "mouseover", "" + atom.getPdbFile(), "" + atom.getChain(),
+ "" + (atom.getPdbResNum()), "" + atom.getAtomIndex() });
+ } catch (Exception ex)
+ {
+ System.err.println("Couldn't execute callback with " + _listenerfn
+ + " for atomSpec: " + atom);
+ ex.printStackTrace();
+ }
}
-
}
@Override
@@ -167,10 +170,14 @@ public class MouseOverStructureListener extends JSFunctionExec implements
final Object source = srce;
StructureSelectionManager ssm = StructureSelectionManager
.getStructureSelectionManager(jvlite);
- // if (jvlite.debug)
- // {
- // ssm.reportMapping();
- // }
+
+ if (JalviewLite.debug)
+ {
+ System.err.println(
+ this.getClass().getName() + " modelSet[0]: " + modelSet[0]);
+ ssm.reportMapping();
+ }
+
if (source instanceof jalview.api.AlignmentViewPanel)
{
SequenceI[][] sequence = new SequenceI[modelSet.length][];
@@ -199,12 +206,14 @@ public class MouseOverStructureListener extends JSFunctionExec implements
SequenceRenderer sr = ((jalview.appletgui.AlignmentPanel) source)
.getSequenceRenderer();
FeatureRenderer fr = ((jalview.appletgui.AlignmentPanel) source).av
- .getShowSequenceFeatures() ? new jalview.appletgui.FeatureRenderer(
- ((jalview.appletgui.AlignmentPanel) source).av) : null;
+ .isShowSequenceFeatures()
+ ? new jalview.appletgui.FeatureRenderer(
+ ((jalview.appletgui.AlignmentPanel) source).av)
+ : null;
if (fr != null)
{
- ((jalview.appletgui.FeatureRenderer) fr)
- .transferSettings(((jalview.appletgui.AlignmentPanel) source)
+ ((jalview.appletgui.FeatureRenderer) fr).transferSettings(
+ ((jalview.appletgui.AlignmentPanel) source)
.getFeatureRenderer());
}
;
@@ -214,8 +223,8 @@ public class MouseOverStructureListener extends JSFunctionExec implements
ArrayList ccomands = new ArrayList();
ArrayList pdbfn = new ArrayList();
StructureMappingcommandSet[] colcommands = JmolCommands
- .getColourBySequenceCommand(ssm, modelSet, sequence, sr, fr,
- ((AlignmentViewPanel) source).getAlignment());
+ .getColourBySequenceCommand(ssm, modelSet, sequence, sr,
+ (AlignmentViewPanel) source);
if (colcommands == null)
{
return;
@@ -236,28 +245,25 @@ public class MouseOverStructureListener extends JSFunctionExec implements
System.arraycopy(ccset, 0, ccomandset, sz, ccset.length);
sz += ccset.length;
}
- if (jvlite.isJsMessageSetChanged(
- mclass = "colourstruct",
+ if (jvlite.isJsMessageSetChanged(mclass = "colourstruct",
mhandle = ((jalview.appletgui.AlignmentPanel) source).av
- .getViewId(), ccomandset))
+ .getViewId(),
+ ccomandset))
{
jvlite.setJsMessageSet(mclass, mhandle, ccomandset);
// and notify javascript handler
- String st[] = new String[]
- {
- "colourstruct",
+ String st[] = new String[] { "colourstruct",
"" + ((jalview.appletgui.AlignmentPanel) source).av.getViewId(),
- "" + ccomandset.length,
- jvlite.arrayToSeparatorList(pdbfn.toArray(new String[pdbfn
- .size()])) };
+ "" + ccomandset.length, jvlite.arrayToSeparatorList(
+ pdbfn.toArray(new String[pdbfn.size()])) };
try
{
executeJavascriptFunction(true, _listenerfn, st);
} catch (Exception ex)
{
- System.err.println("Couldn't execute callback with "
- + _listenerfn + " using args { " + st[0] + ", " + st[1]
- + ", " + st[2] + "," + st[3] + "}"); // + ","+st[4]+"\n");
+ System.err.println("Couldn't execute callback with " + _listenerfn
+ + " using args { " + st[0] + ", " + st[1] + ", " + st[2]
+ + "," + st[3] + "}"); // + ","+st[4]+"\n");
ex.printStackTrace();
}
@@ -280,13 +286,6 @@ public class MouseOverStructureListener extends JSFunctionExec implements
}
@Override
- public Color getColour(int atomIndex, int pdbResNum, String chain,
- String pdbId)
- {
- return null;
- }
-
- @Override
public AlignFrame getAlignFrame()
{
// associated with all alignframes, always.
@@ -299,7 +298,8 @@ public class MouseOverStructureListener extends JSFunctionExec implements
return _listenerfn;
}
- public void finalise()
+ @Override
+ public void finalize() throws Throwable
{
jvlite = null;
super.finalize();
@@ -313,4 +313,10 @@ public class MouseOverStructureListener extends JSFunctionExec implements
}
+ @Override
+ public boolean isListeningFor(SequenceI seq)
+ {
+ return true;
+ }
+
}