Author: rozagh
Date: 2012-06-18 14:35:07 -0700 (Mon, 18 Jun 2012)
New Revision: 29606
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/CombineReaderAndMappingTask.java
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ImportAttributeTableReaderTask.java
Log:
Validator for the ImportAttributeReader checks the number of columns and this
validator is called from the combinator task.
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:09:56 UTC (rev 29605)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/CombineReaderAndMappingTask.java
2012-06-18 21:35:07 UTC (rev 29606)
@@ -40,7 +40,7 @@
if ( readVS != OK )
return readVS;
}
-
+
// If MapTableToNetworkTablesTask implemented TunableValidator,
then
// this is what we'd do:
// return mappingTask.getValidationState(errMsg);
@@ -50,17 +50,8 @@
@Override
public void run(TaskMonitor taskMonitor) throws Exception {
- readerTask.run(taskMonitor);
- checkTable();
+ readerTask.run(taskMonitor);
mappingTask.run(taskMonitor);
}
- private void checkTable() {
-
- for(CyTable table: readerTask.getTables())
- if (table.getColumns().size() <= 1)
- throw new IllegalArgumentException("Imported
table requires to have two or more columns!" +
- "Check the selected delimiters and columns.");
- }
-
}
Modified:
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ImportAttributeTableReaderTask.java
===================================================================
---
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ImportAttributeTableReaderTask.java
2012-06-18 21:09:56 UTC (rev 29605)
+++
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ImportAttributeTableReaderTask.java
2012-06-18 21:35:07 UTC (rev 29606)
@@ -175,6 +175,16 @@
}
return ValidationState.INVALID;
}
+
+ if (amp.getColumnCount() < 2){
+ try {
+ errMsg.append("Table should have more than one
column! Please check the selected delimeters and columns.");
+ } catch (IOException e) {
+ e.printStackTrace();
+ return ValidationState.INVALID;
+ }
+ return ValidationState.INVALID;
+ }
return ValidationState.OK;
}
--
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.
