Author: rozagh
Date: 2012-07-23 18:12:27 -0700 (Mon, 23 Jul 2012)
New Revision: 29969
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
Log:
fixes #1274 remove dependency on ID = column 0 assumption and converted the
column index in view to column index in model to handle the case for moved
columns.
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
2012-07-24 00:25:48 UTC (rev 29968)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
2012-07-24 01:12:27 UTC (rev 29969)
@@ -150,11 +150,12 @@
final int column =
getColumnModel().getColumnIndexAtX(e.getX());
final int row = e.getY() /
getRowHeight();
+ final BrowserTableModel tableModel =
(BrowserTableModel)table.getModel();
+
// Bail out if we're at the ID column:
- if (column == 0)
+ if (tableModel.isPrimaryKey(column))
return;
- final BrowserTableModel tableModel =
(BrowserTableModel)table.getModel();
// Make sure the column and row we're
clicking on actually exists!
if (column >=
tableModel.getColumnCount() || row >= tableModel.getRowCount())
return;
@@ -565,7 +566,7 @@
return;
// Ignore clicks on the ID column:
- if (column == 0)
+ if ( tableModel.isPrimaryKey(column))
return;
final CyColumn cyColumn = tableModel.getColumn(column);
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-07-24 00:25:48 UTC (rev 29968)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
2012-07-24 01:12:27 UTC (rev 29969)
@@ -165,7 +165,8 @@
}
CyColumn getColumn(final int columnIndex) {
- final String columnName = getColumnName(columnIndex);
+ final String columnName = getColumnName(
table.convertColumnIndexToModel(columnIndex));
+
return dataTable.getColumn(columnName);
}
@@ -424,8 +425,7 @@
public boolean isPrimaryKey (int col){
- String colName = getColumnName(col);
- return colName.equals(dataTable.getPrimaryKey());
+ return
dataTable.getPrimaryKey().getName().equals(getColumnName(table.convertColumnIndexToModel(col)));
}
--
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.
