Author: rodche
Date: 2012-02-01 15:09:03 -0800 (Wed, 01 Feb 2012)
New Revision: 28178
Modified:
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/cytoscape/MergeNetworkEdit.java
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/task/ExecuteGetRecordByCPathId.java
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/task/MergeNetworkTask.java
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/util/AttributeUtil.java
Log:
Fixed a refactoring bug: use of empty-body method (AttributeUtil.copyAttributes)
Modified:
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/cytoscape/MergeNetworkEdit.java
===================================================================
---
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/cytoscape/MergeNetworkEdit.java
2012-02-01 20:08:28 UTC (rev 28177)
+++
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/cytoscape/MergeNetworkEdit.java
2012-02-01 23:09:03 UTC (rev 28178)
@@ -125,7 +125,7 @@
// iterate through nodes and restore each one (also set proper
position)
for (CyNode cyNode : cyNodes.keySet()) {
CyNode node = cyNetwork.addNode();
- AttributeUtil.copyAttributes(cyNode, node);
+ AttributeUtil.copyAttributes(cyNetwork, cyNode, node);
Point2D.Double point = cyNodes.get(cyNode);
View<CyNode> nv = view.getNodeView(node);
Modified:
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/task/ExecuteGetRecordByCPathId.java
===================================================================
---
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/task/ExecuteGetRecordByCPathId.java
2012-02-01 20:08:28 UTC (rev 28177)
+++
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/task/ExecuteGetRecordByCPathId.java
2012-02-01 23:09:03 UTC (rev 28178)
@@ -353,7 +353,7 @@
Map<String, CyNode> nodes = new HashMap<String, CyNode>();
for (CyNode node : cyNetwork.getNodeList()) {
CyNode newNode = mergedNetwork.addNode();
- AttributeUtil.copyAttributes(node, newNode);
+ AttributeUtil.copyAttributes(mergedNetwork, node,
newNode);
String name = cyNetwork.getRow(node).get(CyNode.NAME,
String.class);
nodes.put(name, newNode);
}
@@ -364,7 +364,7 @@
CyNode source = nodes.get(sourceName);
CyNode target = nodes.get(targetName);
CyEdge newEdge = mergedNetwork.addEdge(source, target,
true);
- AttributeUtil.copyAttributes(edge, newEdge);
+ AttributeUtil.copyAttributes(mergedNetwork, edge,
newEdge);
edges.add(newEdge);
}
Modified:
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/task/MergeNetworkTask.java
===================================================================
---
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/task/MergeNetworkTask.java
2012-02-01 20:08:28 UTC (rev 28177)
+++
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/task/MergeNetworkTask.java
2012-02-01 23:09:03 UTC (rev 28178)
@@ -120,7 +120,7 @@
// tbd: worry about networks that exceed # node/edge threshold
for (CyNode node : network.getNodeList()) {
CyNode mergedNode = mergedNetwork.addNode();
- AttributeUtil.copyAttributes(node, mergedNode);
+ AttributeUtil.copyAttributes(mergedNetwork, node, mergedNode);
String name = network.getRow(mergedNode).get(CyNode.NAME,
String.class);
newNodes.put(name, mergedNode);
}
@@ -130,7 +130,7 @@
CyNode source = newNodes.get(sourceName);
CyNode target = newNodes.get(targetName);
CyEdge mergedEdge = mergedNetwork.addEdge(source, target, true);
- AttributeUtil.copyAttributes(edge, mergedEdge);
+ AttributeUtil.copyAttributes(mergedNetwork, edge, mergedEdge);
newEdges.add(mergedEdge);
}
Modified:
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/util/AttributeUtil.java
===================================================================
---
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/util/AttributeUtil.java
2012-02-01 20:08:28 UTC (rev 28177)
+++
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/util/AttributeUtil.java
2012-02-01 23:09:03 UTC (rev 28178)
@@ -31,12 +31,7 @@
}
}
- public static void copyAttributes(CyTableEntry source, CyTableEntry
target) {
- // TODO Auto-generated method stub
-
- }
-
public static void set(CyNetwork network, CyTableEntry entry, String
tableName, String name, Object value, Class<?> type) {
CyRow row = (tableName==null) ? network.getRow(entry) :
network.getRow(entry,tableName);
CyTable table = row.getTable();
--
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.
