Author: rozagh
Date: 2012-06-18 15:01:14 -0700 (Mon, 18 Jun 2012)
New Revision: 29609
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/reader/AbstractMappingParameters.java
Log:
Validator requires to get the selected columns count, to invalidate importing
of tables with less than 2 columns selected.
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:41:53 UTC (rev 29608)
+++
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ImportAttributeTableReaderTask.java
2012-06-18 22:01:14 UTC (rev 29609)
@@ -176,7 +176,7 @@
return ValidationState.INVALID;
}
- if (amp.getColumnCount() < 2){
+ if (amp.getSelectedColumnCount() < 2){
try {
errMsg.append("Table should have more than one
column! Please check the selected delimeters and columns.");
} catch (IOException e) {
Modified:
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/reader/AbstractMappingParameters.java
===================================================================
---
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/reader/AbstractMappingParameters.java
2012-06-18 21:41:53 UTC (rev 29608)
+++
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/reader/AbstractMappingParameters.java
2012-06-18 22:01:14 UTC (rev 29609)
@@ -366,6 +366,16 @@
return attributeNames.length;
}
+ public int getSelectedColumnCount(){
+ if (attributeNames == null)
+ return -1;
+ int count = 0;
+ for (boolean b : importFlag)
+ if (b)
+ count++;
+ return count;
+ }
+
protected Map<String, String> getnetworkTitleMap() {
return networkTitle2ID;
}
--
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.
