Author: sletellier Date: 2012-06-20 13:01:32 +0200 (Wed, 20 Jun 2012) New Revision: 2336 Url: http://nuiton.org/repositories/revision/jaxx/2336 Log: Fix dateCellRenderer Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/renderer/DateCellRenderer.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/renderer/DateCellRenderer.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/renderer/DateCellRenderer.java 2012-06-15 10:24:54 UTC (rev 2335) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/renderer/DateCellRenderer.java 2012-06-20 11:01:32 UTC (rev 2336) @@ -23,48 +23,37 @@ */ package jaxx.runtime.swing.renderer; -import java.awt.Color; import java.awt.Component; +import java.text.SimpleDateFormat; import java.util.Date; -import javax.swing.JComponent; +import javax.swing.JLabel; import javax.swing.JTable; import javax.swing.table.TableCellRenderer; -import jaxx.runtime.swing.JAXXDatePicker; +import org.apache.commons.lang3.StringUtils; /** - * TODO sletellier 15/09/2012 : fix color forground - * * @author sletellier <letellier@codelutin.com> */ public class DateCellRenderer implements TableCellRenderer { protected TableCellRenderer delegate; - protected JAXXDatePicker datePicker; + protected SimpleDateFormat dateFormat; public DateCellRenderer(TableCellRenderer renderer, String datePattern) { this.delegate = renderer; - datePicker = new JAXXDatePicker(); - datePicker.setShowPopupButton(false); - datePicker.setPatternLayout(datePattern); + dateFormat = new SimpleDateFormat(datePattern); } @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - ((JComponent) delegate).setBackground(null); - JComponent render = (JComponent) delegate.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); - if (isSelected) { - datePicker.setForeground(table.getSelectionForeground()); - datePicker.setBackground(table.getSelectionBackground()); - } else { - datePicker.setForeground(render.getForeground()); - datePicker.setBackground(render.getBackground()); - //fixme make this works... and remove the test - if (row % 2 == 1) { - datePicker.setBackground(Color.WHITE); - } + JLabel render = (JLabel) delegate.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); + Date date = (Date) value; + String formatedDate = StringUtils.EMPTY; + if (date != null) { + formatedDate = dateFormat.format(date); } - datePicker.setDate((Date) value); - return datePicker; + render.setText(formatedDate); + return render; } }