July 2012 - Jaxx-commits - mailman.cloud.codelutin.com

r2462 - in trunk: jaxx-runtime/src/main/java/jaxx/runtime/swing/editor jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config
by mallon＠users.nuiton.org July 31, 2012

July 31, 2012

Author: mallon Date: 2012-07-31 18:06:55 +0200 (Tue, 31 Jul 2012) New Revision: 2462 Url: http://nuiton.org/repositories/revision/jaxx/2462 Log: Ajout d'un renderer, correspondant a l editeur de couleur precedent. Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorCellEditor.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java Removed: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorEditor.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUIHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigTableEditor.java Copied: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorCellEditor.java (from rev 2459, trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorEditor.java) =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorCellEditor.java (rev 0) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorCellEditor.java 2012-07-31 16:06:55 UTC (rev 2462) @@ -0,0 +1,91 @@ +package jaxx.runtime.swing.editor; + +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 java.awt.Color; +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +public class ColorCellEditor extends AbstractCellEditor + implements TableCellEditor, + ActionListener { + Color currentColor; + JButton button; + JColorChooser colorChooser; + JDialog dialog; + protected static final String EDIT = "edit"; + + public ColorCellEditor() { + //Set up the editor (from the table's point of view), + //which is a button. + //This button brings up the color chooser dialog, + //which is the editor from the user's point of view. + button = new JButton(); + button.setActionCommand(EDIT); + button.addActionListener(this); + button.setBorderPainted(false); + + //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 + } + + /** + * Handles events from the editor button and from + * the dialog's OK button. + */ + public void actionPerformed(ActionEvent e) { + if (EDIT.equals(e.getActionCommand())) { + //The user has clicked the cell, so + //bring up the dialog. + button.setBackground(currentColor); + colorChooser.setColor(currentColor); + dialog.setVisible(true); + + //Make the renderer reappear. + fireEditingStopped(); + + } else { //User pressed dialog's "OK" button. + currentColor = colorChooser.getColor(); + } + } + + //Implement the one CellEditor method that AbstractCellEditor doesn't. + public Color getCellEditorValue() { + //String currentColorHexa = toHex(currentColor.getRed(), currentColor.getGreen(), currentColor.getBlue()); + return currentColor; + } + + protected static String toHex(int r, int g, int b) { + return "#" + toBrowserHexValue(r) + toBrowserHexValue(g) + toBrowserHexValue(b); + } + + protected static String toBrowserHexValue(int number) { + StringBuilder builder = new StringBuilder(Integer.toHexString(number & 0xff)); + while (builder.length() < 2) { + builder.append("0"); + } + return builder.toString().toUpperCase(); + } + + + //Implement the one method defined by TableCellEditor. + public Component getTableCellEditorComponent(JTable table, + Object value, + boolean isSelected, + int row, + int column) { + currentColor = (Color)value; + return button; + } +} \ No newline at end of file Deleted: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorEditor.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorEditor.java 2012-07-31 15:26:06 UTC (rev 2461) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorEditor.java 2012-07-31 16:06:55 UTC (rev 2462) @@ -1,91 +0,0 @@ -package jaxx.runtime.swing.editor; - -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 java.awt.Color; -import java.awt.Component; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -public class ColorEditor extends AbstractCellEditor - implements TableCellEditor, - ActionListener { - Color currentColor; - JButton button; - JColorChooser colorChooser; - JDialog dialog; - protected static final String EDIT = "edit"; - - public ColorEditor() { - //Set up the editor (from the table's point of view), - //which is a button. - //This button brings up the color chooser dialog, - //which is the editor from the user's point of view. - button = new JButton(); - button.setActionCommand(EDIT); - button.addActionListener(this); - button.setBorderPainted(false); - - //Set up the dialog that the button brings up. - colorChooser = new JColorChooser(); - dialog = JColorChooser.createDialog(button, - "Pick a Color", - 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. - */ - public void actionPerformed(ActionEvent e) { - if (EDIT.equals(e.getActionCommand())) { - //The user has clicked the cell, so - //bring up the dialog. - button.setBackground(currentColor); - colorChooser.setColor(currentColor); - dialog.setVisible(true); - - //Make the renderer reappear. - fireEditingStopped(); - - } else { //User pressed dialog's "OK" button. - currentColor = colorChooser.getColor(); - } - } - - //Implement the one CellEditor method that AbstractCellEditor doesn't. - public String getCellEditorValue() { - String currentColorHexa = toHex(currentColor.getRed(), currentColor.getGreen(), currentColor.getBlue()); - return currentColorHexa; - } - - protected static String toHex(int r, int g, int b) { - return "#" + toBrowserHexValue(r) + toBrowserHexValue(g) + toBrowserHexValue(b); - } - - protected static String toBrowserHexValue(int number) { - StringBuilder builder = new StringBuilder(Integer.toHexString(number & 0xff)); - while (builder.length() < 2) { - builder.append("0"); - } - return builder.toString().toUpperCase(); - } - - - //Implement the one method defined by TableCellEditor. - public Component getTableCellEditorComponent(JTable table, - Object value, - boolean isSelected, - int row, - int column) { - currentColor = (Color)value; - return button; - } -} \ No newline at end of file Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java (rev 0) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java 2012-07-31 16:06:55 UTC (rev 2462) @@ -0,0 +1,25 @@ +package jaxx.runtime.swing.renderer; + +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.JTable; +import javax.swing.table.TableCellRenderer; +import java.awt.Color; +import java.awt.Component; + +/** + * Date: 31/07/12 + * + * @author mallon <mallon(a)codelutin.com> + * @since 2.5.4 + */ +public class ColorCellRenderer implements TableCellRenderer { + + 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); + return button; + } +} Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUIHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUIHandler.java 2012-07-31 15:26:06 UTC (rev 2461) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUIHandler.java 2012-07-31 16:06:55 UTC (rev 2462) @@ -26,12 +26,14 @@ import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.editor.config.model.ConfigTableModel; import jaxx.runtime.swing.editor.config.model.OptionModel; +import jaxx.runtime.swing.renderer.ColorCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import javax.swing.JTable; import javax.swing.JTextArea; import javax.swing.ListSelectionModel; +import java.awt.Color; import java.awt.Font; import static org.nuiton.i18n.I18n._; @@ -70,6 +72,7 @@ n_("config.defaultValue.tip")); ConfigTableRenderer renderer = new ConfigTableRenderer(); + ColorCellRenderer colorCellRenderer = new ColorCellRenderer(); SwingUtil.setTableColumnRenderer(table, 0, renderer); SwingUtil.setTableColumnRenderer(table, 1, renderer); SwingUtil.setTableColumnRenderer(table, 2, renderer); @@ -77,6 +80,7 @@ int width = SwingUtil.computeTableColumnWidth(table, f, 0, "___*"); SwingUtil.fixTableColumnWidth(table, 0, width); SwingUtil.setTableColumnEditor(table, 1, new ConfigTableEditor((ConfigTableModel) table.getModel())); + table.setDefaultRenderer(Color.class, colorCellRenderer); } public void updateDescriptionText() { Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigTableEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigTableEditor.java 2012-07-31 15:26:06 UTC (rev 2461) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigTableEditor.java 2012-07-31 16:06:55 UTC (rev 2462) @@ -28,7 +28,7 @@ import com.google.common.io.Files; import jaxx.runtime.swing.JAXXWidgetUtil; import jaxx.runtime.swing.editor.ClassCellEditor; -import jaxx.runtime.swing.editor.ColorEditor; +import jaxx.runtime.swing.editor.ColorCellEditor; import jaxx.runtime.swing.editor.EnumEditor; import jaxx.runtime.swing.editor.LocaleEditor; import jaxx.runtime.swing.editor.cell.FileCellEditor; @@ -132,7 +132,7 @@ editor = new DefaultCellEditor(LocaleEditor.newEditor()); } else if (type.equals(Color.class)) { - editor = new ColorEditor(); + editor = new ColorCellEditor(); } else { editor = table.getDefaultEditor(String.class);

1 0

r2461 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config
by tchemit＠users.nuiton.org July 31, 2012

July 31, 2012

Author: tchemit Date: 2012-07-31 17:26:06 +0200 (Tue, 31 Jul 2012) New Revision: 2461 Url: http://nuiton.org/repositories/revision/jaxx/2461 Log: fixes #2217: Improve ConfigUI Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUI.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUI.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUI.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUI.jaxx 2012-07-31 15:18:20 UTC (rev 2460) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUI.jaxx 2012-07-31 15:26:06 UTC (rev 2461) @@ -26,18 +26,13 @@ <import> java.awt.Color - java.awt.Font javax.swing.DefaultListSelectionModel javax.swing.ScrollPaneConstants jaxx.runtime.swing.editor.config.model.CategoryModel jaxx.runtime.swing.editor.config.model.ConfigTableModel jaxx.runtime.swing.editor.config.model.ConfigUIModel - jaxx.runtime.swing.editor.config.model.OptionModel - static org.nuiton.i18n.I18n.n_ </import> -  - <ConfigCategoryUIHandler id='handler' constructorParams='this'/> <script><![CDATA[ Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUI.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUI.jaxx 2012-07-31 15:18:20 UTC (rev 2460) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUI.jaxx 2012-07-31 15:26:06 UTC (rev 2461) @@ -28,24 +28,16 @@ jaxx.runtime.swing.editor.config.model.ConfigUIModel </import> -  - <script><![CDATA[ public void init(String defaultCategory) { getHandler().initUI(defaultCategory); } -public void destroy() { - log.info("destroy ui " + getName()); - JAXXUtil.destroy(this); - model.destroy(); -} - @Override protected void finalize() throws Throwable { super.finalize(); - destroy(); + getHandler().destroy(); } ]]> </script> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIHandler.java 2012-07-31 15:18:20 UTC (rev 2460) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIHandler.java 2012-07-31 15:26:06 UTC (rev 2461) @@ -25,6 +25,7 @@ */ package jaxx.runtime.swing.editor.config; +import jaxx.runtime.JAXXUtil; import jaxx.runtime.SwingUtil; import jaxx.runtime.context.JAXXInitialContext; import jaxx.runtime.swing.editor.config.model.CallBackEntry; @@ -130,6 +131,14 @@ categories.setSelectedIndex(categoryIndex); } + public void destroy() { + if (log.isDebugEnabled() ) { + log.debug("destroy ui " + ui.getName()); + } + JAXXUtil.destroy(ui); + ui.getModel().destroy(); + } + public void changeCategory(ChangeEvent e) { JPanel p = (JPanel) ui.getCategories().getSelectedComponent(); if (p == null) { @@ -238,7 +247,7 @@ protected void closeUI(Window parentWindow, ConfigUIModel model) { - ui.destroy(); + destroy(); // close the config ui parentWindow.dispose();

1 0

r2460 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config
by tchemit＠users.nuiton.org July 31, 2012

July 31, 2012

Author: tchemit Date: 2012-07-31 17:18:20 +0200 (Tue, 31 Jul 2012) New Revision: 2460 Url: http://nuiton.org/repositories/revision/jaxx/2460 Log: fixes #2217: Improve ConfigCategoryUI Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUIHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCallBackUI.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUI.jaxx Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCallBackUI.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCallBackUI.jaxx 2012-07-31 13:57:54 UTC (rev 2459) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCallBackUI.jaxx 2012-07-31 15:18:20 UTC (rev 2460) @@ -24,10 +24,6 @@ --> <JPanel layout='{new BorderLayout()}'> -  - <script><![CDATA[ /** * Init the ui. Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUI.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUI.jaxx 2012-07-31 13:57:54 UTC (rev 2459) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUI.jaxx 2012-07-31 15:18:20 UTC (rev 2460) @@ -38,54 +38,13 @@  + <ConfigCategoryUIHandler id='handler' constructorParams='this'/> + <script><![CDATA[ void $afterCompleteSetup() { - // prepare table - SwingUtil.setI18nTableHeaderRenderer(table, - n_("config.key"), - n_("config.key.tip"), - n_("config.value"), - n_("config.value.tip"), - n_("config.defaultValue"), - n_("config.defaultValue.tip")); - - ConfigTableRenderer renderer = new ConfigTableRenderer(); - SwingUtil.setTableColumnRenderer(table, 0, renderer); - SwingUtil.setTableColumnRenderer(table, 1, renderer); - SwingUtil.setTableColumnRenderer(table, 2, renderer); - Font f = table.getFont().deriveFont(Font.ITALIC | Font.BOLD); - int width = SwingUtil.computeTableColumnWidth(table, f, 0, "___*"); - SwingUtil.fixTableColumnWidth(table, 0, width); - SwingUtil.setTableColumnEditor(table, 1, new ConfigTableEditor((ConfigTableModel) table.getModel())); + getHandler().init(); } - -protected void updateDescriptionText() { - OptionModel option; - if (selectionModel.isSelectionEmpty()) { - option = null; - } else { - int row = selectionModel.getAnchorSelectionIndex(); - ConfigTableModel m = (ConfigTableModel) table.getModel(); - option = m.getEntry(row); - if (log.isDebugEnabled()) { - log.debug(row + " : " + option); - } - } - StringBuilder buffer = new StringBuilder(); - if (option == null) { - buffer.append(_("config.no.option.selected")); - } else { - buffer.append(_("config.option.label", option.getKey(), _(option.getDescription()))).append('\n'); - if (option.isModified()) { - buffer.append(_("config.option.modified", option.getOriginalValue(), option.getValue())).append('\n'); - } - if (option.isFinal()) { - buffer.append(_("config.option.final")).append('\n'); - } - } - description.setText(buffer.toString()); -} ]]> </script> @@ -97,14 +56,12 @@ javaBean='getContextValue(CategoryModel.class)'/> <ConfigTableModel id='tableModel' constructorParams='categoryModel' - onTableChanged='updateDescriptionText()'/> + onTableChanged='handler.updateDescriptionText()'/> <ListSelectionModel id='selectionModel' javaBean='new DefaultListSelectionModel()' - onValueChanged='if (!event.getValueIsAdjusting()) { updateDescriptionText(); }'/> + onValueChanged='if (!event.getValueIsAdjusting()) {handler.updateDescriptionText(); }'/> -  -  <JPanel id="categoryLabelPanel" constraints='BorderLayout.NORTH'> <JLabel id='categoryLabel'/> Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUIHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUIHandler.java (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUIHandler.java 2012-07-31 15:18:20 UTC (rev 2460) @@ -0,0 +1,112 @@ +package jaxx.runtime.swing.editor.config; +/* + * #%L + * JAXX :: Widgets + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin + * %% + * 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% + */ + +import jaxx.runtime.SwingUtil; +import jaxx.runtime.swing.editor.config.model.ConfigTableModel; +import jaxx.runtime.swing.editor.config.model.OptionModel; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.swing.JTable; +import javax.swing.JTextArea; +import javax.swing.ListSelectionModel; +import java.awt.Font; + +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; + +/** + * Handler of {@link ConfigCategoryUI}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5.4 + */ +public class ConfigCategoryUIHandler { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(ConfigCategoryUIHandler.class); + + private final ConfigCategoryUI ui; + + public ConfigCategoryUIHandler(ConfigCategoryUI ui) { + this.ui = ui; + } + + public void init() { + + JTable table = ui.getTable(); + + // prepare table + SwingUtil.setI18nTableHeaderRenderer( + table, + n_("config.key"), + n_("config.key.tip"), + n_("config.value"), + n_("config.value.tip"), + n_("config.defaultValue"), + n_("config.defaultValue.tip")); + + ConfigTableRenderer renderer = new ConfigTableRenderer(); + SwingUtil.setTableColumnRenderer(table, 0, renderer); + SwingUtil.setTableColumnRenderer(table, 1, renderer); + SwingUtil.setTableColumnRenderer(table, 2, renderer); + Font f = table.getFont().deriveFont(Font.ITALIC | Font.BOLD); + int width = SwingUtil.computeTableColumnWidth(table, f, 0, "___*"); + SwingUtil.fixTableColumnWidth(table, 0, width); + SwingUtil.setTableColumnEditor(table, 1, new ConfigTableEditor((ConfigTableModel) table.getModel())); + } + + public void updateDescriptionText() { + OptionModel option; + JTable table = ui.getTable(); + JTextArea description = ui.getDescription(); + ListSelectionModel selectionModel = ui.getSelectionModel(); + + if (selectionModel.isSelectionEmpty()) { + option = null; + } else { + int row = selectionModel.getAnchorSelectionIndex(); + ConfigTableModel m = (ConfigTableModel) table.getModel(); + option = m.getEntry(row); + if (log.isDebugEnabled()) { + log.debug(row + " : " + option); + } + } + StringBuilder buffer = new StringBuilder(); + if (option == null) { + buffer.append(_("config.no.option.selected")); + } else { + buffer.append(_("config.option.label", option.getKey(), _(option.getDescription()))).append('\n'); + if (option.isModified()) { + buffer.append(_("config.option.modified", option.getOriginalValue(), option.getValue())).append('\n'); + } + if (option.isFinal()) { + buffer.append(_("config.option.final")).append('\n'); + } + } + description.setText(buffer.toString()); + } +} Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUIHandler.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2459 - in trunk: jaxx-runtime/src/main/java/jaxx/runtime/swing/editor jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config
by mallon＠users.nuiton.org July 31, 2012

July 31, 2012

Author: mallon Date: 2012-07-31 15:57:54 +0200 (Tue, 31 Jul 2012) New Revision: 2459 Url: http://nuiton.org/repositories/revision/jaxx/2459 Log: Ajout d'un ?\195?\169diteur Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorEditor.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigTableEditor.java Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorEditor.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorEditor.java (rev 0) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorEditor.java 2012-07-31 13:57:54 UTC (rev 2459) @@ -0,0 +1,91 @@ +package jaxx.runtime.swing.editor; + +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 java.awt.Color; +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +public class ColorEditor extends AbstractCellEditor + implements TableCellEditor, + ActionListener { + Color currentColor; + JButton button; + JColorChooser colorChooser; + JDialog dialog; + protected static final String EDIT = "edit"; + + public ColorEditor() { + //Set up the editor (from the table's point of view), + //which is a button. + //This button brings up the color chooser dialog, + //which is the editor from the user's point of view. + button = new JButton(); + button.setActionCommand(EDIT); + button.addActionListener(this); + button.setBorderPainted(false); + + //Set up the dialog that the button brings up. + colorChooser = new JColorChooser(); + dialog = JColorChooser.createDialog(button, + "Pick a Color", + 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. + */ + public void actionPerformed(ActionEvent e) { + if (EDIT.equals(e.getActionCommand())) { + //The user has clicked the cell, so + //bring up the dialog. + button.setBackground(currentColor); + colorChooser.setColor(currentColor); + dialog.setVisible(true); + + //Make the renderer reappear. + fireEditingStopped(); + + } else { //User pressed dialog's "OK" button. + currentColor = colorChooser.getColor(); + } + } + + //Implement the one CellEditor method that AbstractCellEditor doesn't. + public String getCellEditorValue() { + String currentColorHexa = toHex(currentColor.getRed(), currentColor.getGreen(), currentColor.getBlue()); + return currentColorHexa; + } + + protected static String toHex(int r, int g, int b) { + return "#" + toBrowserHexValue(r) + toBrowserHexValue(g) + toBrowserHexValue(b); + } + + protected static String toBrowserHexValue(int number) { + StringBuilder builder = new StringBuilder(Integer.toHexString(number & 0xff)); + while (builder.length() < 2) { + builder.append("0"); + } + return builder.toString().toUpperCase(); + } + + + //Implement the one method defined by TableCellEditor. + public Component getTableCellEditorComponent(JTable table, + Object value, + boolean isSelected, + int row, + int column) { + currentColor = (Color)value; + return button; + } +} \ No newline at end of file Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigTableEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigTableEditor.java 2012-07-30 18:50:14 UTC (rev 2458) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigTableEditor.java 2012-07-31 13:57:54 UTC (rev 2459) @@ -28,6 +28,7 @@ import com.google.common.io.Files; import jaxx.runtime.swing.JAXXWidgetUtil; import jaxx.runtime.swing.editor.ClassCellEditor; +import jaxx.runtime.swing.editor.ColorEditor; import jaxx.runtime.swing.editor.EnumEditor; import jaxx.runtime.swing.editor.LocaleEditor; import jaxx.runtime.swing.editor.cell.FileCellEditor; @@ -40,6 +41,7 @@ import javax.swing.KeyStroke; import javax.swing.event.CellEditorListener; import javax.swing.table.TableCellEditor; +import java.awt.Color; import java.awt.Component; import java.io.File; import java.util.EventObject; @@ -129,6 +131,9 @@ } else if (type.equals(Locale.class)) { editor = new DefaultCellEditor(LocaleEditor.newEditor()); + } else if (type.equals(Color.class)) { + editor = new ColorEditor(); + } else { editor = table.getDefaultEditor(String.class); }

1 0

r2458 - in trunk: . jaxx-compiler jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by maven-release＠users.nuiton.org July 30, 2012

July 30, 2012

Author: maven-release Date: 2012-07-30 20:50:14 +0200 (Mon, 30 Jul 2012) New Revision: 2458 Url: http://nuiton.org/repositories/revision/jaxx/2458 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-maven-plugin/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-validator/pom.xml trunk/jaxx-widgets/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2012-07-30 18:50:12 UTC (rev 2457) +++ trunk/jaxx-compiler/pom.xml 2012-07-30 18:50:14 UTC (rev 2458) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.3</version> + <version>2.5.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2012-07-30 18:50:12 UTC (rev 2457) +++ trunk/jaxx-demo/pom.xml 2012-07-30 18:50:14 UTC (rev 2458) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.3</version> + <version>2.5.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2012-07-30 18:50:12 UTC (rev 2457) +++ trunk/jaxx-maven-plugin/pom.xml 2012-07-30 18:50:14 UTC (rev 2458) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.3</version> + <version>2.5.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2012-07-30 18:50:12 UTC (rev 2457) +++ trunk/jaxx-runtime/pom.xml 2012-07-30 18:50:14 UTC (rev 2458) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.3</version> + <version>2.5.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2012-07-30 18:50:12 UTC (rev 2457) +++ trunk/jaxx-validator/pom.xml 2012-07-30 18:50:14 UTC (rev 2458) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.3</version> + <version>2.5.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2012-07-30 18:50:12 UTC (rev 2457) +++ trunk/jaxx-widgets/pom.xml 2012-07-30 18:50:14 UTC (rev 2458) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.3</version> + <version>2.5.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-30 18:50:12 UTC (rev 2457) +++ trunk/pom.xml 2012-07-30 18:50:14 UTC (rev 2458) @@ -38,7 +38,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.3</version> + <version>2.5.4-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> @@ -136,11 +136,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.3</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.3 + scm:svn:http://svn.nuiton.org/svn/jaxx/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.5.3</url> + <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> </scm> <distributionManagement>

1 0

r2457 - tags
by maven-release＠users.nuiton.org July 30, 2012

July 30, 2012

Author: maven-release Date: 2012-07-30 20:50:12 +0200 (Mon, 30 Jul 2012) New Revision: 2457 Url: http://nuiton.org/repositories/revision/jaxx/2457 Log: [maven-release-plugin] copy for tag jaxx-2.5.3 Added: tags/jaxx-2.5.3/

1 0

r2456 - in trunk: . jaxx-compiler jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by maven-release＠users.nuiton.org July 30, 2012

July 30, 2012

Author: maven-release Date: 2012-07-30 20:50:10 +0200 (Mon, 30 Jul 2012) New Revision: 2456 Url: http://nuiton.org/repositories/revision/jaxx/2456 Log: [maven-release-plugin] prepare release jaxx-2.5.3 Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-maven-plugin/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-validator/pom.xml trunk/jaxx-widgets/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2012-07-30 18:47:43 UTC (rev 2455) +++ trunk/jaxx-compiler/pom.xml 2012-07-30 18:50:10 UTC (rev 2456) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.3-SNAPSHOT</version> + <version>2.5.3</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2012-07-30 18:47:43 UTC (rev 2455) +++ trunk/jaxx-demo/pom.xml 2012-07-30 18:50:10 UTC (rev 2456) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.3-SNAPSHOT</version> + <version>2.5.3</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2012-07-30 18:47:43 UTC (rev 2455) +++ trunk/jaxx-maven-plugin/pom.xml 2012-07-30 18:50:10 UTC (rev 2456) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.3-SNAPSHOT</version> + <version>2.5.3</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2012-07-30 18:47:43 UTC (rev 2455) +++ trunk/jaxx-runtime/pom.xml 2012-07-30 18:50:10 UTC (rev 2456) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.3-SNAPSHOT</version> + <version>2.5.3</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2012-07-30 18:47:43 UTC (rev 2455) +++ trunk/jaxx-validator/pom.xml 2012-07-30 18:50:10 UTC (rev 2456) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.3-SNAPSHOT</version> + <version>2.5.3</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2012-07-30 18:47:43 UTC (rev 2455) +++ trunk/jaxx-widgets/pom.xml 2012-07-30 18:50:10 UTC (rev 2456) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.3-SNAPSHOT</version> + <version>2.5.3</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-30 18:47:43 UTC (rev 2455) +++ trunk/pom.xml 2012-07-30 18:50:10 UTC (rev 2456) @@ -38,7 +38,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.3-SNAPSHOT</version> + <version>2.5.3</version> <modules> <module>jaxx-runtime</module> @@ -136,11 +136,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.3</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/trunk + scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.3 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> + <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.5.3</url> </scm> <distributionManagement>

1 0

r2455 - in trunk: jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor jaxx-demo/src/main/java/jaxx/demo/feature/validation/list jaxx-demo/src/main/resources/icons jaxx-demo/src/main/resources/jaxx/demo/entities jaxx-runtime/src/main/java/jaxx/runtime/swing/editor jaxx-runtime/src/main/java/jaxx/runtime/swing/model jaxx-validator jaxx-validator/src/main/java/jaxx/runtime/validator/swing jaxx-widgets/src/main/java/jaxx/runtime/swing jaxx-widgets/src/main/java/jaxx/runtime/swing/editor jaxx-
by tchemit＠users.nuiton.org July 30, 2012

July 30, 2012

Author: tchemit Date: 2012-07-30 20:47:43 +0200 (Mon, 30 Jul 2012) New Revision: 2455 Url: http://nuiton.org/repositories/revision/jaxx/2455 Log: - optimize dependencies - add missing file header - add missing svn properties Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/DatePickerDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/FileEditorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemo.css trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/PeopleTableModel.java trunk/jaxx-demo/src/main/resources/icons/action-reload-log.png trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/People-error-validation.xml trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/People-info-validation.xml trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/People-warning-validation.xml trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/BooleanCellEditor.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/AbstractGenericListSelectionModel.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListEvent.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListListener.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListSelectionModel.java trunk/jaxx-validator/pom.xml trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorDataLocator.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorHighlightPredicate.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessage.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableModel.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableMouseListener.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableRenderer.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorTableEditorModelListener.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/BaseActionPanel.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXDatePicker.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXWidgetUtil.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorModel.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/KeyStrokeEditor.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/DateCellEditor.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/FileCellEditor.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jAppender.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jUI.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/renderer/DateCellRenderer.java trunk/jaxx-widgets/src/main/java/org/jdesktop/swingx/plaf/basic/ExtendedBasicDatePickerUI.java trunk/jaxx-widgets/src/main/resources/icons/action-add.png trunk/jaxx-widgets/src/main/resources/icons/action-open.png trunk/jaxx-widgets/src/main/resources/icons/action-remove.png trunk/src/site/rst/tutoriels.rst Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/DatePickerDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/DatePickerDemo.jaxx 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/DatePickerDemo.jaxx 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,8 +1,8 @@  <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> Property changes on: trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/People-error-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/People-info-validation.xml =================================================================== --- trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/People-info-validation.xml 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/People-info-validation.xml 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,3 +1,26 @@ + <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> Property changes on: trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/People-info-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/People-warning-validation.xml =================================================================== --- trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/People-warning-validation.xml 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/People-warning-validation.xml 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,3 +1,26 @@ + <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> Property changes on: trunk/jaxx-demo/src/main/resources/jaxx/demo/entities/People-warning-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/BooleanCellEditor.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/BooleanCellEditor.java 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/BooleanCellEditor.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -2,8 +2,8 @@ * #%L * JAXX :: Runtime * - * $Id: BooleanCellRenderer.java 2334 2012-06-15 10:02:35Z sletellier $ - * $HeadURL: http://svn.nuiton.org/svn/jaxx/trunk/jaxx-runtime/src/main/java/jaxx/runtim… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2010 CodeLutin * %% Property changes on: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/BooleanCellEditor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/AbstractGenericListSelectionModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/AbstractGenericListSelectionModel.java 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/AbstractGenericListSelectionModel.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,8 +1,8 @@ /* * #%L * JAXX :: Runtime - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin * %% Property changes on: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/AbstractGenericListSelectionModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListEvent.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListEvent.java 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListEvent.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,8 +1,8 @@ /* * #%L * JAXX :: Runtime - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin * %% Property changes on: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListEvent.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListListener.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListListener.java 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListListener.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,8 +1,8 @@ /* * #%L * JAXX :: Runtime - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin * %% Property changes on: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListListener.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,8 +1,8 @@ /* * #%L * JAXX :: Widgets - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin * %% Property changes on: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListSelectionModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListSelectionModel.java 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListSelectionModel.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,8 +1,8 @@ /* * #%L * JAXX :: Runtime - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin * %% Property changes on: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListSelectionModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-validator/pom.xml 2012-07-30 18:47:43 UTC (rev 2455) @@ -72,11 +72,21 @@ </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> <groupId>org.swinglabs</groupId> <artifactId>jxlayer</artifactId> </dependency> Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorDataLocator.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorDataLocator.java 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorDataLocator.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,4 +1,27 @@ package jaxx.runtime.validator.swing; +/* + * #%L + * JAXX :: Validator + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin + * %% + * 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% + */ import org.apache.commons.lang3.tuple.Pair; Property changes on: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorDataLocator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorHighlightPredicate.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorHighlightPredicate.java 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorHighlightPredicate.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,4 +1,27 @@ package jaxx.runtime.validator.swing; +/* + * #%L + * JAXX :: Validator + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin + * %% + * 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% + */ import org.jdesktop.swingx.decorator.ComponentAdapter; import org.jdesktop.swingx.decorator.HighlightPredicate; Property changes on: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorHighlightPredicate.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessage.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessage.java 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessage.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,4 +1,27 @@ package jaxx.runtime.validator.swing; +/* + * #%L + * JAXX :: Validator + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin + * %% + * 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% + */ import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.list.BeanListValidator; Property changes on: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessage.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableModel.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableModel.java 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableModel.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,4 +1,27 @@ package jaxx.runtime.validator.swing; +/* + * #%L + * JAXX :: Validator + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin + * %% + * 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% + */ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; Property changes on: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableMouseListener.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableMouseListener.java 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableMouseListener.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,4 +1,27 @@ package jaxx.runtime.validator.swing; +/* + * #%L + * JAXX :: Validator + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin + * %% + * 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% + */ import jaxx.runtime.SwingUtil; import org.apache.commons.lang3.tuple.Pair; Property changes on: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableMouseListener.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableRenderer.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableRenderer.java 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableRenderer.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,4 +1,27 @@ package jaxx.runtime.validator.swing; +/* + * #%L + * JAXX :: Validator + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin + * %% + * 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% + */ import org.nuiton.validator.NuitonValidatorScope; Property changes on: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableRenderer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorTableEditorModelListener.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorTableEditorModelListener.java 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorTableEditorModelListener.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,4 +1,27 @@ package jaxx.runtime.validator.swing; +/* + * #%L + * JAXX :: Validator + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin + * %% + * 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% + */ import com.google.common.collect.Sets; import org.apache.commons.logging.Log; Property changes on: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorTableEditorModelListener.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/BaseActionPanel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/BaseActionPanel.java 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/BaseActionPanel.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,8 +1,8 @@ /* * #%L * JAXX :: Widgets - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin * %% Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/BaseActionPanel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.jaxx 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.jaxx 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,8 +1,8 @@ <!-- #%L JAXX :: Widgets - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2008 - 2012 CodeLutin %% Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.jaxx ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXDatePicker.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXDatePicker.jaxx 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXDatePicker.jaxx 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,8 +1,8 @@ <!-- #%L JAXX :: Widgets - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2008 - 2012 CodeLutin %% Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXDatePicker.jaxx ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXWidgetUtil.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXWidgetUtil.java 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXWidgetUtil.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,8 +1,8 @@ /* * #%L * JAXX :: Widgets - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin * %% Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXWidgetUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorModel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorModel.java 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorModel.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,8 +1,8 @@ /* * #%L * JAXX :: Widgets - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin * %% Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,8 +1,8 @@ <!-- #%L JAXX :: Widgets - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2008 - 2012 CodeLutin %% Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,8 +1,8 @@ <!-- #%L JAXX :: Widgets - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2008 - 2012 CodeLutin %% Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,8 +1,8 @@ /* * #%L * JAXX :: Widgets - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin * %% Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/KeyStrokeEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/KeyStrokeEditor.java 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/KeyStrokeEditor.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,8 +1,8 @@ /* * #%L * JAXX :: Widgets - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin * %% Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/KeyStrokeEditor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/DateCellEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/DateCellEditor.java 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/DateCellEditor.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,8 +1,8 @@ /* * #%L * JAXX :: Widgets - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin * %% Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/DateCellEditor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/FileCellEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/FileCellEditor.java 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/FileCellEditor.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,8 +1,8 @@ /* * #%L * JAXX :: Widgets - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin * %% Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/FileCellEditor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,8 +1,8 @@ /* * #%L * JAXX :: Widgets - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin * %% Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,8 +1,8 @@ /* * #%L * JAXX :: Widgets - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin * %% Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jAppender.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jHandler.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jUI.jaxx ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/renderer/DateCellRenderer.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,8 +1,8 @@ /* * #%L * JAXX :: Widgets - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin * %% Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/renderer/DateCellRenderer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-widgets/src/main/java/org/jdesktop/swingx/plaf/basic/ExtendedBasicDatePickerUI.java =================================================================== --- trunk/jaxx-widgets/src/main/java/org/jdesktop/swingx/plaf/basic/ExtendedBasicDatePickerUI.java 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/jaxx-widgets/src/main/java/org/jdesktop/swingx/plaf/basic/ExtendedBasicDatePickerUI.java 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,8 +1,8 @@ /* * #%L * JAXX :: Widgets - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2008 - 2012 CodeLutin * %% Property changes on: trunk/jaxx-widgets/src/main/java/org/jdesktop/swingx/plaf/basic/ExtendedBasicDatePickerUI.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jaxx-widgets/src/main/resources/icons/action-add.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/jaxx-widgets/src/main/resources/icons/action-open.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/jaxx-widgets/src/main/resources/icons/action-remove.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/tutoriels.rst =================================================================== --- trunk/src/site/rst/tutoriels.rst 2012-07-30 18:40:39 UTC (rev 2454) +++ trunk/src/site/rst/tutoriels.rst 2012-07-30 18:47:43 UTC (rev 2455) @@ -1,8 +1,8 @@ .. - .. * #%L .. * JAXX -.. * $Id:$ -.. * $HeadURL:$ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2008 - 2012 CodeLutin .. * %% Property changes on: trunk/src/site/rst/tutoriels.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2454 - trunk
by tchemit＠users.nuiton.org July 30, 2012

July 30, 2012

Author: tchemit Date: 2012-07-30 20:40:39 +0200 (Mon, 30 Jul 2012) New Revision: 2454 Url: http://nuiton.org/repositories/revision/jaxx/2454 Log: fixes #2202: Updates to nuiton-utils 2.5.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-30 18:29:23 UTC (rev 2453) +++ trunk/pom.xml 2012-07-30 18:40:39 UTC (rev 2454) @@ -118,7 +118,7 @@  <projectId>jaxx</projectId> - <nuitonUtilsVersion>2.5.2-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.5.2</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <eugeneVersion>2.4.2</eugeneVersion> <jxLayerVersion>3.0.4</jxLayerVersion>

1 0

r2453 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor
by tchemit＠users.nuiton.org July 30, 2012

July 30, 2012

Author: tchemit Date: 2012-07-30 20:29:23 +0200 (Mon, 30 Jul 2012) New Revision: 2453 Url: http://nuiton.org/repositories/revision/jaxx/2453 Log: #2215: Can auto-select NumberEditor content when having bad content Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx 2012-07-30 18:29:11 UTC (rev 2452) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx 2012-07-30 18:29:23 UTC (rev 2453) @@ -76,6 +76,9 @@  <Boolean id='popupVisible' javaBean='false'/> +  + <Boolean id='selectAllTextOnError' javaBean='false'/> +  <NumberEditorHandler id='handler' constructorParams='this'/> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java 2012-07-30 18:29:11 UTC (rev 2452) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java 2012-07-30 18:29:23 UTC (rev 2453) @@ -25,6 +25,16 @@ package jaxx.runtime.swing.editor; +import org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.swing.JComponent; +import javax.swing.JTextField; +import javax.swing.SwingUtilities; +import javax.swing.text.BadLocationException; import java.awt.Dimension; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; @@ -37,15 +47,6 @@ import java.math.BigInteger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.swing.JComponent; -import javax.swing.JTextField; -import javax.swing.SwingUtilities; -import javax.swing.text.BadLocationException; -import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.math.NumberUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import static jaxx.runtime.swing.editor.NumberEditor.PROPERTY_MODEL; import static jaxx.runtime.swing.editor.NumberEditor.PROPERTY_POPUP_VISIBLE; @@ -363,16 +364,20 @@ log.debug("invalid text " + s + " reput old text " + text); } - if (oldPosition > 0) { - oldPosition--; - } field.setText(text); lastValidText = text; - try { - field.setCaretPosition(oldPosition); - } catch (IllegalArgumentException ex) { - log.debug("CaretPosition is invalid for position : " + oldPosition, ex); + if (editor.isSelectAllTextOnError()) { + field.selectAll(); + } else { + if (oldPosition > 0) { + oldPosition--; + } + try { + field.setCaretPosition(oldPosition); + } catch (IllegalArgumentException ex) { + log.debug("CaretPosition is invalid for position : " + oldPosition, ex); + } } }

1 0