Author: pwang
Date: 2011-04-04 13:57:21 -0700 (Mon, 04 Apr 2011)
New Revision: 24658
Modified:
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/CytoscapeDesktop.java
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Pass the Desktop reference to TaskManager
Modified:
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/CytoscapeDesktop.java
===================================================================
---
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/CytoscapeDesktop.java
2011-04-04 20:56:29 UTC (rev 24657)
+++
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/CytoscapeDesktop.java
2011-04-04 20:57:21 UTC (rev 24658)
@@ -58,6 +58,7 @@
import javax.swing.WindowConstants;
import java.util.Dictionary;
import java.util.Properties;
+import org.cytoscape.work.swing.GUITaskManager;
/**
@@ -113,7 +114,8 @@
/**
* Creates a new CytoscapeDesktop object.
*/
- public CytoscapeDesktop(CytoscapeMenus cyMenus, NetworkViewManager
networkViewManager, NetworkPanel networkPanel, CytoscapeShutdown shut,
CyEventHelper eh, CyServiceRegistrar registrar) {
+ public CytoscapeDesktop(CytoscapeMenus cyMenus, NetworkViewManager
networkViewManager, NetworkPanel networkPanel,
+ CytoscapeShutdown shut, CyEventHelper eh,
CyServiceRegistrar registrar, GUITaskManager taskManager) {
super("Cytoscape Desktop (New Session)");
this.cyMenus = cyMenus;
@@ -122,6 +124,8 @@
this.shutdown = shut;
this.cyEventHelper = eh;
this.registrar = registrar;
+
+ taskManager.setParent(this);
setIconImage(Toolkit.getDefaultToolkit().getImage(getClass().getResource(SMALL_ICON)));
Modified:
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-04-04 20:56:29 UTC (rev 24657)
+++
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-04-04 20:57:21 UTC (rev 24658)
@@ -107,6 +107,7 @@
<constructor-arg ref="cytoscapeShutdown" />
<constructor-arg ref="cyEventHelperServiceRef" />
<constructor-arg ref="cyServiceRegistrarServiceRef" />
+ <constructor-arg ref="guiTaskManagerServiceRef" />
</bean>
<!-- session support -->
--
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.
