Author: mes
Date: 2012-06-18 14:09:56 -0700 (Mon, 18 Jun 2012)
New Revision: 29605

Modified:
   
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/CombineReaderAndMappingTask.java
Log:
refs #1141 Added a tunable validator to CombineReaderAndMappingTask that wraps 
called to the tunable validators in the respective tasks.

Modified: 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/CombineReaderAndMappingTask.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/CombineReaderAndMappingTask.java
    2012-06-18 21:08:07 UTC (rev 29604)
+++ 
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/CombineReaderAndMappingTask.java
    2012-06-18 21:09:56 UTC (rev 29605)
@@ -8,8 +8,10 @@
 import org.cytoscape.work.ContainsTunables;
 import org.cytoscape.work.ProvidesTitle;
 import org.cytoscape.work.TaskMonitor;
+import org.cytoscape.work.TunableValidator;
+import static org.cytoscape.work.TunableValidator.ValidationState.OK;
 
-public class CombineReaderAndMappingTask extends AbstractTask{
+public class CombineReaderAndMappingTask extends AbstractTask implements 
TunableValidator {
 
        @ProvidesTitle
        public String getTitle() {
@@ -31,6 +33,22 @@
        }
 
        @Override
+       public ValidationState getValidationState(Appendable errMsg) {
+               if ( readerTask instanceof TunableValidator ) {
+                       ValidationState readVS = 
((TunableValidator)readerTask).getValidationState(errMsg);
+
+                       if ( readVS != OK )
+                               return readVS;
+               }
+
+               // If MapTableToNetworkTablesTask implemented TunableValidator, 
then
+               // this is what we'd do:
+               // return mappingTask.getValidationState(errMsg);
+
+               return OK;
+       }
+
+       @Override
        public void run(TaskMonitor taskMonitor) throws Exception {
                readerTask.run(taskMonitor);            
                checkTable();

-- 
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.

Reply via email to