Author: rodche
Date: 2010-01-27 19:03:58 -0800 (Wed, 27 Jan 2010)
New Revision: 19058
Modified:
csplugins/trunk/toronto/rodche/BioPAX/src/cytoscape/coreplugins/biopax/action/DisplayBiopaxXmlAction.java
csplugins/trunk/toronto/rodche/BioPAX/src/cytoscape/coreplugins/biopax/action/NetworkListener.java
Log:
Hidden bug fixed (Map's key type was changed, but such methods, using the old
type key, as map.contains(key) and map.keySet() do not cause compilation error!)
Modified:
csplugins/trunk/toronto/rodche/BioPAX/src/cytoscape/coreplugins/biopax/action/DisplayBiopaxXmlAction.java
===================================================================
---
csplugins/trunk/toronto/rodche/BioPAX/src/cytoscape/coreplugins/biopax/action/DisplayBiopaxXmlAction.java
2010-01-28 02:16:22 UTC (rev 19057)
+++
csplugins/trunk/toronto/rodche/BioPAX/src/cytoscape/coreplugins/biopax/action/DisplayBiopaxXmlAction.java
2010-01-28 03:03:58 UTC (rev 19058)
@@ -33,7 +33,7 @@
String nodeId = nodeView.getNode().getIdentifier();
String biopaxId = Cytoscape.getNodeAttributes()
.getStringAttribute(nodeId,
MapBioPaxToCytoscape.BIOPAX_RDF_ID);
- Model m =
BioPaxUtil.getNetworkModel(Cytoscape.getCurrentNetwork());
+ Model m =
BioPaxUtil.getNetworkModel(Cytoscape.getCurrentNetwork().getIdentifier());
BioPAXElement bpe = m.getByID(biopaxId);
StringWriter writer = new StringWriter();
if (bpe != null) {
Modified:
csplugins/trunk/toronto/rodche/BioPAX/src/cytoscape/coreplugins/biopax/action/NetworkListener.java
===================================================================
---
csplugins/trunk/toronto/rodche/BioPAX/src/cytoscape/coreplugins/biopax/action/NetworkListener.java
2010-01-28 02:16:22 UTC (rev 19057)
+++
csplugins/trunk/toronto/rodche/BioPAX/src/cytoscape/coreplugins/biopax/action/NetworkListener.java
2010-01-28 03:03:58 UTC (rev 19058)
@@ -171,7 +171,7 @@
if (networkId != null) {
// update bpPanel accordingly
if (!sessionLoaded) {
- if (BioPaxUtil.getNetworkModelMap().containsKey(cyNetwork)) {
+ if (BioPaxUtil.getNetworkModelMap().containsKey(networkId)) {
bpPanel.resetText();
} else {
bpPanel.resetText("Node details are not provided for"
@@ -182,7 +182,7 @@
// due to quirky-ness in event model, we could get here without
registering network
// check if this is a biopax network
if (BioPaxUtil.isBioPAXNetwork(cyNetwork)
- &&
!BioPaxUtil.getNetworkModelMap().containsKey(cyNetwork)) {
+ &&
!BioPaxUtil.getNetworkModelMap().containsKey(networkId)) {
registerNetwork(cyNetwork);
}
}
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
