Author: scooter
Date: 2011-08-30 21:30:09 -0700 (Tue, 30 Aug 2011)
New Revision: 26660
Modified:
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/model/MetaNode.java
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/ui/MetanodeSettingsDialog.java
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/view/ViewUtils.java
Log:
Some defensive checks
Modified:
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/model/MetaNode.java
===================================================================
---
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/model/MetaNode.java
2011-08-31 03:33:29 UTC (rev 26659)
+++
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/model/MetaNode.java
2011-08-31 04:30:09 UTC (rev 26660)
@@ -234,13 +234,15 @@
// Get our list of edges in case anyone has addded a new edge
to us
CyNode groupNode = metaGroup.getGroupNode();
List edgeList =
view.getNetwork().getAdjacentEdgesList(metaGroup.getGroupNode(), true, true,
true);
- for (Object e: edgeList) {
- CyEdge edge = (CyEdge)e;
- // Add any new edges.
- if (!metaEdges.containsKey(edge)) {
- // logger.debug(" found new edge:
"+edge.getIdentifier());
- metaEdges.put(edge, edge);
- metaGroup.addOuterEdge(edge);
+ if (edgeList != null) {
+ for (Object e: edgeList) {
+ CyEdge edge = (CyEdge)e;
+ // Add any new edges.
+ if (!metaEdges.containsKey(edge)) {
+ // logger.debug(" found new edge:
"+edge.getIdentifier());
+ metaEdges.put(edge, edge);
+ metaGroup.addOuterEdge(edge);
+ }
}
}
Modified:
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/ui/MetanodeSettingsDialog.java
===================================================================
---
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/ui/MetanodeSettingsDialog.java
2011-08-31 03:33:29 UTC (rev 26659)
+++
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/ui/MetanodeSettingsDialog.java
2011-08-31 04:30:09 UTC (rev 26660)
@@ -378,14 +378,12 @@
t = metanodeProperties.get("hideMetanodes");
if ((t != null) && (t.valueChanged() || force)) {
hideMetaNode = ((Boolean) t.getValue()).booleanValue();
- MetaNodeManager.setHideMetaNodeDefault(hideMetaNode);
metanodeProperties.setProperty(t.getName(),
t.getValue().toString());
}
t = metanodeProperties.get("dontExpandEmpty");
if ((t != null) && (t.valueChanged() || force)) {
dontExpandEmpty = ((Boolean) t.getValue()).booleanValue();
- MetaNodeManager.setHideMetaNodeDefault(dontExpandEmpty);
metanodeProperties.setProperty(t.getName(),
t.getValue().toString());
}
Modified:
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/view/ViewUtils.java
===================================================================
---
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/view/ViewUtils.java
2011-08-31 03:33:29 UTC (rev 26659)
+++
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/view/ViewUtils.java
2011-08-31 04:30:09 UTC (rev 26660)
@@ -239,6 +239,7 @@
*/
public static void restoreEdges(CyGroup metaGroup,
Collection<CyEdge>edgeList, CyNetworkView view) {
CyNetwork network = metaGroup.getNetwork();
+ if (edgeList == null) return;
for (CyEdge edge: edgeList) {
// System.out.println("Restoring edge
"+edge.getIdentifier());
if (network.containsNode(edge.getSource()) &&
network.containsNode(edge.getTarget())) {
--
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.
