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

r2364 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing
by sletellier＠users.nuiton.org 02 Jul '12

02 Jul '12

Author: sletellier Date: 2012-07-02 14:59:47 +0200 (Mon, 02 Jul 2012) New Revision: 2364 Url: http://nuiton.org/repositories/revision/jaxx/2364 Log: Fix layout Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx 2012-07-02 11:04:41 UTC (rev 2363) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx 2012-07-02 12:59:47 UTC (rev 2364) @@ -27,7 +27,7 @@ </import> <row> - <cell fill='both' weightx='1' weighty='1'> + <cell fill='both' weightx='0.5' weighty='1'> <JList id='from' model='{fromModel}' selectionModel='{fromModel}' @@ -52,15 +52,12 @@ </JToolBar> </cell> - <cell fill='both' weightx='1' weighty='1'> - <JScrollPane id='listPane'> - <JList id='to' - model='{toModel}' - selectionModel='{toModel}' - font-size='11' - onMouseClicked='if (event.getClickCount()==2) { remove(); }' - cellRenderer='{getRenderer()}'/> - </JScrollPane> + <cell fill='both' weightx='0.5' weighty='1'> + <JList id='to' + model='{toModel}' + selectionModel='{toModel}' + onMouseClicked='if (event.getClickCount()==2) { remove(); }' + cellRenderer='{getRenderer()}'/> </cell> </row> </ListSelector> \ No newline at end of file

1 0

r2363 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing
by sletellier＠users.nuiton.org 02 Jul '12

02 Jul '12

Author: sletellier Date: 2012-07-02 13:04:41 +0200 (Mon, 02 Jul 2012) New Revision: 2363 Url: http://nuiton.org/repositories/revision/jaxx/2363 Log: Fix list selector Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx 2012-07-02 10:51:21 UTC (rev 2362) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx 2012-07-02 11:04:41 UTC (rev 2363) @@ -121,9 +121,7 @@ protected Collection moveSelect(GenericListModel from, GenericListModel to) { Collection selectedValues = Lists.newArrayList(from.getSelectedValues()); - if (model == null) { - from.removeElements(selectedValues); - } + from.removeElements(selectedValues); to.addElements(selectedValues); return selectedValues; }

1 0

r2362 - in trunk: jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor jaxx-runtime/src/main/java/jaxx/runtime/swing/model jaxx-widgets/src/main/java/jaxx/runtime/swing src/site/rst
by sletellier＠users.nuiton.org 02 Jul '12

02 Jul '12

Author: sletellier Date: 2012-07-02 12:51:21 +0200 (Mon, 02 Jul 2012) New Revision: 2362 Url: http://nuiton.org/repositories/revision/jaxx/2362 Log: - refs #2146 : Add widget to select values in list - Add genericListListener - Introduce ListSelectorModel Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListEvent.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListListener.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorModel.java Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx trunk/src/site/rst/tutoriels.rst 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-06-30 00:38:05 UTC (rev 2361) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx 2012-07-02 10:51:21 UTC (rev 2362) @@ -31,6 +31,7 @@ jaxx.demo.entities.DemoDataProvider jaxx.demo.entities.DemoDecoratorProvider jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer + java.util.Collection </import> <ListCellRenderer id='listCellRenderer' initializer='new DecoratorProviderListCellRenderer(new DemoDecoratorProvider())'/> @@ -40,9 +41,9 @@ <String id='removeToolTip' javaBean='"Remove"'/> <script><![CDATA[ -public List<People> getSelectedActors() { +public List<People> getActors(Collection<Movie> movies) { List<People> actors = Lists.newArrayList(); - for (Movie m : comboToListSelector.getSelectedValues()) { + for (Movie m : movies) { List<People> actorsToAdd = m.getActors(); actors.removeAll(actorsToAdd); actors.addAll(actorsToAdd); @@ -81,8 +82,8 @@ removeToolTip='{getRemoveToolTip()}' values='{dataProvider.getMovies()}' renderer='{listCellRenderer}' - onIntervalAdded='listToListSelector.setValues(getSelectedActors())' - onIntervalRemoved='listToListSelector.setValues(getSelectedActors())'/> + onValuesAdded='listToListSelector.setValues(getActors(comboToListSelector.getSelectedValues()))' + onValuesRemoved='listToListSelector.setValues(getActors(comboToListSelector.getSelectedValues()))'/> </JScrollPane> </cell> </row> Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListEvent.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListEvent.java (rev 0) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListEvent.java 2012-07-02 10:51:21 UTC (rev 2362) @@ -0,0 +1,44 @@ +/* + * #%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 java.util.Collection; +import java.util.EventObject; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public class GenericListEvent extends EventObject { + + protected Collection values; + + public GenericListEvent(Object source, Collection values) { + super(source); + this.values = values; + } + + public Collection getValues() { + return values; + } +} Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListListener.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListListener.java (rev 0) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListListener.java 2012-07-02 10:51:21 UTC (rev 2362) @@ -0,0 +1,40 @@ +/* + * #%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 java.util.EventListener; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public interface GenericListListener extends EventListener { + + void valuesAdded(GenericListEvent event); + + void valuesRemoved(GenericListEvent event); + + void selectionAdded(GenericListEvent event); + + void selectionRemoved(GenericListEvent event); +} 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-06-30 00:38:05 UTC (rev 2361) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java 2012-07-02 10:51:21 UTC (rev 2362) @@ -26,10 +26,12 @@ 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.ComboBoxModel; import javax.swing.DefaultListModel; import javax.swing.DefaultListSelectionModel; +import javax.swing.event.EventListenerList; import javax.swing.event.ListDataListener; /** @@ -37,6 +39,7 @@ */ public class GenericListModel extends DefaultListSelectionModel implements ComboBoxModel { + protected EventListenerList listenerList = new EventListenerList(); protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); public static final String PROPERTY_SELECTED_VALUE = "selectedValues"; @@ -49,21 +52,32 @@ this.selectedValues = Lists.newArrayList(); } - public void setElements(List values) { + public void setElements(Collection values) { + Collection oldValues = getElements(); + Collection oldSelectedValues = getSelectedValues(); clearSelection(); + fireSelectionRemoved(oldSelectedValues); + clearElements(); + fireValuesRemoved(oldValues); + for (B value : values) { - addElement(value); + delegate.addElement(value); } + + fireSelectionAdded(values); } public void clearElements() { + Collection elements = getElements(); delegate.clear(); + + fireValuesRemoved(elements); } - public List getElements() { + public Collection getElements() { int size = delegate.getSize(); - List result = Lists.newArrayList(); + Collection result = Lists.newArrayList(); for (int i=0;i<size;i++) { result.add((B) delegate.get(i)); } @@ -72,50 +86,63 @@ public void addElement(int index, B valueToAdd) { delegate.add(index, valueToAdd); + + fireValuesAdded(Lists.newArrayList(valueToAdd)); } public void addElement(B valueToAdd) { delegate.addElement(valueToAdd); + + fireValuesAdded(Lists.newArrayList(valueToAdd)); } - public void addElements(List valuesToAdd) { + public void addElements(Collection valuesToAdd) { for (B value : valuesToAdd) { - addElement(value); + delegate.addElement(value); } + + fireValuesAdded(valuesToAdd); } - public List getSelectedValues() { + public Collection getSelectedValues() { return Lists.newArrayList(selectedValues); } - public void removeElements(List values) { + public void removeElements(Collection values) { for (B value : values) { delegate.removeElement(value); } unSelectItems(values); + + fireValuesRemoved(values); } - protected void unSelectItems(List values) { - List oldValue = Lists.newArrayList(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) { - List oldValue = Lists.newArrayList(selectedValues); + 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) { - List oldValue = Lists.newArrayList(selectedValues); + 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); } @@ -125,25 +152,38 @@ @Override public void addSelectionInterval(int index0, int index1) { - List oldValue = Lists.newArrayList(selectedValues); + 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) { - List oldValue = Lists.newArrayList(selectedValues); + 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) { - List oldValue = Lists.newArrayList(selectedValues); + Collection oldValue = Lists.newArrayList(selectedValues); removeSelectionIntervalWithoutFire(index0, index1); + + Collection newValue = Lists.newArrayList(selectedValues); + newValue.removeAll(oldValue); + fireSelectionRemoved(newValue); firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); } @@ -178,9 +218,11 @@ @Override public void clearSelection() { - List oldValue = Lists.newArrayList(selectedValues); + Collection oldValue = Lists.newArrayList(selectedValues); selectedValues.clear(); super.clearSelection(); + + fireSelectionRemoved(oldValue); firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); } @@ -191,8 +233,12 @@ @Override public void setSelectedItem(Object anItem) { - List oldValue = this.selectedValues; + Collection oldValue = this.selectedValues; + fireSelectionRemoved(selectedValues); + selectedValues = Lists.newArrayList((B)anItem); + + fireSelectionAdded(selectedValues); firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); } @@ -224,6 +270,14 @@ delegate.removeListDataListener(l); } + 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); } @@ -240,6 +294,74 @@ pcs.removePropertyChangeListener(propertyName, listener); } + 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); + } + } + } + protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { pcs.firePropertyChange(propertyName, oldValue, newValue); } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx 2012-06-30 00:38:05 UTC (rev 2361) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx 2012-07-02 10:51:21 UTC (rev 2362) @@ -34,16 +34,24 @@ java.beans.PropertyChangeListener javax.swing.event.ListDataListener jaxx.runtime.swing.model.GenericListModel + jaxx.runtime.swing.model.GenericListListener + java.util.Collection </import> <String id='addToolTip' javaBean='"+"'/> <String id='removeToolTip' javaBean='"-"'/> + <ListSelectorModel id='model' + genericType='B' + javaBean='null'/> + <GenericListModel id='fromModel' + elements='{model.getValues()}' genericType='B'/> <GenericListModel id='toModel' + elements='{model.getSelectedValues()}' genericType='B'/> <Boolean id='addEnabled' javaBean='Boolean.FALSE'/> @@ -68,44 +76,64 @@ }); } -public void setValues(List values) { +public void addValues(Collection values) { + toModel.removeElements(values); + fromModel.removeElements(values); + fromModel.addElements(values); +} + +public void removeValues(Collection values) { + toModel.removeElements(values); + fromModel.removeElements(values); +} + +public void setValues(Collection values) { toModel.clearElements(); fromModel.setElements(values); } -public List getValues() { +public Collection getValues() { return fromModel.getElements(); } -public void setSelectedValues(List selectedValues) { +public void setSelectedValues(Collection selectedValues) { fromModel.removeElements(selectedValues); toModel.setElements(selectedValues); } -public List getSelectedValues() { +public Collection getSelectedValues() { return toModel.getElements(); } public void add() { - moveSelect(fromModel, toModel); + Collection selectedValues = moveSelect(fromModel, toModel); + if (model != null) { + model.add(selectedValues); + } } public void remove() { - moveSelect(toModel, fromModel); + Collection selectedValues = moveSelect(toModel, fromModel); + if (model != null) { + model.remove(selectedValues); + } } -protected void moveSelect(GenericListModel from, GenericListModel to) { - List selectedValues = from.getSelectedValues(); - from.removeElements(selectedValues); +protected Collection moveSelect(GenericListModel from, GenericListModel to) { + Collection selectedValues = Lists.newArrayList(from.getSelectedValues()); + if (model == null) { + from.removeElements(selectedValues); + } to.addElements(selectedValues); + return selectedValues; } -public void addListDataListener(ListDataListener l) { - toModel.addListDataListener(l); +public void addGenericListListener(GenericListListener l) { + toModel.addGenericListListener(l); } -public void removeListDataListener(ListDataListener l) { - toModel.removeListDataListener(l); +public void removeGenericListListener(GenericListListener l) { + toModel.removeGenericListListener(l); } ]]> </script> Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorModel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorModel.java (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorModel.java 2012-07-02 10:51:21 UTC (rev 2362) @@ -0,0 +1,90 @@ +/* + * #%L + * JAXX :: Widgets + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package jaxx.runtime.swing; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.util.Collection; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public abstract class ListSelectorModel { + + protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); + + public static final String PROPERTY_SELECTED_VALUES = "selectedValues"; + public static final String PROPERTY_VALUES = "values"; + + protected Collection values; + protected Collection selectedValues; + + public Collection getValues() { + return values; + } + + public void setValues(Collection values) { + Collection oldValues = getValues(); + this.values = values; + firePropertyChange(PROPERTY_VALUES, oldValues, values); + } + + public Collection getSelectedValues() { + return selectedValues; + } + + public void setSelectedValues(Collection selectedValues) { + Collection oldValue = getSelectedValues(); + this.selectedValues = selectedValues; + firePropertyChange(PROPERTY_SELECTED_VALUES, oldValue, selectedValues); + } + + public abstract void add(Collection values); + + public abstract void remove(Collection values); + + 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); + } + + protected void fireIndexedPropertyChange(String propertyName, int index, Object oldValue, Object newValue) { + pcs.fireIndexedPropertyChange(propertyName, index, oldValue, newValue); + } +} Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx 2012-06-30 00:38:05 UTC (rev 2361) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx 2012-07-02 10:51:21 UTC (rev 2362) @@ -35,7 +35,9 @@ cellRenderer='{getRenderer()}'/> </cell> <cell anchor='north'> - <JToolBar id='actions' floatable='false' orientation='{SwingConstants.VERTICAL}'> + <JToolBar id='actions' + floatable='false' + orientation='{SwingConstants.VERTICAL}'> <JButton id="add" toolTipText='{getAddToolTip()}' actionIcon='select' Modified: trunk/src/site/rst/tutoriels.rst =================================================================== --- trunk/src/site/rst/tutoriels.rst 2012-06-30 00:38:05 UTC (rev 2361) +++ trunk/src/site/rst/tutoriels.rst 2012-07-02 10:51:21 UTC (rev 2362) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * JAXX +.. * $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% +.. - ========= Tutoriels =========

1 0

r2361 - in trunk: . src/site src/site/rst
by tchemit＠users.nuiton.org 30 Jun '12

30 Jun '12

Author: tchemit Date: 2012-06-30 02:38:05 +0200 (Sat, 30 Jun 2012) New Revision: 2361 Url: http://nuiton.org/repositories/revision/jaxx/2361 Log: use last version of jrst fix docs Added: trunk/src/site/rst/tutoriels.rst Modified: trunk/pom.xml trunk/src/site/rst/demo.rst trunk/src/site/rst/index.rst trunk/src/site/site_fr.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-29 10:01:40 UTC (rev 2360) +++ trunk/pom.xml 2012-06-30 00:38:05 UTC (rev 2361) @@ -116,9 +116,13 @@ <jxLayerVersion>3.0.4</jxLayerVersion> <javaHelpVersion>2.0.05</javaHelpVersion> <swingXVersion>1.6.2-2</swingXVersion> + <jrstPluginVersion>2.0.1-SNAPSHOT</jrstPluginVersion>  <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> + + <site.verbose>true</site.verbose> + <pdfGenerationEnabled>true</pdfGenerationEnabled> </properties> Modified: trunk/src/site/rst/demo.rst =================================================================== --- trunk/src/site/rst/demo.rst 2012-06-29 10:01:40 UTC (rev 2360) +++ trunk/src/site/rst/demo.rst 2012-06-30 00:38:05 UTC (rev 2361) @@ -32,7 +32,6 @@ `Demonstration de JAXX`_ ..Fonctionne seulement si site déployé -.. _Demonstration de JAXX: ./jaxx-demo/jnlp/launch.jnlp Cette démonstration a été réalisée en utilisant JAXX, et vous pouvez visionner tout ou partie du code source en cliquant sur l'onglet 'Sources'. @@ -55,4 +54,5 @@ .. image::demo2.png :width:800px - \ No newline at end of file + +.. _Demonstration de JAXX: ./jaxx-demo/jnlp/launch.jnlp Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-06-29 10:01:40 UTC (rev 2360) +++ trunk/src/site/rst/index.rst 2012-06-30 00:38:05 UTC (rev 2361) @@ -52,11 +52,11 @@ Pour plus d'information sur comment utiliser le plugin, veuillez visiter la `page des goals`_ -Suppression des tutoriaux +Suppression des tutoriels _________________________ -La maintenance des tutoriaux est compliquée, nous les désactivons dans cette version, il seront remplacés -bientôt par des articles sur notre blog. +La maintenance des tutoriels est compliquée, nous les désactivons dans cette version, il seront remplacés +bientôt par des articles sur notre blog (voir page `tutoriels`_). Nouveautés de la version 2.4 ---------------------------- @@ -215,7 +215,7 @@ Cette évolution admet une restriction : si on veut surcharger un component swing, on DOIT alors toujours lui préciser un initializer, sinon le component surchargé ne sera pas généré et à l'exécution on risque d'avoir un - *ClassCastException* si le type n'est pas le même. + *ClassCastException* si le type n'est pas le même. Une documentation plus détaillée sur le mécanisme d'héritage sera écrite pour la version 2.2. @@ -350,4 +350,6 @@ .. _eugene: http://maven-site.nuiton.org/eugene -.. _page des goals: ./jaxx-maven-plugin/plugin-info.html \ No newline at end of file +.. _page des goals: ./jaxx-maven-plugin/plugin-info.html + +.. _tutoriels: ./tutoriels.html \ No newline at end of file Added: trunk/src/site/rst/tutoriels.rst =================================================================== --- trunk/src/site/rst/tutoriels.rst (rev 0) +++ trunk/src/site/rst/tutoriels.rst 2012-06-30 00:38:05 UTC (rev 2361) @@ -0,0 +1,9 @@ +========= +Tutoriels +========= + +Une série d'articles est en cours d'écriture pour remplacer les anciens tutoriels embarqués. + +Vous pourrez les lire dans la version 2.6 sur notre `blog`_. + +:: _blog: http://www.codelutin.com/tag:blogtech?do=showtag&tag=tag%3Ablogtech \ No newline at end of file Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-06-29 10:01:40 UTC (rev 2360) +++ trunk/src/site/site_fr.xml 2012-06-30 00:38:05 UTC (rev 2361) @@ -88,6 +88,7 @@ <item name="Présentation/Concept" href="presentation.html"/> <item name="Qu'est-ce qu'un fichier JAXX ?" href="JAXXFile.html"/> <item name="Démonstration" href="demo.html"/> + <item name="Tutoriels" href="tutoriels.html"/> </menu> <menu name="Fonctionalités de base">

1 0

r2360 - in trunk: jaxx-demo/src/site jaxx-tutorial-config/src/site jaxx-tutorial-css/src/site jaxx-tutorial-databinding/src/site jaxx-tutorial-helloworld/src/site jaxx-tutorial-helloworld2/src/site jaxx-tutorial-validation/src/site
by tchemit＠users.nuiton.org 29 Jun '12

29 Jun '12

Author: tchemit Date: 2012-06-29 12:01:40 +0200 (Fri, 29 Jun 2012) New Revision: 2360 Url: http://nuiton.org/repositories/revision/jaxx/2360 Log: refs #2148: fix logo urls Modified: trunk/jaxx-demo/src/site/site_fr.xml trunk/jaxx-tutorial-config/src/site/site_fr.xml trunk/jaxx-tutorial-css/src/site/site_fr.xml trunk/jaxx-tutorial-databinding/src/site/site_fr.xml trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml trunk/jaxx-tutorial-validation/src/site/site_fr.xml Modified: trunk/jaxx-demo/src/site/site_fr.xml =================================================================== --- trunk/jaxx-demo/src/site/site_fr.xml 2012-06-29 10:00:51 UTC (rev 2359) +++ trunk/jaxx-demo/src/site/site_fr.xml 2012-06-29 10:01:40 UTC (rev 2360) @@ -33,7 +33,7 @@ <poweredBy> <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" - img="http://maven-site.chorem.org/public/images/logos/jaxx-logos.png"/> + img="http://maven-site.chorem.org/public/images/logos/jaxx-logo.png"/> </poweredBy> <body> Modified: trunk/jaxx-tutorial-config/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-config/src/site/site_fr.xml 2012-06-29 10:00:51 UTC (rev 2359) +++ trunk/jaxx-tutorial-config/src/site/site_fr.xml 2012-06-29 10:01:40 UTC (rev 2360) @@ -34,7 +34,7 @@ <poweredBy> <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" - img="http://maven-site.chorem.org/public/images/logos/jaxx-logos.png"/> + img="http://maven-site.chorem.org/public/images/logos/jaxx-logo.png"/> </poweredBy> <body> Modified: trunk/jaxx-tutorial-css/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-css/src/site/site_fr.xml 2012-06-29 10:00:51 UTC (rev 2359) +++ trunk/jaxx-tutorial-css/src/site/site_fr.xml 2012-06-29 10:01:40 UTC (rev 2360) @@ -34,7 +34,7 @@ <poweredBy> <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" - img="http://maven-site.chorem.org/public/images/logos/jaxx-logos.png"/> + img="http://maven-site.chorem.org/public/images/logos/jaxx-logo.png"/> </poweredBy> <body> Modified: trunk/jaxx-tutorial-databinding/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-databinding/src/site/site_fr.xml 2012-06-29 10:00:51 UTC (rev 2359) +++ trunk/jaxx-tutorial-databinding/src/site/site_fr.xml 2012-06-29 10:01:40 UTC (rev 2360) @@ -34,7 +34,7 @@ <poweredBy> <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" - img="http://maven-site.chorem.org/public/images/logos/jaxx-logos.png"/> + img="http://maven-site.chorem.org/public/images/logos/jaxx-logo.png"/> </poweredBy> <body> Modified: trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml 2012-06-29 10:00:51 UTC (rev 2359) +++ trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml 2012-06-29 10:01:40 UTC (rev 2360) @@ -34,7 +34,7 @@ <poweredBy> <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" - img="http://maven-site.chorem.org/public/images/logos/jaxx-logos.png"/> + img="http://maven-site.chorem.org/public/images/logos/jaxx-logo.png"/> </poweredBy> <body> Modified: trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml 2012-06-29 10:00:51 UTC (rev 2359) +++ trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml 2012-06-29 10:01:40 UTC (rev 2360) @@ -34,7 +34,7 @@ <poweredBy> <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" - img="http://maven-site.chorem.org/public/images/logos/jaxx-logos.png"/> + img="http://maven-site.chorem.org/public/images/logos/jaxx-logo.png"/> </poweredBy> <body> Modified: trunk/jaxx-tutorial-validation/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-validation/src/site/site_fr.xml 2012-06-29 10:00:51 UTC (rev 2359) +++ trunk/jaxx-tutorial-validation/src/site/site_fr.xml 2012-06-29 10:01:40 UTC (rev 2360) @@ -35,7 +35,7 @@ <poweredBy> <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" - img="http://maven-site.chorem.org/public/images/logos/jaxx-logos.png"/> + img="http://maven-site.chorem.org/public/images/logos/jaxx-logo.png"/> </poweredBy> <body>

1 0

r2359 - in trunk: jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor jaxx-demo/src/main/java/jaxx/demo/feature/nav jaxx-widgets/src/main/java/jaxx/runtime/swing
by sletellier＠users.nuiton.org 29 Jun '12

29 Jun '12

Author: sletellier Date: 2012-06-29 12:00:51 +0200 (Fri, 29 Jun 2012) New Revision: 2359 Url: http://nuiton.org/repositories/revision/jaxx/2359 Log: - Fix generic in listSelector - Clear selection on setValues on listSelector - Remove moved source in NavDemo Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.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-06-29 09:48:13 UTC (rev 2358) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx 2012-06-29 10:00:51 UTC (rev 2359) @@ -42,7 +42,7 @@ <script><![CDATA[ public List<People> getSelectedActors() { List<People> actors = Lists.newArrayList(); - for (Movie m : (List<Movie>)comboToListSelector.getSelectedValues()) { + for (Movie m : comboToListSelector.getSelectedValues()) { List<People> actorsToAdd = m.getActors(); actors.removeAll(actorsToAdd); actors.addAll(actorsToAdd); Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx 2012-06-29 09:48:13 UTC (rev 2358) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx 2012-06-29 10:00:51 UTC (rev 2359) @@ -48,7 +48,6 @@ protected String[] getSources() { return new String[]{ getDefaultSource(), "NavDemoHandler.java", - "NavDemoDataProvider.java", "tree/NavDemoTreeNode.java", "tree/NavDemoTreeHelper.java", "tree/NavDemoTreeCellRenderer.java", Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.jaxx 2012-06-29 09:48:13 UTC (rev 2358) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.jaxx 2012-06-29 10:00:51 UTC (rev 2359) @@ -21,7 +21,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<ListSelector genericType='B'> +<ListSelector genericType='B' superGenericType='B'> <row> <cell fill='horizontal' weightx='1' anchor="west"> <JComboBox id='from' Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx 2012-06-29 09:48:13 UTC (rev 2358) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx 2012-06-29 10:00:51 UTC (rev 2359) @@ -69,7 +69,7 @@ } public void setValues(List values) { - toModel.removeElements(values); + toModel.clearElements(); fromModel.setElements(values); } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx 2012-06-29 09:48:13 UTC (rev 2358) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx 2012-06-29 10:00:51 UTC (rev 2359) @@ -21,7 +21,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<ListSelector genericType='B'> +<ListSelector genericType='B' superGenericType='B'> <import> javax.swing.SwingConstants </import>

1 0

r2358 - trunk/jaxx-widgets/src/main/resources/icons
by sletellier＠users.nuiton.org 29 Jun '12

29 Jun '12

Author: sletellier Date: 2012-06-29 11:48:13 +0200 (Fri, 29 Jun 2012) New Revision: 2358 Url: http://nuiton.org/repositories/revision/jaxx/2358 Log: Dont rename icons !!! Added: trunk/jaxx-widgets/src/main/resources/icons/action-add.png trunk/jaxx-widgets/src/main/resources/icons/action-remove.png Added: trunk/jaxx-widgets/src/main/resources/icons/action-add.png =================================================================== (Binary files differ) Property changes on: trunk/jaxx-widgets/src/main/resources/icons/action-add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/jaxx-widgets/src/main/resources/icons/action-remove.png =================================================================== (Binary files differ) Property changes on: trunk/jaxx-widgets/src/main/resources/icons/action-remove.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r2357 - in trunk: . jaxx-compiler/src/site jaxx-demo/src/site jaxx-demo/src/site/rst jaxx-demo/src/site/rst/images jaxx-maven-plugin/src/site jaxx-runtime/src/site jaxx-swing-action/src/site jaxx-tutorial/src/site jaxx-tutorial-config/src/site jaxx-tutorial-css/src/site jaxx-tutorial-databinding/src/site jaxx-tutorial-helloworld/src/site jaxx-tutorial-helloworld2/src/site jaxx-tutorial-validation/src/site jaxx-validator/src/site jaxx-widgets/src/site jaxx-widgets/src/site/rst src/site src/sit
by tchemit＠users.nuiton.org 29 Jun '12

29 Jun '12

Author: tchemit Date: 2012-06-29 11:39:27 +0200 (Fri, 29 Jun 2012) New Revision: 2357 Url: http://nuiton.org/repositories/revision/jaxx/2357 Log: fixes #2150: Jnlp demo won't works. fixes #2149: Remove tutorial as part of release build fixes #2148: Use now fluido for generated site Added: trunk/jaxx-validator/src/site/rst/ Removed: trunk/jaxx-demo/src/site/rst/images/webstart.gif trunk/jaxx-validator/src/site/apt/ trunk/jaxx-widgets/src/site/rst/images/ trunk/src/site/resources/images/ Modified: trunk/jaxx-compiler/src/site/site_fr.xml trunk/jaxx-demo/src/site/rst/index.rst trunk/jaxx-demo/src/site/site_fr.xml trunk/jaxx-maven-plugin/src/site/site_fr.xml trunk/jaxx-runtime/src/site/site_fr.xml trunk/jaxx-swing-action/src/site/site_fr.xml trunk/jaxx-tutorial-config/src/site/site_fr.xml trunk/jaxx-tutorial-css/src/site/site_fr.xml trunk/jaxx-tutorial-databinding/src/site/site_fr.xml trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml trunk/jaxx-tutorial-validation/src/site/site_fr.xml trunk/jaxx-tutorial/src/site/site_fr.xml trunk/jaxx-validator/src/site/site_fr.xml trunk/jaxx-widgets/src/site/site_fr.xml trunk/pom.xml trunk/src/site/rst/index.rst trunk/src/site/site_fr.xml Modified: trunk/jaxx-compiler/src/site/site_fr.xml =================================================================== --- trunk/jaxx-compiler/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-compiler/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> @@ -54,7 +54,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Deleted: trunk/jaxx-demo/src/site/rst/images/webstart.gif =================================================================== (Binary files differ) Modified: trunk/jaxx-demo/src/site/rst/index.rst =================================================================== --- trunk/jaxx-demo/src/site/rst/index.rst 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-demo/src/site/rst/index.rst 2012-06-29 09:39:27 UTC (rev 2357) @@ -42,7 +42,7 @@ Screen shot ----------- -.. image:: images/Components-screenshot.gif +.. image:: ./images/Components-screenshot.gif Set it in action ---------------- @@ -62,8 +62,10 @@ .. _Java Web Start: http://java.sun.com/products/javawebstart/ -.. |webstart| image:: images/webstart.gif +.. |webstart| image:: http://maven-site.nuiton.org/public/images/logos//webstart.gif .. _following link: ./jnlp/launch.jnlp .. _Jaxx Demo webstart: jnlp-report.html + +.. _XUL Grand Coding Challenge 2004: http://xul.sourceforge.net/challenge.html Modified: trunk/jaxx-demo/src/site/site_fr.xml =================================================================== --- trunk/jaxx-demo/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-demo/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -27,12 +27,13 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> <poweredBy> - <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> + <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" + img="http://maven-site.chorem.org/public/images/logos/jaxx-logos.png"/> </poweredBy> <body> @@ -62,7 +63,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-maven-plugin/src/site/site_fr.xml =================================================================== --- trunk/jaxx-maven-plugin/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-maven-plugin/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> @@ -68,7 +68,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-runtime/src/site/site_fr.xml =================================================================== --- trunk/jaxx-runtime/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-runtime/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> @@ -58,7 +58,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-swing-action/src/site/site_fr.xml =================================================================== --- trunk/jaxx-swing-action/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-swing-action/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -85,7 +85,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-tutorial/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-tutorial/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> @@ -56,7 +56,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-tutorial-config/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-config/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-tutorial-config/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,12 +28,13 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> <poweredBy> - <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> + <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" + img="http://maven-site.chorem.org/public/images/logos/jaxx-logos.png"/> </poweredBy> <body> @@ -59,7 +60,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-tutorial-css/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-css/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-tutorial-css/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,12 +28,13 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> <poweredBy> - <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> + <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" + img="http://maven-site.chorem.org/public/images/logos/jaxx-logos.png"/> </poweredBy> <body> @@ -59,7 +60,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-tutorial-databinding/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-databinding/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-tutorial-databinding/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,12 +28,13 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> <poweredBy> - <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> + <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" + img="http://maven-site.chorem.org/public/images/logos/jaxx-logos.png"/> </poweredBy> <body> @@ -59,7 +60,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,12 +28,13 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> <poweredBy> - <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> + <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" + img="http://maven-site.chorem.org/public/images/logos/jaxx-logos.png"/> </poweredBy> <body> @@ -59,7 +60,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,12 +28,13 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> <poweredBy> - <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> + <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" + img="http://maven-site.chorem.org/public/images/logos/jaxx-logos.png"/> </poweredBy> <body> @@ -59,7 +60,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-tutorial-validation/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-validation/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-tutorial-validation/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,13 +28,14 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> <poweredBy> - <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> + <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" + img="http://maven-site.chorem.org/public/images/logos/jaxx-logos.png"/> </poweredBy> <body> @@ -60,7 +61,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-validator/src/site/site_fr.xml =================================================================== --- trunk/jaxx-validator/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-validator/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> @@ -56,7 +56,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-widgets/src/site/site_fr.xml =================================================================== --- trunk/jaxx-widgets/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-widgets/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> @@ -56,7 +56,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/pom.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -510,7 +510,8 @@ <gzip>true</gzip> <unsign>true</unsign> <canUnsign>false</canUnsign> - <pack200>true</pack200> +  +  <jnlpExtensions>  </modules> </profile> Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/src/site/rst/index.rst 2012-06-29 09:39:27 UTC (rev 2357) @@ -52,6 +52,12 @@ Pour plus d'information sur comment utiliser le plugin, veuillez visiter la `page des goals`_ +Suppression des tutoriaux +_________________________ + +La maintenance des tutoriaux est compliquée, nous les désactivons dans cette version, il seront remplacés +bientôt par des articles sur notre blog. + Nouveautés de la version 2.4 ---------------------------- Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -34,9 +34,9 @@ <custom> <fluidoSkin> - <topBarEnabled>true</topBarEnabled> + <topBarEnabled>false</topBarEnabled> <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> + <sideBarEnabled>true</sideBarEnabled> <searchEnabled>true</searchEnabled> <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> </fluidoSkin> @@ -44,7 +44,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> @@ -58,12 +58,12 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="${project.url}/images/logos/maven-feather.png"/> + img="http://maven-site.chorem.org/public/images/logos/maven-feather.png"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="${project.url}/images/jrst-logo.png"/> + img="http://maven-site.chorem.org/public/images/logos/jrst-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="${project.url}/images/restructuredtext-logo.png"/> + img="http://maven-site.chorem.org/public/images/logos/restructuredtext-logo.png"/> </poweredBy> <body> @@ -87,6 +87,7 @@ <item name="Accueil" href="index.html"/> <item name="Présentation/Concept" href="presentation.html"/> <item name="Qu'est-ce qu'un fichier JAXX ?" href="JAXXFile.html"/> + <item name="Démonstration" href="demo.html"/> </menu> <menu name="Fonctionalités de base"> @@ -107,14 +108,14 @@  </menu> - <menu name="Démo et Tutoriels"> +  <menu name="Ancienne documentation"> <item name="Migration JAXX 2.0" href="migration.html"/> @@ -133,7 +134,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}'

1 0

r2356 - in trunk/jaxx-widgets/src/main: java/jaxx/runtime/swing resources/icons
by sletellier＠users.nuiton.org 29 Jun '12

29 Jun '12

Author: sletellier Date: 2012-06-29 11:35:53 +0200 (Fri, 29 Jun 2012) New Revision: 2356 Url: http://nuiton.org/repositories/revision/jaxx/2356 Log: - rename action icons for listSelector Added: trunk/jaxx-widgets/src/main/resources/icons/action-select.png trunk/jaxx-widgets/src/main/resources/icons/action-unselect.png Removed: trunk/jaxx-widgets/src/main/resources/icons/action-add.png trunk/jaxx-widgets/src/main/resources/icons/action-remove.png Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx 2012-06-29 09:31:03 UTC (rev 2355) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx 2012-06-29 09:35:53 UTC (rev 2356) @@ -38,13 +38,13 @@ <JToolBar id='actions' floatable='false' orientation='{SwingConstants.VERTICAL}'> <JButton id="add" toolTipText='{getAddToolTip()}' - actionIcon='add' + actionIcon='select' enabled='{isAddEnabled()}' onActionPerformed='add()'/> <JButton id="remove" toolTipText='{getRemoveToolTip()}' - actionIcon='remove' + actionIcon='unselect' enabled='{isRemoveEnabled()}' onActionPerformed='remove()'/> Deleted: trunk/jaxx-widgets/src/main/resources/icons/action-add.png =================================================================== (Binary files differ) Deleted: trunk/jaxx-widgets/src/main/resources/icons/action-remove.png =================================================================== (Binary files differ) Copied: trunk/jaxx-widgets/src/main/resources/icons/action-select.png (from rev 2354, trunk/jaxx-widgets/src/main/resources/icons/action-add.png) =================================================================== (Binary files differ) Property changes on: trunk/jaxx-widgets/src/main/resources/icons/action-select.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Copied: trunk/jaxx-widgets/src/main/resources/icons/action-unselect.png (from rev 2354, trunk/jaxx-widgets/src/main/resources/icons/action-remove.png) =================================================================== (Binary files differ) Property changes on: trunk/jaxx-widgets/src/main/resources/icons/action-unselect.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r2355 - in trunk: jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor jaxx-demo/src/main/java/jaxx/demo/entities jaxx-demo/src/main/java/jaxx/demo/feature/nav jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable jaxx-demo/src/main/java/jaxx/demo/tree jaxx-runtime jaxx-runtime/src/main/java/jaxx/runtime/swing jaxx-runtime/src/main/java/jaxx/runtime/swing/model jaxx-widgets/src/main/java/jaxx/runtime/swing
by sletellier＠users.nuiton.org 29 Jun '12

29 Jun '12

Author: sletellier Date: 2012-06-29 11:31:03 +0200 (Fri, 29 Jun 2012) New Revision: 2355 Url: http://nuiton.org/repositories/revision/jaxx/2355 Log: - refs #2146 : improve listSelector widget to add event on selection change - Move GenericListModel to JaxxRuntime - Fix demo layout - Rename NavDemoDataProvider to DemoDataProvider - Move DemoDataProvider to entities package - Improve listSelectorDemo using demoDataProvider Added: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDataProvider.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java Removed: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoDataProvider.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/GenericListModel.java Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ComboEditorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/DatePickerDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/FileEditorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/ActorsTreeNodeLoador.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeHelper.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/ActorsTreeTableNodeLoador.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableHelper.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoCellRenderer.java trunk/jaxx-runtime/pom.xml trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ComboEditorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ComboEditorDemo.jaxx 2012-06-29 08:55:51 UTC (rev 2354) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ComboEditorDemo.jaxx 2012-06-29 09:31:03 UTC (rev 2355) @@ -24,14 +24,14 @@ --> -<jaxx.demo.DemoPanel> +<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> org.nuiton.i18n.LanguageEnum org.nuiton.i18n.CountryEnum </import> - <Table fill='both'> + <Table fill='both' constraints='BorderLayout.CENTER'> <row> <cell> <JLabel text='Locale editor:' labelFor='{localeEditor}'/> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/DatePickerDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/DatePickerDemo.jaxx 2012-06-29 08:55:51 UTC (rev 2354) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/DatePickerDemo.jaxx 2012-06-29 09:31:03 UTC (rev 2355) @@ -21,7 +21,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<jaxx.demo.DemoPanel> +<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> java.beans.PropertyChangeEvent @@ -59,7 +59,7 @@ } ]]></script> - <Table fill='both'> + <Table fill='both' constraints='BorderLayout.CENTER'> <row> <cell columns='2' fill='horizontal' weightx='1'> <JCheckBox id='showPopupButton' Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/FileEditorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/FileEditorDemo.jaxx 2012-06-29 08:55:51 UTC (rev 2354) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/FileEditorDemo.jaxx 2012-06-29 09:31:03 UTC (rev 2355) @@ -21,7 +21,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<jaxx.demo.DemoPanel> +<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> jaxx.runtime.swing.editor.FileEditor </import> @@ -33,7 +33,7 @@ <Boolean id='directoryEnabled' javaBean='Boolean.TRUE'/> <Boolean id='fileEnabled' javaBean='Boolean.FALSE'/> - <Table fill='both'> + <Table fill='both' constraints='BorderLayout.CENTER'> <row> <cell fill='horizontal' weightx='1'> <JLabel text='jaxxdemo.fileEditor.titleLbl'/> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx 2012-06-29 08:55:51 UTC (rev 2354) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx 2012-06-29 09:31:03 UTC (rev 2355) @@ -24,7 +24,7 @@ --> -<jaxx.demo.DemoPanel> +<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> javax.swing.border.Border jaxx.runtime.swing.editor.I18nEditor @@ -40,7 +40,7 @@ } ]]> </script> - <Table fill='both'> + <Table fill='both' constraints='BorderLayout.CENTER'> <row> <cell> <JPanel 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-06-29 08:55:51 UTC (rev 2354) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx 2012-06-29 09:31:03 UTC (rev 2355) @@ -21,34 +21,37 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<jaxx.demo.DemoPanel> +<jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> jaxx.runtime.swing.ListSelector com.google.common.collect.Lists java.util.List + jaxx.demo.entities.People + jaxx.demo.entities.Movie + jaxx.demo.entities.DemoDataProvider + jaxx.demo.entities.DemoDecoratorProvider + jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer </import> + <ListCellRenderer id='listCellRenderer' initializer='new DecoratorProviderListCellRenderer(new DemoDecoratorProvider())'/> + <DemoDataProvider id='dataProvider'/> + <String id='addToolTip' javaBean='"Add"'/> <String id='removeToolTip' javaBean='"Remove"'/> <script><![CDATA[ -void $afterCompleteSetup() { - - List<String> from = Lists.newArrayList(); - from.add("Value 1"); - from.add("Value 2"); - from.add("Value 3"); - from.add("Value 4"); - from.add("Value 5"); - List<String> to = Lists.newArrayList(); - to.add("Other"); - - comboToListSelector.init(from, to); - listToListSelector.init(from, to); +public List<People> getSelectedActors() { + List<People> actors = Lists.newArrayList(); + for (Movie m : (List<Movie>)comboToListSelector.getSelectedValues()) { + List<People> actorsToAdd = m.getActors(); + actors.removeAll(actorsToAdd); + actors.addAll(actorsToAdd); + } + return actors; } ]]></script> - <Table fill='both'> + <Table fill='both' constraints='BorderLayout.CENTER'> <row> <cell fill='horizontal' weightx='1'> <JLabel text='jaxxdemo.listSelector.addToolTipLbl'/> @@ -71,18 +74,27 @@ </row> <row> <cell fill='horizontal' weightx='1' columns='2'> - <ComboToListSelector id='comboToListSelector' - genericType='String' - addToolTip='{getAddToolTip()}' - removeToolTip='{getRemoveToolTip()}'/> + <JScrollPane> + <ComboToListSelector id='comboToListSelector' + genericType='Movie' + addToolTip='{getAddToolTip()}' + removeToolTip='{getRemoveToolTip()}' + values='{dataProvider.getMovies()}' + renderer='{listCellRenderer}' + onIntervalAdded='listToListSelector.setValues(getSelectedActors())' + onIntervalRemoved='listToListSelector.setValues(getSelectedActors())'/> + </JScrollPane> </cell> </row> <row> <cell fill='horizontal' weightx='1' columns='2'> - <ListToListSelector id='listToListSelector' - genericType='String' - addToolTip='{getAddToolTip()}' - removeToolTip='{getRemoveToolTip()}'/> + <JScrollPane> + <ListToListSelector id='listToListSelector' + genericType='People' + addToolTip='{getAddToolTip()}' + removeToolTip='{getRemoveToolTip()}' + renderer='{listCellRenderer}'/> + </JScrollPane> </cell> </row> </Table> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx 2012-06-29 08:55:51 UTC (rev 2354) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx 2012-06-29 09:31:03 UTC (rev 2355) @@ -79,15 +79,12 @@ selected='false'/> <JPanel border='{new TitledBorder(_("jaxxdemo.numbereditor.numberPattern.configuration"))}' - layout='{new GridLayout(1,0)}'> <JTextField id='numberPattern' text='{"\\d{0,3}"}'/> <JButton id='applyNumberPattern' text='jaxxdemo.numbereditor.applyNumberPattern' onActionPerformed='changeNumberPattern();'/> </JPanel> - - </JPanel> </cell> </row> Copied: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDataProvider.java (from rev 2351, trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoDataProvider.java) =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDataProvider.java (rev 0) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDataProvider.java 2012-06-29 09:31:03 UTC (rev 2355) @@ -0,0 +1,112 @@ +/* + * #%L + * JAXX :: Demo + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package jaxx.demo.entities; + +import jaxx.runtime.swing.nav.NavDataProvider; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 2.1 + */ +public class DemoDataProvider implements NavDataProvider { + + /** Logger */ + static private final Log log = LogFactory.getLog(DemoDataProvider.class); + + protected Map<String, Movie> movies; + + protected Map<String, People> peoples; + + public DemoDataProvider() { + + movies = new HashMap<String, Movie>(); + peoples = new HashMap<String, People>(); + + if (log.isDebugEnabled()) { + log.debug("for " + this); + } + People a = new People("0", "Jack", "Black", 35, "/jaxx/demo/images/jack.jpg"); + People a2 = new People("1", "Héctor", "Jiménez", 28, "/jaxx/demo/images/hector.jpg"); + People a3 = new People("2", "Ana", "de la Reguera", 34, "/jaxx/demo/images/ana.jpg"); + + Movie m = new Movie("0", "Nacho libre", 1996, "/jaxx/demo/images/nacho.jpg"); + m.addActor(a); + m.addActor(a2); + m.addActor(a3); + + Movie m2 = new Movie("1", "Nacho 2", 2009, "/jaxx/demo/images/nacho2.png"); + m2.addActor(a); + m2.addActor(a2); + + movies.put(m.getId(), m); + movies.put(m2.getId(), m2); + + peoples.put(a.getId(), a); + peoples.put(a2.getId(), a2); + peoples.put(a3.getId(), a3); + } + + @Override + public boolean isEnabled() { + return true; + } + + public Movie getMovie(String id) { + return movies.get(id); + } + + public People getPeople(String id) { + return peoples.get(id); + } + + public List<Movie> getMovies() { + return new ArrayList<Movie>(movies.values()); + } + + public List<People> getPeoples() { + return new ArrayList<People>(peoples.values()); + } + + public List<People> getPeoples(Movie m) { + return m.getActors(); + } + + public List<People> getPeoples(String moviesId) { + + if (log.isDebugEnabled()) { + log.debug("Get people for movie " + moviesId); + } + + return movies.get(moviesId).getActors(); + } +} Property changes on: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDataProvider.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx 2012-06-29 08:55:51 UTC (rev 2354) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx 2012-06-29 09:31:03 UTC (rev 2355) @@ -27,13 +27,13 @@ <import> jaxx.demo.feature.nav.tree.NavDemoTreeHelper jaxx.demo.feature.nav.treetable.NavDemoTreeTableHelper - org.jdesktop.swingx.JXTreeTable + jaxx.demo.entities.DemoDataProvider </import> <CardLayout2 id='contentLayout'/> - <NavDemoDataProvider id='dataProvider'/> + <DemoDataProvider id='dataProvider'/> <NavDemoTreeHelper id='treeHelper' constructorParams='getDataProvider()'/> @@ -94,6 +94,7 @@ font-size='11' rootVisible='false' showsRootHandles='false' + columnControlVisible='true' treeTableModel='{treeTableHelper.createModel()}'/> </JScrollPane> Deleted: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoDataProvider.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoDataProvider.java 2012-06-29 08:55:51 UTC (rev 2354) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoDataProvider.java 2012-06-29 09:31:03 UTC (rev 2355) @@ -1,114 +0,0 @@ -/* - * #%L - * JAXX :: Demo - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package jaxx.demo.feature.nav; - -import jaxx.demo.entities.Movie; -import jaxx.demo.entities.People; -import jaxx.runtime.swing.nav.NavDataProvider; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @author sletellier <letellier(a)codelutin.com> - * @since 2.1 - */ -public class NavDemoDataProvider implements NavDataProvider { - - /** Logger */ - static private final Log log = LogFactory.getLog(NavDemoDataProvider.class); - - protected Map<String, Movie> movies; - - protected Map<String, People> peoples; - - public NavDemoDataProvider() { - - movies = new HashMap<String, Movie>(); - peoples = new HashMap<String, People>(); - - if (log.isDebugEnabled()) { - log.debug("for " + this); - } - People a = new People("0", "Jack", "Black", 35, "/jaxx/demo/images/jack.jpg"); - People a2 = new People("1", "Héctor", "Jiménez", 28, "/jaxx/demo/images/hector.jpg"); - People a3 = new People("2", "Ana", "de la Reguera", 34, "/jaxx/demo/images/ana.jpg"); - - Movie m = new Movie("0", "Nacho libre", 1996, "/jaxx/demo/images/nacho.jpg"); - m.addActor(a); - m.addActor(a2); - m.addActor(a3); - - Movie m2 = new Movie("1", "Nacho 2", 2009, "/jaxx/demo/images/nacho2.png"); - m2.addActor(a); - m2.addActor(a2); - - movies.put(m.getId(), m); - movies.put(m2.getId(), m2); - - peoples.put(a.getId(), a); - peoples.put(a2.getId(), a2); - peoples.put(a3.getId(), a3); - } - - @Override - public boolean isEnabled() { - return true; - } - - public Movie getMovie(String id) { - return movies.get(id); - } - - public People getPeople(String id) { - return peoples.get(id); - } - - public List<Movie> getMovies() { - return new ArrayList<Movie>(movies.values()); - } - - public List<People> getPeoples() { - return new ArrayList<People>(peoples.values()); - } - - public List<People> getPeoples(Movie m) { - return m.getActors(); - } - - public List<People> getPeoples(String moviesId) { - - if (log.isDebugEnabled()) { - log.debug("Get people for movie " + moviesId); - } - - return movies.get(moviesId).getActors(); - } -} Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java 2012-06-29 08:55:51 UTC (rev 2354) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java 2012-06-29 09:31:03 UTC (rev 2355) @@ -25,6 +25,7 @@ package jaxx.demo.feature.nav; import jaxx.demo.entities.AbstractDemoBean; +import jaxx.demo.entities.DemoDataProvider; import jaxx.demo.entities.Movie; import jaxx.demo.entities.People; import jaxx.demo.feature.nav.content.AbstractContentUI; @@ -205,7 +206,7 @@ String id = demoNode.getId(); // If it's category demoNode - NavDemoDataProvider provider = ui.getDataProvider(); + DemoDataProvider provider = ui.getDataProvider(); if (editType.equals(String.class)) { // Actors categorie demoNode Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/ActorsTreeNodeLoador.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/ActorsTreeNodeLoador.java 2012-06-29 08:55:51 UTC (rev 2354) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/ActorsTreeNodeLoador.java 2012-06-29 09:31:03 UTC (rev 2355) @@ -25,8 +25,8 @@ package jaxx.demo.feature.nav.tree; +import jaxx.demo.entities.DemoDataProvider; import jaxx.demo.entities.People; -import jaxx.demo.feature.nav.NavDemoDataProvider; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; @@ -50,7 +50,7 @@ NavDataProvider dataProvider) throws Exception { // Get people for parentId - NavDemoDataProvider provider = (NavDemoDataProvider) dataProvider; + DemoDataProvider provider = (DemoDataProvider) dataProvider; // If its not root if (moviesId != null) { Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java 2012-06-29 08:55:51 UTC (rev 2354) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java 2012-06-29 09:31:03 UTC (rev 2355) @@ -25,8 +25,8 @@ package jaxx.demo.feature.nav.tree; +import jaxx.demo.entities.DemoDataProvider; import jaxx.demo.entities.Movie; -import jaxx.demo.feature.nav.NavDemoDataProvider; import jaxx.demo.feature.nav.NavDemoHandler; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.NavHelper; @@ -60,7 +60,7 @@ String parentId, NavDataProvider dataProvider) throws Exception { - NavDemoDataProvider provider = (NavDemoDataProvider) dataProvider; + DemoDataProvider provider = (DemoDataProvider) dataProvider; // Return all movies return provider.getMovies(); Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java 2012-06-29 08:55:51 UTC (rev 2354) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java 2012-06-29 09:31:03 UTC (rev 2355) @@ -25,9 +25,9 @@ package jaxx.demo.feature.nav.tree; +import jaxx.demo.entities.DemoDataProvider; import jaxx.demo.entities.Movie; import jaxx.demo.entities.People; -import jaxx.demo.feature.nav.NavDemoDataProvider; import jaxx.runtime.swing.nav.tree.AbstractNavTreeCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -51,14 +51,14 @@ protected DecoratorProvider decoratorProvider; public NavDemoTreeCellRenderer(DecoratorProvider decoratorProvider, - NavDemoDataProvider provider) { + DemoDataProvider provider) { setDataProvider(provider); this.decoratorProvider = decoratorProvider; } @Override - public NavDemoDataProvider getDataProvider() { - return (NavDemoDataProvider) super.getDataProvider(); + public DemoDataProvider getDataProvider() { + return (DemoDataProvider) super.getDataProvider(); } @Override Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeHelper.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeHelper.java 2012-06-29 08:55:51 UTC (rev 2354) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeHelper.java 2012-06-29 09:31:03 UTC (rev 2355) @@ -25,7 +25,7 @@ package jaxx.demo.feature.nav.tree; -import jaxx.demo.feature.nav.NavDemoDataProvider; +import jaxx.demo.entities.DemoDataProvider; import jaxx.demo.feature.nav.NavDemoHandler; import jaxx.runtime.swing.nav.tree.NavTreeHelper; @@ -37,13 +37,13 @@ */ public class NavDemoTreeHelper extends NavTreeHelper<NavDemoTreeNode> { - public NavDemoTreeHelper(NavDemoDataProvider provider) { + public NavDemoTreeHelper(DemoDataProvider provider) { setDataProvider(provider); } @Override - public NavDemoDataProvider getDataProvider() { - return (NavDemoDataProvider) super.getDataProvider(); + public DemoDataProvider getDataProvider() { + return (DemoDataProvider) super.getDataProvider(); } public DefaultTreeModel createModel() { Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/ActorsTreeTableNodeLoador.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/ActorsTreeTableNodeLoador.java 2012-06-29 08:55:51 UTC (rev 2354) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/ActorsTreeTableNodeLoador.java 2012-06-29 09:31:03 UTC (rev 2355) @@ -25,8 +25,8 @@ package jaxx.demo.feature.nav.treetable; +import jaxx.demo.entities.DemoDataProvider; import jaxx.demo.entities.People; -import jaxx.demo.feature.nav.NavDemoDataProvider; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.treetable.NavTreeTableNodeChildLoador; @@ -50,7 +50,7 @@ NavDataProvider dataProvider) throws Exception { // Get people for parentId - NavDemoDataProvider provider = (NavDemoDataProvider) dataProvider; + DemoDataProvider provider = (DemoDataProvider) dataProvider; // If its not root if (moviesId != null) { Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java 2012-06-29 08:55:51 UTC (rev 2354) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java 2012-06-29 09:31:03 UTC (rev 2355) @@ -25,8 +25,8 @@ package jaxx.demo.feature.nav.treetable; +import jaxx.demo.entities.DemoDataProvider; import jaxx.demo.entities.Movie; -import jaxx.demo.feature.nav.NavDemoDataProvider; import jaxx.demo.feature.nav.NavDemoHandler; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.NavHelper; @@ -60,7 +60,7 @@ String parentId, NavDataProvider dataProvider) throws Exception { - NavDemoDataProvider provider = (NavDemoDataProvider) dataProvider; + DemoDataProvider provider = (DemoDataProvider) dataProvider; // Return all movies return provider.getMovies(); Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableHelper.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableHelper.java 2012-06-29 08:55:51 UTC (rev 2354) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableHelper.java 2012-06-29 09:31:03 UTC (rev 2355) @@ -25,7 +25,7 @@ package jaxx.demo.feature.nav.treetable; -import jaxx.demo.feature.nav.NavDemoDataProvider; +import jaxx.demo.entities.DemoDataProvider; import jaxx.demo.feature.nav.NavDemoHandler; import jaxx.runtime.swing.nav.treetable.NavTreeTableHelper; import jaxx.runtime.swing.nav.treetable.NavTreeTableModel; @@ -36,13 +36,13 @@ */ public class NavDemoTreeTableHelper extends NavTreeTableHelper<NavDemoTreeTableNode> { - public NavDemoTreeTableHelper(NavDemoDataProvider provider) { + public NavDemoTreeTableHelper(DemoDataProvider provider) { setDataProvider(provider); } @Override - public NavDemoDataProvider getDataProvider() { - return (NavDemoDataProvider) super.getDataProvider(); + public DemoDataProvider getDataProvider() { + return (DemoDataProvider) super.getDataProvider(); } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java 2012-06-29 08:55:51 UTC (rev 2354) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java 2012-06-29 09:31:03 UTC (rev 2355) @@ -24,9 +24,9 @@ */ package jaxx.demo.feature.nav.treetable; +import jaxx.demo.entities.DemoDataProvider; import jaxx.demo.entities.Movie; import jaxx.demo.entities.People; -import jaxx.demo.feature.nav.NavDemoDataProvider; import jaxx.runtime.swing.nav.NavNode; import jaxx.runtime.swing.nav.treetable.NavTreeTableModel; @@ -38,9 +38,9 @@ */ public class NavDemoTreeTableModel extends NavTreeTableModel.MyDefaultTreeTableModel { - protected NavDemoDataProvider dataProvider; + protected DemoDataProvider dataProvider; - public NavDemoTreeTableModel(NavDemoDataProvider dataProvider) { + public NavDemoTreeTableModel(DemoDataProvider dataProvider) { this.dataProvider = dataProvider; } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoCellRenderer.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoCellRenderer.java 2012-06-29 08:55:51 UTC (rev 2354) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoCellRenderer.java 2012-06-29 09:31:03 UTC (rev 2355) @@ -25,7 +25,6 @@ package jaxx.demo.tree; -import jaxx.demo.feature.nav.NavDemoDataProvider; import jaxx.runtime.swing.nav.tree.AbstractNavTreeCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -47,13 +46,13 @@ LogFactory.getLog(DemoCellRenderer.class); - public DemoCellRenderer(DemoDataProvider provider) { + public DemoCellRenderer(jaxx.demo.tree.DemoDataProvider provider) { setDataProvider(provider); } @Override - public NavDemoDataProvider getDataProvider() { - return (NavDemoDataProvider) super.getDataProvider(); + public jaxx.demo.entities.DemoDataProvider getDataProvider() { + return (jaxx.demo.entities.DemoDataProvider) super.getDataProvider(); } @Override Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2012-06-29 08:55:51 UTC (rev 2354) +++ trunk/jaxx-runtime/pom.xml 2012-06-29 09:31:03 UTC (rev 2355) @@ -67,6 +67,11 @@ <artifactId>commons-beanutils</artifactId> </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> +  <dependency> <groupId>javax.help</groupId> Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java (rev 0) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java 2012-06-29 09:31:03 UTC (rev 2355) @@ -0,0 +1,246 @@ +/* + * #%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.model; + +import com.google.common.collect.Lists; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.util.List; +import javax.swing.ComboBoxModel; +import javax.swing.DefaultListModel; +import javax.swing.DefaultListSelectionModel; +import javax.swing.event.ListDataListener; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public class GenericListModel extends DefaultListSelectionModel implements ComboBoxModel { + + protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); + + public static final String PROPERTY_SELECTED_VALUE = "selectedValues"; + + protected DefaultListModel delegate = new DefaultListModel(); + + protected List selectedValues; + + public GenericListModel() { + this.selectedValues = Lists.newArrayList(); + } + + public void setElements(List values) { + clearSelection(); + clearElements(); + for (B value : values) { + addElement(value); + } + } + + public void clearElements() { + delegate.clear(); + } + + public List getElements() { + int size = delegate.getSize(); + List result = Lists.newArrayList(); + for (int i=0;i<size;i++) { + result.add((B) delegate.get(i)); + } + return result; + } + + public void addElement(int index, B valueToAdd) { + delegate.add(index, valueToAdd); + } + + public void addElement(B valueToAdd) { + delegate.addElement(valueToAdd); + } + + public void addElements(List valuesToAdd) { + for (B value : valuesToAdd) { + addElement(value); + } + } + + public List getSelectedValues() { + return Lists.newArrayList(selectedValues); + } + + public void removeElements(List values) { + for (B value : values) { + delegate.removeElement(value); + } + unSelectItems(values); + } + + protected void unSelectItems(List values) { + List oldValue = Lists.newArrayList(selectedValues); + for (B value : values) { + int index = selectedValues.indexOf(value); + removeSelectionIntervalWithoutFire(index, index); + } + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + protected void unSelectItem(B value) { + List oldValue = Lists.newArrayList(selectedValues); + int index = selectedValues.indexOf(value); + removeSelectionIntervalWithoutFire(index, index); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + public void addSelectedItem(B toSelect) { + List oldValue = Lists.newArrayList(selectedValues); + selectedValues.add(toSelect); + int index = selectedValues.indexOf(toSelect); + super.addSelectionInterval(index, index); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + public boolean hasSelectedIndex() { + return !selectedValues.isEmpty(); + } + + @Override + public void addSelectionInterval(int index0, int index1) { + List oldValue = Lists.newArrayList(selectedValues); + addSelectionIntervalWithFire(index0, index1); + super.addSelectionInterval(index0, index1); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + @Override + public void setSelectionInterval(int index0, int index1) { + List oldValue = Lists.newArrayList(selectedValues); + selectedValues.clear(); + addSelectionIntervalWithFire(index0, index1); + super.setSelectionInterval(index0, index1); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + @Override + public void removeSelectionInterval(int index0, int index1) { + List oldValue = Lists.newArrayList(selectedValues); + removeSelectionIntervalWithoutFire(index0, index1); + 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 (delegate.size() > i && i != -1) { + B value = (B)delegate.getElementAt(i); + selectedValues.add(value); + } + } + } + + @Override + public void clearSelection() { + List oldValue = Lists.newArrayList(selectedValues); + selectedValues.clear(); + super.clearSelection(); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + @Override + public int getSelectionMode() { + return MULTIPLE_INTERVAL_SELECTION; + } + + @Override + public void setSelectedItem(Object anItem) { + List oldValue = this.selectedValues; + selectedValues = Lists.newArrayList((B)anItem); + firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); + } + + @Override + public Object getSelectedItem() { + if (selectedValues.isEmpty()) { + return null; + } + return selectedValues.get(0); + } + + @Override + public int getSize() { + return delegate.size(); + } + + @Override + public Object getElementAt(int index) { + return delegate.get(index); + } + + @Override + public void addListDataListener(ListDataListener l) { + delegate.addListDataListener(l); + } + + @Override + public void removeListDataListener(ListDataListener l) { + delegate.removeListDataListener(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); + } +} \ No newline at end of file Deleted: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/GenericListModel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/GenericListModel.java 2012-06-29 08:55:51 UTC (rev 2354) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/GenericListModel.java 2012-06-29 09:31:03 UTC (rev 2355) @@ -1,227 +0,0 @@ -/* - * #%L - * JAXX :: Widgets - * $Id:$ - * $HeadURL:$ - * %% - * Copyright (C) 2008 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package jaxx.runtime.swing; - -import com.google.common.collect.Lists; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; -import java.util.List; -import javax.swing.ComboBoxModel; -import javax.swing.DefaultListModel; -import javax.swing.DefaultListSelectionModel; -import javax.swing.event.ListDataListener; - -/** - * @author sletellier <letellier(a)codelutin.com> - */ -public class GenericListModel extends DefaultListSelectionModel implements ComboBoxModel { - - protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); - - public static final String PROPERTY_SELECTED_VALUE = "selectedValues"; - - protected DefaultListModel delegate = new DefaultListModel(); - - protected List selectedValues; - - public GenericListModel() { - this.selectedValues = Lists.newArrayList(); - } - - public void setElements(List values) { - for (B value : values) { - addElement(value); - } - } - - public List getElements() { - int size = delegate.getSize(); - List result = Lists.newArrayList(); - for (int i=0;i<size;i++) { - result.add((B) delegate.get(i)); - } - return result; - } - - public void addElement(int index, B valueToAdd) { - delegate.add(index, valueToAdd); - } - - public void addElement(B valueToAdd) { - delegate.addElement(valueToAdd); - } - - public void addElements(List valuesToAdd) { - for (B value : valuesToAdd) { - addElement(value); - } - } - - public List getSelectedValues() { - return Lists.newArrayList(selectedValues); - } - - public void removeElements(List values) { - for (B value : values) { - delegate.removeElement(value); - } - unSelectItems(values); - } - - protected void unSelectItems(List values) { - List oldValue = Lists.newArrayList(selectedValues); - selectedValues.removeAll(values); - firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); - } - - protected void unSelectItem(B value) { - List oldValue = Lists.newArrayList(selectedValues); - selectedValues.remove(value); - firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); - } - - public void addSelectedItem(B toSelect) { - List oldValue = Lists.newArrayList(selectedValues); - selectedValues.add(toSelect); - int index = selectedValues.indexOf(toSelect); - super.addSelectionInterval(index, index); - firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); - } - - public boolean hasSelectedIndex() { - return !selectedValues.isEmpty(); - } - - @Override - public void addSelectionInterval(int index0, int index1) { - List oldValue = Lists.newArrayList(selectedValues); - addSelectionIntervalWithFire(index0, index1); - super.addSelectionInterval(index0, index1); - firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); - } - - @Override - public void setSelectionInterval(int index0, int index1) { - List oldValue = Lists.newArrayList(selectedValues); - selectedValues.clear(); - addSelectionIntervalWithFire(index0, index1); - super.setSelectionInterval(index0, index1); - firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); - } - - @Override - public void removeSelectionInterval(int index0, int index1) { - List oldValue = Lists.newArrayList(selectedValues); - if (index0 > index1) { - int tmp = index1; - index1 = index0; - index0 = tmp; - } - for (int i=index0;i<=index1;i++) { - selectedValues.remove(i); - } - super.removeSelectionInterval(index0, index1); - firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); - } - - protected void addSelectionIntervalWithFire(int index0, int index1) { - if (index0 > index1) { - int tmp = index1; - index1 = index0; - index0 = tmp; - } - for (int i=index0;i<=index1;i++) { - B value = (B)delegate.getElementAt(i); - selectedValues.add(value); - } - } - - @Override - public void clearSelection() { - List oldValue = Lists.newArrayList(selectedValues); - selectedValues.clear(); - super.clearSelection(); - firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); - } - - @Override - public int getSelectionMode() { - return MULTIPLE_INTERVAL_SELECTION; - } - - @Override - public void setSelectedItem(Object anItem) { - List oldValue = this.selectedValues; - selectedValues = Lists.newArrayList((B)anItem); - firePropertyChange(PROPERTY_SELECTED_VALUE, oldValue, selectedValues); - } - - @Override - public Object getSelectedItem() { - if (selectedValues.isEmpty()) { - return null; - } - return selectedValues.get(0); - } - - @Override - public int getSize() { - return delegate.size(); - } - - @Override - public Object getElementAt(int index) { - return delegate.get(index); - } - - @Override - public void addListDataListener(ListDataListener l) { - delegate.addListDataListener(l); - } - - @Override - public void removeListDataListener(ListDataListener l) { - delegate.removeListDataListener(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); - } -} \ No newline at end of file Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx 2012-06-29 08:55:51 UTC (rev 2354) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx 2012-06-29 09:31:03 UTC (rev 2355) @@ -25,12 +25,15 @@ <Table insets='0' genericType='B' abstract='true'> <import> + com.google.common.collect.Lists java.util.List javax.swing.DefaultComboBoxModel javax.swing.DefaultListModel javax.swing.DefaultListCellRenderer java.beans.PropertyChangeEvent java.beans.PropertyChangeListener + javax.swing.event.ListDataListener + jaxx.runtime.swing.model.GenericListModel </import> <String id='addToolTip' javaBean='"+"'/> @@ -40,12 +43,12 @@ <GenericListModel id='fromModel' genericType='B'/> + <GenericListModel id='toModel' + genericType='B'/> + <Boolean id='addEnabled' javaBean='Boolean.FALSE'/> <Boolean id='removeEnabled' javaBean='Boolean.FALSE'/> - <GenericListModel id='toModel' - genericType='B'/> - <ListCellRenderer id='renderer' javaBean='new DefaultListCellRenderer()'/> <script><![CDATA[ @@ -65,29 +68,22 @@ }); } -/** - * @return the datas from. - */ -public List getFromDatas() { +public void setValues(List values) { + toModel.removeElements(values); + fromModel.setElements(values); +} + +public List getValues() { return fromModel.getElements(); } -/** - * @return the data to. - */ -public List getToDatas() { - return toModel.getElements(); +public void setSelectedValues(List selectedValues) { + fromModel.removeElements(selectedValues); + toModel.setElements(selectedValues); } -/** - * Initialize the component. - * - * @param from datas to set - * @param to datas to set - */ -public void init(List from, List to) { - fromModel.setElements(from); - toModel.setElements(to); +public List getSelectedValues() { + return toModel.getElements(); } public void add() { @@ -104,6 +100,13 @@ to.addElements(selectedValues); } +public void addListDataListener(ListDataListener l) { + toModel.addListDataListener(l); +} + +public void removeListDataListener(ListDataListener l) { + toModel.removeListDataListener(l); +} ]]> </script>

1 0