Author: mes
Date: 2012-03-22 15:27:31 -0700 (Thu, 22 Mar 2012)
New Revision: 28623
Modified:
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/task/NetworkMergeTask.java
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/NetworkMergeFrame.java
Log:
forgot to set an internal field
Modified:
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/task/NetworkMergeTask.java
===================================================================
---
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/task/NetworkMergeTask.java
2012-03-22 22:12:53 UTC (rev 28622)
+++
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/task/NetworkMergeTask.java
2012-03-22 22:27:31 UTC (rev 28623)
@@ -62,6 +62,7 @@
this.operation = operation;
//this.mergedNetworkName = mergedNetworkName;
this.conflictCollector = conflictCollector;
+ this.netViewCreator = netViewCreator;
//this.selectedNetworkAttributeIDType =
selectedNetworkAttributeIDType;
//this.tgtType = tgtType;
//cancelled = true;
@@ -83,7 +84,6 @@
attributeMerger,
attributeValueMatcher);
networkMerge.setWithinNetworkMerge(inNetworkMerge);
- this.netViewCreator = netViewCreator;
}
public boolean isCancelled() {
Modified:
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/NetworkMergeFrame.java
===================================================================
---
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/NetworkMergeFrame.java
2012-03-22 22:12:53 UTC (rev 28622)
+++
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/ui/NetworkMergeFrame.java
2012-03-22 22:27:31 UTC (rev 28623)
@@ -125,6 +125,7 @@
this.cnf = cnf;
this.cnn = cnn;
this.taskManager = taskManager;
+ this.netViewCreator = netViewCreator;
checkCyThesaurus = checkCyThesaurus();
--
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.
