Author: rozagh
Date: 2012-06-11 10:57:41 -0700 (Mon, 11 Jun 2012)
New Revision: 29524
Added:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/DynamicTaskFactoryProvisioner.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/DynamicTaskFactoryProvisionerImpl.java
Removed:
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/DynamicTaskFactoryProvisioner.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/task/DynamicTaskFactoryProvisioner.java
Modified:
core3/gui-distribution/trunk/features/src/main/resources/features.xml
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/CommandExecutorImpl.java
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/CyActivator.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/SettingsAction.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeMenuPopulator.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
Log:
Added:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/DynamicTaskFactoryProvisioner.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/DynamicTaskFactoryProvisioner.java
(rev 0)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/DynamicTaskFactoryProvisioner.java
2012-06-11 17:57:41 UTC (rev 29524)
@@ -0,0 +1,11 @@
+package org.cytoscape.task;
+
+import org.cytoscape.work.TaskFactory;
+
+public interface DynamicTaskFactoryProvisioner {
+ public TaskFactory createFor(final NetworkTaskFactory factory);
+ public TaskFactory createFor(final NetworkViewTaskFactory factory);
+ public TaskFactory createFor(final NetworkCollectionTaskFactory
factory);
+ public TaskFactory createFor(final NetworkViewCollectionTaskFactory
factory);
+ public TaskFactory createFor(final TableTaskFactory factory);
+}
Modified: core3/gui-distribution/trunk/features/src/main/resources/features.xml
===================================================================
--- core3/gui-distribution/trunk/features/src/main/resources/features.xml
2012-06-11 17:44:51 UTC (rev 29523)
+++ core3/gui-distribution/trunk/features/src/main/resources/features.xml
2012-06-11 17:57:41 UTC (rev 29524)
@@ -110,7 +110,6 @@
<bundle
start-level="135">mvn:org.cytoscape/application-impl/${cytoscape.impl.version}</bundle>
<bundle
start-level="140">mvn:org.cytoscape/datasource-biogrid-impl/${cytoscape.impl.version}</bundle>
- <bundle
start-level="140">mvn:org.cytoscape/command-executor-impl/${cytoscape.impl.version}</bundle>
<bundle
start-level="140">mvn:org.cytoscape/session-impl/${cytoscape.impl.version}</bundle>
<bundle
start-level="145">mvn:org.cytoscape/ding-presentation-impl/${cytoscape.impl.version}</bundle>
@@ -118,6 +117,7 @@
<bundle
start-level="150">mvn:org.cytoscape/io-impl/${cytoscape.impl.version}</bundle>
<bundle
start-level="155">mvn:org.cytoscape/core-task-impl/${cytoscape.impl.version}</bundle>
+ <bundle
start-level="157">mvn:org.cytoscape/command-executor-impl/${cytoscape.impl.version}</bundle>
<bundle
start-level="160">mvn:org.cytoscape/swing-application-impl/${cytoscape.impl.version}</bundle>
<bundle
start-level="160">mvn:org.cytoscape/group-data-impl/${cytoscape.impl.version}</bundle>
Modified:
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/CommandExecutorImpl.java
===================================================================
---
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/CommandExecutorImpl.java
2012-06-11 17:44:51 UTC (rev 29523)
+++
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/CommandExecutorImpl.java
2012-06-11 17:57:41 UTC (rev 29524)
@@ -14,6 +14,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.cytoscape.task.DynamicTaskFactoryProvisioner;
import org.cytoscape.task.NetworkViewTaskFactory;
import org.cytoscape.task.NetworkViewCollectionTaskFactory;
import org.cytoscape.task.TableTaskFactory;
@@ -33,9 +34,9 @@
private final DynamicTaskFactoryProvisioner factoryProvisioner;
- public CommandExecutorImpl(CyApplicationManager appMgr,
CommandTunableInterceptorImpl interceptor) {
+ public CommandExecutorImpl(CyApplicationManager appMgr,
CommandTunableInterceptorImpl interceptor, DynamicTaskFactoryProvisioner
factoryProvisioner) {
this.appMgr = appMgr;
- this.factoryProvisioner = new
DynamicTaskFactoryProvisioner(appMgr);
+ this.factoryProvisioner = factoryProvisioner;
this.interceptor = interceptor;
}
Modified:
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/CyActivator.java
2012-06-11 17:44:51 UTC (rev 29523)
+++
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/CyActivator.java
2012-06-11 17:57:41 UTC (rev 29524)
@@ -11,6 +11,7 @@
import org.cytoscape.work.TaskFactory;
+import org.cytoscape.task.DynamicTaskFactoryProvisioner;
import org.cytoscape.task.NetworkTaskFactory;
import org.cytoscape.task.NetworkViewTaskFactory;
import org.cytoscape.task.NetworkViewCollectionTaskFactory;
@@ -34,9 +35,11 @@
CyApplicationManager cyApplicationManagerServiceRef =
getService(bc,CyApplicationManager.class);
TunableSetter tunableSetterServiceRef =
getService(bc,TunableSetter.class);
+ DynamicTaskFactoryProvisioner
dynamicTaskFactoryProvisionerServiceRef = getService(bc,
DynamicTaskFactoryProvisioner.class);
+
CommandTunableInterceptorImpl interceptor = new
CommandTunableInterceptorImpl();
- CommandExecutorImpl commandExecutorImpl = new
CommandExecutorImpl(cyApplicationManagerServiceRef, interceptor);
+ CommandExecutorImpl commandExecutorImpl = new
CommandExecutorImpl(cyApplicationManagerServiceRef, interceptor,
dynamicTaskFactoryProvisionerServiceRef);
CommandExecutorTaskFactoryImpl commandExecutorTaskFactory = new
CommandExecutorTaskFactoryImpl(commandExecutorImpl,tunableSetterServiceRef);
Deleted:
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/DynamicTaskFactoryProvisioner.java
===================================================================
---
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/DynamicTaskFactoryProvisioner.java
2012-06-11 17:44:51 UTC (rev 29523)
+++
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/DynamicTaskFactoryProvisioner.java
2012-06-11 17:57:41 UTC (rev 29524)
@@ -1,73 +0,0 @@
-package org.cytoscape.command.internal;
-
-import org.cytoscape.application.CyApplicationManager;
-import org.cytoscape.task.NetworkTaskFactory;
-import org.cytoscape.task.NetworkViewTaskFactory;
-import org.cytoscape.task.NetworkViewCollectionTaskFactory;
-import org.cytoscape.task.TableTaskFactory;
-import org.cytoscape.work.TaskFactory;
-import org.cytoscape.work.TaskIterator;
-
-public class DynamicTaskFactoryProvisioner {
-
- private CyApplicationManager applicationManager;
-
- public DynamicTaskFactoryProvisioner(CyApplicationManager
applicationManager) {
- this.applicationManager = applicationManager;
- }
-
- public TaskFactory createFor(final NetworkTaskFactory factory) {
- return new TaskFactory() {
- @Override
- public TaskIterator createTaskIterator() {
- return
factory.createTaskIterator(applicationManager.getCurrentNetwork());
- }
-
- @Override
- public boolean isReady() {
- return
factory.isReady(applicationManager.getCurrentNetwork());
- }
- };
- }
-
- public TaskFactory createFor(final NetworkViewTaskFactory factory) {
- return new TaskFactory() {
- @Override
- public TaskIterator createTaskIterator() {
- return
factory.createTaskIterator(applicationManager.getCurrentNetworkView());
- }
-
- @Override
- public boolean isReady() {
- return
factory.isReady(applicationManager.getCurrentNetworkView());
- }
- };
- }
-
- public TaskFactory createFor(final NetworkViewCollectionTaskFactory
factory) {
- return new TaskFactory() {
- @Override
- public TaskIterator createTaskIterator() {
- return
factory.createTaskIterator(applicationManager.getSelectedNetworkViews());
- }
-
- @Override
- public boolean isReady() {
- return
factory.isReady(applicationManager.getSelectedNetworkViews());
- }
- };
- }
-
- public TaskFactory createFor(final TableTaskFactory factory) {
- return new TaskFactory() {
- public TaskIterator createTaskIterator() {
- return
factory.createTaskIterator(applicationManager.getCurrentTable());
- }
-
- @Override
- public boolean isReady() {
- return
factory.isReady(applicationManager.getCurrentTable());
- }
- };
- }
-}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-06-11 17:44:51 UTC (rev 29523)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-06-11 17:57:41 UTC (rev 29524)
@@ -44,6 +44,7 @@
import org.cytoscape.service.util.AbstractCyActivator;
import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.session.CySessionManager;
+import org.cytoscape.task.DynamicTaskFactoryProvisioner;
import org.cytoscape.task.NetworkCollectionTaskFactory;
import org.cytoscape.task.NetworkTaskFactory;
import org.cytoscape.task.NetworkViewCollectionTaskFactory;
@@ -285,6 +286,9 @@
MapGlobalToLocalTableTaskFactoryImpl mapGlobal = new
MapGlobalToLocalTableTaskFactoryImpl(cyTableManagerServiceRef,
cyNetworkManagerServiceRef, tunableSetterServiceRef);
+ DynamicTaskFactoryProvisionerImpl
dynamicTaskFactoryProvisionerImpl = new
DynamicTaskFactoryProvisionerImpl(cyApplicationManagerServiceRef);
+
+ registerAllServices(bc, dynamicTaskFactoryProvisionerImpl, new
Properties());
// Apply Visual Style Task
ApplyVisualStyleTaskFactoryimpl applyVisualStyleTaskFactory =
new ApplyVisualStyleTaskFactoryimpl(visualMappingManagerServiceRef);
Added:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/DynamicTaskFactoryProvisionerImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/DynamicTaskFactoryProvisionerImpl.java
(rev 0)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/DynamicTaskFactoryProvisionerImpl.java
2012-06-11 17:57:41 UTC (rev 29524)
@@ -0,0 +1,91 @@
+package org.cytoscape.task.internal;
+
+import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.task.DynamicTaskFactoryProvisioner;
+import org.cytoscape.task.NetworkCollectionTaskFactory;
+import org.cytoscape.task.NetworkTaskFactory;
+import org.cytoscape.task.NetworkViewCollectionTaskFactory;
+import org.cytoscape.task.NetworkViewTaskFactory;
+import org.cytoscape.task.TableTaskFactory;
+import org.cytoscape.work.TaskFactory;
+import org.cytoscape.work.TaskIterator;
+
+public class DynamicTaskFactoryProvisionerImpl implements
DynamicTaskFactoryProvisioner{
+
+
+ private final CyApplicationManager applicationManager;
+
+ public DynamicTaskFactoryProvisionerImpl(CyApplicationManager
applicationManager) {
+ this.applicationManager = applicationManager;
+ }
+
+ public TaskFactory createFor(final NetworkTaskFactory factory) {
+ return new TaskFactory() {
+ @Override
+ public TaskIterator createTaskIterator() {
+ return
factory.createTaskIterator(applicationManager.getCurrentNetwork());
+ }
+
+ @Override
+ public boolean isReady() {
+ return
factory.isReady(applicationManager.getCurrentNetwork());
+ }
+ };
+ }
+
+ public TaskFactory createFor(final NetworkViewTaskFactory factory) {
+ return new TaskFactory() {
+ @Override
+ public TaskIterator createTaskIterator() {
+ return
factory.createTaskIterator(applicationManager.getCurrentNetworkView());
+ }
+
+ @Override
+ public boolean isReady() {
+ return
factory.isReady(applicationManager.getCurrentNetworkView());
+ }
+ };
+ }
+
+ public TaskFactory createFor(final NetworkCollectionTaskFactory
factory) {
+ return new TaskFactory() {
+ @Override
+ public TaskIterator createTaskIterator() {
+ return
factory.createTaskIterator(applicationManager.getSelectedNetworks());
+ }
+
+ @Override
+ public boolean isReady() {
+ return
factory.isReady(applicationManager.getSelectedNetworks());
+ }
+ };
+ }
+
+ public TaskFactory createFor(final NetworkViewCollectionTaskFactory
factory) {
+ return new TaskFactory() {
+ @Override
+ public TaskIterator createTaskIterator() {
+ return
factory.createTaskIterator(applicationManager.getSelectedNetworkViews());
+ }
+
+ @Override
+ public boolean isReady() {
+ return
factory.isReady(applicationManager.getSelectedNetworkViews());
+ }
+ };
+ }
+
+ public TaskFactory createFor(final TableTaskFactory factory) {
+ return new TaskFactory() {
+ public TaskIterator createTaskIterator() {
+ return
factory.createTaskIterator(applicationManager.getCurrentTable());
+ }
+
+ @Override
+ public boolean isReady() {
+ return
factory.isReady(applicationManager.getCurrentTable());
+ }
+ };
+ }
+
+}
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
2012-06-11 17:44:51 UTC (rev 29523)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
2012-06-11 17:57:41 UTC (rev 29524)
@@ -103,6 +103,7 @@
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.session.CySessionManager;
import org.cytoscape.session.events.SessionLoadedListener;
+import org.cytoscape.task.DynamicTaskFactoryProvisioner;
import org.cytoscape.task.NetworkCollectionTaskFactory;
import org.cytoscape.task.NetworkTaskFactory;
import org.cytoscape.task.NetworkViewCollectionTaskFactory;
@@ -178,6 +179,7 @@
VisualMappingManager visualMappingManagerServiceRef =
getService(bc, VisualMappingManager.class);
FileUtil fileUtilServiceRef = getService(bc, FileUtil.class);
+ DynamicTaskFactoryProvisioner
dynamicTaskFactoryProvisionerServiceRef = getService(bc,
DynamicTaskFactoryProvisioner.class);
UndoAction undoAction = new UndoAction(undoSupportServiceRef);
@@ -206,7 +208,8 @@
cyNetworkManagerServiceRef,
cyNetworkViewManagerServiceRef,
birdsEyeViewHandler,
-
dialogTaskManagerServiceRef);
+
dialogTaskManagerServiceRef,
+
dynamicTaskFactoryProvisionerServiceRef);
CytoscapeDesktop cytoscapeDesktop = new
CytoscapeDesktop(cytoscapeMenus,
networkViewManager, networkPanel,
cytoscapeShutdownServiceRef,
@@ -236,11 +239,12 @@
dialogTaskManagerServiceRef,
panelTaskManagerServiceRef,
cyApplicationManagerServiceRef, cyNetworkViewManagerServiceRef,
-
cyServiceRegistrarServiceRef);
+
cyServiceRegistrarServiceRef,
+
dynamicTaskFactoryProvisionerServiceRef);
SettingsAction settingsAction = new
SettingsAction(cyLayoutsServiceRef, cytoscapeDesktop,
cyApplicationManagerServiceRef, cyNetworkViewManagerServiceRef,
panelTaskManagerServiceRef,
-
cytoscapePropertiesServiceRef);
+
cytoscapePropertiesServiceRef, dynamicTaskFactoryProvisionerServiceRef);
HelpContentsTaskFactory helpContentsTaskFactory = new
HelpContentsTaskFactory(cyHelpBroker,
cytoscapeDesktop);
HelpContactHelpDeskTaskFactory helpContactHelpDeskTaskFactory =
new HelpContactHelpDeskTaskFactory(openBrowserServiceRef);
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
2012-06-11 17:44:51 UTC (rev 29523)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
2012-06-11 17:57:41 UTC (rev 29524)
@@ -62,12 +62,12 @@
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.application.swing.CySwingApplication;
-import org.cytoscape.internal.task.DynamicTaskFactoryProvisioner;
import org.cytoscape.model.CyColumn;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyTable;
import org.cytoscape.property.CyProperty;
+import org.cytoscape.task.DynamicTaskFactoryProvisioner;
import org.cytoscape.task.NetworkViewTaskFactory;
import org.cytoscape.view.layout.CyLayoutAlgorithm;
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
@@ -118,7 +118,8 @@
final CySwingApplication desktop,
final CyApplicationManager appMgr,
final PanelTaskManager taskManager,
- final CyProperty
cytoscapePropertiesServiceRef)
+ final CyProperty
cytoscapePropertiesServiceRef,
+ DynamicTaskFactoryProvisioner
factoryProvisioner)
{
super(desktop.getJFrame(), "Layout Settings", false);
@@ -131,7 +132,7 @@
this.appMgr = appMgr;
this.taskManager = taskManager;
this.cytoscapePropertiesServiceRef =
cytoscapePropertiesServiceRef;
- this.factoryProvisioner = new
DynamicTaskFactoryProvisioner(appMgr);
+ this.factoryProvisioner = factoryProvisioner;
selectedTunable = new SelectedTunable();
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/SettingsAction.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/SettingsAction.java
2012-06-11 17:44:51 UTC (rev 29523)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/SettingsAction.java
2012-06-11 17:57:41 UTC (rev 29524)
@@ -36,6 +36,7 @@
import org.cytoscape.application.swing.CySwingApplication;
import org.cytoscape.application.swing.AbstractCyAction;
import org.cytoscape.property.CyProperty;
+import org.cytoscape.task.DynamicTaskFactoryProvisioner;
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.work.swing.PanelTaskManager;
@@ -55,7 +56,7 @@
private LayoutSettingsDialog settingsDialog;
public SettingsAction(final CyLayoutAlgorithmManager cyl, final
CySwingApplication desk, final CyApplicationManager appMgr, final
CyNetworkViewManager networkViewManager,
- final PanelTaskManager tm, CyProperty
cytoscapePropertiesServiceRef)
+ final PanelTaskManager tm, CyProperty
cytoscapePropertiesServiceRef, DynamicTaskFactoryProvisioner factoryProvisioner)
{
super("Settings...",appMgr,"networkAndView",
networkViewManager);
this.appMgr = appMgr;
@@ -66,7 +67,7 @@
this.tm = tm;
this.cytoscapePropertiesServiceRef =
cytoscapePropertiesServiceRef;
- settingsDialog = new LayoutSettingsDialog(cyl, desk, appMgr,
tm, this.cytoscapePropertiesServiceRef);
+ settingsDialog = new LayoutSettingsDialog(cyl, desk, appMgr,
tm, this.cytoscapePropertiesServiceRef, factoryProvisioner );
}
public void actionPerformed(ActionEvent e) {
Deleted:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/task/DynamicTaskFactoryProvisioner.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/task/DynamicTaskFactoryProvisioner.java
2012-06-11 17:44:51 UTC (rev 29523)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/task/DynamicTaskFactoryProvisioner.java
2012-06-11 17:57:41 UTC (rev 29524)
@@ -1,88 +0,0 @@
-package org.cytoscape.internal.task;
-
-import org.cytoscape.application.CyApplicationManager;
-import org.cytoscape.task.NetworkCollectionTaskFactory;
-import org.cytoscape.task.NetworkTaskFactory;
-import org.cytoscape.task.NetworkViewCollectionTaskFactory;
-import org.cytoscape.task.NetworkViewTaskFactory;
-import org.cytoscape.task.TableTaskFactory;
-import org.cytoscape.work.TaskFactory;
-import org.cytoscape.work.TaskIterator;
-
-public class DynamicTaskFactoryProvisioner {
-
- private CyApplicationManager applicationManager;
-
- public DynamicTaskFactoryProvisioner(CyApplicationManager
applicationManager) {
- this.applicationManager = applicationManager;
- }
-
- public TaskFactory createFor(final NetworkTaskFactory factory) {
- return new TaskFactory() {
- @Override
- public TaskIterator createTaskIterator() {
- return
factory.createTaskIterator(applicationManager.getCurrentNetwork());
- }
-
- @Override
- public boolean isReady() {
- return
factory.isReady(applicationManager.getCurrentNetwork());
- }
- };
- }
-
- public TaskFactory createFor(final NetworkViewTaskFactory factory) {
- return new TaskFactory() {
- @Override
- public TaskIterator createTaskIterator() {
- return
factory.createTaskIterator(applicationManager.getCurrentNetworkView());
- }
-
- @Override
- public boolean isReady() {
- return
factory.isReady(applicationManager.getCurrentNetworkView());
- }
- };
- }
-
- public TaskFactory createFor(final NetworkCollectionTaskFactory
factory) {
- return new TaskFactory() {
- @Override
- public TaskIterator createTaskIterator() {
- return
factory.createTaskIterator(applicationManager.getSelectedNetworks());
- }
-
- @Override
- public boolean isReady() {
- return
factory.isReady(applicationManager.getSelectedNetworks());
- }
- };
- }
-
- public TaskFactory createFor(final NetworkViewCollectionTaskFactory
factory) {
- return new TaskFactory() {
- @Override
- public TaskIterator createTaskIterator() {
- return
factory.createTaskIterator(applicationManager.getSelectedNetworkViews());
- }
-
- @Override
- public boolean isReady() {
- return
factory.isReady(applicationManager.getSelectedNetworkViews());
- }
- };
- }
-
- public TaskFactory createFor(final TableTaskFactory factory) {
- return new TaskFactory() {
- public TaskIterator createTaskIterator() {
- return
factory.createTaskIterator(applicationManager.getCurrentTable());
- }
-
- @Override
- public boolean isReady() {
- return
factory.isReady(applicationManager.getCurrentTable());
- }
- };
- }
-}
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeMenuPopulator.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeMenuPopulator.java
2012-06-11 17:44:51 UTC (rev 29523)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeMenuPopulator.java
2012-06-11 17:57:41 UTC (rev 29524)
@@ -39,9 +39,9 @@
import org.cytoscape.application.swing.CyAction;
import org.cytoscape.application.swing.CySwingApplication;
import org.cytoscape.internal.task.CytoPanelTaskFactoryTunableAction;
-import org.cytoscape.internal.task.DynamicTaskFactoryProvisioner;
import org.cytoscape.internal.task.TaskFactoryTunableAction;
import org.cytoscape.service.util.CyServiceRegistrar;
+import org.cytoscape.task.DynamicTaskFactoryProvisioner;
import org.cytoscape.task.NetworkCollectionTaskFactory;
import org.cytoscape.task.NetworkTaskFactory;
import org.cytoscape.task.NetworkViewCollectionTaskFactory;
@@ -83,7 +83,8 @@
*/
public CytoscapeMenuPopulator(final CySwingApplication app, final
DialogTaskManager dialogTaskManager,
final PanelTaskManager panelTaskManager,
- final CyApplicationManager appManager,
final CyNetworkViewManager networkViewManager, final CyServiceRegistrar
registrar)
+ final CyApplicationManager appManager,
final CyNetworkViewManager networkViewManager, final CyServiceRegistrar
registrar,
+ DynamicTaskFactoryProvisioner
factoryProvisioner)
{
this.app = app;
this.networkViewManager = networkViewManager;
@@ -91,7 +92,7 @@
this.panelTaskManager = panelTaskManager;
this.appManager = appManager;
this.registrar = registrar;
- this.factoryProvisioner = new
DynamicTaskFactoryProvisioner(appManager);
+ this.factoryProvisioner = factoryProvisioner;
taskMap = new HashMap<TaskFactory,CyAction>();
provisionerMap = new IdentityHashMap<Object, TaskFactory>();
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
2012-06-11 17:44:51 UTC (rev 29523)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
2012-06-11 17:57:41 UTC (rev 29524)
@@ -69,7 +69,6 @@
import org.cytoscape.application.events.SetSelectedNetworksEvent;
import org.cytoscape.application.events.SetSelectedNetworksListener;
import org.cytoscape.application.swing.CyAction;
-import org.cytoscape.internal.task.DynamicTaskFactoryProvisioner;
import org.cytoscape.internal.task.TaskFactoryTunableAction;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkManager;
@@ -84,6 +83,7 @@
import org.cytoscape.model.events.RowsSetListener;
import org.cytoscape.model.subnetwork.CyRootNetwork;
import org.cytoscape.model.subnetwork.CySubNetwork;
+import org.cytoscape.task.DynamicTaskFactoryProvisioner;
import org.cytoscape.task.NetworkCollectionTaskFactory;
import org.cytoscape.task.NetworkTaskFactory;
import org.cytoscape.task.NetworkViewCollectionTaskFactory;
@@ -150,7 +150,8 @@
final CyNetworkManager netMgr,
final CyNetworkViewManager
netViewMgr,
final BirdsEyeViewHandler bird,
- final DialogTaskManager
taskMgr) {
+ final DialogTaskManager taskMgr,
+ DynamicTaskFactoryProvisioner
factoryProvisioner) {
super();
this.treeNodeMap = new HashMap<Long, NetworkTreeNode>();
@@ -159,7 +160,7 @@
this.netMgr = netMgr;
this.netViewMgr = netViewMgr;
this.taskMgr = taskMgr;
- this.factoryProvisioner = new
DynamicTaskFactoryProvisioner(appMgr);
+ this.factoryProvisioner = factoryProvisioner;
root = new NetworkTreeNode("Network Root", null);
treeTableModel = new NetworkTreeTableModel(this, root);
--
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.
