Author: mes
Date: 2011-11-29 16:02:09 -0800 (Tue, 29 Nov 2011)
New Revision: 27640
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/MapNetworkAttrTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/AbstractNetworkFromSelectionTask.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingViewModelFactory.java
core3/impl/trunk/graphml-impl/src/main/java/org/cytoscape/io/internal/CyActivator.java
core3/impl/trunk/graphml-impl/src/main/java/org/cytoscape/io/internal/read/graphml/GraphMLParser.java
core3/impl/trunk/graphml-impl/src/main/java/org/cytoscape/io/internal/read/graphml/GraphMLReader.java
core3/impl/trunk/graphml-impl/src/main/java/org/cytoscape/io/internal/read/graphml/GraphMLReaderFactory.java
core3/impl/trunk/graphml-impl/src/test/java/org/cytoscape/data/reader/graphml/GraphMLReaderTest.java
core3/impl/trunk/model-impl/impl/src/test/java/org/cytoscape/model/NetworkTestSupport.java
core3/support/trunk/samples/sample11/src/main/java/org/cytoscape/sample/internal/CreateTableTask.java
core3/support/trunk/samples/sample11/src/main/java/org/cytoscape/sample/internal/Sample11TaskFactory.java
core3/support/trunk/task-testing-impl/src/main/java/org/cytoscape/internal/test/CyActivator.java
Log:
more rootnetworkfactory renaming
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/MapNetworkAttrTask.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/MapNetworkAttrTask.java
2011-11-29 23:28:43 UTC (rev 27639)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/MapNetworkAttrTask.java
2011-11-30 00:02:09 UTC (rev 27640)
@@ -46,7 +46,7 @@
private final CyTable newGlobalTable;
private final CyNetworkManager networkManager;
private final CyApplicationManager applicationManager;
- private final CyRootNetworkManager rootNetworkFactory;
+ private final CyRootNetworkManager rootNetworkManager;
private String mappingKey;
/**
@@ -62,14 +62,14 @@
String mappingKey,
final CyNetworkManager networkManager,
final CyApplicationManager applicationManager,
- final
CyRootNetworkManager rootNetworkFactory)
+ final
CyRootNetworkManager rootNetworkManager)
{
this.type = type;
this.newGlobalTable = newGlobalTable;
this.mappingKey = mappingKey;
this.networkManager = networkManager;
this.applicationManager = applicationManager;
- this.rootNetworkFactory = rootNetworkFactory;
+ this.rootNetworkManager = rootNetworkManager;
this.whichTable = new
ListSingleSelection<String>(CURRENT_SHARED, CURRENT_LOCAL, ALL_SHARED,
INDEPENDENT);
@@ -90,9 +90,9 @@
final CyTable newGlobalTable,
final CyNetworkManager networkManager,
final CyApplicationManager applicationManager,
- final
CyRootNetworkManager rootNetworkFactory)
+ final
CyRootNetworkManager rootNetworkManager)
{
-
this(type,newGlobalTable,CyTableEntry.NAME,networkManager,applicationManager,rootNetworkFactory);
+
this(type,newGlobalTable,CyTableEntry.NAME,networkManager,applicationManager,rootNetworkManager);
}
@@ -115,7 +115,7 @@
:
currentNetwork.getDefaultEdgeTable());
} else if (selection.equals(CURRENT_SHARED)) {
final CyNetwork currentNetwork =
applicationManager.getCurrentNetwork();
- final CyRootNetwork rootNetwork =
rootNetworkFactory.getRootNetwork(currentNetwork);
+ final CyRootNetwork rootNetwork =
rootNetworkManager.getRootNetwork(currentNetwork);
targetTables.add(type == CyNode.class ?
rootNetwork.getSharedNodeTable()
:
rootNetwork.getSharedEdgeTable());
if ( mappingKey.equals(CyTableEntry.NAME) )
@@ -124,7 +124,7 @@
final Set<CyNetwork> networks =
networkManager.getNetworkSet();
final Set<CyRootNetwork> rootNetworks = new
HashSet<CyRootNetwork>();
for (final CyNetwork network : networks)
- rootNetworks.add(
rootNetworkFactory.getRootNetwork(network) );
+ rootNetworks.add(
rootNetworkManager.getRootNetwork(network) );
for (final CyRootNetwork rootNetwork : rootNetworks)
targetTables.add(type == CyNode.class ?
rootNetwork.getSharedNodeTable()
:
rootNetwork.getSharedEdgeTable());
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/AbstractNetworkFromSelectionTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/AbstractNetworkFromSelectionTask.java
2011-11-29 23:28:43 UTC (rev 27639)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/AbstractNetworkFromSelectionTask.java
2011-11-30 00:02:09 UTC (rev 27640)
@@ -57,7 +57,7 @@
abstract class AbstractNetworkFromSelectionTask extends AbstractCreationTask {
private final UndoSupport undoSupport;
- protected final CyRootNetworkManager rootNetworkFactory;
+ protected final CyRootNetworkManager rootNetworkManager;
protected final CyNetworkViewFactory viewFactory;
protected final VisualMappingManager vmm;
protected final CyNetworkNaming cyNetworkNaming;
@@ -66,7 +66,7 @@
public AbstractNetworkFromSelectionTask(final UndoSupport undoSupport,
final CyNetwork parentNetwork,
- final CyRootNetworkManager
rootNetworkFactory,
+ final CyRootNetworkManager
rootNetworkManager,
final CyNetworkViewFactory
viewFactory,
final CyNetworkManager netmgr,
final CyNetworkViewManager
networkViewManager,
@@ -78,7 +78,7 @@
super(parentNetwork, netmgr, networkViewManager);
this.undoSupport = undoSupport;
- this.rootNetworkFactory = rootNetworkFactory;
+ this.rootNetworkManager = rootNetworkManager;
this.viewFactory = viewFactory;
this.cyNetworkNaming = cyNetworkNaming;
this.vmm = vmm;
@@ -106,7 +106,7 @@
throw new IllegalArgumentException("No nodes are
selected!");
// create subnetwork and add selected nodes and appropriate
edges
- final CySubNetwork newNet =
rootNetworkFactory.getRootNetwork(parentNetwork).addSubNetwork();
+ final CySubNetwork newNet =
rootNetworkManager.getRootNetwork(parentNetwork).addSubNetwork();
tm.setProgress(0.3);
for (final CyNode node : selectedNodes)
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2011-11-29 23:28:43 UTC (rev 27639)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2011-11-30 00:02:09 UTC (rev 27640)
@@ -39,7 +39,7 @@
private final RenderingEngineManager renderingEngineManager;
private final CyTableFactory dataTableFactory;
- private final CyRootNetworkManager rootNetworkFactory;
+ private final CyRootNetworkManager rootNetworkManager;
private final SpacialIndex2DFactory spacialFactory;
private final UndoSupport undo;
private final VisualLexicon dingLexicon;
@@ -55,7 +55,7 @@
public DingRenderingEngineFactory(CyTableFactory dataTableFactory,
- CyRootNetworkManager rootNetworkFactory, UndoSupport
undo,
+ CyRootNetworkManager rootNetworkManager, UndoSupport
undo,
SpacialIndex2DFactory spacialFactory, VisualLexicon
dingLexicon,
DialogTaskManager dialogTaskManager,
SubmenuTaskManager menuTaskManager,
@@ -67,7 +67,7 @@
AnnotationFactoryManager annMgr) {
this.dataTableFactory = dataTableFactory;
- this.rootNetworkFactory = rootNetworkFactory;
+ this.rootNetworkManager = rootNetworkManager;
this.spacialFactory = spacialFactory;
this.undo = undo;
this.dingLexicon = dingLexicon;
@@ -117,7 +117,7 @@
}
else
dgv = new DGraphView(targetView,
dataTableFactory,
- rootNetworkFactory, undo,
spacialFactory, dingLexicon,
+ rootNetworkManager, undo,
spacialFactory, dingLexicon,
vtfListener.nodeViewTFs,
vtfListener.edgeViewTFs, vtfListener.emptySpaceTFs, vtfListener.dropNodeViewTFs,
vtfListener.dropEmptySpaceTFs,
dialogTaskManager, menuTaskManager, eventHelper, tableMgr, annMgr);
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingViewModelFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingViewModelFactory.java
2011-11-29 23:28:43 UTC (rev 27639)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingViewModelFactory.java
2011-11-30 00:02:09 UTC (rev 27640)
@@ -25,7 +25,7 @@
private static final Logger logger =
LoggerFactory.getLogger(DingViewModelFactory.class);
private final CyTableFactory dataTableFactory;
- private final CyRootNetworkManager rootNetworkFactory;
+ private final CyRootNetworkManager rootNetworkManager;
private final SpacialIndex2DFactory spacialFactory;
private final UndoSupport undo;
private final VisualLexicon dingLexicon;
@@ -38,7 +38,7 @@
private ViewTaskFactoryListener vtfListener;
private final AnnotationFactoryManager annMgr;
- public DingViewModelFactory(CyTableFactory dataTableFactory,
CyRootNetworkManager rootNetworkFactory,
+ public DingViewModelFactory(CyTableFactory dataTableFactory,
CyRootNetworkManager rootNetworkManager,
UndoSupport undo, SpacialIndex2DFactory spacialFactory,
VisualLexicon dingLexicon,
DialogTaskManager dialogTaskManager, SubmenuTaskManager
menuTaskManager,
CyServiceRegistrar registrar, CyNetworkTableManager
tableMgr, CyEventHelper eventHelper,
@@ -46,7 +46,7 @@
AnnotationFactoryManager annMgr) {
this.dataTableFactory = dataTableFactory;
- this.rootNetworkFactory = rootNetworkFactory;
+ this.rootNetworkManager = rootNetworkManager;
this.spacialFactory = spacialFactory;
this.undo = undo;
this.dingLexicon = dingLexicon;
@@ -70,7 +70,7 @@
if (network == null)
throw new IllegalArgumentException("Cannot create view
without model.");
- final DGraphView dgv = new DGraphView(network,
dataTableFactory, rootNetworkFactory, undo, spacialFactory, dingLexicon,
+ final DGraphView dgv = new DGraphView(network,
dataTableFactory, rootNetworkManager, undo, spacialFactory, dingLexicon,
vtfListener.nodeViewTFs,
vtfListener.edgeViewTFs, vtfListener.emptySpaceTFs,
vtfListener.dropNodeViewTFs,
vtfListener.dropEmptySpaceTFs,
dialogTaskManager, menuTaskManager, eventHelper, tableMgr, annMgr);
Modified:
core3/impl/trunk/graphml-impl/src/main/java/org/cytoscape/io/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/graphml-impl/src/main/java/org/cytoscape/io/internal/CyActivator.java
2011-11-29 23:28:43 UTC (rev 27639)
+++
core3/impl/trunk/graphml-impl/src/main/java/org/cytoscape/io/internal/CyActivator.java
2011-11-30 00:02:09 UTC (rev 27640)
@@ -8,7 +8,7 @@
import org.cytoscape.io.read.InputStreamTaskFactory;
import org.cytoscape.io.util.StreamUtil;
import org.cytoscape.model.CyNetworkFactory;
-import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
+import org.cytoscape.model.subnetwork.CyRootNetworkManager;
import org.cytoscape.service.util.AbstractCyActivator;
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
import org.cytoscape.view.model.CyNetworkViewFactory;
@@ -29,7 +29,7 @@
CyLayoutAlgorithmManager cyLayoutsServiceRef = getService(bc,
CyLayoutAlgorithmManager.class);
CyNetworkFactory cyNetworkFactoryServiceRef = getService(bc,
CyNetworkFactory.class);
CyNetworkViewFactory cyNetworkViewFactoryServiceRef =
getService(bc, CyNetworkViewFactory.class);
- CyRootNetworkFactory cyRootNetworkFactoryServiceRef =
getService(bc, CyRootNetworkFactory.class);
+ CyRootNetworkManager cyRootNetworkFactoryServiceRef =
getService(bc, CyRootNetworkManager.class);
GraphMLFileFilter graphMLFilter = new GraphMLFileFilter(new
String[] { "graphml", "xml" }, new String[] {
"text/graphml", "text/graphml+xml" }, "GraphML
files", DataCategory.NETWORK, streamUtilRef);
Modified:
core3/impl/trunk/graphml-impl/src/main/java/org/cytoscape/io/internal/read/graphml/GraphMLParser.java
===================================================================
---
core3/impl/trunk/graphml-impl/src/main/java/org/cytoscape/io/internal/read/graphml/GraphMLParser.java
2011-11-29 23:28:43 UTC (rev 27639)
+++
core3/impl/trunk/graphml-impl/src/main/java/org/cytoscape/io/internal/read/graphml/GraphMLParser.java
2011-11-30 00:02:09 UTC (rev 27640)
@@ -21,7 +21,7 @@
import org.cytoscape.model.CyNetworkFactory;
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyTableEntry;
-import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
+import org.cytoscape.model.subnetwork.CyRootNetworkManager;
import org.cytoscape.model.subnetwork.CySubNetwork;
import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.work.TaskMonitor;
@@ -51,7 +51,7 @@
private String currentObjectTarget = null;
private final CyNetworkFactory networkFactory;
- private final CyRootNetworkFactory rootNetworkFactory;
+ private final CyRootNetworkManager rootNetworkManager;
private boolean directed = true;
@@ -72,9 +72,9 @@
* result, a minimum number of local data structures
*/
GraphMLParser(final TaskMonitor tm, final CyNetworkFactory
networkFactory,
- final CyRootNetworkFactory rootNetworkFactory) {
+ final CyRootNetworkManager rootNetworkManager) {
this.networkFactory = networkFactory;
- this.rootNetworkFactory = rootNetworkFactory;
+ this.rootNetworkManager = rootNetworkManager;
networkStack = new Stack<CyNetwork>();
cyNetworks = new ArrayList<CyNetwork>();
@@ -145,7 +145,7 @@
currentNetwork = networkFactory.getInstance();
} else {
final CyNetwork parentNetwork = networkStack.peek();
- currentNetwork =
rootNetworkFactory.convert(parentNetwork).addSubNetwork();
+ currentNetwork =
rootNetworkManager.getRootNetwork(parentNetwork).addSubNetwork();
if(lastTag != null && lastTag.equals(NODE.getTag())) {
Collection<CyNode> toBeRemoved = new
ArrayList<CyNode>();
toBeRemoved.add(lastNode);
Modified:
core3/impl/trunk/graphml-impl/src/main/java/org/cytoscape/io/internal/read/graphml/GraphMLReader.java
===================================================================
---
core3/impl/trunk/graphml-impl/src/main/java/org/cytoscape/io/internal/read/graphml/GraphMLReader.java
2011-11-29 23:28:43 UTC (rev 27639)
+++
core3/impl/trunk/graphml-impl/src/main/java/org/cytoscape/io/internal/read/graphml/GraphMLReader.java
2011-11-30 00:02:09 UTC (rev 27640)
@@ -13,7 +13,7 @@
import org.cytoscape.io.read.CyNetworkReader;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkFactory;
-import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
+import org.cytoscape.model.subnetwork.CyRootNetworkManager;
import org.cytoscape.view.layout.CyLayoutAlgorithm;
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
import org.cytoscape.view.model.CyNetworkView;
@@ -46,10 +46,10 @@
private GraphMLParser parser;
private TaskMonitor taskMonitor;
- private final CyRootNetworkFactory cyRootNetworkFactory;
+ private final CyRootNetworkManager cyRootNetworkFactory;
public GraphMLReader(InputStream inputStream, final
CyLayoutAlgorithmManager layouts,
- final CyNetworkFactory cyNetworkFactory, final
CyNetworkViewFactory cyNetworkViewFactory, final CyRootNetworkFactory
cyRootNetworkFactory) {
+ final CyNetworkFactory cyNetworkFactory, final
CyNetworkViewFactory cyNetworkViewFactory, final CyRootNetworkManager
cyRootNetworkFactory) {
if (inputStream == null)
throw new NullPointerException("Input stream is null");
if (cyNetworkViewFactory == null)
Modified:
core3/impl/trunk/graphml-impl/src/main/java/org/cytoscape/io/internal/read/graphml/GraphMLReaderFactory.java
===================================================================
---
core3/impl/trunk/graphml-impl/src/main/java/org/cytoscape/io/internal/read/graphml/GraphMLReaderFactory.java
2011-11-29 23:28:43 UTC (rev 27639)
+++
core3/impl/trunk/graphml-impl/src/main/java/org/cytoscape/io/internal/read/graphml/GraphMLReaderFactory.java
2011-11-30 00:02:09 UTC (rev 27640)
@@ -5,7 +5,7 @@
import org.cytoscape.io.CyFileFilter;
import org.cytoscape.io.read.InputStreamTaskFactory;
import org.cytoscape.model.CyNetworkFactory;
-import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
+import org.cytoscape.model.subnetwork.CyRootNetworkManager;
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.work.TaskIterator;
@@ -16,7 +16,7 @@
private final CyNetworkViewFactory cyNetworkViewFactory;
private final CyNetworkFactory cyNetworkFactory;
- private final CyRootNetworkFactory cyRootNetworkFactory;
+ private final CyRootNetworkManager cyRootNetworkFactory;
private InputStream inputStream;
private String inputName;
@@ -25,7 +25,7 @@
public GraphMLReaderFactory(CyFileFilter filter, final
CyLayoutAlgorithmManager layouts,
CyNetworkViewFactory cyNetworkViewFactory,
CyNetworkFactory cyNetworkFactory,
- final CyRootNetworkFactory cyRootNetworkFactory) {
+ final CyRootNetworkManager cyRootNetworkFactory) {
this.filter = filter;
this.cyNetworkViewFactory = cyNetworkViewFactory;
this.cyNetworkFactory = cyNetworkFactory;
Modified:
core3/impl/trunk/graphml-impl/src/test/java/org/cytoscape/data/reader/graphml/GraphMLReaderTest.java
===================================================================
---
core3/impl/trunk/graphml-impl/src/test/java/org/cytoscape/data/reader/graphml/GraphMLReaderTest.java
2011-11-29 23:28:43 UTC (rev 27639)
+++
core3/impl/trunk/graphml-impl/src/test/java/org/cytoscape/data/reader/graphml/GraphMLReaderTest.java
2011-11-30 00:02:09 UTC (rev 27640)
@@ -15,7 +15,7 @@
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyTableEntry;
import org.cytoscape.model.NetworkTestSupport;
-import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
+import org.cytoscape.model.subnetwork.CyRootNetworkManager;
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.work.TaskMonitor;
@@ -30,7 +30,7 @@
private NetworkTestSupport testSupport;
private NetworkViewTestSupport nvts;
private CyNetworkFactory netFactory;
- private CyRootNetworkFactory rootFactory;
+ private CyRootNetworkManager rootFactory;
private CyNetworkViewFactory viewFactory;
@Mock
Modified:
core3/impl/trunk/model-impl/impl/src/test/java/org/cytoscape/model/NetworkTestSupport.java
===================================================================
---
core3/impl/trunk/model-impl/impl/src/test/java/org/cytoscape/model/NetworkTestSupport.java
2011-11-29 23:28:43 UTC (rev 27639)
+++
core3/impl/trunk/model-impl/impl/src/test/java/org/cytoscape/model/NetworkTestSupport.java
2011-11-30 00:02:09 UTC (rev 27640)
@@ -24,7 +24,7 @@
protected CyEventHelper eventHelper;
protected CyTableManagerImpl tableMgr;
protected CyNetworkTableManagerImpl networkTableMgr;
- protected CyRootNetworkManager rootNetworkFactory;
+ protected CyRootNetworkManager rootNetworkManager;
public NetworkTestSupport() {
eventHelper = new DummyCyEventHelper();
@@ -33,7 +33,7 @@
final CyServiceRegistrar serviceRegistrar =
mock(CyServiceRegistrar.class);
final CyTableFactoryImpl tableFactory = new
CyTableFactoryImpl(eventHelper, mock(Interpreter.class), serviceRegistrar);
networkFactory = new CyNetworkFactoryImpl(eventHelper,
tableMgr, networkTableMgr, tableFactory, serviceRegistrar);
- rootNetworkFactory = new CyRootNetworkManagerImpl();
+ rootNetworkManager = new CyRootNetworkManagerImpl();
}
public CyNetwork getNetwork() {
@@ -45,7 +45,7 @@
}
public CyRootNetworkManager getRootNetworkFactory() {
- return rootNetworkFactory;
+ return rootNetworkManager;
}
}
Modified:
core3/support/trunk/samples/sample11/src/main/java/org/cytoscape/sample/internal/CreateTableTask.java
===================================================================
---
core3/support/trunk/samples/sample11/src/main/java/org/cytoscape/sample/internal/CreateTableTask.java
2011-11-29 23:28:43 UTC (rev 27639)
+++
core3/support/trunk/samples/sample11/src/main/java/org/cytoscape/sample/internal/CreateTableTask.java
2011-11-30 00:02:09 UTC (rev 27640)
@@ -21,13 +21,13 @@
private CyTableFactory tableFactory;
private CyApplicationManager appMgr;
private CyNetworkManager netMgr;
- private CyRootNetworkManager rootNetworkFactory;
+ private CyRootNetworkManager rootNetworkManager;
- public CreateTableTask(CyApplicationManager appMgr, CyNetworkManager
netMgr, CyTableFactory tableFactory, CyRootNetworkManager rootNetworkFactory){
+ public CreateTableTask(CyApplicationManager appMgr, CyNetworkManager
netMgr, CyTableFactory tableFactory, CyRootNetworkManager rootNetworkManager){
this.appMgr = appMgr;
this.netMgr = netMgr;
this.tableFactory = tableFactory;
- this.rootNetworkFactory = rootNetworkFactory;
+ this.rootNetworkManager = rootNetworkManager;
}
@Override
@@ -55,7 +55,7 @@
Class<? extends CyTableEntry> type = CyNode.class;
// Step 3: pass the new table to MapNetworkAttrTask
- super.insertTasksAfterCurrentTask( new
MapNetworkAttrTask(type,table,netMgr,appMgr,rootNetworkFactory) );
+ super.insertTasksAfterCurrentTask( new
MapNetworkAttrTask(type,table,netMgr,appMgr,rootNetworkManager) );
}
}
Modified:
core3/support/trunk/samples/sample11/src/main/java/org/cytoscape/sample/internal/Sample11TaskFactory.java
===================================================================
---
core3/support/trunk/samples/sample11/src/main/java/org/cytoscape/sample/internal/Sample11TaskFactory.java
2011-11-29 23:28:43 UTC (rev 27639)
+++
core3/support/trunk/samples/sample11/src/main/java/org/cytoscape/sample/internal/Sample11TaskFactory.java
2011-11-30 00:02:09 UTC (rev 27640)
@@ -12,19 +12,19 @@
private CyTableFactory tableFactory;
private CyApplicationManager appMgr;
private CyNetworkManager netMgr;
- private CyRootNetworkManager rootNetworkFactory;
+ private CyRootNetworkManager rootNetworkManager;
public Sample11TaskFactory(CyApplicationManager appMgr,
CyNetworkManager netMgr, CyTableFactory tableFactory,
- CyRootNetworkManager rootNetworkFactory){
+ CyRootNetworkManager rootNetworkManager){
this.appMgr = appMgr;
this.netMgr = netMgr;
this.tableFactory = tableFactory;
- this.rootNetworkFactory = rootNetworkFactory;
+ this.rootNetworkManager = rootNetworkManager;
}
public TaskIterator getTaskIterator() {
- return new TaskIterator(new CreateTableTask(appMgr, netMgr,
tableFactory, rootNetworkFactory));
+ return new TaskIterator(new CreateTableTask(appMgr, netMgr,
tableFactory, rootNetworkManager));
}
}
Modified:
core3/support/trunk/task-testing-impl/src/main/java/org/cytoscape/internal/test/CyActivator.java
===================================================================
---
core3/support/trunk/task-testing-impl/src/main/java/org/cytoscape/internal/test/CyActivator.java
2011-11-29 23:28:43 UTC (rev 27639)
+++
core3/support/trunk/task-testing-impl/src/main/java/org/cytoscape/internal/test/CyActivator.java
2011-11-30 00:02:09 UTC (rev 27640)
@@ -39,7 +39,7 @@
CyApplicationManager cyApplicationManagerServiceRef =
getService(bc,CyApplicationManager.class);
TaskManager taskManagerServiceRef =
getService(bc,TaskManager.class);
- CyRootNetworkManager rootNetworkFactoryServiceRef =
getService(bc,CyRootNetworkManager.class);
+ CyRootNetworkManager rootNetworkManagerServiceRef =
getService(bc,CyRootNetworkManager.class);
WaitAction waitAction = new
WaitAction(cyApplicationManagerServiceRef,taskManagerServiceRef);
MultiTunableAction multiTunableAction = new
MultiTunableAction(cyApplicationManagerServiceRef,taskManagerServiceRef);
@@ -48,7 +48,7 @@
TunablesTestTaskFactory3 tunablesTestTaskFactory3 = new
TunablesTestTaskFactory3();
InfiniteTaskFactory infiniteTaskFactory = new
InfiniteTaskFactory();
MultipleTaskFactory multipleTaskFactory = new
MultipleTaskFactory();
- SharedTableTaskFactory sharedTableTaskFactory = new
SharedTableTaskFactory(rootNetworkFactoryServiceRef);
+ SharedTableTaskFactory sharedTableTaskFactory = new
SharedTableTaskFactory(rootNetworkManagerServiceRef);
registerService(bc,waitAction,CyAction.class, new Properties());
registerService(bc,multiTunableAction,CyAction.class, new
Properties());
--
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.
