Author: ruschein
Date: 2011-08-09 14:30:07 -0700 (Tue, 09 Aug 2011)
New Revision: 26504
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
Log:
Fixed Redmine bugs #344 and #291.
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
2011-08-09 21:28:52 UTC (rev 26503)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
2011-08-09 21:30:07 UTC (rev 26504)
@@ -298,7 +298,8 @@
final String newColumnName = e.getNewColumnName();
renameColumnName(e.getOldColumnName(), newColumnName);
final int column = mapColumnNameToColumnIndex(newColumnName);
-
table.getColumnModel().getColumn(column).setHeaderValue(newColumnName);
+ if (column != -1)
+
table.getColumnModel().getColumn(column).setHeaderValue(newColumnName);
}
@Override
@@ -308,7 +309,7 @@
}
@Override
- public void handleEvent(RowsSetEvent e) {
+ public void handleEvent(final RowsSetEvent e) {
if (tableHasBooleanSelected) {
selectedRows = null;
boolean foundANonSelectedColumnName = false;
@@ -325,8 +326,9 @@
}
}
- for (final RowSetRecord rowSet : e.getPayloadCollection())
- handleRowValueUpdate(rowSet.getRow(),
rowSet.getColumn(), rowSet.getValue(), rowSet.getRawValue());
+ for (final RowSetRecord rowSet :
e.getPayloadCollection())
+ handleRowValueUpdate(rowSet.getRow(),
rowSet.getColumn(),
+ rowSet.getValue(),
rowSet.getRawValue());
}
private void handleRowValueUpdate(final CyRow row, final String
columnName, final Object newValue,
@@ -387,7 +389,7 @@
++index;
}
- throw new IllegalStateException("We should *never* get here!");
+ return -1;
}
private String mapColumnIndexToColumnName(final int index) {
--
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.
