Author: mes
Date: 2011-11-21 16:16:28 -0800 (Mon, 21 Nov 2011)
New Revision: 27545

Modified:
   
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/ArraySubGraph.java
Log:
added support for copying default attrs

Modified: 
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/ArraySubGraph.java
===================================================================
--- 
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/ArraySubGraph.java
      2011-11-22 00:16:10 UTC (rev 27544)
+++ 
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/ArraySubGraph.java
      2011-11-22 00:16:28 UTC (rev 27545)
@@ -387,36 +387,29 @@
 
                        subNodeMap.put(rootNode,subNode);
                        updateNode(rootNode);
+                       copyDefaultAttrs(node, subNode);
                }
                
                
-               //copyTableEntry(node, subNode);
                
                eventHelper.addEventPayload((CyNetwork)this, subNode, 
AddedNodesEvent.class);
 
                return true;
        }
        
-//     private void copyTableEntry(final CyTableEntry original, final 
CyTableEntry copy) {
-//             final CyRow originalRow = original.getCyRow();
-//             final CyRow copyRow = copy.getCyRow();
-//             
-//             final Collection<CyColumn> columns = 
originalRow.getTable().getColumns();
-//             for(CyColumn column: columns) {
-//                     final String colName = column.getName();
-//                     final Class<?> colType = column.getType();
-//                     if(copyRow.getTable().getColumn(colName) == null) {
-//                             if(colType == List.class)
-//                                     
copyRow.getTable().createListColumn(colName, column.getListElementType(), 
column.isImmutable());
-//                             else
-//                                     
copyRow.getTable().createColumn(colName, colType, column.isImmutable());
-//                     }
-//                     
-//                     copyRow.set(column.getName(), 
originalRow.get(column.getName(), column.getType()));
-//             }
-//             
-//     }
+       private void copyDefaultAttrs(final CyTableEntry original, final 
CyTableEntry copy) {
+               final CyRow originalRow = original.getCyRow();
+               final CyRow copyRow = copy.getCyRow();
+               copyRow.set(CyTableEntry.NAME, 
originalRow.get(CyTableEntry.NAME, String.class));
+               copyRow.set(CyNetwork.SELECTED, 
originalRow.get(CyNetwork.SELECTED, Boolean.class));
+       }       
 
+       private void copyDefaultEdgeAttrs(final CyTableEntry original, final 
CyTableEntry copy) {
+               final CyRow originalRow = original.getCyRow();
+               final CyRow copyRow = copy.getCyRow();
+               copyRow.set(CyEdge.INTERACTION, 
originalRow.get(CyEdge.INTERACTION, String.class));
+       }       
+
        public boolean addEdge(final CyEdge edge) {
                if (edge == null)
                        throw new NullPointerException("edge is null");
@@ -442,9 +435,10 @@
                        internalEdgeCount++;
                        subEdgeMap.put(rootEdge,subEdge);
                        updateEdge(rootEdge);
+                       copyDefaultAttrs(edge, subEdge);
+                       copyDefaultEdgeAttrs(edge, subEdge);
                }
                
-               //copyTableEntry(edge, subEdge);
                eventHelper.addEventPayload((CyNetwork)this, subEdge, 
AddedEdgesEvent.class);
 
                return true;

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