Author: jm
Date: 2012-08-10 11:45:29 -0700 (Fri, 10 Aug 2012)
New Revision: 30159
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableCellRenderer.java
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
Log:
References #1363: Fixed issue with view/model space indices in
BrowserTableCellRenderer
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableCellRenderer.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableCellRenderer.java
2012-08-10 18:08:26 UTC (rev 30158)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableCellRenderer.java
2012-08-10 18:45:29 UTC (rev 30159)
@@ -73,7 +73,7 @@
// If ID, return default.
//if (((BrowserTableModel)
table.getModel()).getDataTable().getPrimaryKey(). )
if (table.getModel() instanceof BrowserTableModel){
- if (!table.isCellEditable(0, column)){
+ if (!table.isCellEditable(0,
table.convertColumnIndexToModel(column))){
setFont(labelFont);
setBackground(NON_EDITABLE_COLOR);
}
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
2012-08-10 18:08:26 UTC (rev 30158)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
2012-08-10 18:45:29 UTC (rev 30159)
@@ -639,7 +639,8 @@
@Override
public boolean isCellEditable(final int rowIndex, final int
columnIndex) {
- return
!dataTable.getPrimaryKey().getName().equals(getColumnName(table.convertColumnIndexToModel(columnIndex)));
+ CyColumn column = getColumnByModelIndex(columnIndex);
+ return !column.isPrimaryKey();
}
}
--
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.