Author: jm
Date: 2012-03-20 06:51:05 -0700 (Tue, 20 Mar 2012)
New Revision: 28590
Removed:
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/api/core-task-api/src/main/java/org/cytoscape/task/TaskFactoryProvisioner.java
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/core-task-impl/src/main/java/org/cytoscape/task/internal/TaskFactoryProvisionerImpl.java
Modified:
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/command-executor-impl/src/main/java/org/cytoscape/command/internal/CommandExecutorImpl.java
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/command-executor-impl/src/main/java/org/cytoscape/command/internal/CyActivator.java
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleImpl.java
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/LayoutMenuPopulator.java
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/SettingsAction.java
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeMenuPopulator.java
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
Log:
Removed TaskFactoryProvisioner from API
Deleted:
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/api/core-task-api/src/main/java/org/cytoscape/task/TaskFactoryProvisioner.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/api/core-task-api/src/main/java/org/cytoscape/task/TaskFactoryProvisioner.java
2012-03-20 11:12:28 UTC (rev 28589)
+++
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/api/core-task-api/src/main/java/org/cytoscape/task/TaskFactoryProvisioner.java
2012-03-20 13:51:05 UTC (rev 28590)
@@ -1,11 +0,0 @@
-package org.cytoscape.task;
-
-import org.cytoscape.work.TaskFactory;
-
-public interface TaskFactoryProvisioner {
- TaskFactory createFor(NetworkTaskFactory factory);
- TaskFactory createFor(NetworkViewTaskFactory factory);
- TaskFactory createFor(NetworkCollectionTaskFactory factory);
- TaskFactory createFor(NetworkViewCollectionTaskFactory factory);
- TaskFactory createFor(TableTaskFactory factory);
-}
Modified:
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/command-executor-impl/src/main/java/org/cytoscape/command/internal/CommandExecutorImpl.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/command-executor-impl/src/main/java/org/cytoscape/command/internal/CommandExecutorImpl.java
2012-03-20 11:12:28 UTC (rev 28589)
+++
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/command-executor-impl/src/main/java/org/cytoscape/command/internal/CommandExecutorImpl.java
2012-03-20 13:51:05 UTC (rev 28590)
@@ -10,7 +10,6 @@
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.command.internal.tunables.CommandTunableInterceptorImpl;
import org.cytoscape.task.NetworkTaskFactory;
-import org.cytoscape.task.TaskFactoryProvisioner;
import org.cytoscape.work.TaskFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,11 +30,11 @@
private final CommandTunableInterceptorImpl interceptor;
private final CyApplicationManager appMgr;
- private final TaskFactoryProvisioner factoryProvisioner;
+ private final DynamicTaskFactoryProvisioner factoryProvisioner;
- public CommandExecutorImpl(CyApplicationManager appMgr,
CommandTunableInterceptorImpl interceptor, TaskFactoryProvisioner
factoryProvisioner) {
+ public CommandExecutorImpl(CyApplicationManager appMgr,
CommandTunableInterceptorImpl interceptor) {
this.appMgr = appMgr;
- this.factoryProvisioner = factoryProvisioner;
+ this.factoryProvisioner = new
DynamicTaskFactoryProvisioner(appMgr);
this.interceptor = interceptor;
}
Modified:
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/command-executor-impl/src/main/java/org/cytoscape/command/internal/CyActivator.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/command-executor-impl/src/main/java/org/cytoscape/command/internal/CyActivator.java
2012-03-20 11:12:28 UTC (rev 28589)
+++
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/command-executor-impl/src/main/java/org/cytoscape/command/internal/CyActivator.java
2012-03-20 13:51:05 UTC (rev 28590)
@@ -11,7 +11,6 @@
import org.cytoscape.work.TaskFactory;
import org.cytoscape.task.NetworkTaskFactory;
-import org.cytoscape.task.TaskFactoryProvisioner;
import org.cytoscape.task.NetworkViewTaskFactory;
import org.cytoscape.task.TableTaskFactory;
import org.cytoscape.work.util.*;
@@ -32,8 +31,7 @@
CyApplicationManager cyApplicationManagerServiceRef =
getService(bc,CyApplicationManager.class);
CommandTunableInterceptorImpl interceptor = new
CommandTunableInterceptorImpl();
- TaskFactoryProvisioner factoryProvisioner = getService(bc,
TaskFactoryProvisioner.class);
- CommandExecutorImpl commandExecutorImpl = new
CommandExecutorImpl(cyApplicationManagerServiceRef, interceptor,
factoryProvisioner);
+ CommandExecutorImpl commandExecutorImpl = new
CommandExecutorImpl(cyApplicationManagerServiceRef, interceptor);
CommandExecutorTaskFactory commandExecutorTaskFactory = new
CommandExecutorTaskFactory(commandExecutorImpl);
Modified:
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-03-20 11:12:28 UTC (rev 28589)
+++
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-03-20 13:51:05 UTC (rev 28590)
@@ -37,7 +37,6 @@
import org.cytoscape.task.TableCellTaskFactory;
import org.cytoscape.task.TableColumnTaskFactory;
import org.cytoscape.task.TableTaskFactory;
-import org.cytoscape.task.TaskFactoryProvisioner;
import org.cytoscape.task.creation.LoadVisualStyles;
import org.cytoscape.task.creation.NewEmptyNetworkViewFactory;
import org.cytoscape.task.internal.creation.CloneNetworkTaskFactory;
@@ -93,7 +92,6 @@
import org.cytoscape.task.internal.table.CopyValueToEntireColumnTaskFactory;
import org.cytoscape.task.internal.table.DeleteColumnTaskFactory;
import org.cytoscape.task.internal.table.DeleteTableTaskFactory;
-import org.cytoscape.task.internal.table.MapGlobalToLocalTableTask;
import org.cytoscape.task.internal.table.MapGlobalToLocalTableTaskFactory;
import org.cytoscape.task.internal.table.RenameColumnTaskFactory;
import org.cytoscape.task.internal.title.EditNetworkTitleTaskFactory;
@@ -233,9 +231,6 @@
GroupNodeContextTaskFactory collapseGroupTaskFactory = new
GroupNodeContextTaskFactory(cyGroupManager, true);
GroupNodeContextTaskFactory expandGroupTaskFactory = new
GroupNodeContextTaskFactory(cyGroupManager, false);
- TaskFactoryProvisionerImpl factoryProvisioner = new
TaskFactoryProvisionerImpl(cyApplicationManagerServiceRef);
- registerService(bc, factoryProvisioner,
TaskFactoryProvisioner.class, new Properties());
-
MapGlobalToLocalTableTaskFactory mapGlobal = new
MapGlobalToLocalTableTaskFactory(cyTableManagerServiceRef,
cyNetworkManagerServiceRef);
Properties mapGlobalProps = new Properties();
Deleted:
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/core-task-impl/src/main/java/org/cytoscape/task/internal/TaskFactoryProvisionerImpl.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/core-task-impl/src/main/java/org/cytoscape/task/internal/TaskFactoryProvisionerImpl.java
2012-03-20 11:12:28 UTC (rev 28589)
+++
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/core-task-impl/src/main/java/org/cytoscape/task/internal/TaskFactoryProvisionerImpl.java
2012-03-20 13:51:05 UTC (rev 28590)
@@ -1,94 +0,0 @@
-package org.cytoscape.task.internal;
-
-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.task.TaskFactoryProvisioner;
-import org.cytoscape.work.TaskFactory;
-import org.cytoscape.work.TaskIterator;
-
-public class TaskFactoryProvisionerImpl implements TaskFactoryProvisioner {
-
- private CyApplicationManager applicationManager;
-
- public TaskFactoryProvisionerImpl(CyApplicationManager
applicationManager) {
- this.applicationManager = applicationManager;
- }
-
- @Override
- 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());
- }
- };
- }
-
- @Override
- 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());
- }
- };
- }
-
- @Override
- 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());
- }
- };
- }
-
- @Override
- 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());
- }
- };
- }
-
- @Override
- 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:
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2012-03-20 11:12:28 UTC (rev 28589)
+++
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2012-03-20 13:51:05 UTC (rev 28590)
@@ -287,6 +287,16 @@
* Ref to foreground canvas object.
*/
ArbitraryGraphicsCanvas m_foregroundCanvas;
+
+ /**
+ * Current image width
+ */
+ int imageWidth = 0;
+
+ /**
+ * Current image Height
+ */
+ int imageHeight = 0;
/**
*
@@ -1143,7 +1153,16 @@
final long start = System.currentTimeMillis();
cyEventHelper.flushPayloadEvents();
m_networkCanvas.repaint();
- logger.debug("Repaint finised in " +
(System.currentTimeMillis() - start) + " msec.");
+
+ //Check if image size has changed if so, visual property needs
to be changed as well
+ if( m_networkCanvas.getWidth() != imageWidth ||
m_networkCanvas.getHeight() != imageHeight)
+ {
+ imageWidth = m_networkCanvas.getWidth();
+ imageHeight = m_networkCanvas.getHeight();
+
setVisualProperty(BasicVisualLexicon.NETWORK_WIDTH,(double)imageWidth);
+
setVisualProperty(BasicVisualLexicon.NETWORK_HEIGHT,(double)imageHeight);
+ }
+ logger.debug("Repaint finished in " +
(System.currentTimeMillis() - start) + " msec.");
}
/**
Modified:
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleImpl.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleImpl.java
2012-03-20 11:12:28 UTC (rev 28589)
+++
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleImpl.java
2012-03-20 13:51:05 UTC (rev 28590)
@@ -46,6 +46,7 @@
final Double tY =
targetView.getVisualProperty(DVisualLexicon.NODE_Y_LOCATION);
final Point2D newPoint = new Point2D.Double();
+
if (EditMode.isDirectMode() == false) {
// Original edge vector v = (vx, vy). (from source to
target)
@@ -131,23 +132,32 @@
// Now we can get the Cos(theta)
cosTheta = lengthVp/dist1;
- // Theta is the angle between v1 and v2
- final double theta = Math.acos(cosTheta);
+
+// // Theta is the angle between v1 and v2
+ double theta = Math.acos(cosTheta);
+
+ // Adjust angle if >PI/2
+ if(dotProduct<0) {
+ // PI/2< theta <=PI
+ theta = Math.PI-theta;
+ cosTheta = Math.cos(theta);
+ }
sinTheta = Math.sin(theta);
+// System.out.println("## Dot prod = " + dotProduct);
+// System.out.println("** cos = " + cosTheta);
+// System.out.println("** sin = " + sinTheta);
+
// Check direction of rotation
- final double slopeE = (tY-sY)/(tX-sX);
- final double slopeH = (hY-sY)/(hX-sX);
- if((sX<=tX && sY <= tY) || (sX>tX && sY > tY)) {
- if(slopeE>=slopeH) {
- cosTheta = Math.cos(-theta);
- sinTheta = Math.sin(-theta);
- }
+ final double slopeE = (tY-sY)/(tX-sX);
+
+ // Rotate to opposite direction
+ if((sX<=tX && sY <= tY) || (sX<tX && sY > tY)) {
+ if (slopeE * hX > hY)
+ sinTheta = -sinTheta;
} else {
- if(slopeE<=slopeH) {
- cosTheta = Math.cos(-theta);
- sinTheta = Math.sin(-theta);
- }
+ if (slopeE * hX < hY)
+ sinTheta = -sinTheta;
}
// System.out.println("** (Sx, Sy) = (" + sX + ", " + sY + ")");
Modified:
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
2012-03-20 11:12:28 UTC (rev 28589)
+++
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
2012-03-20 13:51:05 UTC (rev 28590)
@@ -109,7 +109,6 @@
import org.cytoscape.task.NetworkViewCollectionTaskFactory;
import org.cytoscape.task.NetworkViewTaskFactory;
import org.cytoscape.task.TableTaskFactory;
-import org.cytoscape.task.TaskFactoryProvisioner;
import org.cytoscape.util.swing.OpenBrowser;
import org.cytoscape.view.layout.CyLayoutAlgorithm;
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
@@ -187,7 +186,6 @@
registerService(bc, bookmarkDialogFactory,
SessionLoadedListener.class, new Properties());
- TaskFactoryProvisioner factoryProvisioner = getService(bc,
TaskFactoryProvisioner.class);
CytoscapeMenuBar cytoscapeMenuBar = new CytoscapeMenuBar();
CytoscapeToolBar cytoscapeToolBar = new CytoscapeToolBar();
CytoscapeMenus cytoscapeMenus = new
CytoscapeMenus(cytoscapeMenuBar, cytoscapeToolBar);
@@ -203,8 +201,7 @@
cyNetworkManagerServiceRef,
cyNetworkViewManagerServiceRef,
birdsEyeViewHandler,
-
dialogTaskManagerServiceRef,
-
factoryProvisioner);
+
dialogTaskManagerServiceRef);
CytoscapeDesktop cytoscapeDesktop = new
CytoscapeDesktop(cytoscapeMenus,
networkViewManager, networkPanel,
cytoscapeShutdownServiceRef,
@@ -231,19 +228,16 @@
cyApplicationManagerServiceRef,
submenuTaskManagerServiceRef,
undoSupportServiceRef,
-
cyEventHelperServiceRef,
-
factoryProvisioner);
+
cyEventHelperServiceRef);
CytoscapeMenuPopulator cytoscapeMenuPopulator = new
CytoscapeMenuPopulator(cytoscapeDesktop,
dialogTaskManagerServiceRef,
panelTaskManagerServiceRef,
cyApplicationManagerServiceRef,
-
cyServiceRegistrarServiceRef,
-
factoryProvisioner);
+
cyServiceRegistrarServiceRef);
SettingsAction settingsAction = new
SettingsAction(cyLayoutsServiceRef, cytoscapeDesktop,
cyApplicationManagerServiceRef,
panelTaskManagerServiceRef,
-
cytoscapePropertiesServiceRef,
-
factoryProvisioner);
+
cytoscapePropertiesServiceRef);
HelpContentsTaskFactory helpContentsTaskFactory = new
HelpContentsTaskFactory(cyHelpBroker,
cytoscapeDesktop);
HelpContactHelpDeskTaskFactory helpContactHelpDeskTaskFactory =
new HelpContactHelpDeskTaskFactory(openBrowserServiceRef);
Modified:
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/LayoutMenuPopulator.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/LayoutMenuPopulator.java
2012-03-20 11:12:28 UTC (rev 28589)
+++
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/LayoutMenuPopulator.java
2012-03-20 13:51:05 UTC (rev 28590)
@@ -49,8 +49,8 @@
import org.cytoscape.application.swing.CySwingApplication;
import org.cytoscape.application.swing.StringEnableSupport;
import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.internal.task.DynamicTaskFactoryProvisioner;
import org.cytoscape.task.NetworkViewTaskFactory;
-import org.cytoscape.task.TaskFactoryProvisioner;
import org.cytoscape.view.layout.AbstractLayoutAlgorithm;
import org.cytoscape.view.layout.AbstractLayoutAlgorithmContext;
import org.cytoscape.view.layout.CyLayoutAlgorithm;
@@ -74,17 +74,17 @@
private Set<JMenu> parentMenuSet = new HashSet<JMenu>();
private UndoSupport undo;
private CyEventHelper eventHelper;
- private TaskFactoryProvisioner factoryProvisioner;
+ private DynamicTaskFactoryProvisioner factoryProvisioner;
private static final Logger logger =
LoggerFactory.getLogger(LayoutMenuPopulator.class);
- public LayoutMenuPopulator(CySwingApplication swingApp,
CyApplicationManager appMgr, SubmenuTaskManager tm, UndoSupport undo,
CyEventHelper eventHelper, TaskFactoryProvisioner factoryProvisioner) {
+ public LayoutMenuPopulator(CySwingApplication swingApp,
CyApplicationManager appMgr, SubmenuTaskManager tm, UndoSupport undo,
CyEventHelper eventHelper) {
this.appMgr = appMgr;
this.tm = tm;
this.swingApp = swingApp;
this.undo = undo;
this.eventHelper = eventHelper;
- this.factoryProvisioner = factoryProvisioner;
+ this.factoryProvisioner = new
DynamicTaskFactoryProvisioner(appMgr);
}
public <T extends AbstractLayoutAlgorithmContext> void
addLayout(CyLayoutAlgorithm<T> layout, Map props) {
Modified:
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
2012-03-20 11:12:28 UTC (rev 28589)
+++
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
2012-03-20 13:51:05 UTC (rev 28590)
@@ -53,9 +53,9 @@
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.application.swing.CySwingApplication;
+import org.cytoscape.internal.task.DynamicTaskFactoryProvisioner;
import org.cytoscape.property.CyProperty;
import org.cytoscape.task.NetworkViewTaskFactory;
-import org.cytoscape.task.TaskFactoryProvisioner;
import org.cytoscape.view.layout.CyLayoutAlgorithm;
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
import org.cytoscape.view.layout.CyLayoutContext;
@@ -87,7 +87,7 @@
private CyApplicationManager appMgr;
private PanelTaskManager taskManager;
private CyProperty cytoscapePropertiesServiceRef;
- private TaskFactoryProvisioner factoryProvisioner;
+ private DynamicTaskFactoryProvisioner factoryProvisioner;
private boolean initialized;
/**
@@ -97,8 +97,7 @@
final CySwingApplication desktop,
final CyApplicationManager appMgr,
final PanelTaskManager taskManager,
- final CyProperty
cytoscapePropertiesServiceRef,
- final TaskFactoryProvisioner
factoryProvisioner)
+ final CyProperty
cytoscapePropertiesServiceRef)
{
super(desktop.getJFrame(), "Layout Settings", false);
@@ -111,7 +110,7 @@
this.appMgr = appMgr;
this.taskManager = taskManager;
this.cytoscapePropertiesServiceRef =
cytoscapePropertiesServiceRef;
- this.factoryProvisioner = factoryProvisioner;
+ this.factoryProvisioner = new
DynamicTaskFactoryProvisioner(appMgr);
Properties props =
(Properties)this.cytoscapePropertiesServiceRef.getProperties();
Modified:
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/SettingsAction.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/SettingsAction.java
2012-03-20 11:12:28 UTC (rev 28589)
+++
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/SettingsAction.java
2012-03-20 13:51:05 UTC (rev 28590)
@@ -34,11 +34,9 @@
import org.cytoscape.application.swing.CySwingApplication;
import org.cytoscape.application.swing.AbstractCyAction;
import org.cytoscape.property.CyProperty;
-import org.cytoscape.task.TaskFactoryProvisioner;
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
import org.cytoscape.work.swing.PanelTaskManager;
-import javax.swing.event.MenuEvent;
import java.awt.event.ActionEvent;
@@ -54,7 +52,7 @@
private LayoutSettingsDialog settingsDialog;
public SettingsAction(final CyLayoutAlgorithmManager cyl, final
CySwingApplication desk, final CyApplicationManager appMgr,
- final PanelTaskManager tm, CyProperty
cytoscapePropertiesServiceRef, TaskFactoryProvisioner factoryProvisioner)
+ final PanelTaskManager tm, CyProperty
cytoscapePropertiesServiceRef)
{
super("Settings...",appMgr,"networkAndView");
this.appMgr = appMgr;
@@ -65,7 +63,7 @@
this.tm = tm;
this.cytoscapePropertiesServiceRef =
cytoscapePropertiesServiceRef;
- settingsDialog = new LayoutSettingsDialog(cyl, desk, appMgr,
tm, this.cytoscapePropertiesServiceRef, factoryProvisioner);
+ settingsDialog = new LayoutSettingsDialog(cyl, desk, appMgr,
tm, this.cytoscapePropertiesServiceRef);
}
public void actionPerformed(ActionEvent e) {
Modified:
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeMenuPopulator.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeMenuPopulator.java
2012-03-20 11:12:28 UTC (rev 28589)
+++
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeMenuPopulator.java
2012-03-20 13:51:05 UTC (rev 28590)
@@ -39,6 +39,7 @@
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.NetworkCollectionTaskFactory;
@@ -46,7 +47,6 @@
import org.cytoscape.task.NetworkViewCollectionTaskFactory;
import org.cytoscape.task.NetworkViewTaskFactory;
import org.cytoscape.task.TableTaskFactory;
-import org.cytoscape.task.TaskFactoryProvisioner;
import org.cytoscape.work.TaskFactory;
import org.cytoscape.work.swing.DialogTaskManager;
import org.cytoscape.work.swing.PanelTaskManager;
@@ -66,7 +66,7 @@
final private DialogTaskManager dialogTaskManager;
final private CyApplicationManager appManager;
final private CyServiceRegistrar registrar;
- final private TaskFactoryProvisioner factoryProvisioner;
+ final private DynamicTaskFactoryProvisioner factoryProvisioner;
final private Map<TaskFactory, CyAction> taskMap;
final private Map<Object, TaskFactory> provisionerMap;
@@ -78,14 +78,14 @@
*/
public CytoscapeMenuPopulator(final CySwingApplication app, final
DialogTaskManager dialogTaskManager,
final PanelTaskManager panelTaskManager,
- final CyApplicationManager appManager,
final CyServiceRegistrar registrar, final TaskFactoryProvisioner
factoryProvisioner)
+ final CyApplicationManager appManager,
final CyServiceRegistrar registrar)
{
this.app = app;
this.dialogTaskManager = dialogTaskManager;
this.panelTaskManager = panelTaskManager;
this.appManager = appManager;
this.registrar = registrar;
- this.factoryProvisioner = factoryProvisioner;
+ this.factoryProvisioner = new
DynamicTaskFactoryProvisioner(appManager);
taskMap = new HashMap<TaskFactory,CyAction>();
provisionerMap = new IdentityHashMap<Object, TaskFactory>();
Modified:
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
2012-03-20 11:12:28 UTC (rev 28589)
+++
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory-alt1/impl/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
2012-03-20 13:51:05 UTC (rev 28590)
@@ -64,6 +64,7 @@
import org.cytoscape.application.events.SetCurrentNetworkViewEvent;
import org.cytoscape.application.events.SetCurrentNetworkViewListener;
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;
@@ -82,7 +83,6 @@
import org.cytoscape.task.NetworkTaskFactory;
import org.cytoscape.task.NetworkViewCollectionTaskFactory;
import org.cytoscape.task.NetworkViewTaskFactory;
-import org.cytoscape.task.TaskFactoryProvisioner;
import org.cytoscape.util.swing.JTreeTable;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewManager;
@@ -120,7 +120,7 @@
final CyNetworkViewManager networkViewManager;
private final DialogTaskManager taskManager;
- private final TaskFactoryProvisioner factoryProvisioner;
+ private final DynamicTaskFactoryProvisioner factoryProvisioner;
private final JPopupMenu popup;
private final Map<TaskFactory, JMenuItem> popupMap;
@@ -142,7 +142,7 @@
*/
public NetworkPanel(final CyApplicationManager applicationManager,
final CyNetworkManager netmgr,
final CyNetworkViewManager networkViewManager, final
BirdsEyeViewHandler bird,
- final DialogTaskManager taskManager,
TaskFactoryProvisioner factoryProvisioner) {
+ final DialogTaskManager taskManager) {
super();
this.treeNodeMap = new HashMap<Long, NetworkTreeNode>();
@@ -151,7 +151,7 @@
this.netmgr = netmgr;
this.networkViewManager = networkViewManager;
this.taskManager = taskManager;
- this.factoryProvisioner = factoryProvisioner;
+ this.factoryProvisioner = new
DynamicTaskFactoryProvisioner(appManager);
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.
