Author: ruschein
Date: 2011-07-05 09:23:31 -0700 (Tue, 05 Jul 2011)
New Revision: 26019
Modified:
core3/swing-application-impl/trunk/pom.xml
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/task/CytoPanelTaskFactoryTunableAction.java
Log:
Updated to track changes in work-api.
Modified: core3/swing-application-impl/trunk/pom.xml
===================================================================
--- core3/swing-application-impl/trunk/pom.xml 2011-07-05 16:13:15 UTC (rev
26018)
+++ core3/swing-application-impl/trunk/pom.xml 2011-07-05 16:23:31 UTC (rev
26019)
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>work-api</artifactId>
- <version>3.0.0-alpha3</version>
+ <version>3.0.0-alpha4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
Modified:
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/task/CytoPanelTaskFactoryTunableAction.java
===================================================================
---
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/task/CytoPanelTaskFactoryTunableAction.java
2011-07-05 16:13:15 UTC (rev 26018)
+++
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/task/CytoPanelTaskFactoryTunableAction.java
2011-07-05 16:23:31 UTC (rev 26019)
@@ -1,7 +1,7 @@
/*
File: CytoPanelTaskFactoryTunableAction.java
- Copyright (c) 2010, The Cytoscape Consortium (www.cytoscape.org)
+ Copyright (c) 2010, 2011, The Cytoscape Consortium (www.cytoscape.org)
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -30,7 +30,6 @@
package org.cytoscape.internal.task;
-
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -52,6 +51,7 @@
import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.work.TaskFactory;
import org.cytoscape.work.TunableValidator;
+import org.cytoscape.work.TunableValidator.ValidationState;
import org.cytoscape.work.swing.GUITaskManager;
import org.cytoscape.service.util.CyServiceRegistrar;
@@ -82,11 +82,19 @@
if (factory instanceof TunableValidator) {
final Appendable errMsg = new StringBuilder();
try {
- if
(!((TunableValidator)factory).tunablesAreValid(errMsg)) {
+ final ValidationState validationState =
+
((TunableValidator)factory).getValidationState(errMsg);
+ if (validationState ==
ValidationState.INVALID) {
JOptionPane.showMessageDialog(new JFrame(), errMsg.toString(),
"Input Validation Problem",
JOptionPane.ERROR_MESSAGE);
return;
+ } else if (validationState ==
ValidationState.REQUEST_CONFIRMATION) {
+ if
(JOptionPane.showConfirmDialog(new JFrame(), errMsg.toString(),
+
"Request Confirmation",
+
JOptionPane.YES_NO_OPTION)
+ == JOptionPane.NO_OPTION)
+ return;
}
} catch (final Exception e) {
e.printStackTrace();
--
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.
