Author: rozagh
Date: 2012-05-22 14:15:36 -0700 (Tue, 22 May 2012)
New Revision: 29320
Modified:
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
Log:
fixes #1021 renaming a column leaves a null column in the column list. A check
for null column is added.
Modified:
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
===================================================================
---
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
2012-05-22 21:01:57 UTC (rev 29319)
+++
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/view/FilterMainPanel.java
2012-05-22 21:15:36 UTC (rev 29320)
@@ -446,18 +446,21 @@
}
final Collection<CyColumn> columns = table.getColumns();
-
+
for (final CyColumn column : columns) {
- // Show all attributes, with type of String or Number
- Class<?> type = column.getType();
+ if(column!= null){
+ // Show all attributes, with type of String or
Number
+ Class<?> type = column.getType();
+
+ // only show user visible attributes,with type
= Number/String/List
+ if ((type == Integer.class)||(type ==
Double.class)||(type == Boolean.class)||(type == String.class)||(type ==
List.class)) {
+ attributeList.add(pType + "." +
column.getName());
+ }
+
+ // Alphabetical sort
+ Collections.sort(attributeList);
+ }
- // only show user visible attributes,with type =
Number/String/List
- if ((type == Integer.class)||(type ==
Double.class)||(type == Boolean.class)||(type == String.class)||(type ==
List.class)) {
- attributeList.add(pType + "." +
column.getName());
- }
-
- // Alphabetical sort
- Collections.sort(attributeList);
}
// type conversion
--
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.
