Author: kozo
Date: 2009-08-07 17:43:17 -0700 (Fri, 07 Aug 2009)
New Revision: 17745

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:
tried to set layer number attribute to all layer nodes, but 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 00:33:25 UTC (rev 17744)
+++ 
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/MultiLayerNetworkBuilderImpl.java
     2009-08-08 00:43:17 UTC (rev 17745)
@@ -73,12 +73,14 @@
                for (CyNode cyNode : topLayer.getNodeList()) {
 
                        String nodeName = cyNode.attrs().get(NODE_TITLE, 
String.class);
-//                     String layerNumber = cyNode.attrs().get(LAYER_NUMBER, 
String.class);
+                       String layerNumber = cyNode.attrs().get(LAYER_NUMBER, 
String.class);
+                       System.out.println(layerNumber);
 
                        if (nodeMap.containsKey(nodeName) == false) {
                                CyNode newNode = layeredNetwork.addNode();
                                newNode.attrs().set(NODE_TITLE, nodeName);
-//                             newNode.attrs().set(LAYER_NUMBER, layerNumber);
+                               
newNode.attrs().getDataTable().createColumn(LAYER_NUMBER, String.class, false); 
                        
+                               newNode.attrs().set(LAYER_NUMBER, layerNumber);
                                nodeMap.put(nodeName, newNode);
                        }
                }
@@ -134,12 +136,14 @@
                for (CyNode cyNode : bottomLayer.getNodeList()) {
 
                        String nodeName = cyNode.attrs().get(NODE_TITLE, 
String.class);
-//                     String layerNumber = cyNode.attrs().get(LAYER_NUMBER, 
String.class);
+                       String layerNumber = cyNode.attrs().get(LAYER_NUMBER, 
String.class);
+                       System.out.println(layerNumber);
                        
                        if (nodeMap.containsKey(nodeName) == false) {
                                CyNode newNode = layeredNetwork.addNode();
                                newNode.attrs().set(NODE_TITLE, nodeName);
-//                             newNode.attrs().set(LAYER_NUMBER, layerNumber); 
                        
+                               
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 00:33:25 UTC (rev 17744)
+++ 
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/ui/LayerBuilderDialog.java
    2009-08-08 00:43:17 UTC (rev 17745)
@@ -29,6 +29,8 @@
 import org.cytoscape.model.CyNode;
 import org.cytoscape.session.CyNetworkManager;
 
+import static org.cytoscape.model.GraphObject.NODE;
+
 /**
  * 
  * @author kozo
@@ -574,20 +576,22 @@
                        
                        for (CyNode cyNode : cyNetwork.getNodeList()) {
 
-                               System.out.println(Integer.toString(i));
+                               
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(cyNode.attrs().get(LAYER_NUMBER, String.class));
+//                             System.out.println("OK!");
                        }
                        
                        layers.add(cyNetwork);
+//                     System.out.println("attribute append finished!");
+                       
                }
 
                for (int i = 0; i < layerConnectionTableModel.getRowCount(); 
i++) {
                        
connectors.add(manager.getNetwork(layerConnectionTableModel
                                        .getValueAt(i, CONNECTOR)));
-                       
System.out.println(layerConnectionTableModel.getValueAt(i,
-                                       CONNECTOR));
+//                     
System.out.println(layerConnectionTableModel.getValueAt(i,
+//                                     CONNECTOR));
                }
 
                // Setup


--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---

Reply via email to