Author: tchemit Date: 2009-07-11 12:12:58 +0000 (Sat, 11 Jul 2009) New Revision: 1583 Modified: trunk/simexplorer-is/pom.xml trunk/simexplorer-is/simexplorer-is-entities/pom.xml trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/SimExplorerPage.java trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/attachment/Attachment.java trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/attachment/RawType.java trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Codes.java trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Constants.java trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java trunk/simexplorer-is/simexplorer-is-security/pom.xml trunk/simexplorer-is/simexplorer-is-security/src/main/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java trunk/simexplorer-is/simexplorer-is-security/src/main/java/fr/cemagref/simexplorer/is/security/dao/DaoPermissionImpl.java trunk/simexplorer-is/simexplorer-is-service/pom.xml trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceHelper.java trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java trunk/simexplorer-is/simexplorer-is-service/src/test/java/fr/cemagref/simexplorer/is/service/StorageServiceVersionsTestCase.java trunk/simexplorer-is/simexplorer-is-storage/src/main/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java trunk/simexplorer-is/simexplorer-is-swing/pom.xml trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportElementAction.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTableModel.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTableModel.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/ListTabModel.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabUpdater.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/ImportDialog.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTabFactory.java trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/util/ChooseFilePanel.jaxx trunk/simexplorer-is/simexplorer-is-swing/src/main/resources/commandline.properties trunk/simexplorer-is/simexplorer-is-web/src/main/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java trunk/simexplorer-is/simexplorer-is-web/src/main/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java Log: migrate to nuiton : stage two (libs) Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/pom.xml 2009-07-11 12:12:58 UTC (rev 1583) @@ -41,14 +41,14 @@ <!-- librairies lutin --> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> <version>${lutinutil.version}</version> </dependency> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinwidget</artifactId> + <!--dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-widgets</artifactId> <version>${lutinwidget.version}</version> <scope>compile</scope> <exclusions> @@ -69,11 +69,11 @@ <artifactId>looks</artifactId> </exclusion> </exclusions> - </dependency> + </dependency--> <!-- librairie Jaxx --> <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime-swing</artifactId> <version>${jaxx.version}</version> <scope>compile</scope> @@ -92,8 +92,15 @@ </exclusion> </exclusions> </dependency> + <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime-swing-widget</artifactId> + <version>${jaxx.version}</version> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-swing-action</artifactId> <version>${jaxx.version}</version> <scope>compile</scope> @@ -339,15 +346,13 @@ <repository.home.url>http://lutinbuilder.labs.libre-entreprise.org/maven2</repository.home.url> <!-- customized libs --> - <jaxx.version>1.3</jaxx.version> + <jaxx.version>1.7.0</jaxx.version> <commandline.version>1.0</commandline.version> - <lutinutil.version>1.0.3</lutinutil.version> - <lutinwidget.version>0.14</lutinwidget.version> - <i18n.version>0.11</i18n.version> - <jrst.version>0.8.4</jrst.version> - <license-switcher.version>0.6</license-switcher.version> - + <lutinutil.version>1.1.0-rc-9-SNAPSHOT</lutinutil.version> + <!--lutinwidget.version>1.0.0-rc-2</lutinwidget.version--> + <i18n.version>1.0.0-rc-4</i18n.version> + <tapestry.version>5.0.11</tapestry.version> <jboss.version>4.2.2.GA</jboss.version> @@ -543,8 +548,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>1.0.0-rc-4</version> - <!--version>${i18n.version}</version--> + <version>${i18n.version}</version> <configuration> <bundles>fr_FR</bundles> </configuration> Modified: trunk/simexplorer-is/simexplorer-is-entities/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-entities/pom.xml 2009-07-11 12:12:58 UTC (rev 1583) @@ -23,8 +23,8 @@ <artifactId>commons-lang</artifactId> </dependency> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> </dependency> </dependencies> Modified: trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/EntityTypeEnum.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,8 +16,8 @@ */ package fr.cemagref.simexplorer.is.entities; -import static org.codelutin.i18n.I18n._; -import static org.codelutin.i18n.I18n.n_; +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.Code; Modified: trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/SimExplorerPage.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/SimExplorerPage.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/SimExplorerPage.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ */ package fr.cemagref.simexplorer.is.entities; -import static org.codelutin.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n_; /** * The Enum SimExplorerPage. Modified: trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/attachment/Attachment.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/attachment/Attachment.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/attachment/Attachment.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,13 +16,13 @@ */ package fr.cemagref.simexplorer.is.entities.attachment; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.ArrayList; import java.util.List; import org.apache.commons.lang.StringUtils; -import org.codelutin.util.StringUtil; +import org.nuiton.util.StringUtil; import fr.cemagref.simexplorer.is.entities.Leaf; Modified: trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/attachment/RawType.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/attachment/RawType.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/attachment/RawType.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.attachment; -import static org.codelutin.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n_; import java.io.InputStream; import java.io.InputStreamReader; Modified: trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Attachments.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,11 +16,11 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.composite; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.List; -import org.codelutin.util.StringUtil; +import org.nuiton.util.StringUtil; import fr.cemagref.simexplorer.is.entities.EntityVisitor; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; Modified: trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Codes.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Codes.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Codes.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.composite; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.List; Modified: trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/ConstantValues.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.composite; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.List; Modified: trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Constants.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Constants.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Constants.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ */ package fr.cemagref.simexplorer.is.entities.composite; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.List; Modified: trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/composite/Descriptors.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.composite; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.List; Modified: trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-entities/src/main/java/fr/cemagref/simexplorer/is/entities/metadata/MetaData.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ * ##% */ package fr.cemagref.simexplorer.is.entities.metadata; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.ArrayList; import java.util.Date; Modified: trunk/simexplorer-is/simexplorer-is-security/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-security/pom.xml 2009-07-11 12:12:58 UTC (rev 1583) @@ -37,8 +37,8 @@ <dependencies> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> </dependency> <!-- jboss dependencies --> @@ -106,7 +106,7 @@ <!-- *** Build Environment ************************************** --> <!-- ************************************************************* --> - <!--repositories> + <repositories> <repository> <snapshots> <enabled>false</enabled> @@ -115,6 +115,6 @@ <name>ejb3unit repository</name> <url>http://ejb3unit.sourceforge.net/maven2</url> </repository> - </repositories--> + </repositories> </project> Modified: trunk/simexplorer-is/simexplorer-is-security/src/main/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/main/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-security/src/main/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.CollectionUtil; +import org.nuiton.util.CollectionUtil; import fr.cemagref.simexplorer.is.security.entities.Actor; import fr.cemagref.simexplorer.is.security.entities.Group; Modified: trunk/simexplorer-is/simexplorer-is-security/src/main/java/fr/cemagref/simexplorer/is/security/dao/DaoPermissionImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/main/java/fr/cemagref/simexplorer/is/security/dao/DaoPermissionImpl.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-security/src/main/java/fr/cemagref/simexplorer/is/security/dao/DaoPermissionImpl.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.CollectionUtil; +import org.nuiton.util.CollectionUtil; import fr.cemagref.simexplorer.is.security.entities.Actor; import fr.cemagref.simexplorer.is.security.entities.Permission; Modified: trunk/simexplorer-is/simexplorer-is-service/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-service/pom.xml 2009-07-11 12:12:58 UTC (rev 1583) @@ -108,7 +108,6 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <!--groupId>org.codelutin</groupId--> <artifactId>maven-i18n-plugin</artifactId> <executions> <execution> Modified: trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceHelper.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceHelper.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ */ package fr.cemagref.simexplorer.is.service; -import org.codelutin.util.ConverterUtil; +import org.nuiton.util.ConverterUtil; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerTechnicalException; Modified: trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ */ package fr.cemagref.simexplorer.is.service; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.ArrayList; import java.util.Arrays; @@ -43,7 +43,7 @@ import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.i18n.I18n; +import org.nuiton.i18n.I18n; import org.jboss.annotation.ejb.RemoteBinding; import fr.cemagref.simexplorer.is.exceptions.SimExplorerBusinessException; Modified: trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ */ package fr.cemagref.simexplorer.is.service; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.exceptions.SimExplorerBusinessException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; Modified: trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ */ package fr.cemagref.simexplorer.is.service; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.IOException; import java.io.InputStream; @@ -36,7 +36,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.ZipStreamEncoder; +import org.nuiton.util.ZipStreamEncoder; import com.healthmarketscience.rmiio.SerializableInputStream; Modified: trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/random/ElementGenerator.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -23,7 +23,7 @@ import java.util.UUID; import org.apache.commons.lang.RandomStringUtils; -import org.codelutin.util.MD5; +import org.nuiton.util.MD5; import fr.cemagref.simexplorer.is.entities.Entity; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; Modified: trunk/simexplorer-is/simexplorer-is-service/src/test/java/fr/cemagref/simexplorer/is/service/StorageServiceVersionsTestCase.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/test/java/fr/cemagref/simexplorer/is/service/StorageServiceVersionsTestCase.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-service/src/test/java/fr/cemagref/simexplorer/is/service/StorageServiceVersionsTestCase.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -23,7 +23,7 @@ import junit.framework.TestCase; -import org.codelutin.util.ArrayUtil; +import org.nuiton.util.ArrayUtil; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; Modified: trunk/simexplorer-is/simexplorer-is-storage/src/main/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/main/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-storage/src/main/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -26,8 +26,8 @@ import java.io.InputStream; import java.io.OutputStream; -import org.codelutin.util.MD5; -import org.codelutin.util.MD5InputStream; +import org.nuiton.util.MD5; +import org.nuiton.util.MD5InputStream; import fr.cemagref.simexplorer.is.entities.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2009-07-11 12:12:58 UTC (rev 1583) @@ -39,14 +39,21 @@ <!-- Jaxx dependencies --> <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime-swing</artifactId> - </dependency> + </dependency> + <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime-swing-widget</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-swing-action</artifactId> </dependency> + <!-- commandline dependencies --> <dependency> @@ -69,10 +76,10 @@ <artifactId>jbossall-client</artifactId> </dependency> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinwidget</artifactId> - </dependency> + <!--dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-widgets</artifactId> + </dependency--> <dependency> <groupId>junit</groupId> @@ -152,12 +159,23 @@ </configuration> </execution> </executions> + <dependencies> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${lutinutil.version}</version> + </dependency> + </dependencies> </plugin> <plugin> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.nuiton.jaxx</groupId> + <!--groupId>org.codelutin.jaxx</groupId--> <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxx.version}</version> + <configuration> + <addProjectClassPath>true</addProjectClassPath> + <addSourcesToClassPath>true</addSourcesToClassPath> + </configuration> <executions> <execution> <goals> @@ -166,15 +184,15 @@ </execution> </executions> <dependencies> - <dependency> + <!--dependency> <groupId>org.codelutin</groupId> <artifactId>lutinwidget</artifactId> <version>${lutinwidget.version}</version> - </dependency> + </dependency--> <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>${lutinutil.version}</version> + <version>1.0.6</version> </dependency> </dependencies> </plugin> Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -23,7 +23,7 @@ import fr.cemagref.simexplorer.is.ui.swing.ui.util.ErrorDialog; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.i18n.I18n; +import org.nuiton.i18n.I18n; import org.codelutin.option.ContextProvider; import org.codelutin.option.ParserFailedException; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -35,7 +35,7 @@ import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerMainUI; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.ui.util.ErrorDialog; -import org.codelutin.i18n.I18n; +import org.nuiton.i18n.I18n; import org.codelutin.jaxx.action.ActionFactory; import org.codelutin.jaxx.action.ActionFactoryFromProvider; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -18,7 +18,7 @@ import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.tab.ListTabModel; -import org.codelutin.util.SimplePaginationEnum; +import org.nuiton.util.SimplePaginationEnum; import javax.swing.Action; import javax.swing.JComboBox; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -25,7 +25,7 @@ import fr.cemagref.simexplorer.is.ui.swing.ui.LoginUI; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerMainUI; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import javax.swing.JOptionPane; import javax.swing.JTabbedPane; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -21,7 +21,7 @@ import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel; import fr.cemagref.simexplorer.is.ui.swing.model.tab.SynchronizeTabModel; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import javax.swing.JOptionPane; import java.awt.event.ActionEvent; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -20,8 +20,8 @@ import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.ui.swing.actions.util.DownloadAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.model.tab.DetailTabModel; -import static org.codelutin.i18n.I18n._; -import org.codelutin.util.FileUtil; +import static org.nuiton.i18n.I18n._; +import org.nuiton.util.FileUtil; import java.io.BufferedInputStream; import java.io.File; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadElementAction.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -18,8 +18,8 @@ import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.ui.swing.actions.util.DownloadAbstractAction; -import static org.codelutin.i18n.I18n._; -import org.codelutin.util.FileUtil; +import static org.nuiton.i18n.I18n._; +import org.nuiton.util.FileUtil; import java.io.BufferedInputStream; import java.io.File; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -26,7 +26,7 @@ import fr.cemagref.simexplorer.is.ui.swing.model.tab.SimExplorerAbstractTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.tab.SynchronizeTabModel; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; -import static org.codelutin.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n_; import org.codelutin.jaxx.tab.TabModel; import org.codelutin.jaxx.util.UIHelper; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportElementAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportElementAction.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/ImportElementAction.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -25,8 +25,8 @@ import fr.cemagref.simexplorer.is.ui.swing.model.tab.SynchronizeTabModel; import fr.cemagref.simexplorer.is.ui.swing.ui.ImportDialog; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; -import static org.codelutin.i18n.I18n._; -import static org.codelutin.i18n.I18n.n_; +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; import java.awt.event.ActionEvent; import java.io.File; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -25,8 +25,8 @@ import jaxx.runtime.JAXXObject; import jaxx.runtime.swing.JAXXTab; import org.apache.commons.beanutils.Converter; -import org.codelutin.i18n.I18n; -import org.codelutin.util.ConverterUtil; +import org.nuiton.i18n.I18n; +import org.nuiton.util.ConverterUtil; import javax.swing.JComponent; import javax.swing.JTabbedPane; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTableModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTableModel.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTableModel.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -19,8 +19,8 @@ import fr.cemagref.simexplorer.is.entities.data.Descriptor; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; -import static org.codelutin.i18n.I18n._; -import static org.codelutin.i18n.I18n.n_; +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; import javax.swing.table.AbstractTableModel; import java.util.ArrayList; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTableModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTableModel.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTableModel.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -19,8 +19,8 @@ import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.storage.SortColumn; -import static org.codelutin.i18n.I18n._; -import static org.codelutin.i18n.I18n.n_; +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; import javax.swing.table.AbstractTableModel; import java.beans.BeanInfo; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/ListTabModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/ListTabModel.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/model/tab/ListTabModel.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -19,7 +19,7 @@ import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.storage.SortColumn; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerContext; -import org.codelutin.util.SimplePaginationEnum; +import org.nuiton.util.SimplePaginationEnum; import java.io.Serializable; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabUpdater.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabUpdater.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/DetailTabUpdater.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -27,7 +27,7 @@ import fr.cemagref.simexplorer.is.ui.swing.model.EntityTreeNode; import fr.cemagref.simexplorer.is.ui.swing.model.HistoryModel; import fr.cemagref.simexplorer.is.ui.swing.model.tab.DetailTabModel; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.codelutin.option.ui.actions.ActionHelper; import javax.swing.DefaultComboBoxModel; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/ImportDialog.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/ImportDialog.jaxx 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/ImportDialog.jaxx 2009-07-11 12:12:58 UTC (rev 1583) @@ -24,7 +24,7 @@ protected void chooseDir() { String type = (String) getTypeImport().getSelectedValue(); String[] filter = this.filters.get(type); - File dir= org.codelutin.util.FileUtil.getFile(filter==null?null:filter); + File dir= org.nuiton.util.FileUtil.getFile(filter==null?null:filter); if (dir!=null) { filePath.setText(dir.toString()); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/JListTab.jaxx 2009-07-11 12:12:58 UTC (rev 1583) @@ -27,7 +27,7 @@ <JTextField id='searchText' toolTipText='simexplorer.action.searchText.tooltip'/> <JButton id='search'/> <JButton id='advancedSearch'/> - <org.codelutin.util.EnumEditor id='changeSizor' font-size='9' constructorParams="org.codelutin.util.SimplePaginationEnum.class" enabled='false' opaque='false' preferredSize='{new Dimension(50,5)}'/> + <org.nuiton.util.EnumEditor id='changeSizor' font-size='9' constructorParams="org.nuiton.util.SimplePaginationEnum.class" enabled='false' opaque='false' preferredSize='{new Dimension(50,5)}'/> </JToolBar> </cell> </row> Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -22,7 +22,7 @@ import fr.cemagref.simexplorer.is.ui.swing.SimExplorer; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerContext; import fr.cemagref.simexplorer.is.ui.swing.actions.ExportElementAction; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.codelutin.option.ui.actions.ActionHelper; import javax.swing.AbstractButton; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTabFactory.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTabFactory.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerTabFactory.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -26,7 +26,7 @@ import org.codelutin.jaxx.tab.TabFactory; import org.codelutin.jaxx.tab.TabModel; import jaxx.runtime.swing.JAXXTab; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import javax.swing.AbstractButton; import javax.swing.JComponent; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx 2009-07-11 12:12:58 UTC (rev 1583) @@ -61,7 +61,8 @@ <!-- la barre de status --> <row> <cell fill="both"> - <org.codelutin.widget.StatusBar id='statusBar'/> + <jaxx.runtime.swing.StatusMessagePanel id='statusBar'/> + <!--org.codelutin.widget.StatusBar id='statusBar'/--> </cell> </row> </Table> Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/util/ChooseFilePanel.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/util/ChooseFilePanel.jaxx 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/java/fr/cemagref/simexplorer/is/ui/swing/ui/util/ChooseFilePanel.jaxx 2009-07-11 12:12:58 UTC (rev 1583) @@ -1,7 +1,7 @@ <Table> <script> protected void chooseDir() { - String dir= org.codelutin.util.FileUtil.getDirectory(); + String dir= org.nuiton.util.FileUtil.getDirectory(); if (dir!=null) { directory.setText(dir); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/main/resources/commandline.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/main/resources/commandline.properties 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-swing/src/main/resources/commandline.properties 2009-07-11 12:12:58 UTC (rev 1583) @@ -59,10 +59,10 @@ ### ### Application preferences ### -main.config.definition.localSizor=org.codelutin.util.SimplePaginationEnum:_5 +main.config.definition.localSizor=org.nuiton.util.SimplePaginationEnum:_5 main.config.modifiers.localSizor= -main.config.definition.remoteSizor=org.codelutin.util.SimplePaginationEnum:_20 +main.config.definition.remoteSizor=org.nuiton.util.SimplePaginationEnum:_20 main.config.modifiers.remoteSizor= main.config.definition.showLocalTab=java.lang.Boolean:True Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -16,7 +16,7 @@ */ package fr.cemagref.simexplorer.is.ui.web.pages; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.InputStream; import java.text.SimpleDateFormat; Modified: trunk/simexplorer-is/simexplorer-is-web/src/main/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/main/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2009-07-11 11:05:59 UTC (rev 1582) +++ trunk/simexplorer-is/simexplorer-is-web/src/main/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2009-07-11 12:12:58 UTC (rev 1583) @@ -21,7 +21,7 @@ import org.apache.tapestry.annotations.Persist; import org.apache.tapestry.ioc.Messages; import org.apache.tapestry.ioc.annotations.Inject; -import org.codelutin.i18n.I18n; +import org.nuiton.i18n.I18n; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerSecurityException;