Author: tchemit Date: 2012-07-03 15:12:49 +0200 (Tue, 03 Jul 2012) New Revision: 2376 Url: http://nuiton.org/repositories/revision/jaxx/2376 Log: refs #2156 (reput old behaviour) Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2012-07-02 23:28:37 UTC (rev 2375) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2012-07-03 13:12:49 UTC (rev 2376) @@ -24,6 +24,46 @@ */ package jaxx.runtime; +import jaxx.runtime.swing.Item; +import jaxx.runtime.swing.JAXXComboBox; +import jaxx.runtime.swing.renderer.BooleanCellEditor; +import jaxx.runtime.swing.renderer.BooleanCellRenderer; +import jaxx.runtime.swing.renderer.EmptyNumberTableCellRenderer; +import jaxx.runtime.swing.renderer.EnumTableCellRenderer; +import jaxx.runtime.swing.renderer.I18nTableCellRenderer; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.jxlayer.JXLayer; +import org.jdesktop.jxlayer.plaf.LayerUI; +import org.jdesktop.swingx.JXTreeTable; + +import javax.swing.DefaultComboBoxModel; +import javax.swing.DefaultListModel; +import javax.swing.Icon; +import javax.swing.ImageIcon; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JLayeredPane; +import javax.swing.JList; +import javax.swing.JRootPane; +import javax.swing.JTabbedPane; +import javax.swing.JTable; +import javax.swing.JTree; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.event.HyperlinkEvent; +import javax.swing.event.TreeSelectionEvent; +import javax.swing.event.TreeSelectionListener; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; +import javax.swing.table.TableColumn; +import javax.swing.text.AbstractDocument; +import javax.swing.text.JTextComponent; +import javax.swing.tree.TreeNode; +import javax.swing.tree.TreePath; import java.awt.Color; import java.awt.Component; import java.awt.Container; @@ -56,44 +96,6 @@ import java.util.Map.Entry; import java.util.NoSuchElementException; import java.util.Properties; -import javax.swing.DefaultComboBoxModel; -import javax.swing.DefaultListModel; -import javax.swing.Icon; -import javax.swing.ImageIcon; -import javax.swing.JComboBox; -import javax.swing.JComponent; -import javax.swing.JLabel; -import javax.swing.JLayeredPane; -import javax.swing.JList; -import javax.swing.JRootPane; -import javax.swing.JTabbedPane; -import javax.swing.JTable; -import javax.swing.JTree; -import javax.swing.SwingUtilities; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.event.HyperlinkEvent; -import javax.swing.event.TreeSelectionEvent; -import javax.swing.event.TreeSelectionListener; -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; -import javax.swing.table.TableColumn; -import javax.swing.text.AbstractDocument; -import javax.swing.text.JTextComponent; -import javax.swing.tree.TreeNode; -import javax.swing.tree.TreePath; -import jaxx.runtime.swing.Item; -import jaxx.runtime.swing.JAXXComboBox; -import jaxx.runtime.swing.renderer.BooleanCellEditor; -import jaxx.runtime.swing.renderer.EmptyNumberTableCellRenderer; -import jaxx.runtime.swing.renderer.EnumTableCellRenderer; -import jaxx.runtime.swing.renderer.I18nTableCellRenderer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.jxlayer.JXLayer; -import org.jdesktop.jxlayer.plaf.LayerUI; -import org.jdesktop.swingx.JXTreeTable; import static org.nuiton.i18n.I18n._; @@ -892,6 +894,11 @@ public static TableCellRenderer newBooleanTableCellRenderer( TableCellRenderer renderer) { + return new BooleanCellRenderer(renderer); + } + + public static TableCellRenderer newBooleanTableCellEditorAndRenderer( + TableCellRenderer renderer) { return new BooleanCellEditor(renderer); } @@ -1232,11 +1239,11 @@ /** * Used to edit cell * - * @param table to edit - * @param row of cell to editing + * @param table to edit + * @param row of cell to editing * @param colummn of cell to editing * @return false if for any reason the cell cannot be edited, - * or if the indices are invalid + * or if the indices are invalid */ public static boolean editCell(JTable table, int row, int colummn) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java 2012-07-02 23:28:37 UTC (rev 2375) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java 2012-07-03 13:12:49 UTC (rev 2376) @@ -24,8 +24,6 @@ */ package jaxx.runtime.swing.renderer; -import java.awt.Color; -import java.awt.Component; import javax.swing.Icon; import javax.swing.JCheckBox; import javax.swing.JComponent; @@ -33,13 +31,13 @@ import javax.swing.JPanel; import javax.swing.JTable; import javax.swing.table.TableCellRenderer; +import java.awt.Color; +import java.awt.Component; /** - * @deprecated prefere use {@link BooleanCellEditor} * @author tchemit <chemit@codelutin.com> * @since 1.5 */ -@Deprecated public class BooleanCellRenderer extends JPanel implements TableCellRenderer { private static final long serialVersionUID = 1L;