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

r2103 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing
by sletellier＠users.nuiton.org 04 Oct '10

04 Oct '10

Author: sletellier Date: 2010-10-04 20:12:49 +0200 (Mon, 04 Oct 2010) New Revision: 2103 Url: http://nuiton.org/repositories/revision/jaxx/2103 Log: Creating handler for ListSelectionUI Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorHandler.java (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorHandler.java 2010-10-04 18:12:49 UTC (rev 2103) @@ -0,0 +1,179 @@ +/* + * #%L + * JAXX :: Widgets + * + * $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.runtime.swing; + +import jaxx.runtime.SwingUtil; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.swing.*; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 2.2.3 + */ +public class ListSelectorHandler { + + public static final Log log = LogFactory.getLog(ListSelectorHandler.class); + + protected ListSelectorUI listSelector; + + public ListSelectorHandler(final ListSelectorUI listSelector) { + this.listSelector = listSelector; + } + + protected JComboBox getCombo() { + return listSelector.getCombo(); + } + + protected JList getList() { + return listSelector.getList(); + } + + /** + * @return the datas from the combo box. + */ + public java.util.List getComboDatas() { + java.util.List datas = new java.util.ArrayList(); + ComboBoxModel comboModel = getCombo().getModel(); + for (int i = 0, j = comboModel.getSize(); i < j; i++) { + B g = (B) comboModel.getElementAt(i); + datas.add(g); + } + return datas; + } + + /** + * @return the data for the list. + */ + public java.util.List getListDatas() { + java.util.List datas = new java.util.ArrayList(); + ListModel listModel = getList().getModel(); + for (int i = 0, j = listModel.getSize(); i < j; i++) { + B g = (B) listModel.getElementAt(i); + datas.add(g); + } + return datas; + } + + /** + * Initialize the component. + * + * @param toCombo datas to set in combo + * @param toList datas to set in list + */ + public void init(java.util.List toCombo, java.util.List toList) { + setComboDatas(toCombo); + setListDatas(toList); + // after init, always unmodified editor + // TODO should avoid to fire a changed ? + listSelector.setModified(false); + + HidorButton hidor = listSelector.getHidor(); + hidor.addPropertyChangeListener("targetVisible", new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (log.isDebugEnabled()) { + log.debug("target visible changed <" + evt.getOldValue() + ":" + evt.getNewValue() + ">"); + } + if (!listSelector.isShowHidor() || !listSelector.isEnabled()) { + return; + } + SwingUtilities.invokeLater(new Runnable() { + + @Override + public void run() { + log.info("invalidate " + listSelector.getParent().getName()); + listSelector.listPane.invalidate(); + } + }); + } + }); + } + + /** + * Transfert the {@code b} data from combo box to list. + * + * @param b the data to transfert + */ + protected void transfertToList(B b) { + ((DefaultListModel) getList().getModel()).addElement(b); + ((DefaultComboBoxModel) getCombo().getModel()).removeElement(b); + listSelector.setModified(true); + } + + /** + * Transfert the {@code b} data from list to combo box. + * + * @param bs the data to transfert + */ + protected void transfertToCombo(B[] bs) { + for (B b : bs) { + ((DefaultListModel) getList().getModel()).removeElement(b); + ((DefaultComboBoxModel) getCombo().getModel()).addElement(b); + } + listSelector.setModified(true); + } + + /** + * @param enabled databinding + * @return {@code true} if add button should be enabled + */ + protected boolean updateAddEnabled(boolean enabled) { + return enabled && getCombo().getModel().getSize() > 0; + } + + /** + * @param enabled databinding + * @return {@code true} if remove button should be enabled + */ + protected boolean updateRemoveEnabled(boolean enabled) { + return enabled && getList().getModel().getSize() > 0; + } + + /** + * Set the data in combo box model. + * + * @param toCombo datas to set in combo box model + */ + protected void setComboDatas(java.util.List toCombo) { + SwingUtil.fillComboBox(getCombo(), toCombo, null); + //Note : there is a case when combo was selected, then come here with an empty + // combo model : no propertyChanged is fired, so add button stays enabled... + listSelector.processDataBinding("add.enabled"); + } + + /** + * Set the data in the list model. + * + * @param toList datas to set in list model + */ + protected void setListDatas(java.util.List toList) { + SwingUtil.fillList(getList(), toList, null); + } +} Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx 2010-10-03 15:50:46 UTC (rev 2102) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx 2010-10-04 18:12:49 UTC (rev 2103) @@ -35,57 +35,27 @@ <ListCellRenderer id='renderer' javaBean='null'/> - <import> -java.beans.PropertyChangeListener -java.beans.PropertyChangeEvent - </import> +  + <ListSelectorHandler id='handler' genericType='B' constructorParams='this'/> <script><![CDATA[ -hidor.addPropertyChangeListener("targetVisible", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (log.isDebugEnabled()) { - log.debug("target visible changed <" + evt.getOldValue() + ":" + evt.getNewValue() + ">"); - } - if (!showHidor || !isEnabled()) { - return; - } - SwingUtilities.invokeLater(new Runnable() { +public void setHandler(ListSelectorHandler handler) { + this.handler = handler; +} - @Override - public void run() { - log.info("invalidate " + getParent().getName()); - listPane.invalidate(); - } - }); - } -}); - /** * @return the datas from the combo box. */ public java.util.List getComboDatas() { - java.util.List datas = new java.util.ArrayList(); - ComboBoxModel comboModel = combo.getModel(); - for (int i = 0, j = comboModel.getSize(); i < j; i++) { - B g = (B) comboModel.getElementAt(i); - datas.add(g); - } - return datas; + return handler.getComboDatas(); } /** * @return the data for the list. */ public java.util.List getListDatas() { - java.util.List datas = new java.util.ArrayList(); - ListModel listModel = list.getModel(); - for (int i = 0, j = listModel.getSize(); i < j; i++) { - B g = (B) listModel.getElementAt(i); - datas.add(g); - } - return datas; + return handler.getListDatas(); } /** @@ -95,74 +65,8 @@ * @param toList datas to set in list */ public void init(java.util.List toCombo, java.util.List toList) { - setComboDatas(toCombo); - setListDatas(toList); - // after init, always unmodified editor - // TODO should avoid to fire a changed ? - setModified(false); + handler.init(toCombo, toList); } - -/** - * Transfert the {@code b} data from combo box to list. - * - * @param b the data to transfert - */ -protected void transfertToList(B b) { - ((DefaultListModel) list.getModel()).addElement(b); - ((DefaultComboBoxModel) combo.getModel()).removeElement(b); - setModified(true); -} - -/** - * Transfert the {@code b} data from list to combo box. - * - * @param bs the data to transfert - */ -protected void transfertToCombo(B[] bs) { - for (B b : bs) { - ((DefaultListModel) list.getModel()).removeElement(b); - ((DefaultComboBoxModel) combo.getModel()).addElement(b); - } - setModified(true); -} - -/** - * @param enabled databinding - * @return {@code true} if add button should be enabled - */ -protected boolean updateAddEnabled(boolean enabled) { - return enabled && combo.getModel().getSize() > 0; -} - -/** - * @param enabled databinding - * @return {@code true} if remove button should be enabled - */ -protected boolean updateRemoveEnabled(boolean enabled) { - return enabled && list.getModel().getSize() > 0; -} - -/** - * Set the data in combo box model. - * - * @param toCombo datas to set in combo box model - */ -protected void setComboDatas(java.util.List toCombo) { - SwingUtil.fillComboBox(combo, toCombo, null); - //Note : there is a case when combo was selected, then come here with an empty - // combo model : no propertyChanged is fired, so add button stays enabled... - processDataBinding("add.enabled"); -} - -/** - * Set the data in the list model. - * - * @param toList datas to set in list model - */ -protected void setListDatas(java.util.List toList) { - SwingUtil.fillList(list, toList, null); -} - ]]> </script> @@ -176,7 +80,7 @@ enabled='{isEnabled()}' model='{new DefaultListModel()}' font-size='11' - onMouseClicked='if (event.getClickCount()==2) { transfertToCombo((B[]) list.getSelectedValues()); }' + onMouseClicked='if (event.getClickCount()==2) { handler.transfertToCombo((B[]) list.getSelectedValues()); }' cellRenderer='{getRenderer()}'/> </JPanel> @@ -194,14 +98,14 @@ <JButton id="add" toolTipText='{getAddToListTip()}' actionIcon='add' - enabled='{updateAddEnabled(combo.isEnabled() && combo.getSelectedIndex() > -1)}' - onActionPerformed='transfertToList((B) combo.getSelectedItem());'/> + enabled='{handler.updateAddEnabled(combo.isEnabled() && combo.getSelectedIndex() > -1)}' + onActionPerformed='handler.transfertToList((B) combo.getSelectedItem());'/> <JButton id="remove" toolTipText='{getAddToComboTip()}' actionIcon='remove' - enabled='{updateRemoveEnabled(list.isEnabled() && list.getSelectedIndex() > -1)}' - onActionPerformed='transfertToCombo((B[]) list.getSelectedValues())'/> + enabled='{handler.updateRemoveEnabled(list.isEnabled() && list.getSelectedIndex() > -1)}' + onActionPerformed='handler.transfertToCombo((B[]) list.getSelectedValues())'/> <HidorButton id="hidor" target='{list}'

1 0

r2102 - trunk
by tchemit＠users.nuiton.org 03 Oct '10

03 Oct '10

Author: tchemit Date: 2010-10-03 17:50:46 +0200 (Sun, 03 Oct 2010) New Revision: 2102 Url: http://nuiton.org/repositories/revision/jaxx/2102 Log: Update mavenpom4redmineAndCentral to 2.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-30 08:06:27 UTC (rev 2101) +++ trunk/pom.xml 2010-10-03 15:50:46 UTC (rev 2102) @@ -33,8 +33,8 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.2.6</version> + <artifactId>mavenpom4redmineAndCentral</artifactId> + <version>2.3</version> </parent> <artifactId>jaxx</artifactId> @@ -443,14 +443,6 @@ <javahelp.version>2.0.02</javahelp.version> <jnlp.version>1.0-alpha-2-cl_20100511</jnlp.version> -  - -  - <arguments>-DperformRelease -Pcentral-safe</arguments> - -  - <releaseProfiles>central-safe</releaseProfiles> - </properties> <build>

1 0

r2101 - in trunk: . jaxx-compiler jaxx-demo jaxx-runtime jaxx-tutorial jaxx-tutorial-config jaxx-tutorial-css jaxx-tutorial-databinding jaxx-tutorial-helloworld jaxx-tutorial-helloworld2 jaxx-widgets maven-jaxx-plugin
by tchemit＠users.nuiton.org 30 Sep '10

30 Sep '10

Author: tchemit Date: 2010-09-30 10:06:27 +0200 (Thu, 30 Sep 2010) New Revision: 2101 Url: http://nuiton.org/repositories/revision/jaxx/2101 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-tutorial-config/pom.xml trunk/jaxx-tutorial-css/pom.xml trunk/jaxx-tutorial-databinding/pom.xml trunk/jaxx-tutorial-helloworld/pom.xml trunk/jaxx-tutorial-helloworld2/pom.xml trunk/jaxx-tutorial/pom.xml trunk/jaxx-widgets/pom.xml trunk/maven-jaxx-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2010-09-30 08:06:22 UTC (rev 2100) +++ trunk/jaxx-compiler/pom.xml 2010-09-30 08:06:27 UTC (rev 2101) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2.2</version> + <version>2.2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2010-09-30 08:06:22 UTC (rev 2100) +++ trunk/jaxx-demo/pom.xml 2010-09-30 08:06:27 UTC (rev 2101) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2.2</version> + <version>2.2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2010-09-30 08:06:22 UTC (rev 2100) +++ trunk/jaxx-runtime/pom.xml 2010-09-30 08:06:27 UTC (rev 2101) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2.2</version> + <version>2.2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2010-09-30 08:06:22 UTC (rev 2100) +++ trunk/jaxx-tutorial/pom.xml 2010-09-30 08:06:27 UTC (rev 2101) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2.2</version> + <version>2.2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial-config/pom.xml =================================================================== --- trunk/jaxx-tutorial-config/pom.xml 2010-09-30 08:06:22 UTC (rev 2100) +++ trunk/jaxx-tutorial-config/pom.xml 2010-09-30 08:06:27 UTC (rev 2101) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2.2</version> + <version>2.2.3-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-css/pom.xml =================================================================== --- trunk/jaxx-tutorial-css/pom.xml 2010-09-30 08:06:22 UTC (rev 2100) +++ trunk/jaxx-tutorial-css/pom.xml 2010-09-30 08:06:27 UTC (rev 2101) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2.2</version> + <version>2.2.3-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-databinding/pom.xml =================================================================== --- trunk/jaxx-tutorial-databinding/pom.xml 2010-09-30 08:06:22 UTC (rev 2100) +++ trunk/jaxx-tutorial-databinding/pom.xml 2010-09-30 08:06:27 UTC (rev 2101) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2.2</version> + <version>2.2.3-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2010-09-30 08:06:22 UTC (rev 2100) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2010-09-30 08:06:27 UTC (rev 2101) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2.2</version> + <version>2.2.3-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2010-09-30 08:06:22 UTC (rev 2100) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2010-09-30 08:06:27 UTC (rev 2101) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2.2</version> + <version>2.2.3-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2010-09-30 08:06:22 UTC (rev 2100) +++ trunk/jaxx-widgets/pom.xml 2010-09-30 08:06:27 UTC (rev 2101) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2.2</version> + <version>2.2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2010-09-30 08:06:22 UTC (rev 2100) +++ trunk/maven-jaxx-plugin/pom.xml 2010-09-30 08:06:27 UTC (rev 2101) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2.2</version> + <version>2.2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-30 08:06:22 UTC (rev 2100) +++ trunk/pom.xml 2010-09-30 08:06:27 UTC (rev 2101) @@ -38,7 +38,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.2.2</version> + <version>2.2.3-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> @@ -541,9 +541,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.2.2</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.2.2</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.2.2</url> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> </scm> <profiles>

1 0

r2100 - tags
by tchemit＠users.nuiton.org 30 Sep '10

30 Sep '10

Author: tchemit Date: 2010-09-30 10:06:22 +0200 (Thu, 30 Sep 2010) New Revision: 2100 Url: http://nuiton.org/repositories/revision/jaxx/2100 Log: [maven-release-plugin] copy for tag jaxx-2.2.2 Added: tags/jaxx-2.2.2/

1 0

r2099 - in trunk: . jaxx-compiler jaxx-demo jaxx-runtime jaxx-tutorial jaxx-tutorial-config jaxx-tutorial-css jaxx-tutorial-databinding jaxx-tutorial-helloworld jaxx-tutorial-helloworld2 jaxx-widgets maven-jaxx-plugin
by tchemit＠users.nuiton.org 30 Sep '10

30 Sep '10

Author: tchemit Date: 2010-09-30 10:06:20 +0200 (Thu, 30 Sep 2010) New Revision: 2099 Url: http://nuiton.org/repositories/revision/jaxx/2099 Log: [maven-release-plugin] prepare release jaxx-2.2.2 Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-tutorial-config/pom.xml trunk/jaxx-tutorial-css/pom.xml trunk/jaxx-tutorial-databinding/pom.xml trunk/jaxx-tutorial-helloworld/pom.xml trunk/jaxx-tutorial-helloworld2/pom.xml trunk/jaxx-tutorial/pom.xml trunk/jaxx-widgets/pom.xml trunk/maven-jaxx-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2010-09-29 22:29:01 UTC (rev 2098) +++ trunk/jaxx-compiler/pom.xml 2010-09-30 08:06:20 UTC (rev 2099) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2010-09-29 22:29:01 UTC (rev 2098) +++ trunk/jaxx-demo/pom.xml 2010-09-30 08:06:20 UTC (rev 2099) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2010-09-29 22:29:01 UTC (rev 2098) +++ trunk/jaxx-runtime/pom.xml 2010-09-30 08:06:20 UTC (rev 2099) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2010-09-29 22:29:01 UTC (rev 2098) +++ trunk/jaxx-tutorial/pom.xml 2010-09-30 08:06:20 UTC (rev 2099) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial-config/pom.xml =================================================================== --- trunk/jaxx-tutorial-config/pom.xml 2010-09-29 22:29:01 UTC (rev 2098) +++ trunk/jaxx-tutorial-config/pom.xml 2010-09-30 08:06:20 UTC (rev 2099) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.2</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-css/pom.xml =================================================================== --- trunk/jaxx-tutorial-css/pom.xml 2010-09-29 22:29:01 UTC (rev 2098) +++ trunk/jaxx-tutorial-css/pom.xml 2010-09-30 08:06:20 UTC (rev 2099) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.2</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-databinding/pom.xml =================================================================== --- trunk/jaxx-tutorial-databinding/pom.xml 2010-09-29 22:29:01 UTC (rev 2098) +++ trunk/jaxx-tutorial-databinding/pom.xml 2010-09-30 08:06:20 UTC (rev 2099) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.2</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2010-09-29 22:29:01 UTC (rev 2098) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2010-09-30 08:06:20 UTC (rev 2099) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.2</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2010-09-29 22:29:01 UTC (rev 2098) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2010-09-30 08:06:20 UTC (rev 2099) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.2</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2010-09-29 22:29:01 UTC (rev 2098) +++ trunk/jaxx-widgets/pom.xml 2010-09-30 08:06:20 UTC (rev 2099) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2010-09-29 22:29:01 UTC (rev 2098) +++ trunk/maven-jaxx-plugin/pom.xml 2010-09-30 08:06:20 UTC (rev 2099) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-29 22:29:01 UTC (rev 2098) +++ trunk/pom.xml 2010-09-30 08:06:20 UTC (rev 2099) @@ -38,7 +38,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.2</version> <modules> <module>jaxx-runtime</module> @@ -541,9 +541,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.2.2</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.2.2</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.2.2</url> </scm> <profiles>

1 0

r2098 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field
by tchemit＠users.nuiton.org 29 Sep '10

29 Sep '10

Author: tchemit Date: 2010-09-30 00:29:01 +0200 (Thu, 30 Sep 2010) New Revision: 2098 Url: http://nuiton.org/repositories/revision/jaxx/2098 Log: remove fully qualified name Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidator.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidator.java 2010-09-29 13:06:14 UTC (rev 2097) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidator.java 2010-09-29 22:29:01 UTC (rev 2098) @@ -31,6 +31,7 @@ import java.util.Map; import java.util.StringTokenizer; +import java.util.TreeMap; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -198,7 +199,7 @@ } StringTokenizer stk = new StringTokenizer(extraParams, "|"); - Map<String, T> result = new java.util.TreeMap<String, T>(); + Map<String, T> result = new TreeMap<String, T>(); while (stk.hasMoreTokens()) { String entry = stk.nextToken(); Matcher matcher = pattern.matcher(entry);

1 0

r2097 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable
by sletellier＠users.nuiton.org 29 Sep '10

29 Sep '10

Author: sletellier Date: 2010-09-29 15:06:14 +0200 (Wed, 29 Sep 2010) New Revision: 2097 Url: http://nuiton.org/repositories/revision/jaxx/2097 Log: Throw illegalArgumentException if node is not found Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java 2010-09-29 12:27:08 UTC (rev 2096) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java 2010-09-29 13:06:14 UTC (rev 2097) @@ -127,6 +127,9 @@ public void removeNodeFromParent(N node) { N parent = node.getParent(); int index = parent.getIndex(node); + if (index == -1) { + throw new IllegalArgumentException("Node " + node + " is not in tree"); + } parent.remove(node); model.getModelSupport().fireChildRemoved(getTreePath(parent), index, node); } @@ -222,11 +225,14 @@ N parent = node.getParent(); if (parent != null) { - int indice = parent.getIndex(node); + int index = parent.getIndex(node); + if (index == -1) { + throw new IllegalArgumentException("Node " + node + " is not in tree"); + } if (log.isDebugEnabled()) { - log.debug("Notify for node : " + node + ", for parent [" + parent + "] child " + indice + " inserted."); + log.debug("Notify for node : " + node + ", for parent [" + parent + "] child " + index + " inserted."); } - nodesWereInserted(parent, new int[]{indice}); + nodesWereInserted(parent, new int[]{index}); notifyChildNodesInserted(node); } }

1 0

r2096 - trunk
by tchemit＠users.nuiton.org 29 Sep '10

29 Sep '10

Author: tchemit Date: 2010-09-29 14:27:08 +0200 (Wed, 29 Sep 2010) New Revision: 2096 Url: http://nuiton.org/repositories/revision/jaxx/2096 Log: add developpeurs in pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-29 12:01:07 UTC (rev 2095) +++ trunk/pom.xml 2010-09-29 12:27:08 UTC (rev 2096) @@ -51,6 +51,42 @@ </modules> + <developers> + + <developer> + <name>Tony Chemit</name> + <id>tchemit</id> + <email>chemit(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Developer</role> + </roles> + </developer> + + <developer> + <name>Sylvain Letellier</name> + <id>sletellier</id> + <email>letellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Developer</role> + </roles> + </developer> + + <developer> + <name>Jean Couteau</name> + <id>jcouteau</id> + <email>couteau(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Technical Writer</role> + </roles> + </developer> + </developers> + <dependencyManagement> <dependencies>

1 0

r2095 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable
by sletellier＠users.nuiton.org 29 Sep '10

29 Sep '10

Author: sletellier Date: 2010-09-29 14:01:07 +0200 (Wed, 29 Sep 2010) New Revision: 2095 Url: http://nuiton.org/repositories/revision/jaxx/2095 Log: Fire only needed events to keep tree table safe (http://www.nuiton.org/issues/show/904) Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableNode.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java 2010-09-29 11:59:39 UTC (rev 2094) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java 2010-09-29 12:01:07 UTC (rev 2095) @@ -34,6 +34,7 @@ import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; import java.util.ArrayList; +import java.util.Enumeration; import java.util.EventListener; import java.util.List; @@ -118,19 +119,21 @@ @Override public void insertNodeInto(N newChild, N parent, int index) { - //FIXME c'est ca le code ? y'a rien d'ajoute au model c'est pas normal - model.nodeStructureChanged(parent); + parent.insert(newChild, index); + model.getModelSupport().fireChildAdded(getTreePath(parent), index, newChild); } @Override public void removeNodeFromParent(N node) { - //FIXME c'est ca le code ? y'a rien de supprimer au model c'est pas normal - model.nodeStructureChanged(node); + N parent = node.getParent(); + int index = parent.getIndex(node); + parent.remove(node); + model.getModelSupport().fireChildRemoved(getTreePath(parent), index, node); } @Override public void reload(N node) { - model.getModelSupport().fireTreeStructureChanged(new TreePath(getPathToRoot(node))); + model.getModelSupport().fireTreeStructureChanged(getTreePath(node)); } //-------------------------------------------------------------------------- @@ -154,30 +157,34 @@ @Override public void nodesChanged(TreeNode node, int[] childIndices) { - //FIXME c'est plus fin que ça je pense, on indique juste que les fils ont // changé par le node en lui meme - model.nodeChanged((NavTreeTableNode<?>) node); + NavTreeTableNode<?> tableNode = (NavTreeTableNode<?>) node; + + // Extract children + Object[] children = getChildren(tableNode, childIndices); + + model.getModelSupport().fireChildrenChanged(getTreePath(tableNode), childIndices, children); } @Override public void nodesWereInserted(N parent, int[] indices) { - //FIXME, hum c'est louche (on ne veut pas recharger tout le noeud sinon - // on peut perdre le positionnement de l'arbre - nodeStructureChanged(parent); + // Extract children + Object[] children = getChildren(parent, indices); + + model.getModelSupport().fireChildrenAdded(getTreePath(parent), indices, children); } @Override - public void nodeWereInserted(N parentNode, int childIndice, N node) { - //FIXME, hum c'est louche (on ne veut pas recharger tout le noeud sinon - // on peut perdre le positionnement de l'arbre - nodeStructureChanged(node); + public void nodeWereInserted(N parentNode, int index, N node) { + + model.getModelSupport().fireChildAdded(getTreePath(parentNode), index, node); } @Override public void nodesWereRemoved(TreeNode node, int[] childIndices, Object[] removedChildren) { - TreePath path = new TreePath(getPathToRoot(node)); - model.getModelSupport().fireChildrenRemoved(path, + + model.getModelSupport().fireChildrenRemoved(getTreePath(node), childIndices, removedChildren); } @@ -185,16 +192,43 @@ @Override @SuppressWarnings({"unchecked"}) public void notifyChildNodesInserted(N node) { - //FIXME quel raccourci :) pour moi ça va pas trop de faire ça c'est - // trop violent, il faut affiner - nodeStructureChanged(node); + int count = node.getChildCount(); + if (count < 1) { + if (log.isDebugEnabled()) { + log.debug("Skip for leaf node : " + node); + } + return; + } + if (log.isDebugEnabled()) { + log.debug("Notify for node : " + node + ", " + count + " child(s) inserted."); + } + int[] indices = new int[count]; + for (int i = 0; i < count; i++) { + indices[i] = i; + } + + nodesWereInserted(node, indices); + + // recurse notify on childs + for (Enumeration<? extends NavTreeTableNode<?>> childs = node.children(); + childs.hasMoreElements();) { + N child = (N) childs.nextElement(); + notifyChildNodesInserted(child); + } } @Override public void notifyNodeInserted(N node) { - //FIXME quel raccourci :) pour moi ça va pas trop de faire ça c'est - // trop violent, il faut affiner - nodeStructureChanged(node); + + N parent = node.getParent(); + if (parent != null) { + int indice = parent.getIndex(node); + if (log.isDebugEnabled()) { + log.debug("Notify for node : " + node + ", for parent [" + parent + "] child " + indice + " inserted."); + } + nodesWereInserted(parent, new int[]{indice}); + notifyChildNodesInserted(node); + } } //-------------------------------------------------------------------------- @@ -230,6 +264,24 @@ return (T[]) result.toArray(); } + // Extract children + protected Object[] getChildren(NavTreeTableNode<?> tableNode, int[] childIndices) { + + int size = childIndices.length; + Object[] children = new Object[size]; + for (int i = 0; i < size; i++) { + int index = childIndices[i]; + NavTreeTableNode<?> child = tableNode.getChildAt(index); + children[i] = child; + } + return children; + } + + // Create tree path for node in param + protected TreePath getTreePath(TreeNode node) { + return new TreePath(getPathToRoot(node)); + } + // //-------------------------------------------------------------------------- // //-- UI // //-------------------------------------------------------------------------- Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableNode.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableNode.java 2010-09-29 11:59:39 UTC (rev 2094) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableNode.java 2010-09-29 12:01:07 UTC (rev 2095) @@ -31,8 +31,12 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTreeTable; import org.jdesktop.swingx.treetable.DefaultMutableTreeTableNode; +import org.jdesktop.swingx.treetable.MutableTreeTableNode; +import java.util.ArrayList; +import java.util.Collections; import java.util.Enumeration; +import java.util.List; /** * Implementation of {@link NavNode} used to create in tree table @@ -277,10 +281,15 @@ return (N) super.getChildAt(index); } + // It's a hack to prevent concurent modification exception, caused by + // children() of AbstractMutableTreeTableNode return Collections.enumeration @SuppressWarnings({"unchecked"}) @Override public Enumeration<N> children() { - return (Enumeration<N>) super.children(); + List<? extends MutableTreeTableNode> newChildrenList = + new ArrayList<MutableTreeTableNode>(super.children); + + return (Enumeration<N>) Collections.enumeration(newChildrenList); } public void removeAllChildren() {

1 0

r2094 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing
by sletellier＠users.nuiton.org 29 Sep '10

29 Sep '10

Author: sletellier Date: 2010-09-29 13:59:39 +0200 (Wed, 29 Sep 2010) New Revision: 2094 Url: http://nuiton.org/repositories/revision/jaxx/2094 Log: Use import balise Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx 2010-09-29 08:10:38 UTC (rev 2093) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx 2010-09-29 11:59:39 UTC (rev 2094) @@ -35,10 +35,12 @@ <ListCellRenderer id='renderer' javaBean='null'/> + <import> +java.beans.PropertyChangeListener +java.beans.PropertyChangeEvent + </import> + <script><![CDATA[ -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeEvent; - hidor.addPropertyChangeListener("targetVisible", new PropertyChangeListener() { @Override

1 0