- Nuiton-web-commits - mailman.cloud.codelutin.com

r101 - trunk
by tchemit＠users.nuiton.org Aug. 4, 2011

Aug. 4, 2011

Author: tchemit Date: 2011-08-04 17:29:47 +0200 (Thu, 04 Aug 2011) New Revision: 101 Url: http://nuiton.org/repositories/revision/nuiton-web/101 Log: Evolution #1657: Updates to i18n 2.4.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-04 09:51:39 UTC (rev 100) +++ trunk/pom.xml 2011-08-04 15:29:47 UTC (rev 101) @@ -221,7 +221,7 @@  <projectId>nuiton-web</projectId> - <nuitonI18nVersion>2.4.1-SNAPSHOT</nuitonI18nVersion> + <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> <jredminePluginVersion>1.2</jredminePluginVersion>

1 0

r100 - trunk
by tchemit＠users.nuiton.org Aug. 4, 2011

Aug. 4, 2011

Author: tchemit Date: 2011-08-04 11:51:39 +0200 (Thu, 04 Aug 2011) New Revision: 100 Url: http://nuiton.org/repositories/revision/nuiton-web/100 Log: Update mavenpom4redmineAndCentral to 3.0. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-04 07:51:42 UTC (rev 99) +++ trunk/pom.xml 2011-08-04 09:51:39 UTC (rev 100) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.5</version> + <version>3.0</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r99 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2
by tchemit＠users.nuiton.org Aug. 4, 2011

Aug. 4, 2011

Author: tchemit Date: 2011-08-04 09:51:42 +0200 (Thu, 04 Aug 2011) New Revision: 99 Url: http://nuiton.org/repositories/revision/nuiton-web/99 Log: add little javadoc to use text provider Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java 2011-08-03 08:27:27 UTC (rev 98) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java 2011-08-04 07:51:42 UTC (rev 99) @@ -37,8 +37,14 @@ import java.util.ResourceBundle; /** - * Struts2's TextProvider implementation using nuiton's i18n + * Struts2's TextProvider implementation using nuiton's i18n. * + * To use this text provider add the two following lines in your strust.xml : + * <pre> + * <bean class="org.nuiton.web.struts2.I18nTextProvider" name="i18nTextProvider" type="com.opensymphony.xwork2.TextProvider" /> + <constant name="struts.xworkTextProvider" value="i18nTextProvider" /> + * </pre> + * * @author Arnaud Thimel<thimel(a)codelutin.com> * @since 1.3 */

1 0

r98 - in trunk: . nuiton-struts2 nuiton-struts2/src nuiton-struts2/src/main/java/org/nuiton/web/struts2 nuiton-struts2/src/test nuiton-struts2/src/test/java nuiton-struts2/src/test/java/org nuiton-struts2/src/test/java/org/nuiton nuiton-struts2/src/test/java/org/nuiton/web nuiton-struts2/src/test/java/org/nuiton/web/struts2 nuiton-struts2/src/test/resources nuiton-struts2/src/test/resources/META-INF
by athimel＠users.nuiton.org Aug. 3, 2011

Aug. 3, 2011

Author: athimel Date: 2011-08-03 10:27:27 +0200 (Wed, 03 Aug 2011) New Revision: 98 Url: http://nuiton.org/repositories/revision/nuiton-web/98 Log: #1651 : Create a TextProvider for Struts2 using nuiton's i18n Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java trunk/nuiton-struts2/src/test/ trunk/nuiton-struts2/src/test/java/ trunk/nuiton-struts2/src/test/java/org/ trunk/nuiton-struts2/src/test/java/org/nuiton/ trunk/nuiton-struts2/src/test/java/org/nuiton/web/ trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/ trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java trunk/nuiton-struts2/src/test/resources/ trunk/nuiton-struts2/src/test/resources/META-INF/ trunk/nuiton-struts2/src/test/resources/META-INF/toto-definition.properties trunk/nuiton-struts2/src/test/resources/META-INF/toto_fr_FR.properties Modified: trunk/nuiton-struts2/pom.xml trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java trunk/pom.xml Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-07-30 01:28:16 UTC (rev 97) +++ trunk/nuiton-struts2/pom.xml 2011-08-03 08:27:27 UTC (rev 98) @@ -31,6 +31,11 @@ </dependency> <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency> Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java 2011-07-30 01:28:16 UTC (rev 97) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java 2011-08-03 08:27:27 UTC (rev 98) @@ -25,13 +25,8 @@ package org.nuiton.web.struts2; import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.util.ValueStack; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.util.Arrays; -import java.util.List; /** * Base action to use for a better usage of I18n. @@ -43,10 +38,6 @@ private static final long serialVersionUID = 1L; - public static final String UNTRANSLATED_MARKER = "???"; - - private static final Log log = LogFactory.getLog(BaseAction.class); - public String _(String aTextName) { String value = getText(aTextName); return value; @@ -57,80 +48,4 @@ return value; } - @Override - public String getText(String aTextName) { - String value = super.getText(aTextName); - return getSafeText(aTextName, value); - } - - @Override - public String getText(String aTextName, String defaultValue) { - String value = super.getText(aTextName, defaultValue); - return getSafeText(aTextName, value); - } - - @Override - public String getText(String aTextName, - String defaultValue, - String obj) { - String value = super.getText(aTextName, defaultValue, obj); - return getSafeText(aTextName, value); - } - - @Override - public String getText(String aTextName, List<?> args) { - String value = super.getText(aTextName, args); - return getSafeText(aTextName, value); - } - - @Override - public String getText(String key, String[] args) { - String value = super.getText(key, args); - return getSafeText(key, value); - } - - @Override - public String getText(String aTextName, - String defaultValue, - List<?> args) { - String value = super.getText(aTextName, defaultValue, args); - return getSafeText(aTextName, value); - } - - @Override - public String getText(String key, - String defaultValue, - String[] args) { - String value = super.getText(key, defaultValue, args); - return getSafeText(key, value); - } - - @Override - public String getText(String key, - String defaultValue, - List<?> args, - ValueStack stack) { - String value = super.getText(key, defaultValue, args, stack); - return getSafeText(key, value); - } - - @Override - public String getText(String key, - String defaultValue, - String[] args, - ValueStack stack) { - String value = super.getText(key, defaultValue, args, stack); - return getSafeText(key, value); - } - - protected String getSafeText(String key, String value) { - if (StringUtils.isEmpty(value)) { - if (log.isWarnEnabled()) { - log.warn("Key [" + key + "] is not translated"); - } - return UNTRANSLATED_MARKER + key + UNTRANSLATED_MARKER; - } - return value; - } - } Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java (rev 0) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java 2011-08-03 08:27:27 UTC (rev 98) @@ -0,0 +1,183 @@ +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 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 org.nuiton.web.struts2; + +import com.opensymphony.xwork2.LocaleProvider; +import com.opensymphony.xwork2.ResourceBundleTextProvider; +import com.opensymphony.xwork2.util.ValueStack; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.i18n.I18n; + +import java.util.List; +import java.util.Locale; +import java.util.ResourceBundle; + +/** + * Struts2's TextProvider implementation using nuiton's i18n + * + * @author Arnaud Thimel<thimel(a)codelutin.com> + * @since 1.3 + */ +public class I18nTextProvider implements ResourceBundleTextProvider { + + private static final Log log = LogFactory.getLog(BaseAction.class); + + public static final String UNTRANSLATED_MARKER = "???"; + + protected LocaleProvider localeProvider; + + protected String getSafeText(String key, String value) { + if (StringUtils.isEmpty(value)) { + if (log.isWarnEnabled()) { + log.warn("Key [" + key + "] is not translated"); + } + return UNTRANSLATED_MARKER + key + UNTRANSLATED_MARKER; + } + return value; + } + + @Override + public void setBundle(ResourceBundle bundle) { + // Nothing to do + } + + @Override + public void setClazz(Class clazz) { + // Nothing to do + } + + @Override + public void setLocaleProvider(LocaleProvider localeProvider) { + this.localeProvider = localeProvider; + } + + @Override + public boolean hasKey(String key) { + Locale locale = localeProvider.getLocale(); + boolean result = I18n.hasKey(locale, key); + return result; + } + + protected String getTextFromLocale(String key, String defaultValue) { + Locale locale = localeProvider.getLocale(); + String result = I18n.l_(locale, key); + if (result == null) { + result = defaultValue; + } + result = getSafeText(key, result); + return result; + } + + protected String getTextFromLocale(String key, String defaultValue, Object ... args) { + Locale locale = localeProvider.getLocale(); + String result = I18n.l_(locale, key, args); + if (result == null) { + result = defaultValue; + } + result = getSafeText(key, result); + return result; + } + + @Override + public String getText(String aTextName) { + String value = getTextFromLocale(aTextName, null); + return value; + } + + @Override + public String getText(String aTextName, String defaultValue) { + String value = getTextFromLocale(aTextName, defaultValue); + return value; + } + + @Override + public String getText(String aTextName, + String defaultValue, + String obj) { + String value = getTextFromLocale(aTextName, defaultValue, obj); + return value; + } + + @Override + public String getText(String aTextName, List<?> args) { + Object[] array = args.toArray(); + String value = getTextFromLocale(aTextName, null, array); + return value; + } + + @Override + public String getText(String key, String[] args) { + String value = getTextFromLocale(key, null, args); + return value; + } + + @Override + public String getText(String aTextName, + String defaultValue, + List<?> args) { + Object[] array = args.toArray(); + String value = getTextFromLocale(aTextName, defaultValue, array); + return value; + } + + @Override + public String getText(String key, + String defaultValue, + String[] args) { + String value = getTextFromLocale(key, defaultValue, args); + return value; + } + + @Override + public String getText(String key, + String defaultValue, + List<?> args, + ValueStack stack) { + String value = getText(key, defaultValue, args); + return value; + } + + @Override + public String getText(String key, + String defaultValue, + String[] args, + ValueStack stack) { + String value = getText(key, defaultValue, args); + return value; + } + + @Override + public ResourceBundle getTexts(String bundleName) { + return null; + } + + @Override + public ResourceBundle getTexts() { + return null; + } + +} Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java =================================================================== --- trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java (rev 0) +++ trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java 2011-08-03 08:27:27 UTC (rev 98) @@ -0,0 +1,95 @@ +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 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 org.nuiton.web.struts2; + +import com.opensymphony.xwork2.LocaleProvider; +import junit.framework.Assert; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.DefaultI18nInitializer; + +import java.util.Arrays; +import java.util.Locale; + +public class I18nTextProviderTest { + + protected I18nTextProvider provider; + @After + public void after() throws Exception { + I18n.close(); + } + + @Before + public void init() throws Exception { + + DefaultI18nInitializer initializer = new DefaultI18nInitializer("toto"); + initializer.setMissingKeyReturnNull(true); + I18n.init(initializer, Locale.FRENCH); + + provider = new I18nTextProvider(); + provider.setLocaleProvider(new LocaleProvider() { + @Override + public Locale getLocale() { + return Locale.FRENCH; + } + }); + + } + + @Test + public void testHasKey() throws Exception { + Assert.assertFalse(provider.hasKey("missing")); + Assert.assertTrue(provider.hasKey("present")); + } + + @Test + public void testGetTextSimple() throws Exception { + Assert.assertEquals("yes", provider.getText("present")); + Assert.assertEquals(I18nTextProvider.UNTRANSLATED_MARKER + "missing" + I18nTextProvider.UNTRANSLATED_MARKER, provider.getText("missing")); + } + + @Test + public void testGetTextDefaultValue() throws Exception { + Assert.assertEquals("yes", provider.getText("present", "toto")); + Assert.assertEquals("toto", provider.getText("missing", "toto")); + } + + @Test + public void testGetTextArg() throws Exception { + Assert.assertEquals("Hello Arno !", provider.getText("hello", null, "Arno")); + } + + @Test + public void testGetTextArgs() throws Exception { + Assert.assertEquals("Hello Arno, ça biche ?", provider.getText("hello_plus", new String[] {"Arno", "ça biche"})); + Assert.assertEquals("Hello Moto, ça gaze ?", provider.getText("hello_plus", Arrays.asList("Moto", "ça gaze"))); + + Assert.assertEquals("Bonjour", provider.getText("hello_moins", "Bonjour", new String[] {"Arno", "ça biche"})); + Assert.assertEquals("Bonjour", provider.getText("hello_moins", "Bonjour", Arrays.asList("Moto", "ça gaze"))); + } + +} Property changes on: trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-struts2/src/test/resources/META-INF/toto-definition.properties =================================================================== --- trunk/nuiton-struts2/src/test/resources/META-INF/toto-definition.properties (rev 0) +++ trunk/nuiton-struts2/src/test/resources/META-INF/toto-definition.properties 2011-08-03 08:27:27 UTC (rev 98) @@ -0,0 +1,28 @@ +### +# #%L +# Nuiton Web :: Nuiton Struts 2 +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2010 - 2011 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% +### + +bundles.fr_FR=bundleTest/toto_fr_FR.properties +encoding=utf-8 +locales=fr_FR Property changes on: trunk/nuiton-struts2/src/test/resources/META-INF/toto-definition.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-struts2/src/test/resources/META-INF/toto_fr_FR.properties =================================================================== --- trunk/nuiton-struts2/src/test/resources/META-INF/toto_fr_FR.properties (rev 0) +++ trunk/nuiton-struts2/src/test/resources/META-INF/toto_fr_FR.properties 2011-08-03 08:27:27 UTC (rev 98) @@ -0,0 +1,27 @@ +### +# #%L +# Nuiton Web :: Nuiton Struts 2 +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2010 - 2011 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% +### +present=yes +hello=Hello %s ! +hello_plus=Hello %s, %s ? \ No newline at end of file Property changes on: trunk/nuiton-struts2/src/test/resources/META-INF/toto_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-30 01:28:16 UTC (rev 97) +++ trunk/pom.xml 2011-08-03 08:27:27 UTC (rev 98) @@ -110,6 +110,14 @@  <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + <scope>provided</scope> + </dependency> + +  + <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> <version>${topiaVersion}</version> @@ -213,7 +221,9 @@  <projectId>nuiton-web</projectId> - <nuitonI18nPluginVersion>2.4</nuitonI18nPluginVersion> + <nuitonI18nVersion>2.4.1-SNAPSHOT</nuitonI18nVersion> + + <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> <jredminePluginVersion>1.2</jredminePluginVersion> <topiaVersion>2.6.1-SNAPSHOT</topiaVersion>

1 0

r97 - trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table
by jcouteau＠users.nuiton.org July 30, 2011

July 30, 2011

Author: jcouteau Date: 2011-07-30 03:28:16 +0200 (Sat, 30 Jul 2011) New Revision: 97 Url: http://nuiton.org/repositories/revision/nuiton-web/97 Log: #1642 : SortableFlexTable does not update correctly Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java 2011-07-22 13:41:22 UTC (rev 96) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java 2011-07-30 01:28:16 UTC (rev 97) @@ -34,6 +34,9 @@ implements TableModelListener, ClickHandler { SortableTableModel model; + + //number of rows for update + int rows = 0; public SortableFlexTableWithModel() { super(); @@ -53,7 +56,7 @@ this.model.removeTableModelListener(this); } this.model = model; - this.model.addTableModelListener(this); + getModel().addTableModelListener(this); } public SortableTableModel getModel() { @@ -66,8 +69,9 @@ int firstColumn = event.getColumn(); int lastColumn = event.getColumn(); int type = event.getType(); - - + + int oldRows = rows; + if (firstColumn == TableModelEvent.ALL_COLUMNS) { firstColumn = 0; lastColumn = getColumnCount() - 1; @@ -96,17 +100,29 @@ if (firstRow == lastRow) { Object value = model.getValueAt(i, firstRow); setValueAt(value, firstRow, i); + rows = 1; } else { - for (int j = firstRow; j <= lastRow; j++) { + for (int j = firstRow; j < lastRow; j++) { if (j < model.getRowCount()) { Object value = model.getValueAt(i, j); setValueAt(value, j, i); + rows = j+1; } else { break; } } } + + } + + for (int i = rows; i < oldRows; i++) { + //remove all rows that are not in model anymore + if ((rows+1) < getRowCount()){ + removeRow(rows+1); + } + } + } }

1 0

r96 - trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table
by jcouteau＠users.nuiton.org July 22, 2011

July 22, 2011

Author: jcouteau Date: 2011-07-22 15:41:22 +0200 (Fri, 22 Jul 2011) New Revision: 96 Url: http://nuiton.org/repositories/revision/nuiton-web/96 Log: #1638 : ArrayOutOfBoundException if the model is empty Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableTableModel.java Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableTableModel.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableTableModel.java 2011-07-19 17:07:51 UTC (rev 95) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableTableModel.java 2011-07-22 13:41:22 UTC (rev 96) @@ -81,8 +81,12 @@ @Override public Object getValueAt(int col, int row) { - - int modelRow = rowsOrder[row]; + + int modelRow = 0; + + if (rowsOrder.length > 0) { + modelRow = rowsOrder[row]; + } return model.getValueAt(col, modelRow); } @@ -154,6 +158,9 @@ } protected void initRowsOrder() { + + System.out.println("init rows order"); + int rowCount = model.getRowCount(); rowsOrder = new int[rowCount]; for (int i = 0;i<rowCount;i++) {

1 0

r95 - in trunk/nuiton-struts2/src/main/resources: . i18n template/simple
by tchemit＠users.nuiton.org July 19, 2011

July 19, 2011

Author: tchemit Date: 2011-07-19 19:07:51 +0200 (Tue, 19 Jul 2011) New Revision: 95 Url: http://nuiton.org/repositories/revision/nuiton-web/95 Log: Evolution #1635: use i18n in template mycheckboxlist Added: trunk/nuiton-struts2/src/main/resources/i18n/ trunk/nuiton-struts2/src/main/resources/i18n/nuiton-struts2_en_GB.properties trunk/nuiton-struts2/src/main/resources/i18n/nuiton-struts2_fr_FR.properties Modified: trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl Added: trunk/nuiton-struts2/src/main/resources/i18n/nuiton-struts2_en_GB.properties =================================================================== --- trunk/nuiton-struts2/src/main/resources/i18n/nuiton-struts2_en_GB.properties (rev 0) +++ trunk/nuiton-struts2/src/main/resources/i18n/nuiton-struts2_en_GB.properties 2011-07-19 17:07:51 UTC (rev 95) @@ -0,0 +1,2 @@ +nuiton-struts2.selectAll=Select all +nuiton-struts2.unselectAll=Unselect all \ No newline at end of file Property changes on: trunk/nuiton-struts2/src/main/resources/i18n/nuiton-struts2_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-struts2/src/main/resources/i18n/nuiton-struts2_fr_FR.properties =================================================================== --- trunk/nuiton-struts2/src/main/resources/i18n/nuiton-struts2_fr_FR.properties (rev 0) +++ trunk/nuiton-struts2/src/main/resources/i18n/nuiton-struts2_fr_FR.properties 2011-07-19 17:07:51 UTC (rev 95) @@ -0,0 +1,2 @@ +nuiton-struts2.selectAll=Tout sélectionner +nuiton-struts2.unselectAll=Tout désélectionner \ No newline at end of file Property changes on: trunk/nuiton-struts2/src/main/resources/i18n/nuiton-struts2_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl =================================================================== --- trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl 2011-07-19 14:35:15 UTC (rev 94) +++ trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl 2011-07-19 17:07:51 UTC (rev 95) @@ -30,9 +30,9 @@ </(a)s.iterator> <#if !parameters.disabled?default(false) && (itemCount > 0)> -<a href="javascript:void($('input[name=${parameters.name?html}]').attr('checked', true))">Tout sélectionner</a> +<a href="javascript:void($('input[name=${parameters.name?html}]').attr('checked', true))"><@s.text name="nuiton-struts2.selectAll"/></a>   -<a href="javascript:void($('input[name=${parameters.name?html}]').attr('checked', false))">Tout désélectionner</a> +<a href="javascript:void($('input[name=${parameters.name?html}]').attr('checked', false))"><@s.text name="nuiton-struts2.unselectAll"/></a> </#if> <#else>

1 0

r94 - trunk/nuiton-struts2/src/main/resources/template/simple
by tchemit＠users.nuiton.org July 19, 2011

July 19, 2011

Author: tchemit Date: 2011-07-19 16:35:15 +0200 (Tue, 19 Jul 2011) New Revision: 94 Url: http://nuiton.org/repositories/revision/nuiton-web/94 Log: Anomalie #1633: mycheckboxlist does not work under firefox Modified: trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl Modified: trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl =================================================================== --- trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl 2011-07-08 07:19:00 UTC (rev 93) +++ trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl 2011-07-19 14:35:15 UTC (rev 94) @@ -30,9 +30,9 @@ </(a)s.iterator> <#if !parameters.disabled?default(false) && (itemCount > 0)> -<a href="javascript:$('input[name=${parameters.name?html}]').attr('checked', true);">Tout sélectionner</a> +<a href="javascript:void($('input[name=${parameters.name?html}]').attr('checked', true))">Tout sélectionner</a>   -<a href="javascript:$('input[name=${parameters.name?html}]').attr('checked', false);">Tout désélectionner</a> +<a href="javascript:void($('input[name=${parameters.name?html}]').attr('checked', false))">Tout désélectionner</a> </#if> <#else>

1 0

r93 - in trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2: . interceptor
by tchemit＠users.nuiton.org July 8, 2011

July 8, 2011

Author: tchemit Date: 2011-07-08 09:19:00 +0200 (Fri, 08 Jul 2011) New Revision: 93 Url: http://nuiton.org/repositories/revision/nuiton-web/93 Log: Evolution #1624: Remove TopiaTransactionAware Evolution #1628: Improve the TopiaTransactionInterceptor Removed: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java Deleted: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java 2011-07-07 18:02:25 UTC (rev 92) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java 2011-07-08 07:19:00 UTC (rev 93) @@ -1,45 +0,0 @@ -/* - * #%L - * Nuiton Web :: Nuiton Struts 2 - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 - 2011 CodeLutin, Tony Chemit - * %% - * 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 org.nuiton.web.struts2; - -import org.nuiton.topia.TopiaContext; - -/** - * Use this contract on a object which use a {@code TopiaContext} as a - * transaction. - * - * The method {@link #getTransaction()} returns the internal transaction used. - * - * the method {@link #setTransaction(TopiaContext)} put the internal - * transaction. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.2 - * @deprecated since 1.4, prefer use the same class in topia project., will be remove soon - */ -@Deprecated -public interface TopiaTransactionAware extends org.nuiton.topia.framework.TopiaTransactionAware { - -} Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-07 18:02:25 UTC (rev 92) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-08 07:19:00 UTC (rev 93) @@ -32,8 +32,12 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.web.struts2.TopiaTransactionAware; +import org.nuiton.topia.framework.TopiaTransactionAware; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; @@ -45,25 +49,28 @@ /** *  * - * The aim of this Interceptor is to inject a freshly opened {@code transaction} - * in a action which implements {@link TopiaTransactionAware} contract and - * after result of action, to close the transaction. + * The aim of this Interceptor is to manage a {@code transaction} all along + * a action which implements {@link TopiaTransactionAware} + * contract. * + * Technicaly, the action will receive only a proxy of a transaction and a real + * transaction will only be created as soon as a method will be asked on it. + * * The interceptor is abstract and let user to implement the way how to open a * new transaction via the method {@link #beginTransaction()}. * - * Note that the transaction pushed in the action is in fact a proxy of the - * freshly opened transaction to forbid some method to be call on it. The list - * of method to forbid can be customized using the interceptor parameter - * {@link #excludeMethods}. + * Note that the transaction pushed in the action can be limited using a list + * of methods to exclude on it. The list of methods to forbid can be customized + * using the interceptor parameter {@link #excludeMethods}. * - * Note also that the transaction is closed after all stack of interceptor - * consumed, this means that the transaction will still be opened while - * rendering the result, this is a particular interesting thing to avoid + * Note also that the transaction is commited and closed after all stack of + * interceptor consumed, this means that the transaction will still be opened + * while rendering the result, this is a particular interesting thing to avoid * pre-loading of entities due to lazy strategy of hibernate for example. * With this mecanism you can feel free to just obtain the obtain from database * via a DAO and then really load it in the rendering result. * + * If you do not want any commit for a given action, just put on the class a commit * * This interceptor, as it provides connection to database should be in the * interceptor stack before any other interceptor requiring access to database. @@ -89,6 +96,12 @@ */ public abstract class TopiaTransactionInterceptor extends AbstractInterceptor { + /** To specify on your action that you never want any commit. */ + @Retention(RetentionPolicy.RUNTIME) + @Target({ElementType.TYPE, ElementType.METHOD}) + public @interface NoCommit { + } + /** Logger. */ private static final Log log = LogFactory.getLog(TopiaTransactionInterceptor.class); @@ -109,7 +122,8 @@ } public void setExcludeMethods(String excludeMethods) { - this.excludeMethods = TextParseUtil.commaDelimitedStringToSet(excludeMethods); + this.excludeMethods = + TextParseUtil.commaDelimitedStringToSet(excludeMethods); } /** @@ -136,59 +150,109 @@ @Override public String intercept(ActionInvocation invocation) throws Exception { - org.nuiton.topia.framework.TopiaTransactionAware transactionAware = null; + TopiaTransactionAware transactionAware = null; Object action = invocation.getProxy().getAction(); - if (action instanceof org.nuiton.topia.framework.TopiaTransactionAware) { - transactionAware = (org.nuiton.topia.framework.TopiaTransactionAware) action; + if (action instanceof TopiaTransactionAware) { + transactionAware = (TopiaTransactionAware) action; } if (transactionAware == null) { - // not a transaction aware action + // not a transaction aware action, direct skip this interceptor return invocation.invoke(); } - // action need a transaction - TopiaContext transaction = beginTransaction(); + // creates a proxy of a lazy transaction - if (log.isDebugEnabled()) { - log.debug("Open transaction " + transaction); - } + TopiaTransactionProxyInvocationHandler proxyInvocationHandler = + new TopiaTransactionProxyInvocationHandler(); - // creates a proxy on the transaction to push back in action TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( getClass().getClassLoader(), new Class<?>[]{TopiaContext.class, TopiaContextImplementor.class}, - new TopiaTransactionProxyInvocationHandler(transaction) + proxyInvocationHandler ); // set the transaction in the action transactionAware.setTransaction(proxy); - boolean doCommit = true; + boolean doCommit = isCommitNeeded(action, invocation); try { return invocation.invoke(); } catch (Exception e) { doCommit = false; - transaction.rollbackTransaction(); + TopiaContext transaction = proxyInvocationHandler.getTransaction(); + if (transaction != null && !transaction.isClosed()) { + if (log.isDebugEnabled()) { + log.debug("rollback transaction " + transaction); + } + transaction.rollbackTransaction(); + } + throw e; } finally { - if (doCommit) { - transaction.commitTransaction(); + TopiaContext transaction = proxyInvocationHandler.getTransaction(); + + if (transaction != null && !transaction.isClosed()) { + try { + if (doCommit) { + + // commit the opened transaction + if (log.isDebugEnabled()) { + log.debug("Commit transaction " + transaction); + } + transaction.commitTransaction(); + } + } finally { + + // close the opened transaction + if (log.isDebugEnabled()) { + log.debug("Close transaction " + transaction); + } + transaction.closeContext(); + } + } + } + } + + protected boolean isCommitNeeded(Object action, + ActionInvocation invocation) throws NoSuchMethodException { + Class<?> actionType = action.getClass(); + boolean noCommit = actionType.isAnnotationPresent(NoCommit.class); + if (noCommit) { + + // a no commit annotation was found on the top of action if (log.isDebugEnabled()) { - log.debug("Close transaction " + transaction); + log.debug("NoCommit annotation found on action " + + actionType.getName()); } - // close the opened transaction - transaction.closeContext(); + return false; } + + // try to look on the methodName + String methodName = invocation.getProxy().getMethod(); + if (methodName == null) { + + // no methodName specify, means the execute one + methodName = "execute"; + } + Method method = actionType.getMethod(methodName); + noCommit = method.isAnnotationPresent(NoCommit.class); + if (noCommit) { + if (log.isDebugEnabled()) { + log.debug("NoCommit annotation found on action methodName " + + actionType.getName() + "#" + methodName); + } + } + return !noCommit; } /** @@ -196,13 +260,13 @@ * * @see TopiaTransactionInterceptor#excludeMethods */ - class TopiaTransactionProxyInvocationHandler implements InvocationHandler { + public class TopiaTransactionProxyInvocationHandler implements InvocationHandler { /** Target to use for the proxy. */ - protected final TopiaContext tx; + protected TopiaContext transaction; - TopiaTransactionProxyInvocationHandler(TopiaContext tx) { - this.tx = tx; + public TopiaContext getTransaction() { + return transaction; } @Override @@ -220,9 +284,18 @@ proxy); } - // can invoke the method on the tx + if (transaction == null) { + + // first time transaction is required, create its + transaction = beginTransaction(); + + if (log.isDebugEnabled()) { + log.debug("Open transaction " + transaction); + } + } + // can invoke the method on the transaction try { - Object result = method.invoke(tx, args); + Object result = method.invoke(transaction, args); return result; } catch (Exception eee) { if (log.isErrorEnabled()) {

1 0

r92 - in trunk: . nuiton-struts2/src/main/java/org/nuiton/web/struts2 nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor
by tchemit＠users.nuiton.org July 7, 2011

July 7, 2011

Author: tchemit Date: 2011-07-07 20:02:25 +0200 (Thu, 07 Jul 2011) New Revision: 92 Url: http://nuiton.org/repositories/revision/nuiton-web/92 Log: Evolution #1627: Updates to ToPIA 2.6.1 Evolution #1624: Remove TopiaTransactionAware Evolution #1628: Improve the TopiaTransactionInterceptor Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java trunk/pom.xml Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java 2011-07-05 13:19:59 UTC (rev 91) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java 2011-07-07 18:02:25 UTC (rev 92) @@ -37,22 +37,9 @@ * * @author tchemit <chemit(a)codelutin.com> * @since 1.2 + * @deprecated since 1.4, prefer use the same class in topia project., will be remove soon */ -public interface TopiaTransactionAware { +@Deprecated +public interface TopiaTransactionAware extends org.nuiton.topia.framework.TopiaTransactionAware { - /** - * Obtains the internal transaction. - * - * If no transaction was opened, can return the {@code null} object. - * - * @return the current transaction (can be null or closed...). - */ - TopiaContext getTransaction(); - - /** - * Put in the instance, the given transaction. - * - * @param transaction the transaction to push - */ - void setTransaction(TopiaContext transaction); } Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-05 13:19:59 UTC (rev 91) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-07 18:02:25 UTC (rev 92) @@ -136,51 +136,58 @@ @Override public String intercept(ActionInvocation invocation) throws Exception { - TopiaTransactionAware transactionAware = null; + org.nuiton.topia.framework.TopiaTransactionAware transactionAware = null; Object action = invocation.getProxy().getAction(); - if (action instanceof TopiaTransactionAware) { - transactionAware = (TopiaTransactionAware) action; + if (action instanceof org.nuiton.topia.framework.TopiaTransactionAware) { + transactionAware = (org.nuiton.topia.framework.TopiaTransactionAware) action; } - TopiaContext transaction = null; - if (transactionAware != null) { + if (transactionAware == null) { - // action need a transaction - transaction = beginTransaction(); + // not a transaction aware action + return invocation.invoke(); + } - if (log.isDebugEnabled()) { - log.debug("Open transaction " + transaction); - } - // creates a proxy on the transaction to push back in action - TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( - getClass().getClassLoader(), - new Class<?>[]{TopiaContext.class, - TopiaContextImplementor.class}, - new TopiaTransactionProxyInvocationHandler(transaction) - ); + // action need a transaction + TopiaContext transaction = beginTransaction(); - // set the transaction in the action - transactionAware.setTransaction(proxy); + if (log.isDebugEnabled()) { + log.debug("Open transaction " + transaction); } + + // creates a proxy on the transaction to push back in action + TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class<?>[]{TopiaContext.class, + TopiaContextImplementor.class}, + new TopiaTransactionProxyInvocationHandler(transaction) + ); + + // set the transaction in the action + transactionAware.setTransaction(proxy); + + boolean doCommit = true; try { return invocation.invoke(); - } finally { + } catch (Exception e) { - if (transactionAware != null) { + doCommit = false; + transaction.rollbackTransaction(); - // we are on a action with a internal topia transaction + throw e; + } finally { - if (transaction != null && !transaction.isClosed()) { + if (doCommit) { + transaction.commitTransaction(); + } - if (log.isDebugEnabled()) { - log.debug("Close transaction " + transaction); - } - // close the opened transaction - transaction.closeContext(); - } + if (log.isDebugEnabled()) { + log.debug("Close transaction " + transaction); } + // close the opened transaction + transaction.closeContext(); } } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-05 13:19:59 UTC (rev 91) +++ trunk/pom.xml 2011-07-07 18:02:25 UTC (rev 92) @@ -215,7 +215,7 @@ <nuitonI18nPluginVersion>2.4</nuitonI18nPluginVersion> <jredminePluginVersion>1.2</jredminePluginVersion> - <topiaVersion>2.6</topiaVersion> + <topiaVersion>2.6.1-SNAPSHOT</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion>

1 0