Author: rozagh
Date: 2012-09-12 17:18:41 -0700 (Wed, 12 Sep 2012)
New Revision: 30362
Modified:
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/reader/AttributeLineParser.java
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/AttributeTypeDialog.java
Log:
fixes #1450 the type of list element was not passed correctly to
createlistattrs method also a bug in gui is fixed.
Modified:
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/reader/AttributeLineParser.java
===================================================================
---
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/reader/AttributeLineParser.java
2012-09-13 00:03:01 UTC (rev 30361)
+++
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/reader/AttributeLineParser.java
2012-09-13 00:18:41 UTC (rev 30362)
@@ -198,7 +198,7 @@
curList.addAll(buildList(entry, listType));
try {
-
setListAttribute(table,AttributeTypes.TYPE_SIMPLE_LIST,key,
mapping.getAttributeNames()[index], curList);
+
setListAttribute(table,mapping.getListAttributeTypes()[index],key,
mapping.getAttributeNames()[index], curList);
//mapping.setAttribute(key,
mapping.getAttributeNames()[index], curList);
@@ -251,8 +251,11 @@
tbl.createListColumn(attributeName,
Boolean.class, false);
else if (type == AttributeTypes.TYPE_FLOATING)
tbl.createListColumn(attributeName,
Double.class, false);
+ else if (type == AttributeTypes.TYPE_STRING){
+ tbl.createListColumn(attributeName,
String.class, false);
+ }
else
- ;// type is String, do nothing
+ ;//invalid type
}
CyRow row = tbl.getRow(key);
row.set(attributeName, elmsBuff);
Modified:
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/AttributeTypeDialog.java
===================================================================
---
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/AttributeTypeDialog.java
2012-09-13 00:03:01 UTC (rev 30361)
+++
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/AttributeTypeDialog.java
2012-09-13 00:18:41 UTC (rev 30362)
@@ -435,7 +435,7 @@
} else if (dataType == AttributeTypes.TYPE_BOOLEAN) {
delimiterButtonGroup.setSelected(booleanRadioButton.getModel(), true);
} else if (dataType == AttributeTypes.TYPE_SIMPLE_LIST) {
-
delimiterButtonGroup.setSelected(booleanRadioButton.getModel(), true);
+
delimiterButtonGroup.setSelected(listRadioButton.getModel(), true);
listDelimiterComboBox.setEnabled(true);
listTypeComboBox.setEnabled(true);
otherTextField.setEnabled(false);
--
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.
