Author: mes
Date: 2010-08-12 16:38:49 -0700 (Thu, 12 Aug 2010)
New Revision: 21368
Modified:
core3/model-impl/trunk/src/main/java/org/cytoscape/model/internal/ArrayGraph.java
Log:
rearranged how we add table maps for networks
Modified:
core3/model-impl/trunk/src/main/java/org/cytoscape/model/internal/ArrayGraph.java
===================================================================
---
core3/model-impl/trunk/src/main/java/org/cytoscape/model/internal/ArrayGraph.java
2010-08-12 23:33:10 UTC (rev 21367)
+++
core3/model-impl/trunk/src/main/java/org/cytoscape/model/internal/ArrayGraph.java
2010-08-12 23:38:49 UTC (rev 21368)
@@ -125,7 +125,6 @@
netAttrMgr.get(CyNetwork.DEFAULT_ATTRS).createColumn("name",String.class,false);
attrs().set("name","");
// potential leak since "this" isn't yet fully constructed
- tableMgr.setTableMap("NETWORK", this, netAttrMgr);
nodeAttrMgr = new HashMap<String, CyDataTable>();
nodeAttrMgr.put(CyNetwork.DEFAULT_ATTRS, new
CyDataTableImpl(null, suid + " node", true,eh));
@@ -133,7 +132,6 @@
nodeAttrMgr.get(CyNetwork.DEFAULT_ATTRS).createColumn("name",String.class,false);
nodeAttrMgr.get(CyNetwork.DEFAULT_ATTRS).createColumn("selected",Boolean.class,false);
- tableMgr.setTableMap("NODE", this, nodeAttrMgr);
edgeAttrMgr = new HashMap<String, CyDataTable>();
edgeAttrMgr.put(CyNetwork.DEFAULT_ATTRS, new
CyDataTableImpl(null, suid + " edge", true,eh));
@@ -142,7 +140,6 @@
edgeAttrMgr.get(CyNetwork.DEFAULT_ATTRS).createColumn("name",String.class,false);
edgeAttrMgr.get(CyNetwork.DEFAULT_ATTRS).createColumn("selected",Boolean.class,false);
edgeAttrMgr.get(CyNetwork.DEFAULT_ATTRS).createColumn("interaction",String.class,false);
- tableMgr.setTableMap("EDGE", this, edgeAttrMgr);
eventHelper = eh;
@@ -150,6 +147,10 @@
metaNodes = new ArrayList<CyMetaNode>();
base = addSubNetwork();
+
+ tableMgr.setTableMap("NETWORK", base, netAttrMgr);
+ tableMgr.setTableMap("NODE", base, nodeAttrMgr);
+ tableMgr.setTableMap("EDGE", base, edgeAttrMgr);
}
/**
--
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.
