This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit 0c910f08b1bba1d705197d3140579180f1e5fe48 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 23 18:50:01 2014 +0100 deprecates NumberCellEditor and replace it with new one at org.nuiton.jaxx.widgets.editor.cell package --- .../swing/editor/cell/NumberCellEditor.java | 3 +- .../widgets}/editor/cell/NumberCellEditor.java | 71 +++++++++------------- 2 files changed, 31 insertions(+), 43 deletions(-) diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java index 82cd0c6..df1222c 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java @@ -25,7 +25,6 @@ import java.awt.Component; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import javax.swing.AbstractCellEditor; -import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; @@ -37,7 +36,9 @@ import jaxx.runtime.swing.editor.NumberEditor; /** * @author sletellier <letellier@codelutin.com> + * @deprecated since 2.17, prefer use {@link org.nuiton.jaxx.widgets.editor.cell.NumberCellEditor}. */ +@Deprecated public class NumberCellEditor<E extends Number> extends AbstractCellEditor implements TableCellEditor, FocusListener, AncestorListener { diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/cell/NumberCellEditor.java similarity index 63% copy from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java copy to jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/cell/NumberCellEditor.java index 82cd0c6..8c53b2c 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/widgets/editor/cell/NumberCellEditor.java @@ -1,81 +1,68 @@ -/* - * #%L - * JAXX :: Widgets - * %% - * Copyright (C) 2008 - 2014 Code Lutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package jaxx.runtime.swing.editor.cell; +package org.nuiton.jaxx.widgets.editor.cell; + +import jaxx.runtime.swing.editor.NumberEditor; +import org.nuiton.jaxx.widgets.editor.number.NumberEditor2; +import org.nuiton.jaxx.widgets.editor.number.NumberEditor2Model; -import java.awt.Component; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; import javax.swing.AbstractCellEditor; -import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.event.AncestorEvent; import javax.swing.event.AncestorListener; import javax.swing.table.TableCellEditor; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.swing.editor.NumberEditor; +import java.awt.Component; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; /** - * @author sletellier <letellier@codelutin.com> + * Created on 11/23/14. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 2.17 */ public class NumberCellEditor<E extends Number> extends AbstractCellEditor implements TableCellEditor, FocusListener, AncestorListener { private static final long serialVersionUID = 1L; - protected final NumberEditor numberEditor; + protected final NumberEditor2 numberEditor; /** constructor */ public NumberCellEditor(Class<E> type, boolean useSign) { - numberEditor = new NumberEditor(); + numberEditor = new NumberEditor2(); numberEditor.getTextField().setHorizontalAlignment(SwingConstants.RIGHT); numberEditor.getTextField().setBorder(null); numberEditor.getTextField().addFocusListener(this); numberEditor.getTextField().addAncestorListener(this); - numberEditor.setModelType(type); - + numberEditor.setNumberType(type); numberEditor.setUseSign(useSign); numberEditor.init(); + } @Override - public Component getTableCellEditorComponent(JTable table, Object value, - boolean isSelected, int row, int column) { + public Component getTableCellEditorComponent(JTable table, + Object value, + boolean isSelected, + int row, + int column) { E number = (E) value; - numberEditor.setModel(number); - numberEditor.setModelText(JAXXUtil.getStringValue(number)); + numberEditor.setNumberValue(number); +// numberEditor.setModelText(JAXXUtil.getStringValue(number)); return numberEditor; } - public NumberEditor getNumberEditor() { + public NumberEditor2 getNumberEditor() { return numberEditor; } @Override public E getCellEditorValue() { - return (E)numberEditor.getModel(); + NumberEditor2Model model = numberEditor.getModel(); + return (E) model.getNumberValue(); } @Override @@ -117,9 +104,9 @@ public class NumberCellEditor<E extends Number> extends AbstractCellEditor boolean result = super.stopCellEditing(); // Reset previous data to avoid keeping it on other cell edition if (result) { - numberEditor.setModel(null); - // Use empty string, otherwise there is a NPE in NumberEditorHandler - numberEditor.setModelText(""); + numberEditor.setNumberValue(null); +// // Use empty string, otherwise there is a NPE in NumberEditorHandler +// numberEditor.setModelText(""); // force binding, I do not know why the textfield text is not emptied // if we do not force it numberEditor.applyDataBinding(NumberEditor.BINDING_TEXT_FIELD_TEXT); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.