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

r2392 - trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor
by sletellier＠users.nuiton.org July 6, 2012

July 6, 2012

Author: sletellier Date: 2012-07-06 14:44:21 +0200 (Fri, 06 Jul 2012) New Revision: 2392 Url: http://nuiton.org/repositories/revision/jaxx/2392 Log: Fix layout Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx 2012-07-06 12:02:51 UTC (rev 2391) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx 2012-07-06 12:44:21 UTC (rev 2392) @@ -32,6 +32,7 @@ jaxx.demo.entities.DemoDecoratorProvider jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer java.util.Collection + jaxx.runtime.swing.model.GenericListModel </import> <ListCellRenderer id='listCellRenderer' initializer='new DecoratorProviderListCellRenderer(new DemoDecoratorProvider())'/> @@ -74,7 +75,7 @@ </cell> </row> <row> - <cell fill='horizontal' weightx='1' columns='2'> + <cell fill='both' weightx='1' weighty='0.5' columns='2'> <JScrollPane> <ComboToListSelector id='comboToListSelector' genericType='Movie' @@ -88,7 +89,7 @@ </cell> </row> <row> - <cell fill='horizontal' weightx='1' columns='2'> + <cell fill='both' weightx='1' weighty='0.5' columns='2'> <JScrollPane> <ListToListSelector id='listToListSelector' genericType='People'

1 0

r2391 - in trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor: cell config
by sletellier＠users.nuiton.org July 6, 2012

July 6, 2012

Author: sletellier Date: 2012-07-06 14:02:51 +0200 (Fri, 06 Jul 2012) New Revision: 2391 Url: http://nuiton.org/repositories/revision/jaxx/2391 Log: - Allow to use custom FileEditor - FireStopEditing on actionPerform on FileCellEditor - Use custom FileCellEditor to detect ext in ApplicationConfig ui Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/FileCellEditor.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigTableEditor.java 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-06 11:31:51 UTC (rev 2390) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/FileCellEditor.java 2012-07-06 12:02:51 UTC (rev 2391) @@ -24,6 +24,8 @@ package jaxx.runtime.swing.editor.cell; import java.awt.Component; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.io.File; import javax.swing.AbstractCellEditor; import javax.swing.JTable; @@ -39,12 +41,28 @@ protected FileEditor fileEditor; public FileCellEditor() { - fileEditor = new FileEditor(); + setFileEditor(new FileEditor()); } + public FileCellEditor(FileEditor editor) { + setFileEditor(editor); + } + + public void setFileEditor(FileEditor fileEditor) { + this.fileEditor = fileEditor; + fileEditor.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + fireEditingStopped(); + } + }); + } + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - fileEditor.setSelectedFile((File)value); + File file = (File) value; + fileEditor.setSelectedFile(file); return fileEditor; } 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-06 11:31:51 UTC (rev 2390) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigTableEditor.java 2012-07-06 12:02:51 UTC (rev 2391) @@ -25,6 +25,7 @@ package jaxx.runtime.swing.editor.config; +import com.google.common.io.Files; import java.awt.Component; import java.io.File; import java.util.EventObject; @@ -38,8 +39,10 @@ import jaxx.runtime.swing.editor.ClassCellEditor; import jaxx.runtime.swing.editor.EnumEditor; import jaxx.runtime.swing.editor.LocaleEditor; +import jaxx.runtime.swing.editor.cell.FileCellEditor; import jaxx.runtime.swing.editor.config.model.ConfigTableModel; import jaxx.runtime.swing.editor.config.model.OptionModel; +import org.apache.commons.lang3.StringUtils; /** * L'éditeur des valeurs des propriétés d'une configuration @@ -117,7 +120,7 @@ editor = new ClassCellEditor(); } else if (type.equals(File.class)){ - editor = JAXXWidgetUtil.newFileTableCellEditor(); + editor = new FileCellEditorWithExtDetector(); } else if (type.equals(KeyStroke.class)){ editor = JAXXWidgetUtil.newKeyStrokeTableCellEditor(); @@ -136,6 +139,20 @@ return editor; } + protected static class FileCellEditorWithExtDetector extends FileCellEditor { + + @Override + public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { + + String fileExtension = Files.getFileExtension(((File)value).getName()); + if (StringUtils.isNotEmpty(fileExtension)) { + fileEditor.setExts(fileExtension); + fileEditor.setAcceptAllFileFilterUsed(true); + } + return super.getTableCellEditorComponent(table, value, isSelected, row, column); + } + } + protected boolean hasDelegate() { return delegate != null; }

1 0

r2390 - in trunk: jaxx-runtime/src/main/java/jaxx/runtime/swing/model jaxx-widgets/src/main/java/jaxx/runtime/swing/editor jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell
by sletellier＠users.nuiton.org July 6, 2012

July 6, 2012

Author: sletellier Date: 2012-07-06 13:31:51 +0200 (Fri, 06 Jul 2012) New Revision: 2390 Url: http://nuiton.org/repositories/revision/jaxx/2390 Log: refs #2173 : fireStopEditing on actionPerformed Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/KeyStrokeEditor.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java 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-06 11:20:36 UTC (rev 2389) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java 2012-07-06 11:31:51 UTC (rev 2390) @@ -128,20 +128,6 @@ return selectedValues.get(0); } - protected void fireContentsChanged(Object source, int index0, int index1) { - Object[] listeners = getListModel().getListDataListeners(); - ListDataEvent e = null; - - for (int i = listeners.length - 2; i >= 0; i -= 2) { - if (listeners[i] == ListDataListener.class) { - if (e == null) { - e = new ListDataEvent(source, ListDataEvent.CONTENTS_CHANGED, index0, index1); - } - ((ListDataListener)listeners[i+1]).contentsChanged(e); - } - } - } - @Override public int getSize() { return getListModel().size(); @@ -162,4 +148,17 @@ getListModel().removeListDataListener(l); } + protected void fireContentsChanged(Object source, int index0, int index1) { + Object[] listeners = getListModel().getListDataListeners(); + ListDataEvent e = null; + + for (int i = listeners.length - 2; i >= 0; i -= 2) { + if (listeners[i] == ListDataListener.class) { + if (e == null) { + e = new ListDataEvent(source, ListDataEvent.CONTENTS_CHANGED, index0, index1); + } + ((ListDataListener)listeners[i+1]).contentsChanged(e); + } + } + } } \ No newline at end of file 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-06 11:20:36 UTC (rev 2389) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/KeyStrokeEditor.java 2012-07-06 11:31:51 UTC (rev 2390) @@ -71,6 +71,7 @@ KeyStroke oldValue = getKeyStroke(); this.keyStroke = keyStroke; firePropertyChange("keyStroke", oldValue, keyStroke); + fireActionPerformed(); SwingUtilities.invokeLater(new Runnable() { @Override public void run() { 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-06 11:20:36 UTC (rev 2389) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java 2012-07-06 11:31:51 UTC (rev 2390) @@ -24,6 +24,8 @@ package jaxx.runtime.swing.editor.cell; import java.awt.Component; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import javax.swing.AbstractCellEditor; import javax.swing.JTable; import javax.swing.KeyStroke; @@ -40,6 +42,13 @@ public KeyStrokeCellEditor() { keyStrokeEditor = new KeyStrokeEditor(); + keyStrokeEditor.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + fireEditingStopped(); + } + }); } @Override

1 0

r2389 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model
by sletellier＠users.nuiton.org July 6, 2012

July 6, 2012

Author: sletellier Date: 2012-07-06 13:20:36 +0200 (Fri, 06 Jul 2012) New Revision: 2389 Url: http://nuiton.org/repositories/revision/jaxx/2389 Log: FireContentChanged like DefaultComboBoxModel Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java 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-06 10:29:24 UTC (rev 2388) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java 2012-07-06 11:20:36 UTC (rev 2389) @@ -28,6 +28,7 @@ import java.util.List; import javax.swing.ComboBoxModel; import javax.swing.DefaultListModel; +import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; /** @@ -114,6 +115,7 @@ List newValues = getSelectedValues(); fireSelectionAdded(newValues); + fireContentsChanged(this, -1, -1); firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, newValues); } @@ -126,6 +128,20 @@ return selectedValues.get(0); } + protected void fireContentsChanged(Object source, int index0, int index1) { + Object[] listeners = getListModel().getListDataListeners(); + ListDataEvent e = null; + + for (int i = listeners.length - 2; i >= 0; i -= 2) { + if (listeners[i] == ListDataListener.class) { + if (e == null) { + e = new ListDataEvent(source, ListDataEvent.CONTENTS_CHANGED, index0, index1); + } + ((ListDataListener)listeners[i+1]).contentsChanged(e); + } + } + } + @Override public int getSize() { return getListModel().size();

1 0

r2388 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model
by sletellier＠users.nuiton.org July 6, 2012

July 6, 2012

Author: sletellier Date: 2012-07-06 12:29:24 +0200 (Fri, 06 Jul 2012) New Revision: 2388 Url: http://nuiton.org/repositories/revision/jaxx/2388 Log: Really fixes #2159 : Create GenericListSelectionModel extracted from GenericListModel Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/AbstractGenericListSelectionModel.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListSelectionModel.java Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/AbstractGenericListSelectionModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/AbstractGenericListSelectionModel.java (rev 0) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/AbstractGenericListSelectionModel.java 2012-07-06 10:29:24 UTC (rev 2388) @@ -0,0 +1,275 @@ +/* + * #%L + * JAXX :: Runtime + * $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.model; + +import com.google.common.collect.Lists; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.util.Collection; +import java.util.List; +import javax.swing.DefaultListSelectionModel; +import javax.swing.event.EventListenerList; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public abstract class AbstractGenericListSelectionModel extends DefaultListSelectionModel { + + public static final String PROPERTY_SELECTED_VALUE = "selectedValues"; + + protected EventListenerList listenerList = new EventListenerList(); + protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); + + protected List selectedValues; + + public AbstractGenericListSelectionModel() { + this.selectedValues = Lists.newArrayList(); + } + + public B getSelectedValue() { + return selectedValues.get(0); + } + + public List getSelectedValues() { + return Lists.newArrayList(selectedValues); + } + + public void setSelectedValues(List selectedValues) { + this.selectedValues = selectedValues; + } + + protected void unSelectItems(Collection values) { + Collection oldValue = Lists.newArrayList(selectedValues); + for (B value : values) { + int index = selectedValues.indexOf(value); + removeSelectionIntervalWithoutFire(index, index); + } + fireSelectionRemoved(values); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + protected void unSelectItem(B value) { + Collection oldValue = Lists.newArrayList(selectedValues); + int index = selectedValues.indexOf(value); + removeSelectionIntervalWithoutFire(index, index); + + fireSelectionRemoved(Lists.newArrayList(value)); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + public void addSelectedItem(B toSelect) { + Collection oldValue = Lists.newArrayList(selectedValues); + selectedValues.add(toSelect); + int index = selectedValues.indexOf(toSelect); + super.addSelectionInterval(index, index); + + fireSelectionAdded(Lists.newArrayList(toSelect)); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + public boolean hasSelectedIndex() { + return !selectedValues.isEmpty(); + } + + @Override + public void addSelectionInterval(int index0, int index1) { + Collection oldValue = Lists.newArrayList(selectedValues); + + addSelectionIntervalWithFire(index0, index1); + super.addSelectionInterval(index0, index1); + + Collection newValue = Lists.newArrayList(selectedValues); + newValue.removeAll(oldValue); + fireSelectionAdded(newValue); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + @Override + public void setSelectionInterval(int index0, int index1) { + Collection oldValue = Lists.newArrayList(selectedValues); + selectedValues.clear(); + addSelectionIntervalWithFire(index0, index1); + super.setSelectionInterval(index0, index1); + + Collection newValue = Lists.newArrayList(selectedValues); + newValue.removeAll(oldValue); + fireSelectionAdded(newValue); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + @Override + public void removeSelectionInterval(int index0, int index1) { + Collection oldValue = Lists.newArrayList(selectedValues); + removeSelectionIntervalWithoutFire(index0, index1); + + Collection newValue = Lists.newArrayList(selectedValues); + newValue.removeAll(oldValue); + fireSelectionRemoved(newValue); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + protected void removeSelectionIntervalWithoutFire(int index0, int index1) { + if (index0 > index1) { + int tmp = index1; + index1 = index0; + index0 = tmp; + } + for (int i=index0;i<=index1;i++) { + if (selectedValues.size() > i && i != -1) { + selectedValues.remove(i); + } + } + super.removeSelectionInterval(index0, index1); + } + + protected void addSelectionIntervalWithFire(int index0, int index1) { + if (index0 > index1) { + int tmp = index1; + index1 = index0; + index0 = tmp; + } + for (int i=index0;i<=index1;i++) { + + if (getSize() > i && i != -1) { + B value = getValueAt(i); + selectedValues.add(value); + } + } + } + + public abstract int getSize(); + + public abstract B getValueAt(int i); + + @Override + public void clearSelection() { + Collection oldValue = Lists.newArrayList(selectedValues); + selectedValues.clear(); + super.clearSelection(); + + fireSelectionRemoved(oldValue); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + @Override + public int getSelectionMode() { + return MULTIPLE_INTERVAL_SELECTION; + } + + protected void fireValuesAdded(Collection values) { + if (values.isEmpty()) { + return; + } + Object[] listeners = listenerList.getListenerList(); + GenericListEvent e = null; + + for (int i = listeners.length - 2; i >= 0; i -= 2) { + if (listeners[i] == GenericListListener.class) { + if (e == null) { + e = new GenericListEvent(this, values); + } + ((GenericListListener)listeners[i+1]).valuesAdded(e); + } + } + } + + protected void fireValuesRemoved(Collection values) { + if (values.isEmpty()) { + return; + } + Object[] listeners = listenerList.getListenerList(); + GenericListEvent e = null; + + for (int i = listeners.length - 2; i >= 0; i -= 2) { + if (listeners[i] == GenericListListener.class) { + if (e == null) { + e = new GenericListEvent(this, values); + } + ((GenericListListener)listeners[i+1]).valuesRemoved(e); + } + } + } + + protected void fireSelectionAdded(Collection selectedValues) { + if (selectedValues.isEmpty()) { + return; + } + Object[] listeners = listenerList.getListenerList(); + GenericListEvent e = null; + + for (int i = listeners.length - 2; i >= 0; i -= 2) { + if (listeners[i] == GenericListListener.class) { + if (e == null) { + e = new GenericListEvent(this, selectedValues); + } + ((GenericListListener)listeners[i+1]).selectionAdded(e); + } + } + } + + protected void fireSelectionRemoved(Collection selectedValues) { + if (selectedValues.isEmpty()) { + return; + } + Object[] listeners = listenerList.getListenerList(); + GenericListEvent e = null; + + for (int i = listeners.length - 2; i >= 0; i -= 2) { + if (listeners[i] == GenericListListener.class) { + if (e == null) { + e = new GenericListEvent(this, selectedValues); + } + ((GenericListListener)listeners[i+1]).selectionAdded(e); + } + } + } + + public void addGenericListListener(GenericListListener l) { + listenerList.add(GenericListListener.class, l); + } + + public void removeGenericListListener(GenericListListener l) { + listenerList.remove(GenericListListener.class, l); + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + pcs.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + pcs.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.removePropertyChangeListener(propertyName, listener); + } + + protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { + pcs.firePropertyChange(propertyName, oldValue, newValue); + } +} 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-06 10:11:43 UTC (rev 2387) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListSelectionModel.java 2012-07-06 10:29:24 UTC (rev 2388) @@ -23,30 +23,17 @@ */ package jaxx.runtime.swing.model; -import com.google.common.collect.Lists; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; -import java.util.Collection; -import java.util.List; import javax.swing.DefaultListModel; -import javax.swing.DefaultListSelectionModel; -import javax.swing.event.EventListenerList; /** * @author sletellier <letellier(a)codelutin.com> */ -public class GenericListSelectionModel extends DefaultListSelectionModel { +public class GenericListSelectionModel extends AbstractGenericListSelectionModel { - public static final String PROPERTY_SELECTED_VALUE = "selectedValues"; - - protected EventListenerList listenerList = new EventListenerList(); - protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); - - protected List selectedValues; protected DefaultListModel listModel; public GenericListSelectionModel(DefaultListModel listModel) { - this.selectedValues = Lists.newArrayList(); + super(); this.listModel = listModel; } @@ -54,225 +41,13 @@ return listModel; } - public B getSelectedValue() { - return selectedValues.get(0); - } - - public List getSelectedValues() { - return Lists.newArrayList(selectedValues); - } - - public void setSelectedValues(List selectedValues) { - this.selectedValues = selectedValues; - } - - protected void unSelectItems(Collection values) { - Collection oldValue = Lists.newArrayList(selectedValues); - for (B value : values) { - int index = selectedValues.indexOf(value); - removeSelectionIntervalWithoutFire(index, index); - } - fireSelectionRemoved(values); - firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); - } - - protected void unSelectItem(B value) { - Collection oldValue = Lists.newArrayList(selectedValues); - int index = selectedValues.indexOf(value); - removeSelectionIntervalWithoutFire(index, index); - - fireSelectionRemoved(Lists.newArrayList(value)); - firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); - } - - public void addSelectedItem(B toSelect) { - Collection oldValue = Lists.newArrayList(selectedValues); - selectedValues.add(toSelect); - int index = selectedValues.indexOf(toSelect); - super.addSelectionInterval(index, index); - - fireSelectionAdded(Lists.newArrayList(toSelect)); - firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); - } - - public boolean hasSelectedIndex() { - return !selectedValues.isEmpty(); - } - @Override - public void addSelectionInterval(int index0, int index1) { - Collection oldValue = Lists.newArrayList(selectedValues); - - addSelectionIntervalWithFire(index0, index1); - super.addSelectionInterval(index0, index1); - - Collection newValue = Lists.newArrayList(selectedValues); - newValue.removeAll(oldValue); - fireSelectionAdded(newValue); - firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + public int getSize() { + return listModel.size(); } @Override - public void setSelectionInterval(int index0, int index1) { - Collection oldValue = Lists.newArrayList(selectedValues); - selectedValues.clear(); - addSelectionIntervalWithFire(index0, index1); - super.setSelectionInterval(index0, index1); - - Collection newValue = Lists.newArrayList(selectedValues); - newValue.removeAll(oldValue); - fireSelectionAdded(newValue); - firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + public B getValueAt(int i) { + return (B)listModel.getElementAt(i); } - - @Override - public void removeSelectionInterval(int index0, int index1) { - Collection oldValue = Lists.newArrayList(selectedValues); - removeSelectionIntervalWithoutFire(index0, index1); - - Collection newValue = Lists.newArrayList(selectedValues); - newValue.removeAll(oldValue); - fireSelectionRemoved(newValue); - firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); - } - - protected void removeSelectionIntervalWithoutFire(int index0, int index1) { - if (index0 > index1) { - int tmp = index1; - index1 = index0; - index0 = tmp; - } - for (int i=index0;i<=index1;i++) { - if (selectedValues.size() > i && i != -1) { - selectedValues.remove(i); - } - } - super.removeSelectionInterval(index0, index1); - } - - protected void addSelectionIntervalWithFire(int index0, int index1) { - if (index0 > index1) { - int tmp = index1; - index1 = index0; - index0 = tmp; - } - for (int i=index0;i<=index1;i++) { - - if (listModel.size() > i && i != -1) { - B value = (B)listModel.getElementAt(i); - selectedValues.add(value); - } - } - } - - @Override - public void clearSelection() { - Collection oldValue = Lists.newArrayList(selectedValues); - selectedValues.clear(); - super.clearSelection(); - - fireSelectionRemoved(oldValue); - firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); - } - - @Override - public int getSelectionMode() { - return MULTIPLE_INTERVAL_SELECTION; - } - - protected void fireValuesAdded(Collection values) { - if (values.isEmpty()) { - return; - } - Object[] listeners = listenerList.getListenerList(); - GenericListEvent e = null; - - for (int i = listeners.length - 2; i >= 0; i -= 2) { - if (listeners[i] == GenericListListener.class) { - if (e == null) { - e = new GenericListEvent(this, values); - } - ((GenericListListener)listeners[i+1]).valuesAdded(e); - } - } - } - - protected void fireValuesRemoved(Collection values) { - if (values.isEmpty()) { - return; - } - Object[] listeners = listenerList.getListenerList(); - GenericListEvent e = null; - - for (int i = listeners.length - 2; i >= 0; i -= 2) { - if (listeners[i] == GenericListListener.class) { - if (e == null) { - e = new GenericListEvent(this, values); - } - ((GenericListListener)listeners[i+1]).valuesRemoved(e); - } - } - } - - protected void fireSelectionAdded(Collection selectedValues) { - if (selectedValues.isEmpty()) { - return; - } - Object[] listeners = listenerList.getListenerList(); - GenericListEvent e = null; - - for (int i = listeners.length - 2; i >= 0; i -= 2) { - if (listeners[i] == GenericListListener.class) { - if (e == null) { - e = new GenericListEvent(this, selectedValues); - } - ((GenericListListener)listeners[i+1]).selectionAdded(e); - } - } - } - - protected void fireSelectionRemoved(Collection selectedValues) { - if (selectedValues.isEmpty()) { - return; - } - Object[] listeners = listenerList.getListenerList(); - GenericListEvent e = null; - - for (int i = listeners.length - 2; i >= 0; i -= 2) { - if (listeners[i] == GenericListListener.class) { - if (e == null) { - e = new GenericListEvent(this, selectedValues); - } - ((GenericListListener)listeners[i+1]).selectionAdded(e); - } - } - } - - public void addGenericListListener(GenericListListener l) { - listenerList.add(GenericListListener.class, l); - } - - public void removeGenericListListener(GenericListListener l) { - listenerList.remove(GenericListListener.class, l); - } - - public void addPropertyChangeListener(PropertyChangeListener listener) { - pcs.addPropertyChangeListener(listener); - } - - public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { - pcs.addPropertyChangeListener(propertyName, listener); - } - - public void removePropertyChangeListener(PropertyChangeListener listener) { - pcs.removePropertyChangeListener(listener); - } - - public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { - pcs.removePropertyChangeListener(propertyName, listener); - } - - protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { - pcs.firePropertyChange(propertyName, oldValue, newValue); - } }

1 0

r2387 - in trunk: . jaxx-demo/src/main/java/jaxx/demo jaxx-demo/src/main/resources/i18n jaxx-runtime/src/main/java/jaxx/runtime/swing/model 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/cell jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config
by sletellier＠users.nuiton.org July 6, 2012

July 6, 2012

Author: sletellier Date: 2012-07-06 12:11:43 +0200 (Fri, 06 Jul 2012) New Revision: 2387 Url: http://nuiton.org/repositories/revision/jaxx/2387 Log: - fixes #2173 : Add keyStroke editor to input shortcut key in config ui - Up to nuiton-util 2.5.1-SNAPSHOT Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/KeyStrokeEditor.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListSelectionModel.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXWidgetUtil.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigTableEditor.java trunk/pom.xml Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java 2012-07-06 08:42:54 UTC (rev 2386) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java 2012-07-06 10:11:43 UTC (rev 2387) @@ -30,6 +30,7 @@ import java.io.InputStream; import java.util.Locale; import java.util.Properties; +import javax.swing.KeyStroke; import jaxx.demo.feature.nav.NavDemo; import jaxx.runtime.JAXXUtil; import org.apache.commons.logging.Log; @@ -69,6 +70,8 @@ public static final String PROPERTY_LOG_PATTERN_LAYOUT = "logPatternLayout"; + public static final String PROPERTY_KEY_OPEN_CONFIG = "keyOpenConfig"; + public DemoConfig() { setConfigFileName(Option.CONFIG_FILE.defaultValue); @@ -148,6 +151,10 @@ return result; } + public KeyStroke getKeyOpenConfig() { + return getOptionAsKeyStroke(Option.KEY_OPEN_CONFIG.key); + } + public void setFullscreen(boolean fullscreen) { Object oldValue = null; setOption(Option.FULL_SCREEN.key, fullscreen + ""); @@ -180,6 +187,12 @@ firePropertyChange(PROPERTY_LOG_PATTERN_LAYOUT, oldValue, logPatternLayout); } + public void setKeyOpenConfig(KeyStroke keyStroke) { + KeyStroke oldValue = getKeyOpenConfig(); + setOption(Option.KEY_OPEN_CONFIG.key, keyStroke.toString()); + firePropertyChange(PROPERTY_KEY_OPEN_CONFIG, oldValue, keyStroke); + } + /** * Save configuration, in user home directory using the * {@link #getConfigFileName}. Default, env and commande line note saved @@ -264,6 +277,13 @@ String.class, false, false), + KEY_OPEN_CONFIG( + "ui." + PROPERTY_KEY_OPEN_CONFIG, + _("jaxxdemo.config.ui.keyOpenConfig"), + "ctrl alt pressed S", + KeyStroke.class, + false, + false), DEMO_PATH( "ui.demo.path", _("jaxxdemo.config.ui.demo.path"), Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2012-07-06 08:42:54 UTC (rev 2386) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2012-07-06 10:11:43 UTC (rev 2387) @@ -44,6 +44,25 @@ */ package jaxx.demo; +import java.awt.Component; +import java.awt.Desktop; +import java.awt.event.ActionEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.lang.reflect.Constructor; +import java.net.URL; +import java.util.Arrays; +import java.util.Locale; +import javax.swing.AbstractAction; +import javax.swing.InputMap; +import javax.swing.JComponent; +import javax.swing.JPanel; +import javax.swing.JTree; +import javax.swing.KeyStroke; +import javax.swing.SwingUtilities; +import javax.swing.event.TreeSelectionEvent; +import javax.swing.event.TreeSelectionListener; +import javax.swing.tree.TreePath; import jaxx.demo.tree.DemoNode; import jaxx.demo.tree.DemoTreeHelper; import jaxx.runtime.JAXXContext; @@ -52,29 +71,16 @@ import jaxx.runtime.context.DefaultApplicationContext; import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.context.JAXXInitialContext; -import jaxx.runtime.swing.log.JAXXLog4jUI; -import org.nuiton.util.decorator.DecoratorProvider; import jaxx.runtime.swing.AboutPanel; import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.swing.editor.config.ConfigUIHelper; +import jaxx.runtime.swing.log.JAXXLog4jUI; import jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; +import org.nuiton.util.decorator.DecoratorProvider; -import javax.swing.JPanel; -import javax.swing.JTree; -import javax.swing.SwingUtilities; -import javax.swing.event.TreeSelectionEvent; -import javax.swing.event.TreeSelectionListener; -import javax.swing.tree.TreePath; -import java.awt.Component; -import java.awt.Desktop; -import java.lang.reflect.Constructor; -import java.net.URL; -import java.util.Arrays; -import java.util.Locale; - import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; @@ -92,6 +98,8 @@ static final JAXXContextEntryDef<DemoUI> MAIN_UI_ENTRY_DEF = JAXXUtil.newContextEntryDef("mainui", DemoUI.class); + public static final String OPEN_CONFIG_ACTION = "openConfig"; + /** * Methode pour initialiser l'ui principale sans l'afficher. * @@ -138,6 +146,9 @@ // instanciate ui DemoUI ui = new DemoUI(context); + // add key strokes + addKeyStrokes(ui, config); + // keep it in root context MAIN_UI_ENTRY_DEF.setContextValue(rootContext, ui); @@ -150,6 +161,34 @@ return ui; } + protected void addKeyStrokes(final DemoUI ui, DemoConfig config) { + + // Use WHEN_IN_FOCUSED_WINDOW to don't have focus check for binding keys + JPanel mainPane = ui.getMainPane(); + mainPane.getActionMap().put(OPEN_CONFIG_ACTION, new AbstractAction() { + + @Override + public void actionPerformed(ActionEvent e) { + showConfig(ui); + } + }); + final InputMap inputMap = mainPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); + config.addPropertyChangeListener(DemoConfig.PROPERTY_KEY_OPEN_CONFIG, new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + KeyStroke oldValue = (KeyStroke) evt.getOldValue(); + inputMap.remove(oldValue); + setShowConfigInputMap(inputMap, (KeyStroke) evt.getNewValue()); + } + }); + setShowConfigInputMap(inputMap, config.getKeyOpenConfig()); + } + + protected void setShowConfigInputMap(InputMap inputMap, KeyStroke keyStroke) { + inputMap.put(keyStroke, OPEN_CONFIG_ACTION); + } + public void initUI(final DemoUI ui) { // Creation of selection listener to open ui when tree selection change @@ -450,6 +489,10 @@ helper.setOptionPropertyName(DemoConfig.PROPERTY_LOCALE); helper.setOptionCallBack("ui"); + helper.addOption(DemoConfig.Option.KEY_OPEN_CONFIG); + helper.setOptionPropertyName(DemoConfig.PROPERTY_KEY_OPEN_CONFIG); +// helper.setOptionCallBack("keymap"); + helper.addOption(DemoConfig.Option.LOG_LEVEL); helper.setOptionPropertyName(DemoConfig.PROPERTY_LOG_LEVEL); helper.setOptionCallBack("log"); Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2012-07-06 08:42:54 UTC (rev 2386) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2012-07-06 10:11:43 UTC (rev 2387) @@ -185,6 +185,7 @@ jaxxdemo.config.ui.demo.path=Path of demo to select when starting application jaxxdemo.config.ui.fontSize=default font size to use in sources jaxxdemo.config.ui.fullscreen=To change the screen mode (true for full screen) +jaxxdemo.config.ui.keyOpenConfig=To change key for open config ui jaxxdemo.config.ui.locale=Language used in application jaxxdemo.config.ui.logLevel=Log level jaxxdemo.config.ui.logPatternLayout=Log pattern Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties 2012-07-06 08:42:54 UTC (rev 2386) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties 2012-07-06 10:11:43 UTC (rev 2387) @@ -21,7 +21,7 @@ Blue=Bleu Blue\:=bleu \: Bold=En gras -Button\ label\:=Libellé de l'action +Button\ label\:=Libell\u00E9 de l'action C=C CE=CE Cancel=Annuler @@ -35,12 +35,12 @@ Editable=Editable Email\ Address\:=Courriel Email\:=Courriel -Enabled=Activé +Enabled=Activ\u00E9 EnumEditor\ (country)\ \:=Editeur de pays EnumEditor\ (language)\ \:=Editeur de langue Fancy\ Button=Bouton 'Fancy' -First\ Name\:=Prénom -FirstName\:=Prénom \: +First\ Name\:=Pr\u00E9nom +FirstName\:=Pr\u00E9nom \: Font\ size=Taille de la police Font\ size\:\ = Fool\ me\ once= @@ -49,7 +49,7 @@ Green\:=Vert \: Greet= Help= -Inc\ (+)=Incrémenter (+) +Inc\ (+)=Incr\u00E9menter (+) Italic=Italique JAXX\ Demo= JMenu\ demo= @@ -70,26 +70,26 @@ Red\:=rouge \: Reset=Reinitialiser Show\ Background=Voir le fond -Show\ password\ dialog=Voir l'éditeur de mot de passe +Show\ password\ dialog=Voir l'\u00E9diteur de mot de passe Sign\ on=Signer Simple\ Button=Bouton simple Size\:=Taille \: Sources=Sources Spacing\:=Espacement \: -Start=Démarrer -Stop=Arrêter -Supported\ Swing\ components\:=Composants Swing supportés +Start=D\u00E9marrer +Stop=Arr\u00EAter +Supported\ Swing\ components\:=Composants Swing support\u00E9s Text2\:=Text 2 Text\:=Texte \: Total\:\ = -Underline=souligné +Underline=soulign\u00E9 Upper\ case\ text\:=Texte en majuscule Use\ the\ spinner\ to=Utiliser la jauge pour Username\:=Utilisateur \: -Vegetable=Légumes +Vegetable=L\u00E9gumes View=Vue Welcome\ to\ the\ JAXX\ framework\!=Bienvenu dans le framework JAXX -Working\ directory\:=Répertoire de travail +Working\ directory\:=R\u00E9pertoire de travail Yellow=Jaune You\ entered\:\ = Your\ name\:=Votre nom \: @@ -98,8 +98,8 @@ between\ these\ lines= button\ A=Bouton A button\ B=Bouton B -button\ C\ (full\ block)=Bouton C (blocage complêt) -button\ D\ (full\ block\ 2)=Bouton D (blocage complêt) +button\ C\ (full\ block)=Bouton C (blocage compl\u00EAt) +button\ D\ (full\ block\ 2)=Bouton D (blocage compl\u00EAt) cancel=Annuler close=Fermer close2=Fermer 2 @@ -143,12 +143,12 @@ jaxxdemo.action.configuration.tip=Modifier la configuration jaxxdemo.action.exit=Quitter jaxxdemo.action.exit.tip=Quitter JAXX Demo -jaxxdemo.action.fullscreen=Plein écran -jaxxdemo.action.fullscreen.tip=Passer en mode pleine écran +jaxxdemo.action.fullscreen=Plein \u00E9cran +jaxxdemo.action.fullscreen.tip=Passer en mode pleine \u00E9cran jaxxdemo.action.help=Aide jaxxdemo.action.help.tip=Affichier l'aide -jaxxdemo.action.locale.fr=Français -jaxxdemo.action.locale.fr.tip=Changer la langue en français +jaxxdemo.action.locale.fr=Fran\u00E7ais +jaxxdemo.action.locale.fr.tip=Changer la langue en fran\u00E7ais jaxxdemo.action.locale.uk=Anglais jaxxdemo.action.locale.uk.tip=Changer la langue en anglais jaxxdemo.action.normalscreen=Ecran normal @@ -156,10 +156,10 @@ jaxxdemo.action.remove=Supprimer jaxxdemo.action.show=Voir jaxxdemo.action.site=Site internet -jaxxdemo.action.site.tip=Accéder au site de l'application sur internet +jaxxdemo.action.site.tip=Acc\u00E9der au site de l'application sur internet jaxxdemo.common.actors=Acteurs jaxxdemo.common.age=Age -jaxxdemo.common.firstName=Prénom +jaxxdemo.common.firstName=Pr\u00E9nom jaxxdemo.common.id=Identifiant jaxxdemo.common.image=Image jaxxdemo.common.lastName=Nom @@ -167,7 +167,7 @@ jaxxdemo.common.movies=Films jaxxdemo.common.people=Acteur jaxxdemo.common.title=Titre -jaxxdemo.common.year=Année +jaxxdemo.common.year=Ann\u00E9e jaxxdemo.component.jaxx=Composants JAXX jaxxdemo.component.jaxx.editor=Editeurs jaxxdemo.component.swing=Composants Swing @@ -176,51 +176,52 @@ jaxxdemo.component.swing.form.text=Texte jaxxdemo.component.swing.layout=Layouts jaxxdemo.component.swing.menu=Menus -jaxxdemo.component.swing.window=Fenêtres -jaxxdemo.config.category.directories=Répertoires -jaxxdemo.config.category.directories.description=Répertoires de l'application +jaxxdemo.component.swing.window=Fen\u00EAtres +jaxxdemo.config.category.directories=R\u00E9pertoires +jaxxdemo.config.category.directories.description=R\u00E9pertoires de l'application jaxxdemo.config.category.other=Autre jaxxdemo.config.category.other.description=Autres options jaxxdemo.config.configFileName.description=Le nom du fichier de configuration -jaxxdemo.config.ui.demo.path=Chemin de la démo par défaut -jaxxdemo.config.ui.fontSize=La taille de la police à utiliser pour visualiser dans les sources -jaxxdemo.config.ui.fullscreen=Pour afficher l'aplication en mode pleine écran -jaxxdemo.config.ui.locale=La langue utilisée par l'application +jaxxdemo.config.ui.demo.path=Chemin de la d\u00E9mo par d\u00E9faut +jaxxdemo.config.ui.fontSize=La taille de la police \u00E0 utiliser pour visualiser dans les sources +jaxxdemo.config.ui.fullscreen=Pour afficher l'aplication en mode pleine \u00E9cran +jaxxdemo.config.ui.keyOpenConfig=Pour changer le racourcie clavier pour ouvrir l'\u00E9cran de configuration +jaxxdemo.config.ui.locale=La langue utilis\u00E9e par l'application jaxxdemo.config.ui.logLevel=Level de log jaxxdemo.config.ui.logPatternLayout=Pattern des log -jaxxdemo.datePickerEditor.dateResult=Affichage du résultat +jaxxdemo.datePickerEditor.dateResult=Affichage du r\u00E9sultat jaxxdemo.datePickerEditor.patternLayout=Pattern de date jaxxdemo.datePickerEditor.showPopupButton=Afficher le boutton pour ouvrir la popup -jaxxdemo.feature=Fonctionnalités +jaxxdemo.feature=Fonctionnalit\u00E9s jaxxdemo.feature.databinding=Data binding jaxxdemo.feature.nav=API JAXX pour les arbres jaxxdemo.feature.validation=Validation -jaxxdemo.fileEditor.acceptAllFileFilterUsed=Accèpte tout les FileFilter -jaxxdemo.fileEditor.directoryEnabled=Activer la sélection des files -jaxxdemo.fileEditor.extsDescLbl=Description des extensions (séparées par des virgules, ex \: Texte (*.txt), Images (*.png)) +jaxxdemo.fileEditor.acceptAllFileFilterUsed=Acc\u00E8pte tout les FileFilter +jaxxdemo.fileEditor.directoryEnabled=Activer la s\u00E9lection des files +jaxxdemo.fileEditor.extsDescLbl=Description des extensions (s\u00E9par\u00E9es par des virgules, ex \: Texte (*.txt), Images (*.png)) jaxxdemo.fileEditor.extsLbl=Extensions (separated by comma, ex \: txt, png) -jaxxdemo.fileEditor.fileEnabled=Activer la sélection des fichiers +jaxxdemo.fileEditor.fileEnabled=Activer la s\u00E9lection des fichiers jaxxdemo.fileEditor.titleLbl=Titre du dialog d'ouverture de fichier jaxxdemo.fun=Fun jaxxdemo.i18neditor.configuration=Configuration jaxxdemo.i18neditor.popup.title=Titre de la popup jaxxdemo.i18neditor.popupBorderText=Titre de la popup -jaxxdemo.i18neditor.selected.locale=Langue sélectionnée +jaxxdemo.i18neditor.selected.locale=Langue s\u00E9lectionn\u00E9e jaxxdemo.i18neditor.showIcon=Afficher les icones jaxxdemo.i18neditor.showPopupIcon=Afficher les icones dans la popup jaxxdemo.i18neditor.showPopupText=Afficher les textes dans la popup jaxxdemo.i18neditor.showText=Afficher le text -jaxxdemo.init.closed=JAXX Demo a été fermé à %1$s -jaxxdemo.init.context.done=Initialisation du contexte terminée en %1$s. -jaxxdemo.init.ui.done=Initialisation de l'interface graphique terminée. +jaxxdemo.init.closed=JAXX Demo a \u00E9t\u00E9 ferm\u00E9 \u00E0 %1$s +jaxxdemo.init.context.done=Initialisation du contexte termin\u00E9e en %1$s. +jaxxdemo.init.ui.done=Initialisation de l'interface graphique termin\u00E9e. jaxxdemo.listSelector.addToolTipLbl=Add button toolTip jaxxdemo.listSelector.removeToolTipLbl=Remove button toolTip jaxxdemo.menu.file=Fichier jaxxdemo.menu.file.locale=Langues jaxxdemo.menu.help=Aide jaxxdemo.menu.showLogs=Afficher les logs -jaxxdemo.message.config.loaded=Configuration de JAXX Demo v. %1$s chargée. -jaxxdemo.message.goto.site=Accéder au site de JAXX Demo (%1$s) +jaxxdemo.message.config.loaded=Configuration de JAXX Demo v. %1$s charg\u00E9e. +jaxxdemo.message.goto.site=Acc\u00E9der au site de JAXX Demo (%1$s) jaxxdemo.navigation.actor.title=Acteur jaxxdemo.navigation.actors.title=Acteurs jaxxdemo.navigation.movie.title=Film @@ -228,25 +229,25 @@ jaxxdemo.numbereditor.applyNumberPattern=Appliquer le pattern jaxxdemo.numbereditor.autoPopup=Affichage automatique popup jaxxdemo.numbereditor.configuration=Configuration -jaxxdemo.numbereditor.model=Résultat -jaxxdemo.numbereditor.model.float=Valeur décimale \: %1$s -jaxxdemo.numbereditor.model.int=Valeur entière \: %1$s -jaxxdemo.numbereditor.model.numberPattern=Format de l'éditeur \: %s +jaxxdemo.numbereditor.model=R\u00E9sultat +jaxxdemo.numbereditor.model.float=Valeur d\u00E9cimale \: %1$s +jaxxdemo.numbereditor.model.int=Valeur enti\u00E8re \: %1$s +jaxxdemo.numbereditor.model.numberPattern=Format de l'\u00E9diteur \: %s jaxxdemo.numbereditor.numberPattern.configuration=Pattern du nombre jaxxdemo.numbereditor.showPopupButton=Afficher le boutton de popup jaxxdemo.numbereditor.showReset=Afficher le boutton de reset -jaxxdemo.numbereditor.useFloat=Utiliser les décimales +jaxxdemo.numbereditor.useFloat=Utiliser les d\u00E9cimales jaxxdemo.numbereditor.useSign=Utiliser le signe jaxxdemo.timeeditor.editor=Editeur de temps jaxxdemo.timeeditor.label=Label -jaxxdemo.timeeditor.model=Résultat -jaxxdemo.timeeditor.value=Heure sélectionnée \: %1$tH\:%1$tM +jaxxdemo.timeeditor.model=R\u00E9sultat +jaxxdemo.timeeditor.value=Heure s\u00E9lectionn\u00E9e \: %1$tH\:%1$tM jaxxdemo.title.about=A propos de JAXX Demo... jaxxdemo.title.showLog=Logs de JAXX Demo jaxxdemo.tree.tabtitle=Arbre jaxxdemo.treeTable.tabtitle=Arbre tableau -jaxxdemo.warning.nimbus.landf=Le look and Feel Nimbus n'a pas été trouvé, il faut au moins la version 1.6u10 de java. -jaxxdemo.warning.no.ui=Aucun environnement graphique détecté +jaxxdemo.warning.nimbus.landf=Le look and Feel Nimbus n'a pas \u00E9t\u00E9 trouv\u00E9, il faut au moins la version 1.6u10 de java. +jaxxdemo.warning.no.ui=Aucun environnement graphique d\u00E9tect\u00E9 model0.f0= model0.f1= model0.file...= Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2012-07-06 08:42:54 UTC (rev 2386) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2012-07-06 10:11:43 UTC (rev 2387) @@ -21,7 +21,7 @@ Blue=Bleu Blue\:=bleu \: Bold=En gras -Button\ label\:=Libellé de l'action +Button\ label\:=Libell\u00E9 de l'action C=C CE=CE Cancel=Annuler @@ -35,12 +35,12 @@ Editable=Editable Email\ Address\:=Courriel Email\:=Courriel -Enabled=Activé +Enabled=Activ\u00E9 EnumEditor\ (country)\ \:=Editeur de pays EnumEditor\ (language)\ \:=Editeur de langue Fancy\ Button=Bouton 'Fancy' -First\ Name\:=Prénom -FirstName\:=Prénom \: +First\ Name\:=Pr\u00E9nom +FirstName\:=Pr\u00E9nom \: Font\ size=Taille de la police Font\ size\:\ = Fool\ me\ once= @@ -49,7 +49,7 @@ Green\:=Vert \: Greet= Help= -Inc\ (+)=Incrémenter (+) +Inc\ (+)=Incr\u00E9menter (+) Italic=Italique JAXX\ Demo= JMenu\ demo= @@ -70,26 +70,26 @@ Red\:=rouge \: Reset=Reinitialiser Show\ Background=Voir le fond -Show\ password\ dialog=Voir l'éditeur de mot de passe +Show\ password\ dialog=Voir l'\u00E9diteur de mot de passe Sign\ on=Signer Simple\ Button=Bouton simple Size\:=Taille \: Sources=Sources Spacing\:=Espacement \: -Start=Démarrer -Stop=Arrêter -Supported\ Swing\ components\:=Composants Swing supportés +Start=D\u00E9marrer +Stop=Arr\u00EAter +Supported\ Swing\ components\:=Composants Swing support\u00E9s Text2\:=Text 2 Text\:=Texte \: Total\:\ = -Underline=souligné +Underline=soulign\u00E9 Upper\ case\ text\:=Texte en majuscule Use\ the\ spinner\ to=Utiliser la jauge pour Username\:=Utilisateur \: -Vegetable=Légumes +Vegetable=L\u00E9gumes View=Vue Welcome\ to\ the\ JAXX\ framework\!=Bienvenu dans le framework JAXX -Working\ directory\:=Répertoire de travail +Working\ directory\:=R\u00E9pertoire de travail Yellow=Jaune You\ entered\:\ = Your\ name\:=Votre nom \: @@ -98,8 +98,8 @@ between\ these\ lines= button\ A=Bouton A button\ B=Bouton B -button\ C\ (full\ block)=Bouton C (blocage complêt) -button\ D\ (full\ block\ 2)=Bouton D (blocage complêt) +button\ C\ (full\ block)=Bouton C (blocage compl\u00EAt) +button\ D\ (full\ block\ 2)=Bouton D (blocage compl\u00EAt) cancel=Annuler close=Fermer close2=Fermer 2 @@ -143,12 +143,12 @@ jaxxdemo.action.configuration.tip=Modifier la configuration jaxxdemo.action.exit=Quitter jaxxdemo.action.exit.tip=Quitter JAXX Demo -jaxxdemo.action.fullscreen=Plein écran -jaxxdemo.action.fullscreen.tip=Passer en mode pleine écran +jaxxdemo.action.fullscreen=Plein \u00E9cran +jaxxdemo.action.fullscreen.tip=Passer en mode pleine \u00E9cran jaxxdemo.action.help=Aide jaxxdemo.action.help.tip=Affichier l'aide -jaxxdemo.action.locale.fr=Français -jaxxdemo.action.locale.fr.tip=Changer la langue en français +jaxxdemo.action.locale.fr=Fran\u00E7ais +jaxxdemo.action.locale.fr.tip=Changer la langue en fran\u00E7ais jaxxdemo.action.locale.uk=Anglais jaxxdemo.action.locale.uk.tip=Changer la langue en anglais jaxxdemo.action.normalscreen=Ecran normal @@ -156,10 +156,10 @@ jaxxdemo.action.remove=Supprimer jaxxdemo.action.show=Voir jaxxdemo.action.site=Site internet -jaxxdemo.action.site.tip=Accéder au site de l'application sur internet +jaxxdemo.action.site.tip=Acc\u00E9der au site de l'application sur internet jaxxdemo.common.actors=Acteurs jaxxdemo.common.age=Age -jaxxdemo.common.firstName=Prénom +jaxxdemo.common.firstName=Pr\u00E9nom jaxxdemo.common.id=Identifiant jaxxdemo.common.image=Image jaxxdemo.common.lastName=Nom @@ -167,7 +167,7 @@ jaxxdemo.common.movies=Films jaxxdemo.common.people=Acteur jaxxdemo.common.title=Titre -jaxxdemo.common.year=Année +jaxxdemo.common.year=Ann\u00E9e jaxxdemo.component.jaxx=Composants JAXX jaxxdemo.component.jaxx.editor=Editeurs jaxxdemo.component.swing=Composants Swing @@ -176,51 +176,52 @@ jaxxdemo.component.swing.form.text=Texte jaxxdemo.component.swing.layout=Layouts jaxxdemo.component.swing.menu=Menus -jaxxdemo.component.swing.window=Fenêtres -jaxxdemo.config.category.directories=Répertoires -jaxxdemo.config.category.directories.description=Répertoires de l'application +jaxxdemo.component.swing.window=Fen\u00EAtres +jaxxdemo.config.category.directories=R\u00E9pertoires +jaxxdemo.config.category.directories.description=R\u00E9pertoires de l'application jaxxdemo.config.category.other=Autre jaxxdemo.config.category.other.description=Autres options jaxxdemo.config.configFileName.description=Le nom du fichier de configuration -jaxxdemo.config.ui.demo.path=Chemin de la démo par défaut -jaxxdemo.config.ui.fontSize=La taille de la police à utiliser pour visualiser dans les sources -jaxxdemo.config.ui.fullscreen=Pour afficher l'aplication en mode pleine écran -jaxxdemo.config.ui.locale=La langue utilisée par l'application +jaxxdemo.config.ui.demo.path=Chemin de la d\u00E9mo par d\u00E9faut +jaxxdemo.config.ui.fontSize=La taille de la police \u00E0 utiliser pour visualiser dans les sources +jaxxdemo.config.ui.fullscreen=Pour afficher l'aplication en mode pleine \u00E9cran +jaxxdemo.config.ui.keyOpenConfig=Pour changer le racourcie clavier pour ouvrir l'\u00E9cran de configuration +jaxxdemo.config.ui.locale=La langue utilis\u00E9e par l'application jaxxdemo.config.ui.logLevel=Level de log jaxxdemo.config.ui.logPatternLayout=Pattern des log -jaxxdemo.datePickerEditor.dateResult=Affichage du résultat +jaxxdemo.datePickerEditor.dateResult=Affichage du r\u00E9sultat jaxxdemo.datePickerEditor.patternLayout=Pattern de date jaxxdemo.datePickerEditor.showPopupButton=Afficher le boutton pour ouvrir la popup -jaxxdemo.feature=Fonctionnalités +jaxxdemo.feature=Fonctionnalit\u00E9s jaxxdemo.feature.databinding=Data binding jaxxdemo.feature.nav=API JAXX pour les arbres jaxxdemo.feature.validation=Validation -jaxxdemo.fileEditor.acceptAllFileFilterUsed=Accèpte tout les FileFilter -jaxxdemo.fileEditor.directoryEnabled=Activer la sélection des files -jaxxdemo.fileEditor.extsDescLbl=Description des extensions (séparées par des virgules, ex \: Texte (*.txt), Images (*.png)) +jaxxdemo.fileEditor.acceptAllFileFilterUsed=Acc\u00E8pte tout les FileFilter +jaxxdemo.fileEditor.directoryEnabled=Activer la s\u00E9lection des files +jaxxdemo.fileEditor.extsDescLbl=Description des extensions (s\u00E9par\u00E9es par des virgules, ex \: Texte (*.txt), Images (*.png)) jaxxdemo.fileEditor.extsLbl=Extensions (separated by comma, ex \: txt, png) -jaxxdemo.fileEditor.fileEnabled=Activer la sélection des fichiers -jaxxdemo.fileEditor.titleLbl=Titre de la fenêtre de sélection de fichier +jaxxdemo.fileEditor.fileEnabled=Activer la s\u00E9lection des fichiers +jaxxdemo.fileEditor.titleLbl=Titre de la fen\u00EAtre de s\u00E9lection de fichier jaxxdemo.fun=Fun jaxxdemo.i18neditor.configuration=Configuration jaxxdemo.i18neditor.popup.title=Titre de la popup jaxxdemo.i18neditor.popupBorderText=Titre de la popup -jaxxdemo.i18neditor.selected.locale=Langue sélectionnée +jaxxdemo.i18neditor.selected.locale=Langue s\u00E9lectionn\u00E9e jaxxdemo.i18neditor.showIcon=Afficher les icones jaxxdemo.i18neditor.showPopupIcon=Afficher les icones dans la popup jaxxdemo.i18neditor.showPopupText=Afficher les textes dans la popup jaxxdemo.i18neditor.showText=Afficher le text -jaxxdemo.init.closed=JAXX Demo a été fermé à %1$s -jaxxdemo.init.context.done=Initialisation du contexte terminée en %1$s. -jaxxdemo.init.ui.done=Initialisation de l'interface graphique terminée. +jaxxdemo.init.closed=JAXX Demo a \u00E9t\u00E9 ferm\u00E9 \u00E0 %1$s +jaxxdemo.init.context.done=Initialisation du contexte termin\u00E9e en %1$s. +jaxxdemo.init.ui.done=Initialisation de l'interface graphique termin\u00E9e. jaxxdemo.listSelector.addToolTipLbl=Tooltip du boutton ajouter jaxxdemo.listSelector.removeToolTipLbl=Tooltip du boutton enlever jaxxdemo.menu.file=Fichier jaxxdemo.menu.file.locale=Langues jaxxdemo.menu.help=Aide jaxxdemo.menu.showLogs=Afficher les logs -jaxxdemo.message.config.loaded=Configuration de JAXX Demo v. %1$s chargée. -jaxxdemo.message.goto.site=Accéder au site de JAXX Demo (%1$s) +jaxxdemo.message.config.loaded=Configuration de JAXX Demo v. %1$s charg\u00E9e. +jaxxdemo.message.goto.site=Acc\u00E9der au site de JAXX Demo (%1$s) jaxxdemo.navigation.actor.title=Acteur jaxxdemo.navigation.actors.title=Acteurs jaxxdemo.navigation.movie.title=Film @@ -228,25 +229,25 @@ jaxxdemo.numbereditor.applyNumberPattern=Appliquer le pattern jaxxdemo.numbereditor.autoPopup=Affichage automatique popup jaxxdemo.numbereditor.configuration=Configuration -jaxxdemo.numbereditor.model=Résultat -jaxxdemo.numbereditor.model.float=Valeur décimale \: %1$s -jaxxdemo.numbereditor.model.int=Valeur entière \: %1$s -jaxxdemo.numbereditor.model.numberPattern=Format de l'éditeur \: %s +jaxxdemo.numbereditor.model=R\u00E9sultat +jaxxdemo.numbereditor.model.float=Valeur d\u00E9cimale \: %1$s +jaxxdemo.numbereditor.model.int=Valeur enti\u00E8re \: %1$s +jaxxdemo.numbereditor.model.numberPattern=Format de l'\u00E9diteur \: %s jaxxdemo.numbereditor.numberPattern.configuration=Pattern du nombre jaxxdemo.numbereditor.showPopupButton=Afficher le boutton de popup jaxxdemo.numbereditor.showReset=Afficher le boutton de reset -jaxxdemo.numbereditor.useFloat=Utiliser les décimales +jaxxdemo.numbereditor.useFloat=Utiliser les d\u00E9cimales jaxxdemo.numbereditor.useSign=Utiliser le signe jaxxdemo.timeeditor.editor=Editeur de temps jaxxdemo.timeeditor.label=Label -jaxxdemo.timeeditor.model=Résultat -jaxxdemo.timeeditor.value=Heure sélectionnée \: %1$tH\:%1$tM +jaxxdemo.timeeditor.model=R\u00E9sultat +jaxxdemo.timeeditor.value=Heure s\u00E9lectionn\u00E9e \: %1$tH\:%1$tM jaxxdemo.title.about=A propos de JAXX Demo... jaxxdemo.title.showLog=Logs de JAXX Demo jaxxdemo.tree.tabtitle=Arbre jaxxdemo.treeTable.tabtitle=Arbre tableau -jaxxdemo.warning.nimbus.landf=Le look and Feel Nimbus n'a pas été trouvé, il faut au moins la version 1.6u10 de java. -jaxxdemo.warning.no.ui=Aucun environnement graphique détecté +jaxxdemo.warning.nimbus.landf=Le look and Feel Nimbus n'a pas \u00E9t\u00E9 trouv\u00E9, il faut au moins la version 1.6u10 de java. +jaxxdemo.warning.no.ui=Aucun environnement graphique d\u00E9tect\u00E9 model0.f0= model0.f1= model0.file...= 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-06 08:42:54 UTC (rev 2386) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListSelectionModel.java 2012-07-06 10:11:43 UTC (rev 2387) @@ -1,3 +1,26 @@ +/* + * #%L + * JAXX :: Runtime + * $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.model; import com.google.common.collect.Lists; 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-06 08:42:54 UTC (rev 2386) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXWidgetUtil.java 2012-07-06 10:11:43 UTC (rev 2387) @@ -28,6 +28,7 @@ import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.editor.cell.DateCellEditor; import jaxx.runtime.swing.editor.cell.FileCellEditor; +import jaxx.runtime.swing.editor.cell.KeyStrokeCellEditor; import jaxx.runtime.swing.editor.cell.NumberCellEditor; import jaxx.runtime.swing.renderer.DateCellRenderer; @@ -52,6 +53,10 @@ return new FileCellEditor(); } + public static TableCellEditor newKeyStrokeTableCellEditor() { + return new KeyStrokeCellEditor(); + } + public static <E extends Number> NumberCellEditor<E> newNumberTableCellEditor(Class<E> type, boolean useSign) { return new NumberCellEditor<E>(type, useSign); } 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-06 08:42:54 UTC (rev 2386) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java 2012-07-06 10:11:43 UTC (rev 2387) @@ -53,7 +53,6 @@ String startPath = view.getStartPath(); if (startFile == null && StringUtils.isNotEmpty(startPath)) { - // else filed start path startFile = new File(startPath); } else if (startFile == null) { Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/KeyStrokeEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/KeyStrokeEditor.java (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/KeyStrokeEditor.java 2012-07-06 10:11:43 UTC (rev 2387) @@ -0,0 +1,81 @@ +/* + * #%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.event.KeyEvent; +import javax.swing.JTextField; +import javax.swing.KeyStroke; +import javax.swing.SwingUtilities; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Custom text field to disable default key events + * + * @author sletellier <letellier(a)codelutin.com> + */ +public class KeyStrokeEditor extends JTextField { + + private static final Log log = LogFactory.getLog(KeyStrokeEditor.class); + + protected KeyStroke keyStroke; + + public KeyStrokeEditor() { + enableEvents(KeyEvent.KEY_EVENT_MASK); + setFocusTraversalKeysEnabled(false); + } + + @Override + protected void processKeyEvent(KeyEvent e) { + if (e.getID() == KeyEvent.KEY_PRESSED) { + int keyCode = e.getKeyCode(); + if (keyCode == KeyEvent.VK_SHIFT || + keyCode == KeyEvent.VK_ALT || + keyCode == KeyEvent.VK_CONTROL || + keyCode == KeyEvent.VK_ALT_GRAPH || + keyCode == KeyEvent.VK_META) { + + return; + } + + setKeyStroke(KeyStroke.getKeyStroke(keyCode, e.getModifiers())); + } + } + + public KeyStroke getKeyStroke() { + return keyStroke; + } + + public void setKeyStroke(KeyStroke keyStroke) { + KeyStroke oldValue = getKeyStroke(); + this.keyStroke = keyStroke; + firePropertyChange("keyStroke", oldValue, keyStroke); + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + setText(getKeyStroke().toString()); + } + }); + } +} Added: 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 (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java 2012-07-06 10:11:43 UTC (rev 2387) @@ -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.cell; + +import java.awt.Component; +import javax.swing.AbstractCellEditor; +import javax.swing.JTable; +import javax.swing.KeyStroke; +import javax.swing.table.TableCellEditor; +import jaxx.runtime.swing.editor.KeyStrokeEditor; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public class KeyStrokeCellEditor extends AbstractCellEditor + implements TableCellEditor { + + protected KeyStrokeEditor keyStrokeEditor; + + public KeyStrokeCellEditor() { + keyStrokeEditor = new KeyStrokeEditor(); + } + + @Override + public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { + keyStrokeEditor.setKeyStroke((KeyStroke) value); + return keyStrokeEditor; + } + + @Override + public Object getCellEditorValue() { + return keyStrokeEditor.getKeyStroke(); + } +} 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-06 08:42:54 UTC (rev 2386) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigTableEditor.java 2012-07-06 10:11:43 UTC (rev 2387) @@ -31,6 +31,7 @@ import java.util.Locale; import javax.swing.DefaultCellEditor; import javax.swing.JTable; +import javax.swing.KeyStroke; import javax.swing.event.CellEditorListener; import javax.swing.table.TableCellEditor; import jaxx.runtime.swing.JAXXWidgetUtil; @@ -111,23 +112,23 @@ if (type.isEnum()) { // add a EnumEditor to table editor = new DefaultCellEditor(EnumEditor.newEditor((Class<Enum>) type)); - table.setDefaultEditor(type, editor); } else if (type.equals(Class.class)) { editor = new ClassCellEditor(); - table.setDefaultEditor(type, editor); } else if (type.equals(File.class)){ editor = JAXXWidgetUtil.newFileTableCellEditor(); - table.setDefaultEditor(type, editor); + } else if (type.equals(KeyStroke.class)){ + editor = JAXXWidgetUtil.newKeyStrokeTableCellEditor(); + } else if (type.equals(Locale.class)) { editor = new DefaultCellEditor(LocaleEditor.newEditor()); - table.setDefaultEditor(Locale.class, editor); } else { editor = table.getDefaultEditor(String.class); } + table.setDefaultEditor(type, editor); } if (editor == null) { throw new IllegalStateException("could not find a editor for type +" + type); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-06 08:42:54 UTC (rev 2386) +++ trunk/pom.xml 2012-07-06 10:11:43 UTC (rev 2387) @@ -107,7 +107,7 @@  <projectId>jaxx</projectId> - <nuitonUtilsVersion>2.5</nuitonUtilsVersion> + <nuitonUtilsVersion>2.5.1-SNAPSHOT</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <eugeneVersion>2.4.2</eugeneVersion> <xworkVersion>2.3.1.2</xworkVersion>

1 0

r2386 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor
by sletellier＠users.nuiton.org July 6, 2012

July 6, 2012

Author: sletellier Date: 2012-07-06 10:42:54 +0200 (Fri, 06 Jul 2012) New Revision: 2386 Url: http://nuiton.org/repositories/revision/jaxx/2386 Log: really fixes #2171 : FileEditor dont keep input path 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 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-06 08:24:11 UTC (rev 2385) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx 2012-07-06 08:42:54 UTC (rev 2386) @@ -24,7 +24,6 @@ <BaseActionPanel layout='{new BorderLayout()}'> <import> java.io.File - java.beans.PropertyChangeListener jaxx.runtime.swing.BaseActionPanel org.apache.commons.lang3.StringUtils </import> @@ -50,6 +49,10 @@ public void setSelectedFile(File selectedFile) { this.selectedFile = selectedFile; + if (selectedFile != null) { + setStartPath(selectedFile.getAbsolutePath()); + fireActionEvent(); + } } public File getSelectedFile() { @@ -67,7 +70,7 @@ constraints='BorderLayout.CENTER' enabled='{isEnabled()}' text='{getStartPath()}' - onKeyReleased='handler.setSelectedFile(pathField.getText())'/> + onKeyReleased='setSelectedFile(null);setStartPath(pathField.getText())'/> <JButton id='boutonXslLocation' constraints='BorderLayout.EAST' 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-06 08:24:11 UTC (rev 2385) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java 2012-07-06 08:42:54 UTC (rev 2386) @@ -56,7 +56,7 @@ // else filed start path startFile = new File(startPath); - } else { + } else if (startFile == null) { // else start with user home startFile = lastSelectedPath;

1 0

r2385 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor
by sletellier＠users.nuiton.org July 6, 2012

July 6, 2012

Author: sletellier Date: 2012-07-06 10:24:11 +0200 (Fri, 06 Jul 2012) New Revision: 2385 Url: http://nuiton.org/repositories/revision/jaxx/2385 Log: fixes #2171 : FileEditor dont keep input path 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 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-05 16:08:24 UTC (rev 2384) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx 2012-07-06 08:24:11 UTC (rev 2385) @@ -24,9 +24,9 @@ <BaseActionPanel layout='{new BorderLayout()}'> <import> java.io.File - java.beans.PropertyChangeEvent java.beans.PropertyChangeListener jaxx.runtime.swing.BaseActionPanel + org.apache.commons.lang3.StringUtils </import> <FileEditorHandler id='handler' constructorParams='this'/> @@ -37,8 +37,6 @@ <Boolean id='fileEnabled' javaBean='Boolean.TRUE'/> - <File id='selectedFile' javaBean='null'/> - <String id='startPath' javaBean='null'/> <String id='title' javaBean='null'/> @@ -48,26 +46,28 @@ <String id='extsDescription' javaBean='null'/> <script><![CDATA[ - protected void $afterCompleteSetup() { + protected File selectedFile; - addPropertyChangeListener(PROPERTY_SELECTED_FILE, new PropertyChangeListener() { + public void setSelectedFile(File selectedFile) { + this.selectedFile = selectedFile; + } - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (selectedFile != null) { - pathField.setText(selectedFile.getAbsolutePath()); - fireActionEvent(); - } + public File getSelectedFile() { + if (selectedFile == null) { + if (StringUtils.isNotEmpty(startPath)) { + selectedFile = new File(startPath); } - }); + } + return selectedFile; } + ]]></script> <JTextField id='pathField' constraints='BorderLayout.CENTER' enabled='{isEnabled()}' text='{getStartPath()}' - onFocusLost='setSelectedFile(new File(pathField.getText()))'/> + onKeyReleased='handler.setSelectedFile(pathField.getText())'/> <JButton id='boutonXslLocation' constraints='BorderLayout.EAST' 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-05 16:08:24 UTC (rev 2384) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java 2012-07-06 08:24:11 UTC (rev 2385) @@ -27,6 +27,7 @@ import java.io.File; import javax.swing.JFileChooser; import javax.swing.filechooser.FileFilter; +import org.apache.commons.lang3.StringUtils; /** * @author sletellier <letellier(a)codelutin.com> @@ -34,10 +35,15 @@ public class FileEditorHandler { public static final String SEPARATOR_REGEX = "\\s*,\\s*"; + public static File lastSelectedPath; + protected FileEditor view; public FileEditorHandler(FileEditor view) { this.view = view; + if (lastSelectedPath == null) { + lastSelectedPath = new File(System.getProperty("user.home")); + } } public void openLocation() { @@ -45,7 +51,7 @@ // use last selected file File startFile = view.getSelectedFile(); String startPath = view.getStartPath(); - if (startFile == null && startPath != null) { + if (startFile == null && StringUtils.isNotEmpty(startPath)) { // else filed start path @@ -53,7 +59,7 @@ } else { // else start with user home - startFile = new File(System.getProperty("user.home")); + startFile = lastSelectedPath; } JFileChooser fc = new JFileChooser(startFile); @@ -118,10 +124,26 @@ // get selected to display in ui File file = fc.getSelectedFile(); - view.setSelectedFile(file); + setSelectedFile(file); } } + public void setSelectedFile(String path) { + setSelectedFile(new File(path)); + } + + public void setSelectedFile(File file) { + view.setSelectedFile(file); + view.setStartPath(file.getPath()); + File dir = file; + if (dir.exists()) { + if (!dir.isDirectory()) { + dir = dir.getParentFile(); + } + lastSelectedPath = dir; + } + } + public static class ExtentionFileFiler extends FileFilter { protected String ext; protected String desciption;

1 0

r2384 - trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin
by tchemit＠users.nuiton.org July 5, 2012

July 5, 2012

Author: tchemit Date: 2012-07-05 18:08:24 +0200 (Thu, 05 Jul 2012) New Revision: 2384 Url: http://nuiton.org/repositories/revision/jaxx/2384 Log: fixes #930: Use maven-plugin-plugin 3 api Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java 2012-07-05 16:08:02 UTC (rev 2383) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java 2012-07-05 16:08:24 UTC (rev 2384) @@ -27,10 +27,19 @@ import org.apache.commons.lang3.StringUtils; import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugins.annotations.Parameter; import org.nuiton.i18n.I18nUtil; -import java.io.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Locale; +import java.util.Set; /** * Abstract Mojo to generate help stuff. @@ -45,52 +54,49 @@ * * The first locale given is the default locale. * - * @parameter expression="${jaxx.locales}" - * @required * @since 2.0.0 */ + @Parameter(property = "jaxx.locales", required = true) protected String locales; + /** * Where to generate helpIds files. * - * @parameter expression="${jaxx.outputHelpIds}" default-value="target/generated-sources/jaxx" - * @required * @since 1.3 */ + @Parameter(property = "jaxx.outputHelpIds", defaultValue = "target/generated-sources/jaxx", required = true) private File outputHelpIds; + /** * The store of helpIds generated by the goal {@link GenerateMojo} and then * used by the goal {@link GenerateHelpMojo}. * - * @parameter expression="${jaxx.helpIdsFilename}" default-value="helpIds.properties" - * @required * @since 1.3 */ + @Parameter(property = "jaxx.helpIdsFilename", defaultValue = "helpIds.properties", required = true) private String helpIdsFilename; + /** * The store of cumulate helpIds generated by the goal {@link GenerateMojo} * and then used by the goal {@link GenerateHelpMojo}. * - * @parameter expression="${jaxx.mergeHelpIdsFilename}" default-value="helpIds-all.properties" - * @required * @since 1.3 */ + @Parameter(property = "jaxx.mergeHelpIdsFilename", defaultValue = "helpIds-all.properties", required = true) private String mergeHelpIdsFilename; + /** * Flag to generate the search index. * - * @parameter expression="${jaxx.generateSearch}" default-value="true" - * @required * @since 1.3 */ + @Parameter(property = "jaxx.generateSearch", defaultValue = "true", required = true) protected boolean generateSearch; - /** - * Default locale (the first locale in {@link #localesToTreate}. - */ + + /** Default locale (the first locale in {@link #localesToTreate}. */ private Locale defaultLocale; - /** - * Locales to treate - */ + + /** Locales to treate */ private Locale[] localesToTreate; /** @@ -110,9 +116,7 @@ File source, String localePath) throws Exception; - /** - * Call back after doing all stuff for all locales declared - */ + /** Call back after doing all stuff for all locales declared */ protected abstract void postDoAction(); @Override Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java 2012-07-05 16:08:02 UTC (rev 2383) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java 2012-07-05 16:08:24 UTC (rev 2384) @@ -24,6 +24,8 @@ */ package org.nuiton.jaxx.plugin; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; import org.nuiton.io.MirroredFileUpdater; import org.nuiton.plugin.AbstractPlugin; @@ -44,41 +46,35 @@ public abstract void setTargetDirectory(File targetDirectory); - /** - * Dépendance du projet. - * - * @parameter default-value="${project}" - * @required - * @readonly - */ + /** Current maven project. */ + @Component private MavenProject project; /** - * Encoding pour la generation des fichiers. + * Encoding used for file generation. * * Note: If nothing is filled here, we will use the system * property {@code file.encoding}. * - * @parameter expression="${jaxx.encoding}" default-value="${project.build.sourceEncoding}" * @since 2.0.0 */ + @Parameter(property = "jaxx.encoding", defaultValue = "${project.build.sourceEncoding}") private String encoding; /** - * verbose flag + * Verbose flag. * - * @parameter expression="${jaxx.verbose}" default-value="false" * @since 1.3 */ + @Parameter(property = "jaxx.verbose", defaultValue = "false") private boolean verbose; /** - * to force generation of java source for any jaxx files with no timestamp checking. + * To force generation of java source for any jaxx files with no timestamp checking. * * By default, never force generation. - * - * @parameter expression="${jaxx.force}" default-value="false" */ + @Parameter(property = "jaxx.force", defaultValue = "false") private boolean force; /** @@ -86,9 +82,9 @@ * * By default, not active. * - * @parameter expression="${jaxx.generateHelp}" default-value="false" * @since 1.3 */ + @Parameter(property = "jaxx.generateHelp", defaultValue = "false") protected boolean generateHelp; @Override Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java 2012-07-05 16:08:02 UTC (rev 2383) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java 2012-07-05 16:08:24 UTC (rev 2384) @@ -26,6 +26,11 @@ package org.nuiton.jaxx.plugin; import org.apache.commons.io.FileUtils; +import org.apache.maven.plugins.annotations.Execute; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.nuiton.plugin.VelocityTemplateGenerator; import org.nuiton.util.SortedProperties; @@ -40,13 +45,13 @@ * Mojo to generate javax help files for your project. * * @author tchemit <chemit(a)codelutin.com> - * @goal generate-help-files - * @phase process-sources - * @requiresProject - * @requiresDependencyResolution compile - * @execute goal=generate-help-ids * @since 2.0.0 */ +@Mojo(name = "generate-help-files", + defaultPhase = LifecyclePhase.PROCESS_SOURCES, + requiresProject = true, + requiresDependencyResolution = ResolutionScope.COMPILE) +@Execute(goal = "generate-help-ids") public class GenerateHelpFilesMojo extends AbstractGenerateHelpMojo { protected static final String AUTOREMOVE_LINE = @@ -55,79 +60,80 @@ /** * The directory where to create or update help files. * - * @parameter expression="${jaxx.outputHelp}" default-value="${project.basedir}/src/main/help" - * @required * @since 2.0.0 */ + @Parameter(property = "jaxx.outputHelp", defaultValue = "${project.basedir}/src/main/help", required = true) protected File outputHelp; + /** * The name of the helpset to generate. * - * @parameter expression="${jaxx.helpsetName}" default-value="${project.artifactId}" - * @required * @since 1.3 */ + @Parameter(property = "jaxx.helpsetName", defaultValue = "${project.artifactId}", required = true) protected String helpsetName; + /** * The template used to generate helpset file. * * Must be an existing file or a ressource in class-path * - * @parameter expression="${jaxx.helpsetTemplate}" default-value="/defaultHelpSet.hs.vm" - * @required * @since 1.3 */ + @Parameter(property = "jaxx.helpsetTemplate", defaultValue = "/defaultHelpSet.hs.vm", required = true) protected File helpsetTemplate; + /** * The template used to generate helpset map file. * * Must be an existing file or a ressource in class-path * - * @parameter expression="${jaxx.mapTemplate}" default-value="/defaultMap.jhm.vm" - * @required * @since 1.3 */ + @Parameter(property = "jaxx.mapTemplate", defaultValue = "/defaultMap.jhm.vm", required = true) protected File mapTemplate; + /** * The template used to generate helpset index file. * * Must be an existing file or a ressource in class-path * - * @parameter expression="${jaxx.indexTemplate}" default-value="/defaultIndex.xml.vm" - * @required * @since 1.3 */ + @Parameter(property = "jaxx.indexTemplate", defaultValue = "/defaultIndex.xml.vm", required = true) protected File indexTemplate; + /** * The template used to generate helpset toc file. * * Must be an existing file or a ressource in class-path * - * @parameter expression="${jaxx.tocTemplate}" default-value="/defaultToc.xml.vm" - * @required * @since 1.3 */ + @Parameter(property = "jaxx.tocTemplate", defaultValue = "/defaultToc.xml.vm", required = true) protected File tocTemplate; + /** * The template used to generate helpset content file. * * Must be an existing file or a ressource in class-path * - * @parameter expression="${jaxx.contentTemplate}" default-value="/defaultContent.html.vm" - * @required * @since 1.3 */ + @Parameter(property = "jaxx.contentTemplate", defaultValue = "/defaultContent.html.vm", required = true) protected File contentTemplate; protected String mapFileName; + protected String indexFileName; + protected String tocFileName; + protected int touchedFiles; + protected File idsFile; - /** - * The help ids discovered. - */ + /** The help ids discovered. */ protected Properties helpIds; @Override @@ -303,7 +309,7 @@ boolean exist = f.exists(); if (exist) { // check if there is a autoremoveLine in content - String content = FileUtils.readFileToString( f ); + String content = FileUtils.readFileToString(f); if (!content.contains(AUTOREMOVE_LINE)) { // no regenerate marker detected, so skip this file if (isVerbose()) { Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2012-07-05 16:08:02 UTC (rev 2383) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2012-07-05 16:08:24 UTC (rev 2384) @@ -26,6 +26,8 @@ import jaxx.compiler.decorators.HelpRootCompiledObjectDecorator; import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; import java.io.File; import java.util.Locale; @@ -37,17 +39,13 @@ * Created: 22 déc. 2009 * * @author tchemit <chemit(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> - * @goal generate-help-ids - * @phase process-sources - * @requiresProject * @since 2.0.0 */ +@Mojo(name = "generate-help-ids", + defaultPhase = LifecyclePhase.PROCESS_SOURCES, requiresProject = true) public class GenerateHelpIdsMojo extends AbstractGenerateHelpMojo { - /** - * help ids to react. - */ + /** help ids to react. */ protected Set<String> helpIds; @Override Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java 2012-07-05 16:08:02 UTC (rev 2383) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java 2012-07-05 16:08:24 UTC (rev 2384) @@ -25,6 +25,11 @@ package org.nuiton.jaxx.plugin; +import org.apache.maven.plugins.annotations.Execute; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.ResolutionScope; + import java.io.File; import java.util.Locale; @@ -34,13 +39,13 @@ * This mojo will chain all others help mojo required. * * @author tchemit <chemit(a)codelutin.com> - * @goal generate-help - * @phase process-sources - * @requiresProject - * @requiresDependencyResolution compile - * @execute goal=generate-help-search * @since 1.3 */ +@Mojo(name = "generate-help", + defaultPhase = LifecyclePhase.PROCESS_SOURCES, + requiresProject = true, + requiresDependencyResolution = ResolutionScope.COMPILE) +@Execute(goal = "generate-help-search") public class GenerateHelpMojo extends AbstractGenerateHelpMojo { @Override Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java 2012-07-05 16:08:02 UTC (rev 2383) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java 2012-07-05 16:08:24 UTC (rev 2384) @@ -26,6 +26,11 @@ package org.nuiton.jaxx.plugin; import com.sun.java.help.search.Indexer; +import org.apache.maven.plugins.annotations.Execute; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.codehaus.plexus.util.FileUtils; import org.nuiton.plugin.PluginHelper; @@ -43,31 +48,29 @@ * your src directories (this is mainly binary files not to be stored in scm system)... * * @author tchemit <chemit(a)codelutin.com> - * @goal generate-help-search - * @phase process-sources - * @requiresProject - * @requiresDependencyResolution compile - * @execute goal=generate-help-files * @since 2.0.0 */ +@Mojo(name = "generate-help-search", + defaultPhase = LifecyclePhase.PROCESS_SOURCES, + requiresProject = true, + requiresDependencyResolution = ResolutionScope.COMPILE) +@Execute(goal = "generate-help-files") public class GenerateHelpSearchMojo extends AbstractGenerateHelpMojo { /** * The directory where to create or update help search index files. * - * @parameter expression="${jaxx.outputHelpSearch}" default-value="${project.basedir}/target/generated-sources/help" - * @required * @since 2.0.0 */ + @Parameter(property = "jaxx.outputHelpSearch", defaultValue = "${project.basedir}/target/generated-sources/help", required = true) protected File outputHelpSearch; /** * The directory where to pick content files to generate the index. * - * @parameter expression="${jaxx.inputHelp}" default-value="${project.basedir}/src/main/help" - * @required * @since 2.0.0 */ + @Parameter(property = "jaxx.inputHelp", defaultValue = "${project.basedir}/src/main/help", required = true) protected File inputHelp; protected String timestamp; Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java 2012-07-05 16:08:02 UTC (rev 2383) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java 2012-07-05 16:08:24 UTC (rev 2384) @@ -29,11 +29,11 @@ import jaxx.compiler.CompilerConfiguration; import jaxx.compiler.I18nHelper; import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.finalizers.JAXXCompilerFinalizer; import jaxx.compiler.JAXXEngine; import jaxx.compiler.JAXXFactory; import jaxx.compiler.beans.BeanInfoUtil; import jaxx.compiler.binding.DataBindingHelper; +import jaxx.compiler.finalizers.JAXXCompilerFinalizer; import jaxx.compiler.spi.DefaultInitializer; import jaxx.compiler.spi.Initializer; import jaxx.runtime.JAXXContext; @@ -42,6 +42,11 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.nuiton.i18n.I18n; import org.nuiton.io.MirroredFileUpdater; import org.nuiton.plugin.PluginHelper; @@ -59,158 +64,139 @@ * Generates some java code from jaxx files. * * @author tchemit <chemit(a)codelutin.com> - * @goal generate - * @phase process-sources - * @requiresDependencyResolution compile - * @requiresProject */ +@Mojo(name = "generate", defaultPhase = LifecyclePhase.PROCESS_SOURCES, + requiresDependencyResolution = ResolutionScope.COMPILE, requiresProject = true) public class GenerateMojo extends AbstractJaxxMojo implements CompilerConfiguration { /** Default includes to use, if none provided */ private static final String[] INCLUDES = {"**/*.jaxx", "**/*.css"}; /** - * Repertoire sources des fichiers jaxx a generer. - * - * @parameter expression="${jaxx.src}" default-value="${basedir}/src/main/java" + * Directory where jaxx files are located. */ + @Parameter(property = "jaxx.src", defaultValue = "${basedir}/src/main/java") protected File src; /** - * Repertoire de destination des fichiers java a generer. - * - * @parameter expression="${jaxx.outJava}" default-value="${basedir}/target/generated-sources/java" + * Where to generate java files. */ + @Parameter(property = "jaxx.outJava", defaultValue = "${basedir}/target/generated-sources/java") protected File outJava; /** - * pour filter les fichiers a traiter - * - * @parameter expression="${jaxx.includes}" + * To filter file to treat. */ + @Parameter(property = "jaxx.includes") protected String[] includes; /** - * pour filter les fichiers a ne pas traiter - * - * @parameter expression="${jaxx.excludes}" + * To filter files to NOt treat. */ + @Parameter(property = "jaxx.excludes") protected String[] excludes; /** - * Le compilateur à utiliser (par défaut celui de Swing) - * - * @parameter expression="${jaxx.compilerFQN}" default-value="jaxx.compiler.JAXXCompiler" + * FQN of compiler to use (by default swing one). */ + @Parameter(property = "jaxx.compilerFQN", defaultValue = "jaxx.compiler.JAXXCompiler", required = true) protected String compilerFQN; /** - * the name of implementation of {@link JAXXContext}to be used on {@link - * JAXXObject}. + * The name of implementation of {@link JAXXContext}to be used on {@link JAXXObject}. * * Must not be abstract. - * - * @parameter expression="${jaxx.jaxxContextFQN}" default-value="jaxx.runtime.context.DefaultJAXXContext" - * @required */ + @Parameter(property = "jaxx.jaxxContextFQN", defaultValue = "jaxx.runtime.context.DefaultJAXXContext", required = true) protected String jaxxContextFQN; /** - * the FQN of the ui to use for error notification. + * The FQN of the ui to use for error notification. * * If not given, will use the one defined in validator - * - * @parameter expression="${jaxx.defaultErrorUIFQN}" */ + @Parameter(property = "jaxx.defaultErrorUIFQN") protected String defaultErrorUIFQN; /** - * the FQN of the ui to use for error notification. + * The FQN of the ui to use for error notification. * * If not given, will use the one defined in validator * - * @parameter expression="${jaxx.defaultDecoratorFQN}" - * default-value="jaxx.compiler.decorators.DefaultCompiledObjectDecorator" * @see CompiledObjectDecorator */ + @Parameter(property = "jaxx.defaultDecoratorFQN", defaultValue = "jaxx.compiler.decorators.DefaultCompiledObjectDecorator") protected String defaultDecoratorFQN; /** - * flag to include in compiler classpath the java sources directories (src + * Flag to include in compiler classpath the java sources directories (src * and outJava). * * By default, false. - * - * @parameter expression="${jaxx.addSourcesToClassPath}" - * default-value="false" */ + @Parameter(property = "jaxx.addSourcesToClassPath", defaultValue = "false") protected boolean addSourcesToClassPath; /** - * flag to include in compiler classpath the java resources directories (src + * Flag to include in compiler classpath the java resources directories (src * and outJava). * * By default, false. * - * @parameter expression="${jaxx.addResourcesToClassPath}" - * default-value="false" * @since 1.6.0 */ + @Parameter(property = "jaxx.addResourcesToClassPath", defaultValue = "false") protected boolean addResourcesToClassPath; /** - * flag to include in compiler classpath the compile class-path (can only be + * Flag to include in compiler classpath the compile class-path (can only be * used in a test phase). * * By default, false. * - * @parameter expression="${jaxx.addCompileClassPath}" - * default-value="false" * @since 1.6.0 */ + @Parameter(property = "jaxx.addCompileClassPath", defaultValue = "false") protected boolean addCompileClassPath; /** - * flag to include in compiler classpath the project compile classpath. + * Flag to include in compiler classpath the project compile classpath. * * By default, false. - * - * @parameter expression="${jaxx.addProjectClassPath}" - * default-value="false" */ + @Parameter(property = "jaxx.addProjectClassPath", defaultValue = "false") protected boolean addProjectClassPath; /** - * A flag to mark themojo to be used in a test phase. This will permits to + * A flag to mark the mojo to be used in a test phase. This will permits to * add generated sources in test compile roots. * - * @parameter expression="${jaxx.testPhase}" default-value="false" * @since 1.6.0 */ + @Parameter(property = "jaxx.testPhase", defaultValue = "false") protected boolean testPhase; /** - * to make compiler i18nable, says add the {@link I18n#_(String, Object...)} + * To make compiler i18nable, says add the {@link I18n#_(String, Object...)} * method invocation on {@link I18nHelper#I18N_ATTRIBUTES} attributes. * - * @parameter expression="${jaxx.i18nable}" default-value="true" * @see I18nHelper */ + @Parameter(property = "jaxx.i18nable", defaultValue = "true") protected boolean i18nable; /** - * pour optimizer le code compile ou genere ? - * - * @parameter expression="${jaxx.optimize}" default-value="false" + * To optimize generated code. */ + @Parameter(property = "jaxx.optimize", defaultValue = "false") protected boolean optimize; /** * To auto import css files for a jaxx file. * - * @parameter expression="${jaxx.autoImportCss}" default-value="false" * @since 2.0.2 */ + @Parameter(property = "jaxx.autoImportCss", defaultValue = "false") protected boolean autoImportCss; /** @@ -220,31 +206,29 @@ * Warning: This option will be removed in version 3.0 or at least * default value will become {@code false}. * - * @parameter expression="${jaxx.autoRecurseInCss}" default-value="true" * @since 2.0.2 */ + @Parameter(property = "jaxx.autoRecurseInCss", defaultValue = "true") protected boolean autoRecurseInCss; /** - * flag to add logger to each generated jaxx file. + * Flag to add logger to each generated jaxx file. * * By default, always add it. - * - * @parameter expression="${jaxx.addLogger}" default-value="true" */ + @Parameter(property = "jaxx.addLogger", defaultValue = "true") protected boolean addLogger; /** - * flag to keep compilers after the generate operation (usefull for tests. + * Flag to keep compilers after the generate operation (usefull for tests. * * By default, always reset. - * - * @parameter expression="${jaxx.resetAfterCompile}" default-value="true" */ + @Parameter(property = "jaxx.resetAfterCompile", defaultValue = "true") protected boolean resetAfterCompile; /** - * extra path to be added in {@link Introspector#setBeanInfoSearchPath(String[])}. + * Extra path to be added in {@link Introspector#setBeanInfoSearchPath(String[])}. * * add beanInfoSearchPath to be registred by {@link BeanInfoUtil#addJaxxBeanInfoPath(String...)} * @@ -252,33 +236,28 @@ * * * This permit to use real beanInfo of imported graphic libraries. - * - * @parameter expression="${jaxx.beanInfoSearchPath}" */ + @Parameter(property = "jaxx.beanInfoSearchPath") protected String[] beanInfoSearchPath; /** - * list of fqn of class toimport for all generated jaxx files - * - * @parameter expression="${jaxx.extraImportList}" + * List of fqn of class toimport for all generated jaxx files. */ + @Parameter(property = "jaxx.extraImportList") protected String extraImportList; /** - * a flag to use UIManager to retreave icons. - * - * @parameter expression="${jaxx.useUIManagerForIcon}" - * default-value="false" + * A flag to use UIManager to retreave icons. */ + @Parameter(property = "jaxx.useUIManagerForIcon", defaultValue = "false") protected boolean useUIManagerForIcon; /** * flag to activate profile mode. * * By default, not active. - * - * @parameter expression="${jaxx.profile}" default-value="false" */ + @Parameter(property = "jaxx.profile", defaultValue = "false") protected boolean profile; /** @@ -286,9 +265,9 @@ * * By default, do not show them. * - * @parameter expression="${jaxx.showBinding}" default-value="false" * @since 2.0.0 */ + @Parameter(property = "jaxx.showBinding", defaultValue = "false") protected boolean showBinding; /** @@ -296,9 +275,9 @@ * * By default, use the JAXX implementation {@link JAXXHelpBroker}. * - * @parameter expression="${jaxx.helpBrokerFQN}" default-value="jaxx.runtime.swing.help.JAXXHelpBroker" * @since 1.3 */ + @Parameter(property = "jaxx.helpBrokerFQN", defaultValue = "jaxx.runtime.swing.help.JAXXHelpBroker") protected String helpBrokerFQN; /** @@ -306,11 +285,35 @@ * * By default, do not trace it. * - * @parameter expression="${jaxx.showClassDescriptorLoading}" default-value="false" * @since 2.4 */ + @Parameter(property = "jaxx.showClassDescriptorLoading", defaultValue = "false") private boolean showClassDescriptorLoading; + /** + * Decorators available in engine. + * + * @since 2.0.2 + */ + @Component(role = CompiledObjectDecorator.class) + protected Map<String, CompiledObjectDecorator> decorators; + + /** + * Finalizers available in engine. + * + * @since 2.0.2 + */ + @Component(role = JAXXCompilerFinalizer.class) + protected Map<String, JAXXCompilerFinalizer> finalizers; + + /** + * Initializers available to init engine. + * + * @since 2.0.2 + */ + @Component(role = Initializer.class) + protected Map<String, Initializer> initializers; + /** detected jaxx files in {@link #init()} method */ protected String[] files; @@ -342,30 +345,6 @@ /** customized classloader to use in engine */ protected ClassLoader cl; - /** - * decorators available in engine. - * - * @component role="jaxx.compiler.CompiledObjectDecorator" - * @since 2.0.2 - */ - protected Map<String, CompiledObjectDecorator> decorators; - - /** - * Finalizers available in engine. - * - * @component role="jaxx.compiler.finalizers.JAXXCompilerFinalizer" - * @since 2.0.2 - */ - protected Map<String, JAXXCompilerFinalizer> finalizers; - - /** - * initializers availables to init engine. - * - * @component role="jaxx.compiler.spi.Initializer" - * @since 2.0.2 - */ - protected Map<String, Initializer> initializers; - /** JAXX engine */ private JAXXEngine engine;

1 0

r2383 - in trunk: . jaxx-maven-plugin
by tchemit＠users.nuiton.org July 5, 2012

July 5, 2012

Author: tchemit Date: 2012-07-05 18:08:02 +0200 (Thu, 05 Jul 2012) New Revision: 2383 Url: http://nuiton.org/repositories/revision/jaxx/2383 Log: refs #2166: Updates to mavenpom 3.3.4 fixes #2167: Updates to eugene 2.4.2 fixes #2168: Updates to maven-verifier 1.3 fixes #2169: Updates to plexus-utils 3.0.1 Modified: trunk/jaxx-maven-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2012-07-05 14:56:58 UTC (rev 2382) +++ trunk/jaxx-maven-plugin/pom.xml 2012-07-05 16:08:02 UTC (rev 2383) @@ -24,7 +24,9 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -76,6 +78,11 @@ <artifactId>maven-project</artifactId> </dependency> + <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + </dependency> +  <dependency> @@ -92,7 +99,7 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> - + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> @@ -107,7 +114,7 @@ <groupId>javax.help</groupId> <artifactId>javahelp</artifactId> </dependency> - +  <dependency> <groupId>com.sun</groupId> @@ -145,11 +152,11 @@ </dependency>  - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <scope>compile</scope> + </dependency> <dependency> <groupId>log4j</groupId> @@ -175,36 +182,30 @@ <packaging>maven-plugin</packaging> - <profiles> -  - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> + <build> + <plugins> - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>helpmojo</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <configuration> + <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> + </configuration> + <executions> + <execution> + <goals> + <goal>helpmojo</goal> + <goal>descriptor</goal> + </goals> + </execution> + </executions> + </plugin> - </plugins> + </plugins> - </build> - </profile> + </build> -  + <profiles> + <profile> <id>reporting</id> <activation> @@ -222,6 +223,35 @@ <version>${pluginPluginVersion}</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadocPluginVersion}</version> + <configuration> + <quiet>true</quiet> + <tagletArtifacts> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>${pluginPluginVersion}</version> + </tagletArtifact> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-javadoc</artifactId> + <version>1.5.5</version> + </tagletArtifact> + </tagletArtifacts> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>javadoc</report> + <report>test-javadoc</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> </reporting> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-05 14:56:58 UTC (rev 2382) +++ trunk/pom.xml 2012-07-05 16:08:02 UTC (rev 2383) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.3</version> + <version>3.3.4-SNAPSHOT</version> </parent> <artifactId>jaxx</artifactId> @@ -109,12 +109,11 @@ <projectId>jaxx</projectId> <nuitonUtilsVersion>2.5</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <eugeneVersion>2.3.2</eugeneVersion> + <eugeneVersion>2.4.2</eugeneVersion> <xworkVersion>2.3.1.2</xworkVersion> <jxLayerVersion>3.0.4</jxLayerVersion> <javaHelpVersion>2.0.05</javaHelpVersion> <swingXVersion>1.6.2-2</swingXVersion> - <jrstPluginVersion>2.0.1</jrstPluginVersion>  <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -174,6 +173,10 @@ <artifactId>jaxen</artifactId> </exclusion> <exclusion> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + </exclusion> + <exclusion> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> </exclusion> @@ -349,12 +352,6 @@ </dependency>  -  - <dependency> <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> @@ -396,10 +393,18 @@ </exclusions> </dependency> +  <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + <version>${pluginPluginVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-verifier</artifactId> - <version>1.0</version> + <version>1.3</version> <scope>test</scope> </dependency> @@ -442,7 +447,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>1.5.15</version> + <version>3.0.1</version> <scope>compile</scope> </dependency>

1 0