Author: scooter
Date: 2010-07-18 12:05:02 -0700 (Sun, 18 Jul 2010)
New Revision: 20962
Modified:
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/commands/ClusterCommandHandler.java
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/ui/ClusterTask.java
Log:
Don't leave task dialog up if you're using commands
Modified:
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/commands/ClusterCommandHandler.java
===================================================================
---
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/commands/ClusterCommandHandler.java
2010-07-18 16:37:28 UTC (rev 20961)
+++
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/commands/ClusterCommandHandler.java
2010-07-18 19:05:02 UTC (rev 20962)
@@ -161,7 +161,7 @@
ClusterTask clusterTask = new ClusterTask(alg, null);
TaskManager.executeTask( clusterTask,
-
ClusterTask.getDefaultTaskConfig() );
+
ClusterTask.getDefaultTaskConfig(false) );
// Now, wait until cluster is complete.
while (!clusterTask.done()) {
Thread.yield();
Modified:
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/ui/ClusterTask.java
===================================================================
---
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/ui/ClusterTask.java
2010-07-18 16:37:28 UTC (rev 20961)
+++
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/ui/ClusterTask.java
2010-07-18 19:05:02 UTC (rev 20962)
@@ -113,13 +113,25 @@
* @return a default JTaskConfig object.
*/
public static JTaskConfig getDefaultTaskConfig() {
+ return ClusterTask.getDefaultTaskConfig(true);
+ }
+
+ /**
+ * This method returns a default TaskConfig object.
+ * @param includeClose whether to include the close button
+ * @return a default JTaskConfig object.
+ */
+ public static JTaskConfig getDefaultTaskConfig(boolean includeClose) {
JTaskConfig result = new JTaskConfig();
result.displayCancelButton(true);
- result.displayCloseButton(true);
+ result.displayCloseButton(includeClose);
result.displayStatus(true);
result.displayTimeElapsed(false);
- result.setAutoDispose(false);
+ if (includeClose)
+ result.setAutoDispose(false);
+ else
+ result.setAutoDispose(true);
result.setModal(true);
result.setOwner(Cytoscape.getDesktop());
--
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.
