Author: jm
Date: 2012-03-26 07:29:48 -0700 (Mon, 26 Mar 2012)
New Revision: 28644
Modified:
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/task/NetworkMergeTask.java
Log:
Fixed compile error
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-24 00:22:44 UTC (rev 28643)
+++
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/task/NetworkMergeTask.java
2012-03-26 14:29:48 UTC (rev 28644)
@@ -1,24 +1,23 @@
package org.cytoscape.network.merge.internal.task;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.cytoscape.model.CyNetwork;
import org.cytoscape.network.merge.internal.AttributeBasedNetworkMerge;
import org.cytoscape.network.merge.internal.NetworkMerge.Operation;
-import org.cytoscape.network.merge.internal.model.*;
import
org.cytoscape.network.merge.internal.conflict.AttributeConflictCollector;
+import org.cytoscape.network.merge.internal.model.AttributeMapping;
+import org.cytoscape.network.merge.internal.model.MatchingAttribute;
import org.cytoscape.network.merge.internal.util.AttributeMerger;
import org.cytoscape.network.merge.internal.util.AttributeValueMatcher;
import org.cytoscape.network.merge.internal.util.DefaultAttributeMerger;
import org.cytoscape.network.merge.internal.util.DefaultAttributeValueMatcher;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyNetworkFactory;
+import org.cytoscape.task.creation.NetworkViewCreator;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskMonitor;
-import org.cytoscape.task.creation.NetworkViewCreator;
/**
*
@@ -175,7 +174,7 @@
HandleConflictsTask hcTask = new
HandleConflictsTask(conflictCollector);
insertTasksAfterCurrentTask( hcTask );
} else {
- insertTasksAfterCurrentTask(
netViewCreator.createView( network ) );
+ insertTasksAfterCurrentTask(
netViewCreator.createTaskIterator( network ) );
}
}
}
--
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.
