Author: tchemit Date: 2012-08-06 14:17:07 +0200 (Mon, 06 Aug 2012) New Revision: 2471 Url: http://nuiton.org/repositories/revision/jaxx/2471 Log: refs #2227: Make a color editor and its renderer (reformat code, add javadoc, override annotation, ...) Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorCellEditor.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorCellEditor.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorCellEditor.java 2012-08-06 11:29:21 UTC (rev 2470) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorCellEditor.java 2012-08-06 12:17:07 UTC (rev 2471) @@ -24,23 +24,37 @@ */ import javax.swing.AbstractCellEditor; -import javax.swing.table.TableCellEditor; import javax.swing.JButton; import javax.swing.JColorChooser; import javax.swing.JDialog; import javax.swing.JTable; +import javax.swing.table.TableCellEditor; import java.awt.Color; import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +/** + * A {@link Color} cell editor. + * + * @author mallon <mallon@codelutin.com> + * @author tchemit <chemit@codelutin.com> + * @since 2.5.4 + */ public class ColorCellEditor extends AbstractCellEditor implements TableCellEditor, ActionListener { - Color currentColor; - JButton button; - JColorChooser colorChooser; - JDialog dialog; + + private static final long serialVersionUID = 1L; + + protected Color currentColor; + + protected JButton button; + + protected JColorChooser colorChooser; + + protected JDialog dialog; + protected static final String EDIT = "edit"; public ColorCellEditor() { @@ -56,17 +70,18 @@ //Set up the dialog that the button brings up. colorChooser = new JColorChooser(); dialog = JColorChooser.createDialog(button, - "", - true, //modal - colorChooser, - this, //OK button handler - null); //no CANCEL button handler + "", + true, //modal + colorChooser, + this, //OK button handler + null); //no CANCEL button handler } /** * Handles events from the editor button and from * the dialog's OK button. */ + @Override public void actionPerformed(ActionEvent e) { if (EDIT.equals(e.getActionCommand())) { //The user has clicked the cell, so @@ -83,10 +98,10 @@ } } - //Implement the one CellEditor method that AbstractCellEditor doesn't. - public Color getCellEditorValue() { - //String currentColorHexa = toHex(currentColor.getRed(), currentColor.getGreen(), currentColor.getBlue()); - return currentColor; + @Override + public Color getCellEditorValue() { + //String currentColorHexa = toHex(currentColor.getRed(), currentColor.getGreen(), currentColor.getBlue()); + return currentColor; } protected static String toHex(int r, int g, int b) { @@ -102,13 +117,13 @@ } - //Implement the one method defined by TableCellEditor. + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - currentColor = (Color)value; + currentColor = (Color) value; return button; } } \ No newline at end of file Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java 2012-08-06 11:29:21 UTC (rev 2470) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java 2012-08-06 12:17:07 UTC (rev 2471) @@ -24,7 +24,6 @@ */ import javax.swing.JButton; -import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.table.TableCellRenderer; import java.awt.Color; @@ -41,8 +40,13 @@ protected JButton button = new JButton(); @Override - public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - button.setBackground((Color)value); + public Component getTableCellRendererComponent(JTable table, + Object value, + boolean isSelected, + boolean hasFocus, + int row, + int column) { + button.setBackground((Color) value); return button; } }