Author: kozo
Date: 2009-08-07 18:23:46 -0700 (Fri, 07 Aug 2009)
New Revision: 17748
Modified:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/MultiLayerNetworkBuilderImpl.java
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/ui/LayerBuilderDialog.java
Log:
still there is nullPointer error (refs ticket:21)
Modified:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/MultiLayerNetworkBuilderImpl.java
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/MultiLayerNetworkBuilderImpl.java
2009-08-08 01:21:32 UTC (rev 17747)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/MultiLayerNetworkBuilderImpl.java
2009-08-08 01:23:46 UTC (rev 17748)
@@ -1,10 +1,13 @@
package org.cytoscape.layer.internal;
+import static org.cytoscape.model.GraphObject.NODE;
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.cytoscape.layer.MultiLayerNetworkBuilder;
+import org.cytoscape.model.CyDataTable;
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkFactory;
@@ -24,6 +27,8 @@
private static final String EDGE_TITLE = "name";
private static final String LAYER_NUMBER = "layerNumber";
+ private Map<String, CyDataTable> netAttrMgr;
+
private CyNetworkManager manager;
private CyNetwork layeredNetwork;
private CyNetworkFactory factory;
@@ -42,6 +47,10 @@
layeredNetwork = factory.getInstance();
layeredNetwork.attrs().set(NETWORK_TITLE, "Layered Network");
+ netAttrMgr = layeredNetwork.getCyDataTables(NODE);
+// netAttrMgr = new HashMap<String, CyDataTable>();
+
netAttrMgr.get(CyNetwork.DEFAULT_ATTRS).createColumn(LAYER_NUMBER,
String.class, false);
+
// HashSet cumulatedNodes = new HashSet();
Map<String, CyNode> nodeMap = new HashMap<String, CyNode>();
Map<String, CyEdge> edgeMap = new HashMap<String, CyEdge>();
@@ -79,7 +88,7 @@
if (nodeMap.containsKey(nodeName) == false) {
CyNode newNode = layeredNetwork.addNode();
newNode.attrs().set(NODE_TITLE, nodeName);
-
newNode.attrs().getDataTable().createColumn(LAYER_NUMBER, String.class, false);
+//
newNode.attrs().getDataTable().createColumn(LAYER_NUMBER, String.class, false);
newNode.attrs().set(LAYER_NUMBER, layerNumber);
nodeMap.put(nodeName, newNode);
}
@@ -142,7 +151,7 @@
if (nodeMap.containsKey(nodeName) == false) {
CyNode newNode = layeredNetwork.addNode();
newNode.attrs().set(NODE_TITLE, nodeName);
-
newNode.attrs().getDataTable().createColumn(LAYER_NUMBER, String.class, false);
+//
newNode.attrs().getDataTable().createColumn(LAYER_NUMBER, String.class, false);
newNode.attrs().set(LAYER_NUMBER, layerNumber);
nodeMap.put(nodeName, newNode);
}
Modified:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/ui/LayerBuilderDialog.java
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/ui/LayerBuilderDialog.java
2009-08-08 01:21:32 UTC (rev 17747)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/ui/LayerBuilderDialog.java
2009-08-08 01:23:46 UTC (rev 17748)
@@ -25,6 +25,7 @@
import javax.swing.JDialog;
import org.cytoscape.layer.MultiLayerNetworkBuilder;
+import org.cytoscape.model.CyDataTable;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
import org.cytoscape.session.CyNetworkManager;
@@ -46,6 +47,8 @@
private static final String[] COLUMN_NAMES = { "Layer 1", "Layer 2",
"Connector Networks" };
+ private Map<String, CyDataTable> netAttrMgr;
+
/*
* Mandatory parameters
*/
@@ -573,17 +576,18 @@
for (int i = 0; i < layeredNetworkListModel.getSize(); i++) {
CyNetwork cyNetwork = manager.getNetwork((Long)
layeredNetworkListModel.getElementAt(i));
+
+ netAttrMgr = cyNetwork.getCyDataTables(NODE);
+
netAttrMgr.get(CyNetwork.DEFAULT_ATTRS).createColumn(LAYER_NUMBER,
String.class, false);
for (CyNode cyNode : cyNetwork.getNodeList()) {
-
-
cyNode.attrs().getDataTable().createColumn(LAYER_NUMBER, String.class, false);
cyNode.attrs().set(LAYER_NUMBER,
Integer.toString(i));
-//
System.out.println(cyNode.attrs().get(LAYER_NUMBER, String.class));
-// System.out.println("OK!");
+
System.out.println(cyNode.attrs().get(LAYER_NUMBER, String.class));
+ System.out.println("OK!");
}
layers.add(cyNetwork);
-// System.out.println("attribute append finished!");
+ System.out.println("attribute append finished!");
}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
