You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/02/03 01:47:27 UTC
svn commit: r905852 - in /pivot/trunk:
wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java
wtk/src/org/apache/pivot/wtk/TableViewHeader.java
wtk/src/org/apache/pivot/wtk/content/TableViewHeaderDataRenderer.java
Author: gbrown
Date: Wed Feb 3 00:47:26 2010
New Revision: 905852
URL: http://svn.apache.org/viewvc?rev=905852&view=rev
Log:
Add column index and column name arguments to table view header renderer API.
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TableViewHeader.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewHeaderDataRenderer.java
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java?rev=905852&r1=905851&r2=905852&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java Wed Feb 3 00:47:26 2010
@@ -192,7 +192,7 @@
for (int i = 0, n = columns.getLength(); i < n; i++) {
TableView.Column column = columns.get(i);
- dataRenderer.render(column.getHeaderData(), tableViewHeader, false);
+ dataRenderer.render(column.getHeaderData(), i, tableViewHeader, column.getName(), false);
preferredHeight = Math.max(preferredHeight, dataRenderer.getPreferredHeight(-1));
}
@@ -224,7 +224,7 @@
for (int i = 0, n = columns.getLength(); i < n; i++) {
TableView.Column column = columns.get(i);
- dataRenderer.render(column.getHeaderData(), tableViewHeader, false);
+ dataRenderer.render(column.getHeaderData(), i, tableViewHeader, column.getName(), false);
baseline = Math.max(baseline, dataRenderer.getBaseline(headerWidths.get(i), rowHeight));
}
}
@@ -295,7 +295,7 @@
// Paint the header data
Object headerData = column.getHeaderData();
- dataRenderer.render(headerData, tableViewHeader, false);
+ dataRenderer.render(headerData, columnIndex, tableViewHeader, column.getName(), false);
dataRenderer.setSize(headerWidth, height - 1);
Graphics2D rendererGraphics = (Graphics2D)graphics.create(headerX, 0,
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TableViewHeader.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TableViewHeader.java?rev=905852&r1=905851&r2=905852&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TableViewHeader.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TableViewHeader.java Wed Feb 3 00:47:26 2010
@@ -37,7 +37,8 @@
* Table view header data renderer interface.
*/
public interface DataRenderer extends Renderer {
- public void render(Object data, TableViewHeader tableViewHeader, boolean highlighted);
+ public void render(Object data, int columnIndex, TableViewHeader tableViewHeader,
+ String columnName, boolean highlighted);
}
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewHeaderDataRenderer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewHeaderDataRenderer.java?rev=905852&r1=905851&r2=905852&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewHeaderDataRenderer.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewHeaderDataRenderer.java Wed Feb 3 00:47:26 2010
@@ -57,7 +57,8 @@
}
@Override
- public void render(Object data, TableViewHeader tableViewHeader, boolean highlighted) {
+ public void render(Object data, int columnIndex, TableViewHeader tableViewHeader,
+ String columnName, boolean highlighted) {
Image icon = null;
String text = null;