Author: ruschein
Date: 2011-03-28 09:11:05 -0700 (Mon, 28 Mar 2011)
New Revision: 24596
Modified:
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/MultiLineTableCellEditor.java
Log:
Fixed annoying editor bug when an empty string or whitespace only string was
entered in the cell editor.
Modified:
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
===================================================================
---
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
2011-03-25 10:05:16 UTC (rev 24595)
+++
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
2011-03-28 16:11:05 UTC (rev 24596)
@@ -380,7 +380,11 @@
final String columnName =
mapColumnIndexToColumnName(columnIndex);
final Class<?> columnType =
attrs.getColumn(columnName).getType();
- if (text.startsWith("=")) {
+ if (text.isEmpty()) {
+ if (!row.isSet(columnName))
+ return;
+ row.set(columnName, null);
+ } else if (text.startsWith("=")) {
final Map<String, Class<?>> variableNameToTypeMap = new
HashMap<String, Class<?>>();
initVariableNameToTypeMap(variableNameToTypeMap);
if (compiler.compile(text, variableNameToTypeMap)) {
Modified:
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/MultiLineTableCellEditor.java
===================================================================
---
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/MultiLineTableCellEditor.java
2011-03-25 10:05:16 UTC (rev 24595)
+++
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/MultiLineTableCellEditor.java
2011-03-28 16:11:05 UTC (rev 24596)
@@ -50,7 +50,7 @@
@Override
public Object getCellEditorValue() {
- return textArea.getText();
+ return textArea.getText().trim();
}
@Override
--
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.
