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

r2341 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor
by sletellier＠users.nuiton.org 27 Jun '12

27 Jun '12

Author: sletellier Date: 2012-06-27 12:14:52 +0200 (Wed, 27 Jun 2012) New Revision: 2341 Url: http://nuiton.org/repositories/revision/jaxx/2341 Log: Dont force using bean to init Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java 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-06-25 17:06:30 UTC (rev 2340) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java 2012-06-27 10:14:52 UTC (rev 2341) @@ -25,16 +25,6 @@ package jaxx.runtime.swing.editor; -import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.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; @@ -47,6 +37,15 @@ 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.lang.StringUtils; +import org.apache.commons.lang.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; @@ -88,9 +87,9 @@ /** initialise l'ui et les listeners d'évènements. */ public void init() { try { - if (editor.getBean() == null) { - throw new NullPointerException("can not have a null bean in ui " + editor); - } +// if (editor.getBean() == null) { +// throw new NullPointerException("can not have a null bean in ui " + editor); +// } editor.addPropertyChangeListener(NumberEditor.PROPERTY_NUMBER_PATTERN, new PropertyChangeListener() { @@ -157,11 +156,11 @@ if (StringUtils.isNotEmpty(editor.getNumberPattern())) { numberPattern = Pattern.compile(editor.getNumberPattern()); } - + // Determine si c'est un float - Class<?> type = getGetter().getReturnType(); - if (editor.getModelType() != null) { - type = editor.getModelType(); + Class<?> type = editor.getModelType(); + if (editor.getModelType() == null) { + type = getGetter().getReturnType(); } modelType = type; if (log.isDebugEnabled()) { @@ -277,6 +276,9 @@ Number newValue = null; + // allow using ',' char + s = s.replaceAll(",", "."); + if (s.trim().isEmpty()) { // le champ est vide donc c'est la valeur null a reaffecter s = null;

1 0

r2340 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer
by sletellier＠users.nuiton.org 25 Jun '12

25 Jun '12

Author: sletellier Date: 2012-06-25 19:06:30 +0200 (Mon, 25 Jun 2012) New Revision: 2340 Url: http://nuiton.org/repositories/revision/jaxx/2340 Log: - Fix BooleanCellEditor display - Fix npe Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellEditor.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellEditor.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellEditor.java 2012-06-25 11:31:31 UTC (rev 2339) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellEditor.java 2012-06-25 17:06:30 UTC (rev 2340) @@ -24,7 +24,6 @@ */ package jaxx.runtime.swing.renderer; -import java.awt.Color; import java.awt.Component; import javax.swing.AbstractCellEditor; import javax.swing.Icon; @@ -34,6 +33,7 @@ import javax.swing.JTable; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; +import org.jdesktop.swingx.JXTable; /** * @author tchemit <chemit(a)codelutin.com> @@ -43,53 +43,41 @@ private static final long serialVersionUID = 1L; - protected TableCellRenderer defaultDelegate; + protected TableCellRenderer rendererDelegate; + protected TableCellEditor editorDelegate; - protected JCheckBox checkBox; + protected Icon icon; public BooleanCellEditor(TableCellRenderer delegate) { - //super(new BorderLayout()); - this.checkBox = new JCheckBox(); - checkBox.setHorizontalAlignment(JLabel.CENTER); - checkBox.setBorderPainted(true); - this.defaultDelegate = delegate; + this(delegate, null); } public BooleanCellEditor(TableCellRenderer delegate, Icon icon) { - //super(new BorderLayout()); - this.checkBox = new JCheckBox(icon); - checkBox.setHorizontalAlignment(JLabel.CENTER); - checkBox.setVerticalTextPosition(JLabel.TOP); - checkBox.setBorderPainted(true); - this.defaultDelegate = delegate; + this.rendererDelegate = delegate; + this.editorDelegate = new JXTable.BooleanEditor(); + this.icon = icon; } @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - JComponent render = (JComponent) defaultDelegate.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); - if (isSelected) { - checkBox.setForeground(table.getSelectionForeground()); - checkBox.setBackground(table.getSelectionBackground()); - } else { - checkBox.setForeground(render.getForeground()); - checkBox.setBackground(render.getBackground()); - //fixme make this works... and remove the test - if (row % 2 == 1) { - checkBox.setBackground(Color.WHITE); - } + JComponent rendered = (JComponent) rendererDelegate.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); + if (rendered instanceof JCheckBox) { + JCheckBox checkBox = (JCheckBox)rendered; + checkBox.setHorizontalAlignment(JLabel.CENTER); + checkBox.setVerticalTextPosition(JLabel.TOP); + checkBox.setBorderPainted(true); + checkBox.setIcon(icon); } - checkBox.setSelected((value != null && (Boolean) value)); - checkBox.setBorder(render.getBorder()); - return checkBox; + return rendered; } @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - return getTableCellRendererComponent(table, value, isSelected, true, row, column); + return editorDelegate.getTableCellEditorComponent(table, value, isSelected, row, column); } @Override public Object getCellEditorValue() { - return checkBox.isSelected(); + return editorDelegate.getCellEditorValue(); } } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java 2012-06-25 11:31:31 UTC (rev 2339) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java 2012-06-25 17:06:30 UTC (rev 2340) @@ -65,7 +65,7 @@ if (value == null) { value = " "; } - if (!(value instanceof String)) { + if (!(value instanceof String) && decorator != null) { value = decorator.toString(value); } return delegate.getListCellRendererComponent(list,

1 0

r2339 - trunk/jaxx-runtime/src/main/java/jaxx/runtime
by sletellier＠users.nuiton.org 25 Jun '12

25 Jun '12

Author: sletellier Date: 2012-06-25 13:31:31 +0200 (Mon, 25 Jun 2012) New Revision: 2339 Url: http://nuiton.org/repositories/revision/jaxx/2339 Log: fixes #2144 : Add method to select next editable cell on TAB key released Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2012-06-25 09:56:24 UTC (rev 2338) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2012-06-25 11:31:31 UTC (rev 2339) @@ -32,6 +32,8 @@ import java.awt.Font; import java.awt.FontMetrics; import java.awt.Rectangle; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; import java.beans.BeanInfo; import java.beans.IntrospectionException; import java.beans.Introspector; @@ -44,6 +46,7 @@ import java.net.URL; import java.util.ArrayList; import java.util.Collection; +import java.util.EventObject; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; @@ -1178,4 +1181,89 @@ } return iconPath; } + + /** + * Add {@link java.awt.event.KeyListener} to focus next editable cell on TAB key + * + * @param table to add TAB {@link java.awt.event.KeyListener} + */ + public static void makeTableTabFocusable(final JTable table) { + table.setCellSelectionEnabled(true); + table.setSurrendersFocusOnKeystroke(true); + table.addKeyListener(new KeyAdapter() { + + @Override + public void keyReleased(KeyEvent e) { + if (e.getKeyCode() == KeyEvent.VK_TAB) { + + // get table informations + int selectedColumn = table.getSelectedColumn(); + int selectedRow = table.getSelectedRow(); + + if (log.isDebugEnabled()) { + log.debug("Selected was row[" + selectedRow + "] column[" + selectedColumn + "]"); + } + + int columnCount = table.getColumnCount(); + int rowCount = table.getRowCount(); + + // search on current line + for (int toSelectColumn = selectedColumn; toSelectColumn < columnCount; toSelectColumn++) { + + if (editCell(table, selectedRow, toSelectColumn)) { + return; + } + } + + // search on other lines + for (int toSelectRow = selectedRow; toSelectRow < rowCount; toSelectRow++) { + for (int toSelectColumn = 0; toSelectColumn < columnCount; toSelectColumn++) { + + if (editCell(table, toSelectRow, toSelectColumn)) { + return; + } + } + } + } + } + }); + } + + /** + * Used to edit cell + * + * @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 + */ + public static boolean editCell(JTable table, int row, int colummn) { + + if (table.isCellEditable(row, colummn)) { + + // get table informations + int selectedColumn = table.getSelectedColumn(); + int selectedRow = table.getSelectedRow(); + + // stop edition + TableCellEditor cellEditor = table.getCellEditor(selectedRow, selectedColumn); + cellEditor.stopCellEditing(); + + // select row + table.setColumnSelectionInterval(colummn, colummn); + table.setRowSelectionInterval(row, row); + + // edit cell + boolean result = table.editCellAt(row, colummn, new EventObject(table)); + Component component = table.getEditorComponent(); + component.requestFocus(); + + if (log.isDebugEnabled()) { + log.debug("Select row[" + row + "] column[" + colummn + "] return : " + result); + } + return result; + } + return false; + } }

1 0

r2338 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer
by sletellier＠users.nuiton.org 25 Jun '12

25 Jun '12

Author: sletellier Date: 2012-06-25 11:56:24 +0200 (Mon, 25 Jun 2012) New Revision: 2338 Url: http://nuiton.org/repositories/revision/jaxx/2338 Log: Fix classCastException Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellEditor.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellEditor.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellEditor.java 2012-06-21 10:16:46 UTC (rev 2337) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellEditor.java 2012-06-25 09:56:24 UTC (rev 2338) @@ -66,7 +66,6 @@ @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - ((JComponent) defaultDelegate).setBackground(null); JComponent render = (JComponent) defaultDelegate.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); if (isSelected) { checkBox.setForeground(table.getSelectionForeground());

1 0

r2337 - in trunk: jaxx-runtime/src/main/java/jaxx/runtime jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer jaxx-widgets/src/main/java/jaxx/runtime/swing/renderer
by sletellier＠users.nuiton.org 21 Jun '12

21 Jun '12

Author: sletellier Date: 2012-06-21 12:16:46 +0200 (Thu, 21 Jun 2012) New Revision: 2337 Url: http://nuiton.org/repositories/revision/jaxx/2337 Log: Depreciate BooleanCellRenderer, prefere use BooleanCellEditor Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellEditor.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/renderer/DateCellRenderer.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2012-06-20 11:01:32 UTC (rev 2336) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2012-06-21 10:16:46 UTC (rev 2337) @@ -24,45 +24,6 @@ */ package jaxx.runtime; -import jaxx.runtime.swing.Item; -import jaxx.runtime.swing.JAXXComboBox; -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; @@ -92,6 +53,44 @@ 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._; @@ -885,14 +884,19 @@ // try with default icon icon = createActionIcon("delete"); } - return new BooleanCellRenderer(renderer, icon); + return new BooleanCellEditor(renderer, icon); } public static TableCellRenderer newBooleanTableCellRenderer( TableCellRenderer renderer) { - return new BooleanCellRenderer(renderer); + return new BooleanCellEditor(renderer); } + public static BooleanCellEditor newBooleanTableCellEditor( + TableCellRenderer renderer) { + return new BooleanCellEditor(renderer); + } + public static EmptyNumberTableCellRenderer newEmptyNumberTableCellRenderer( TableCellRenderer renderer) { return new EmptyNumberTableCellRenderer(renderer); Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellEditor.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellEditor.java (rev 0) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellEditor.java 2012-06-21 10:16:46 UTC (rev 2337) @@ -0,0 +1,96 @@ +/* + * #%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… $ + * %% + * Copyright (C) 2008 - 2010 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% + */ +package jaxx.runtime.swing.renderer; + +import java.awt.Color; +import java.awt.Component; +import javax.swing.AbstractCellEditor; +import javax.swing.Icon; +import javax.swing.JCheckBox; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JTable; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; + +/** + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class BooleanCellEditor extends AbstractCellEditor implements TableCellRenderer, TableCellEditor { + + private static final long serialVersionUID = 1L; + + protected TableCellRenderer defaultDelegate; + + protected JCheckBox checkBox; + + public BooleanCellEditor(TableCellRenderer delegate) { + //super(new BorderLayout()); + this.checkBox = new JCheckBox(); + checkBox.setHorizontalAlignment(JLabel.CENTER); + checkBox.setBorderPainted(true); + this.defaultDelegate = delegate; + } + + public BooleanCellEditor(TableCellRenderer delegate, Icon icon) { + //super(new BorderLayout()); + this.checkBox = new JCheckBox(icon); + checkBox.setHorizontalAlignment(JLabel.CENTER); + checkBox.setVerticalTextPosition(JLabel.TOP); + checkBox.setBorderPainted(true); + this.defaultDelegate = delegate; + } + + @Override + public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { + ((JComponent) defaultDelegate).setBackground(null); + JComponent render = (JComponent) defaultDelegate.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); + if (isSelected) { + checkBox.setForeground(table.getSelectionForeground()); + checkBox.setBackground(table.getSelectionBackground()); + } else { + checkBox.setForeground(render.getForeground()); + checkBox.setBackground(render.getBackground()); + //fixme make this works... and remove the test + if (row % 2 == 1) { + checkBox.setBackground(Color.WHITE); + } + } + checkBox.setSelected((value != null && (Boolean) value)); + checkBox.setBorder(render.getBorder()); + return checkBox; + } + + @Override + public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { + return getTableCellRendererComponent(table, value, isSelected, true, row, column); + } + + @Override + public Object getCellEditorValue() { + return checkBox.isSelected(); + } +} 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-06-20 11:01:32 UTC (rev 2336) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java 2012-06-21 10:16:46 UTC (rev 2337) @@ -35,9 +35,11 @@ import javax.swing.table.TableCellRenderer; /** + * @deprecated prefere use {@link BooleanCellEditor} * @author tchemit <chemit(a)codelutin.com> * @since 1.5 */ +@Deprecated public class BooleanCellRenderer extends JPanel implements TableCellRenderer { private static final long serialVersionUID = 1L; Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/renderer/DateCellRenderer.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/renderer/DateCellRenderer.java 2012-06-20 11:01:32 UTC (rev 2336) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/renderer/DateCellRenderer.java 2012-06-21 10:16:46 UTC (rev 2337) @@ -41,7 +41,10 @@ public DateCellRenderer(TableCellRenderer renderer, String datePattern) { this.delegate = renderer; - dateFormat = new SimpleDateFormat(datePattern); + dateFormat = new SimpleDateFormat(); + if (datePattern != null) { + dateFormat.applyPattern(datePattern); + } } @Override

1 0

r2336 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/renderer
by sletellier＠users.nuiton.org 20 Jun '12

20 Jun '12

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

1 0

r2335 - in trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing: . renderer
by sletellier＠users.nuiton.org 15 Jun '12

15 Jun '12

Author: sletellier Date: 2012-06-15 12:24:54 +0200 (Fri, 15 Jun 2012) New Revision: 2335 Url: http://nuiton.org/repositories/revision/jaxx/2335 Log: Add missing directory Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/renderer/ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/renderer/DateCellRenderer.java Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/renderer/DateCellRenderer.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/renderer/DateCellRenderer.java (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/renderer/DateCellRenderer.java 2012-06-15 10:24:54 UTC (rev 2335) @@ -0,0 +1,70 @@ +/* + * #%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% + */ +package jaxx.runtime.swing.renderer; + +import java.awt.Color; +import java.awt.Component; +import java.util.Date; +import javax.swing.JComponent; +import javax.swing.JTable; +import javax.swing.table.TableCellRenderer; +import jaxx.runtime.swing.JAXXDatePicker; + +/** + * TODO sletellier 15/09/2012 : fix color forground + * + * @author sletellier <letellier(a)codelutin.com> + */ +public class DateCellRenderer implements TableCellRenderer { + + protected TableCellRenderer delegate; + protected JAXXDatePicker datePicker; + + public DateCellRenderer(TableCellRenderer renderer, String datePattern) { + this.delegate = renderer; + datePicker = new JAXXDatePicker(); + datePicker.setShowPopupButton(false); + datePicker.setPatternLayout(datePattern); + } + + @Override + public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { + ((JComponent) delegate).setBackground(null); + JComponent render = (JComponent) delegate.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); + if (isSelected) { + datePicker.setForeground(table.getSelectionForeground()); + datePicker.setBackground(table.getSelectionBackground()); + } else { + datePicker.setForeground(render.getForeground()); + datePicker.setBackground(render.getBackground()); + //fixme make this works... and remove the test + if (row % 2 == 1) { + datePicker.setBackground(Color.WHITE); + } + } + datePicker.setDate((Date) value); + return datePicker; + + } +}

1 0

r2334 - in trunk: jaxx-runtime/src/main/java/jaxx/runtime jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer jaxx-widgets/src/main/java/jaxx/runtime/swing jaxx-widgets/src/main/java/jaxx/runtime/swing/editor jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config
by sletellier＠users.nuiton.org 15 Jun '12

15 Jun '12

Author: sletellier Date: 2012-06-15 12:02:35 +0200 (Fri, 15 Jun 2012) New Revision: 2334 Url: http://nuiton.org/repositories/revision/jaxx/2334 Log: - Create JAXXWidgetUtil extend SwingUtil - Add cell editor for Date and File - Add cell renderer for Date Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXWidgetUtil.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/DateCellEditor.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileCellEditor.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/BaseActionPanel.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigTableEditor.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2012-06-15 07:38:00 UTC (rev 2333) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2012-06-15 10:02:35 UTC (rev 2334) @@ -889,7 +889,7 @@ } public static TableCellRenderer newBooleanTableCellRenderer( - DefaultTableCellRenderer renderer) { + TableCellRenderer renderer) { return new BooleanCellRenderer(renderer); } 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-06-15 07:38:00 UTC (rev 2333) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java 2012-06-15 10:02:35 UTC (rev 2334) @@ -24,6 +24,8 @@ */ 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; @@ -31,9 +33,6 @@ import javax.swing.JPanel; import javax.swing.JTable; import javax.swing.table.TableCellRenderer; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Component; /** * @author tchemit <chemit(a)codelutin.com> @@ -50,7 +49,6 @@ public BooleanCellRenderer(TableCellRenderer delegate) { //super(new BorderLayout()); this.checkBox = new JCheckBox(); - add(checkBox, BorderLayout.CENTER); checkBox.setHorizontalAlignment(JLabel.CENTER); checkBox.setBorderPainted(true); this.defaultDelegate = delegate; @@ -59,7 +57,6 @@ public BooleanCellRenderer(TableCellRenderer delegate, Icon icon) { //super(new BorderLayout()); this.checkBox = new JCheckBox(icon); - add(checkBox, BorderLayout.NORTH); checkBox.setHorizontalAlignment(JLabel.CENTER); checkBox.setVerticalTextPosition(JLabel.TOP); checkBox.setBorderPainted(true); Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/BaseActionPanel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/BaseActionPanel.java 2012-06-15 07:38:00 UTC (rev 2333) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/BaseActionPanel.java 2012-06-15 10:02:35 UTC (rev 2334) @@ -28,6 +28,8 @@ import javax.swing.JPanel; /** + * TODO sletellier 15/06/2012 : find a better way to add onActionPerform on custom components + * * @author sletellier <letellier(a)codelutin.com> */ public abstract class BaseActionPanel extends JPanel { Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXWidgetUtil.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXWidgetUtil.java (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXWidgetUtil.java 2012-06-15 10:02:35 UTC (rev 2334) @@ -0,0 +1,53 @@ +/* + * #%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% + */ +package jaxx.runtime.swing; + +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; +import jaxx.runtime.SwingUtil; +import jaxx.runtime.swing.editor.DateCellEditor; +import jaxx.runtime.swing.editor.FileCellEditor; +import jaxx.runtime.swing.renderer.DateCellRenderer; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public class JAXXWidgetUtil extends SwingUtil { + + public static TableCellRenderer newDateTableCellRenderer(TableCellRenderer renderer) { + return newDateTableCellRenderer(renderer, null); + } + + public static TableCellRenderer newDateTableCellRenderer(TableCellRenderer renderer, String datePattern) { + return new DateCellRenderer(renderer, datePattern); + } + + public static TableCellEditor newDateTableCellEditor() { + return new DateCellEditor(); + } + + public static TableCellEditor newFileTableCellEditor() { + return new FileCellEditor(); + } +} Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/DateCellEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/DateCellEditor.java (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/DateCellEditor.java 2012-06-15 10:02:35 UTC (rev 2334) @@ -0,0 +1,55 @@ +/* + * #%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% + */ +package jaxx.runtime.swing.editor; + +import java.awt.Component; +import java.util.Date; +import javax.swing.AbstractCellEditor; +import javax.swing.JTable; +import javax.swing.table.TableCellEditor; +import jaxx.runtime.swing.JAXXDatePicker; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public class DateCellEditor extends AbstractCellEditor + implements TableCellEditor { + + protected JAXXDatePicker datePicker; + + public DateCellEditor() { + datePicker = new JAXXDatePicker(); + } + + @Override + public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { + datePicker.setDate((Date) value); + return datePicker; + } + + @Override + public Object getCellEditorValue() { + return datePicker.getDate(); + } +} \ No newline at end of file Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileCellEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileCellEditor.java (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileCellEditor.java 2012-06-15 10:02:35 UTC (rev 2334) @@ -0,0 +1,54 @@ +/* + * #%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% + */ +package jaxx.runtime.swing.editor; + +import java.awt.Component; +import java.io.File; +import javax.swing.AbstractCellEditor; +import javax.swing.JTable; +import javax.swing.table.TableCellEditor; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public class FileCellEditor extends AbstractCellEditor + implements TableCellEditor { + + protected FileEditor fileEditor; + + public FileCellEditor() { + fileEditor = new FileEditor(); + } + + @Override + public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { + fileEditor.setSelectedFile((File)value); + return fileEditor; + } + + @Override + public Object getCellEditorValue() { + return fileEditor.getSelectedFile(); + } +} 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-06-15 07:38:00 UTC (rev 2333) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigTableEditor.java 2012-06-15 10:02:35 UTC (rev 2334) @@ -29,14 +29,13 @@ import java.io.File; import java.util.EventObject; import java.util.Locale; -import javax.swing.AbstractCellEditor; import javax.swing.DefaultCellEditor; import javax.swing.JTable; import javax.swing.event.CellEditorListener; import javax.swing.table.TableCellEditor; +import jaxx.runtime.swing.JAXXWidgetUtil; import jaxx.runtime.swing.editor.ClassCellEditor; import jaxx.runtime.swing.editor.EnumEditor; -import jaxx.runtime.swing.editor.FileEditor; import jaxx.runtime.swing.editor.LocaleEditor; import jaxx.runtime.swing.editor.config.model.ConfigTableModel; import jaxx.runtime.swing.editor.config.model.OptionModel; @@ -119,7 +118,7 @@ table.setDefaultEditor(type, editor); } else if (type.equals(File.class)){ - editor = new FileCellEditor(); + editor = JAXXWidgetUtil.newFileTableCellEditor(); table.setDefaultEditor(type, editor); } else if (type.equals(Locale.class)) { @@ -139,25 +138,4 @@ protected boolean hasDelegate() { return delegate != null; } - - protected static class FileCellEditor extends AbstractCellEditor - implements TableCellEditor { - - protected FileEditor fileEditor; - - public FileCellEditor() { - fileEditor = new FileEditor(); - } - - @Override - public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - fileEditor.setSelectedFile((File)value); - return fileEditor; - } - - @Override - public Object getCellEditorValue() { - return fileEditor.getSelectedFile(); - } - } }

1 0

r2333 - in trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing: . editor
by sletellier＠users.nuiton.org 15 Jun '12

15 Jun '12

Author: sletellier Date: 2012-06-15 09:38:00 +0200 (Fri, 15 Jun 2012) New Revision: 2333 Url: http://nuiton.org/repositories/revision/jaxx/2333 Log: Fix FileEditor layout Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/BaseActionPanel.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/BaseActionPanel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/BaseActionPanel.java 2012-06-14 17:32:58 UTC (rev 2332) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/BaseActionPanel.java 2012-06-15 07:38:00 UTC (rev 2333) @@ -32,7 +32,6 @@ */ public abstract class BaseActionPanel extends JPanel { - /** * Notifies all listeners that have registered interest for * notification on this event type. @@ -53,7 +52,6 @@ } } - /** * Adds an <code>ActionListener</code>. * <p> 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-06-14 17:32:58 UTC (rev 2332) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx 2012-06-15 07:38:00 UTC (rev 2333) @@ -21,11 +21,12 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<BaseActionPanel> +<BaseActionPanel layout='{new BorderLayout()}'> <import> java.io.File java.beans.PropertyChangeEvent java.beans.PropertyChangeListener + jaxx.runtime.swing.BaseActionPanel </import> <FileEditorHandler id='handler' constructorParams='this'/> @@ -47,35 +48,30 @@ <String id='extsDescription' javaBean='null'/> <script><![CDATA[ - protected void $afterCompleteSetup() { + protected void $afterCompleteSetup() { - addPropertyChangeListener(PROPERTY_SELECTED_FILE, new PropertyChangeListener() { + addPropertyChangeListener(PROPERTY_SELECTED_FILE, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (selectedFile != null) { - pathField.setText(selectedFile.getAbsolutePath()); - fireActionEvent(); - } - } - }); - } - ]]></script> + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (selectedFile != null) { + pathField.setText(selectedFile.getAbsolutePath()); + fireActionEvent(); + } + } + }); + } + ]]></script> - <Table constraints='BorderLayout.CENTER'> - <row> - <cell fill='horizontal' weightx='1'> - <JTextField id='pathField' - enabled='{isEnabled()}' - text='{getStartPath()}' - onFocusLost='setSelectedFile(new File(pathField.getText()))'/> - </cell> - <cell> - <JButton id='boutonXslLocation' - enabled='{isEnabled()}' - actionIcon='open' - onActionPerformed='handler.openLocation()'/> - </cell> - </row> - </Table> + <JTextField id='pathField' + constraints='{BorderLayout.CENTER}' + enabled='{isEnabled()}' + text='{getStartPath()}' + onFocusLost='setSelectedFile(new File(pathField.getText()))'/> + + <JButton id='boutonXslLocation' + constraints='{BorderLayout.EAST}' + enabled='{isEnabled()}' + actionIcon='open' + onActionPerformed='handler.openLocation()'/> </BaseActionPanel> \ No newline at end of file

1 0

r2332 - in trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing: . editor
by sletellier＠users.nuiton.org 14 Jun '12

14 Jun '12

Author: sletellier Date: 2012-06-14 19:32:58 +0200 (Thu, 14 Jun 2012) New Revision: 2332 Url: http://nuiton.org/repositories/revision/jaxx/2332 Log: Allow using onActionPerformed on FileEditor Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/BaseActionPanel.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/BaseActionPanel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/BaseActionPanel.java (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/BaseActionPanel.java 2012-06-14 17:32:58 UTC (rev 2332) @@ -0,0 +1,78 @@ +/* + * #%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% + */ +package jaxx.runtime.swing; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import javax.swing.JPanel; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public abstract class BaseActionPanel extends JPanel { + + + /** + * Notifies all listeners that have registered interest for + * notification on this event type. + * + * @see javax.swing.event.EventListenerList + */ + protected void fireActionEvent() { + ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, "actionPerformed"); + + // Guaranteed to return a non-null array + Object[] listeners = listenerList.getListenerList(); + // Process the listeners last to first, notifying + // those that are interested in this event + for (Object listener : listeners) { + if (ActionListener.class.isInstance(listener)) { + ((ActionListener)listener).actionPerformed(e); + } + } + } + + + /** + * Adds an <code>ActionListener</code>. + * <p> + * The <code>ActionListener</code> will receive an <code>ActionEvent</code> + * when a selection has been made. If the combo box is editable, then + * an <code>ActionEvent</code> will be fired when editing has stopped. + * + * @param l the <code>ActionListener</code> that is to be notified + * @see #setSelectedItem + */ + public void addActionListener(ActionListener l) { + listenerList.add(ActionListener.class,l); + } + + /** Removes an <code>ActionListener</code>. + * + * @param l the <code>ActionListener</code> to remove + */ + public void removeActionListener(ActionListener l) { + listenerList.remove(ActionListener.class, l); + } +} 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-06-14 15:47:32 UTC (rev 2331) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx 2012-06-14 17:32:58 UTC (rev 2332) @@ -21,8 +21,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<Table> - +<BaseActionPanel> <import> java.io.File java.beans.PropertyChangeEvent @@ -39,7 +38,7 @@ <File id='selectedFile' javaBean='null'/> - <File id='startFile' javaBean='null'/> + <String id='startPath' javaBean='null'/> <String id='title' javaBean='null'/> @@ -48,41 +47,35 @@ <String id='extsDescription' javaBean='null'/> <script><![CDATA[ - protected void $afterCompleteSetup() { + protected void $afterCompleteSetup() { - addPropertyChangeListener(PROPERTY_START_FILE, new PropertyChangeListener() { + addPropertyChangeListener(PROPERTY_SELECTED_FILE, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (startFile != null) { - pathField.setText(startFile.getAbsolutePath()); - } - } - }); + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (selectedFile != null) { + pathField.setText(selectedFile.getAbsolutePath()); + fireActionEvent(); + } + } + }); + } + ]]></script> - addPropertyChangeListener(PROPERTY_SELECTED_FILE, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (selectedFile != null) { - pathField.setText(selectedFile.getAbsolutePath()); - } - } - }); - } - ]]></script> - - <row> - <cell fill='horizontal' weightx='1'> - <JTextField id='pathField' - enabled='{isEnabled()}' - onFocusLost='setSelectedFile(new File(pathField.getText()))'/> - </cell> - <cell> - <JButton id='boutonXslLocation' - enabled='{isEnabled()}' - actionIcon='open' - onActionPerformed='handler.openLocation()'/> - </cell> - </row> -</Table> \ No newline at end of file + <Table constraints='BorderLayout.CENTER'> + <row> + <cell fill='horizontal' weightx='1'> + <JTextField id='pathField' + enabled='{isEnabled()}' + text='{getStartPath()}' + onFocusLost='setSelectedFile(new File(pathField.getText()))'/> + </cell> + <cell> + <JButton id='boutonXslLocation' + enabled='{isEnabled()}' + actionIcon='open' + onActionPerformed='handler.openLocation()'/> + </cell> + </row> + </Table> +</BaseActionPanel> \ No newline at end of file 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-06-14 15:47:32 UTC (rev 2331) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java 2012-06-14 17:32:58 UTC (rev 2332) @@ -44,13 +44,14 @@ // use last selected file File startFile = view.getSelectedFile(); - if (startFile == null) { + String startPath = view.getStartPath(); + if (startFile == null && startPath != null) { - // else filed start file - startFile = view.getStartFile(); - } - if (startFile == null) { + // else filed start path + startFile = new File(startPath); + } else { + // else start with user home startFile = new File(System.getProperty("user.home")); } @@ -85,7 +86,12 @@ // extentions can be separted by comma String[] exts = extsAsString.split(SEPARATOR_REGEX); - String[] descs = view.getExtsDescription().split(SEPARATOR_REGEX); + String extsDescription = view.getExtsDescription(); + + String[] descs = new String[0]; + if (extsDescription != null) { + descs = extsDescription.split(SEPARATOR_REGEX); + } for (int i = 0;i<exts.length;i++) { // use ext if no desc found

1 0