[Coser-commits] r1124 - in trunk: . coser-business coser-business/src/license coser-business/src/main/java/fr/ifremer/coser coser-business/src/main/java/fr/ifremer/coser/bean coser-business/src/main/java/fr/ifremer/coser/command coser-business/src/main/java/fr/ifremer/coser/data coser-business/src/main/java/fr/ifremer/coser/services coser-business/src/test/java/fr/ifremer/coser/services coser-ui coser-ui/src/license coser-ui/src/main/java/fr/ifremer/coser coser-ui/src/main/java/fr/ifremer/coser/ui coser-ui/

Author: tchemit Date: 2014-02-24 16:14:55 +0100 (Mon, 24 Feb 2014) New Revision: 1124 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1124 Log: fixes #3545: Updates mavenpom to 4.7 refs #4546: Updates dependencies Modified: trunk/LICENSE.txt trunk/coser-business/LICENSE.txt trunk/coser-business/pom.xml trunk/coser-business/src/license/THIRD-PARTY.properties trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/data/AbstractDataEntity.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/CommonService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java trunk/coser-ui/pom.xml trunk/coser-ui/src/license/THIRD-PARTY.properties trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenu.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlCategoryListRenderer.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDuplicatedLineTableModel.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlErrorTreeRenderer.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalControlErrorModel.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/ConfigurationView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/NoCopiedLayerUI.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/OptionHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/ValidatorDialog.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/ValidatorsTreeRenderer.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectCreationView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectEditView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectOpenView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/SpeciesFieldTypeListRenderer.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ExportUploadDialog.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableModel.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableRenderer.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/RsufiResultTableModel.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionRsufiView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SpeciesListOccDensRenderer.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/CoserProgressBar.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/ErrorHelper.java trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties trunk/coser-web/LICENSE.txt trunk/coser-web/pom.xml trunk/coser-web/src/license/THIRD-PARTY.properties trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/ServiceFactory.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/admin/DeleteProjectsAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/search/ExtractAction.java trunk/pom.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/LICENSE.txt 2014-02-24 15:14:55 UTC (rev 1124) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/coser-business/LICENSE.txt =================================================================== --- trunk/coser-business/LICENSE.txt 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-business/LICENSE.txt 2014-02-24 15:14:55 UTC (rev 1124) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-business/pom.xml 2014-02-24 15:14:55 UTC (rev 1124) @@ -1,23 +1,34 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> <artifactId>coser-business</artifactId> + <packaging>jar</packaging> + <name>Coser :: Business</name> + <description>Coser business module</description> + + <properties> + <license.licenseName>lgpl_v3</license.licenseName> + </properties> + <dependencies> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + </dependency> + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> @@ -42,8 +53,8 @@ <artifactId>commons-beanutils</artifactId> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> <groupId>commons-io</groupId> @@ -107,15 +118,6 @@ </dependency> </dependencies> - <name>Coser :: Business</name> - <description>Coser business module</description> - - <packaging>jar</packaging> - - <properties> - <license.licenseName>lgpl_v3</license.licenseName> - </properties> - <build> <plugins> <plugin> @@ -133,4 +135,5 @@ </plugin> </plugins> </build> + </project> Modified: trunk/coser-business/src/license/THIRD-PARTY.properties =================================================================== --- trunk/coser-business/src/license/THIRD-PARTY.properties 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-business/src/license/THIRD-PARTY.properties 2014-02-24 15:14:55 UTC (rev 1124) @@ -1,7 +1,6 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache License # - Apache Software License, Version 2.0 # - BSD License # - BSD-style license @@ -23,7 +22,6 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jan 29 16:06:34 CET 2013 -commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0 +#Mon Feb 24 15:56:47 CET 2014 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javassist--javassist--3.8.0.GA=GNU Lesser General Public License -regexp--regexp--1.3=The Apache Software License, Version 2.0 Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -25,13 +25,14 @@ package fr.ifremer.coser; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.util.List; import java.util.Locale; -import org.nuiton.util.ApplicationConfig; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ConfigOptionDef; /** * Coser business application config. @@ -237,36 +238,36 @@ return emails; } - public static enum CoserBusinessOption { + public static enum CoserBusinessOption implements ConfigOptionDef { - DATABASE_DIRECTORY("coser.database.directory", _("coser.config.database.directory.description"), "${user.home}" + File.separator + "coser"), - PROJECTS_DIRECTORY("coser.projects.directory", _("coser.config.projects.directory.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "projects"), - VALIDATOR_DIRECTORY("coser.validator.directory", _("coser.config.validator.directory.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "validators"), + DATABASE_DIRECTORY("coser.database.directory", t("coser.config.database.directory.description"), "${user.home}" + File.separator + "coser"), + PROJECTS_DIRECTORY("coser.projects.directory", t("coser.config.projects.directory.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "projects"), + VALIDATOR_DIRECTORY("coser.validator.directory", t("coser.config.validator.directory.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "validators"), - SMTP_HOST("coser.smtp.host", _("coser.config.smtp.host.description"), "smtp"), - LOCALE("coser.locale", _("coser.config.locale.description"), Locale.FRANCE.toString()), + SMTP_HOST("coser.smtp.host", t("coser.config.smtp.host.description"), "smtp"), + LOCALE("coser.locale", t("coser.config.locale.description"), Locale.FRANCE.toString()), - REFERENCE_SPECIES("coser.reference.species", _("coser.config.reference.species.description"), ""), - REFERENCE_TYPE_ESPECES("coser.reference.typeSpecies", _("coser.config.reference.typeSpecies.description"), ""), + REFERENCE_SPECIES("coser.reference.species", t("coser.config.reference.species.description"), ""), + REFERENCE_TYPE_ESPECES("coser.reference.typeSpecies", t("coser.config.reference.typeSpecies.description"), ""), - CONTROL_NOBSMIN("coser.control.nobsmin", _("coser.config.control.nobsmin.description"), "1.0"), - CONTROL_DIFF_CATCH_LENGTH("coser.control.diffcatchlength", _("coser.config.control.diffcatchlength.description"), "5.0"), - CONTROL_TYPE_FISH("coser.control.typeFish", _("coser.config.control.typeFish.description"), "Pisces + Agnatha"), - CONTROL_STANDARD_DEVIATION_TO_AVERAGE("coser.control.standarddeviationtoaverage", _("coser.config.control.standarddeviationtoaverage.description"), "3"), - SELECTION_FILTER_OCCURRENCE("coser.selection.occurrenceFilter", _("coser.config.selection.occurrenceFilter.description"), "5.0"), - SELECTION_FILTER_DENSITY("coser.selection.densityFilter", _("coser.config.selection.densityFilter.description"), "5.0"), + CONTROL_NOBSMIN("coser.control.nobsmin", t("coser.config.control.nobsmin.description"), "1.0"), + CONTROL_DIFF_CATCH_LENGTH("coser.control.diffcatchlength", t("coser.config.control.diffcatchlength.description"), "5.0"), + CONTROL_TYPE_FISH("coser.control.typeFish", t("coser.config.control.typeFish.description"), "Pisces + Agnatha"), + CONTROL_STANDARD_DEVIATION_TO_AVERAGE("coser.control.standarddeviationtoaverage", t("coser.config.control.standarddeviationtoaverage.description"), "3"), + SELECTION_FILTER_OCCURRENCE("coser.selection.occurrenceFilter", t("coser.config.selection.occurrenceFilter.description"), "5.0"), + SELECTION_FILTER_DENSITY("coser.selection.densityFilter", t("coser.config.selection.densityFilter.description"), "5.0"), /** Client side. */ - WEB_FRONT_END("coser.web.frontend", _("coser.config.web.frontend.description"), "http://www.ifremer.fr/SIH-indices-campagnes"), - WEB_UPLOAD_URL("coser.web.uploadurl", _("coser.config.web.uploadurl.description"), "${" + WEB_FRONT_END.key + "}/upload-result.action"), + WEB_FRONT_END("coser.web.frontend", t("coser.config.web.frontend.description"), "http://www.ifremer.fr/SIH-indices-campagnes"), + WEB_UPLOAD_URL("coser.web.uploadurl", t("coser.config.web.uploadurl.description"), "${" + WEB_FRONT_END.key + "}/upload-result.action"), /** Server side. */ - WEB_PROPERTIES_FILE("coser.web.properties.file", _("coser.config.web.properties.file.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "web.properties"), - WEB_INDICATORS_PROJECTS_DIRECTORY("coser.web.indicators.projects.directory", _("coser.config.web.indicators.projects.directory.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "webindicatorsprojects"), - WEB_MAPS_PROJECTS_DIRECTORY("coser.web.maps.projects.directory", _("coser.config.web.maps.projects.directory.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "webmapsprojects"), - WEB_INDICATORS("coser.web.indicators.file", _("coser.config.web.indicators.file.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "webindicators.csv"), - WEB_ZONES("coser.web.zones.file", _("coser.config.web.zones.file.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "webzones.csv"), - WEB_PUBLICATION_EMAIL("coser.web.newresult.emails", _("coser.config.web.newresult.emails.description"), null); + WEB_PROPERTIES_FILE("coser.web.properties.file", t("coser.config.web.properties.file.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "web.properties"), + WEB_INDICATORS_PROJECTS_DIRECTORY("coser.web.indicators.projects.directory", t("coser.config.web.indicators.projects.directory.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "webindicatorsprojects"), + WEB_MAPS_PROJECTS_DIRECTORY("coser.web.maps.projects.directory", t("coser.config.web.maps.projects.directory.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "webmapsprojects"), + WEB_INDICATORS("coser.web.indicators.file", t("coser.config.web.indicators.file.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "webindicators.csv"), + WEB_ZONES("coser.web.zones.file", t("coser.config.web.zones.file.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "webzones.csv"), + WEB_PUBLICATION_EMAIL("coser.web.newresult.emails", t("coser.config.web.newresult.emails.description"), null); protected String key; protected String description; @@ -282,6 +283,31 @@ return defaultValue; } + @Override + public boolean isTransient() { + return false; + } + + @Override + public boolean isFinal() { + return false; + } + + @Override + public void setDefaultValue(String defaultValue) { + // not used + } + + @Override + public void setTransient(boolean isTransient) { + // not used + } + + @Override + public void setFinal(boolean isFinal) { + // not used + } + public String getDescription() { return description; } @@ -289,5 +315,13 @@ public String getKey() { return key; } + + @Override + public Class<?> getType() { + //FIXME use it soon... + return null; + } + + } } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -25,7 +25,7 @@ package fr.ifremer.coser; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Coser constants. @@ -82,12 +82,12 @@ /** Categories des données manipulées. */ public static enum Category { - CATCH(n_("coser.business.category.catch"), "catch.csv", true), - STRATA(n_("coser.business.category.strata"), "strata.csv", true), - HAUL(n_("coser.business.category.haul"), "haul.csv", true), - LENGTH(n_("coser.business.category.length"), "length.csv", true), - REFTAX_SPECIES(n_("coser.business.category.reftax.species"), "reftaxSpecies.csv", false), - TYPE_ESPECES(n_("coser.business.category.typeEspece"), "codeTypeEspeces.csv", false); + CATCH(n("coser.business.category.catch"), "catch.csv", true), + STRATA(n("coser.business.category.strata"), "strata.csv", true), + HAUL(n("coser.business.category.haul"), "haul.csv", true), + LENGTH(n("coser.business.category.length"), "length.csv", true), + REFTAX_SPECIES(n("coser.business.category.reftax.species"), "reftaxSpecies.csv", false), + TYPE_ESPECES(n("coser.business.category.typeEspece"), "codeTypeEspeces.csv", false); protected String translationKey; protected String storageFileName; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -34,7 +34,7 @@ import java.util.Map; import java.util.Properties; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import fr.ifremer.coser.CoserUtils; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -25,7 +25,7 @@ package fr.ifremer.coser.command; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.ArrayList; import java.util.List; @@ -84,7 +84,7 @@ } else { // if not found, throw business exception - throw new CoserBusinessException(_("Can't find line %s for deletion", lineNumber)); + throw new CoserBusinessException(t("Can't find line %s for deletion", lineNumber)); } } @@ -146,7 +146,7 @@ // if not found, throw business exception else { - throw new CoserBusinessException(_("Can't find line %s for undeletion", lineNumber)); + throw new CoserBusinessException(t("Can't find line %s for undeletion", lineNumber)); } } @@ -183,12 +183,12 @@ @Override public String getLogString(Project project, AbstractDataContainer container) { - return _("coser.business.command.deleteline.log", _(category.getTranslationKey()), lineNumber); + return t("coser.business.command.deleteline.log", t(category.getTranslationKey()), lineNumber); } @Override public String getDescription(Project project, AbstractDataContainer container) { - String desc = _("coser.business.command.deleteline.desc", _(category.getTranslationKey()), lineNumber); + String desc = t("coser.business.command.deleteline.desc", t(category.getTranslationKey()), lineNumber); if (StringUtils.isNotBlank(comment)) { desc += " (" + comment + ")"; } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -25,7 +25,7 @@ package fr.ifremer.coser.command; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.ArrayList; import java.util.Arrays; @@ -384,10 +384,10 @@ } String log = null; if (speciesNames.length == 1) { - log = _("coser.business.command.mergespecies.rename.log", + log = t("coser.business.command.mergespecies.rename.log", project.getDisplaySpeciesText(newSpecyName), speciesAsString.toString()); } else { - log = _("coser.business.command.mergespecies.log", + log = t("coser.business.command.mergespecies.log", project.getDisplaySpeciesText(newSpecyName), speciesAsString.toString()); } return log; @@ -404,10 +404,10 @@ } String desc = null; if (speciesNames.length == 1) { - desc = _("coser.business.command.mergespecies.rename.desc", + desc = t("coser.business.command.mergespecies.rename.desc", project.getDisplaySpeciesText(newSpecyName), speciesNames.length, speciesAsString.toString()); } else { - desc = _("coser.business.command.mergespecies.desc", + desc = t("coser.business.command.mergespecies.desc", project.getDisplaySpeciesText(newSpecyName), speciesNames.length, speciesAsString.toString()); } if (StringUtils.isNotBlank(comment)) { Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -25,7 +25,7 @@ package fr.ifremer.coser.command; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.beans.Introspector; import java.util.ArrayList; @@ -128,7 +128,7 @@ dataStorage.set(lineIndex, beanData.getData()); } else { - throw new CoserBusinessException(_("Can't replace data value. Expected %s but was %s", currentValue, dataValue)); + throw new CoserBusinessException(t("Can't replace data value. Expected %s but was %s", currentValue, dataValue)); } } catch (Exception ex) { throw new CoserBusinessException("Can't replace data field value", ex); @@ -171,7 +171,7 @@ dataStorage.set(lineIndex, beanData.getData()); } else { - throw new CoserBusinessException(_("Can't replace data value. Expected %s but was %s", newValue, dataValue)); + throw new CoserBusinessException(t("Can't replace data value. Expected %s but was %s", newValue, dataValue)); } } catch (Exception ex) { throw new CoserBusinessException("Can't replace data field value", ex); @@ -224,13 +224,13 @@ @Override public String getLogString(Project project, AbstractDataContainer container) { String realFieldName = getRealFieldName(container); - return _("coser.business.command.modifyfield.log", _(category.getTranslationKey()), lineNumber, realFieldName, currentValue, newValue); + return t("coser.business.command.modifyfield.log", t(category.getTranslationKey()), lineNumber, realFieldName, currentValue, newValue); } @Override public String getDescription(Project project, AbstractDataContainer container) { String realFieldName = getRealFieldName(container); - String desc = _("coser.business.command.modifyfield.desc", _(category.getTranslationKey()), lineNumber, realFieldName, currentValue, newValue); + String desc = t("coser.business.command.modifyfield.desc", t(category.getTranslationKey()), lineNumber, realFieldName, currentValue, newValue); if (StringUtils.isNotBlank(comment)) { desc += " (" + comment + ")"; } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/data/AbstractDataEntity.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/data/AbstractDataEntity.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/data/AbstractDataEntity.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -25,7 +25,7 @@ package fr.ifremer.coser.data; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; import fr.ifremer.coser.bean.AbstractEntity; /** @@ -43,7 +43,7 @@ private static final long serialVersionUID = 4188448448464323807L; public static final int INDEX_LINE = 0; - public static final String PROPERTY_LINE = n_("coser.business.line"); + public static final String PROPERTY_LINE = n("coser.business.line"); protected String[] data; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/CommonService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/CommonService.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/CommonService.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -25,7 +25,7 @@ package fr.ifremer.coser.services; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -44,7 +44,7 @@ import java.util.Iterator; import java.util.Map; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.nuiton.util.ArrayUtil; @@ -146,7 +146,7 @@ // check header String[] line = csvReader.readNext(); if (line == null || line.length <= 1) { - throw new CoserBusinessException(_("Can't read file '%s'. Check CSV file separator", + throw new CoserBusinessException(t("Can't read file '%s'. Check CSV file separator", file.getAbsolutePath())); } else { if (originalLoading) { @@ -220,7 +220,7 @@ if (frHeaders != null) { if (!Arrays.equals(line, enHeaders) && !Arrays.equals(line, frHeaders)) { - throw new CoserBusinessException(_("Wrong header detected in file %s. Found : %s, expected %s or %s", + throw new CoserBusinessException(t("Wrong header detected in file %s. Found : %s, expected %s or %s", file.getName(), StringUtils.join(line, ", "), StringUtils.join(frHeaders, ", "), @@ -228,7 +228,7 @@ } } else { if (!Arrays.equals(line, enHeaders)) { - throw new CoserBusinessException(_("Wrong header detected in file %s. Found : %s, expected %s", + throw new CoserBusinessException(t("Wrong header detected in file %s. Found : %s, expected %s", file.getName(), StringUtils.join(line, ", "), StringUtils.join(enHeaders, ", "))); @@ -300,7 +300,7 @@ * @param category category used to replace species output field if needed (can be null) * * @throws CoserBusinessException - * @deprecated since 1.4, prefer use of {@link storeDataWhithoutQuote(DataStorage, Writer, Map, Category)} + * @deprecated since 1.4, prefer use of {@link #storeDataWhithoutQuote(DataStorage, Writer, Map, Category)} */ public void storeDataWhithoutQuote(DataStorage content, File file, Map<String, String> refTaxSpecies, Category category) throws CoserBusinessException { @@ -445,7 +445,7 @@ // check header String[] line = csvReader.readNext(); if (line == null || line.length <= 1) { - throw new CoserBusinessException(_("Can't read file '%s'. Check CSV file separator", + throw new CoserBusinessException(t("Can't read file '%s'. Check CSV file separator", file.getAbsolutePath())); } else { Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -25,7 +25,7 @@ package fr.ifremer.coser.services; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.ArrayList; import java.util.Collection; @@ -41,7 +41,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -262,7 +262,7 @@ if (validationErrors.isEmpty()) { ControlError noErrorError = new ControlError(); noErrorError.setLevel(ValidationLevel.INFO); - noErrorError.setMessage(_("coser.business.control.noerrorfound")); + noErrorError.setMessage(t("coser.business.control.noerrorfound")); validationErrors.add(noErrorError); } return validationErrors; @@ -306,7 +306,7 @@ // update progress int total = dataToCheck.size() - 1; if (progress != null) { - progress.setText(_("coser.business.control.step.xworks", _(category.getTranslationKey()), 0)); + progress.setText(t("coser.business.control.step.xworks", t(category.getTranslationKey()), 0)); progress.setTotal(total); } @@ -320,7 +320,7 @@ // update progress if (progress != null) { int progressPercent = (int)((double)lineIndex / (double)total * 100.0); - progress.setText(_("coser.business.control.step.xworks", _(category.getTranslationKey()), progressPercent)); + progress.setText(t("coser.business.control.step.xworks", t(category.getTranslationKey()), progressPercent)); progress.setCurrent(lineIndex); ++lineIndex; } @@ -366,8 +366,8 @@ error.setLevel(ValidationLevel.ERROR); // warning, line number must stay sorted error.addLineNumber(uniqueDataKeys.get(uniqueDataKey)); - error.setMessage(_("coser.business.control.error.duplicatedLine", uniqueDataKey)); - error.setDetailMessage(_("coser.business.control.error.duplicatedLineDetails", uniqueDataKey)); + error.setMessage(t("coser.business.control.error.duplicatedLine", uniqueDataKey)); + error.setDetailMessage(t("coser.business.control.error.duplicatedLineDetails", uniqueDataKey)); validationErrors.add(error); uniqueDataErrors.put(uniqueDataKey, error); } @@ -495,7 +495,7 @@ int total = control.getCatch().size() - 1; if (progress != null) { - progress.setText(_("coser.business.control.step.observation", _(Category.CATCH.getTranslationKey()), 0)); + progress.setText(t("coser.business.control.step.observation", t(Category.CATCH.getTranslationKey()), 0)); progress.setTotal(total); } @@ -513,7 +513,7 @@ // update progress if (progress != null) { int progressPercent = (int)((double)lineIndex / (double)total * 100.0); - progress.setText(_("coser.business.control.step.observation", _(Category.CATCH.getTranslationKey()), progressPercent)); + progress.setText(t("coser.business.control.step.observation", t(Category.CATCH.getTranslationKey()), progressPercent)); progress.setCurrent(lineIndex); ++lineIndex; } @@ -566,8 +566,8 @@ error.setCategory(Category.CATCH); error.setLevel(ValidationLevel.WARNING); error.addLineNumber(lineNumber); - error.setMessage(_("coser.business.control.error.minObservationCount")); - error.setDetailMessage(_("coser.business.control.error.minObservationCountDetail", key, value)); + error.setMessage(t("coser.business.control.error.minObservationCount")); + error.setDetailMessage(t("coser.business.control.error.minObservationCountDetail", key, value)); validationErrors.add(error); } } @@ -593,7 +593,7 @@ int total = control.getCatch().size() - 1 + control.getLength().size() - 1; if (progress != null) { - progress.setText(_("coser.business.control.step.diffCatchLength", 0)); + progress.setText(t("coser.business.control.step.diffCatchLength", 0)); progress.setTotal(total); } @@ -612,7 +612,7 @@ // update progress if (progress != null) { int progressPercent = (int)((double)lineIndex / (double)total * 100.0); - progress.setText(_("coser.business.control.step.diffCatchLength", progressPercent)); + progress.setText(t("coser.business.control.step.diffCatchLength", progressPercent)); progress.setCurrent(lineIndex); ++lineIndex; } @@ -656,7 +656,7 @@ // update progress if (progress != null) { int progressPercent = (int)((double)lineIndex / (double)total * 100.0); - progress.setText(_("coser.business.control.step.diffCatchLength", progressPercent)); + progress.setText(t("coser.business.control.step.diffCatchLength", progressPercent)); progress.setCurrent(lineIndex); ++lineIndex; } @@ -722,8 +722,8 @@ SpeciesControlError error = new SpeciesControlError(); error.setSpecies(species); error.setLevel(ValidationLevel.WARNING); - error.setMessage(_("coser.business.control.error.diffCatchLengthMissingYear")); - error.setDetailMessage(_("coser.business.control.error.diffCatchLengthMissingYearDetail", + error.setMessage(t("coser.business.control.error.diffCatchLengthMissingYear")); + error.setDetailMessage(t("coser.business.control.error.diffCatchLengthMissingYearDetail", project.getDisplaySpeciesText(species))); validationErrors.add(error); missingYearLengthSpecies.add(species); @@ -739,8 +739,8 @@ DiffCatchLengthControlError error = new DiffCatchLengthControlError(); error.setSpecies(species); error.setLevel(ValidationLevel.WARNING); - error.setMessage(_("coser.business.control.error.diffCatchLength")); - error.setDetailMessage(_("coser.business.control.error.diffCatchLengthDetail", + error.setMessage(t("coser.business.control.error.diffCatchLength")); + error.setDetailMessage(t("coser.business.control.error.diffCatchLengthDetail", project.getDisplaySpeciesText(species), year)); validationErrors.add(error); } @@ -777,7 +777,7 @@ int total = control.getLength().size() - 1; if (progress != null) { - progress.setText(_("coser.business.control.step.observation", _(Category.LENGTH.getTranslationKey()), 0)); + progress.setText(t("coser.business.control.step.observation", t(Category.LENGTH.getTranslationKey()), 0)); progress.setTotal(total); } @@ -799,7 +799,7 @@ // update progress if (progress != null) { int progressPercent = (int)((double)lineIndex / (double)total * 100.0); - progress.setText(_("coser.business.control.step.observation", _(Category.LENGTH.getTranslationKey()), progressPercent)); + progress.setText(t("coser.business.control.step.observation", t(Category.LENGTH.getTranslationKey()), progressPercent)); progress.setCurrent(lineIndex); ++lineIndex; } @@ -876,8 +876,8 @@ error.setCategory(Category.LENGTH); error.setLevel(ValidationLevel.WARNING); error.addLineNumber(lineNumber); - error.setMessage(_("coser.business.control.error.minObservationCount")); - error.setDetailMessage(_("coser.business.control.error.minObservationCountDetail", key, value)); + error.setMessage(t("coser.business.control.error.minObservationCount")); + error.setDetailMessage(t("coser.business.control.error.minObservationCountDetail", key, value)); validationErrors.add(error); } } @@ -904,7 +904,7 @@ // update progress if (progress != null) { int progressPercent = (int)((double)lineIndex / (double)total * 50.0); - progress.setText(_("coser.business.control.step.lengthdeviation", _(Category.LENGTH.getTranslationKey()), progressPercent)); + progress.setText(t("coser.business.control.step.lengthdeviation", t(Category.LENGTH.getTranslationKey()), progressPercent)); progress.setCurrent(lineIndex); ++lineIndex; } @@ -951,7 +951,7 @@ // update progress if (progress != null) { int progressPercent = (int)((double)lineIndex / (double)total * 50.0 + 50.0); - progress.setText(_("coser.business.control.step.lengthoutliers", _(Category.LENGTH.getTranslationKey()), progressPercent)); + progress.setText(t("coser.business.control.step.lengthoutliers", t(Category.LENGTH.getTranslationKey()), progressPercent)); progress.setCurrent(total + lineIndex); ++lineIndex; } @@ -977,8 +977,8 @@ error.setLevel(ValidationLevel.WARNING); error.addLineNumber(lineNumber); error.setSpecies(species); - error.setMessage(_("coser.business.control.error.lengthOutliers", avg, deviation)); - error.setDetailMessage(_("coser.business.control.error.lengthOutliersDetail", + error.setMessage(t("coser.business.control.error.lengthOutliers", avg, deviation)); + error.setDetailMessage(t("coser.business.control.error.lengthOutliersDetail", project.getDisplaySpeciesText(species), avg, deviation, lengthValue)); validationErrors.add(error); } @@ -1039,7 +1039,7 @@ int total = control.getCatch().size() + control.getHaul().size() + control.getStrata().size() + control.getLength().size() - 4; if (progress != null) { - progress.setText(_("coser.business.control.step.crossFileChech", 0)); + progress.setText(t("coser.business.control.step.crossFileChech", 0)); progress.setTotal(total); progress.setCurrent(0); } @@ -1113,7 +1113,7 @@ // update progress if (progress != null) { int progressPercent = (int)((double)lineIndex / (double)total * 100.0); - progress.setText(_("coser.business.control.step.crossFileChech", progressPercent)); + progress.setText(t("coser.business.control.step.crossFileChech", progressPercent)); progress.setCurrent(lineIndex); ++lineIndex; } @@ -1128,7 +1128,7 @@ // update progress if (progress != null) { int progressPercent = (int)((double)lineIndex / (double)total * 100.0); - progress.setText(_("coser.business.control.step.crossFileChech", progressPercent)); + progress.setText(t("coser.business.control.step.crossFileChech", progressPercent)); progress.setCurrent(lineIndex); ++lineIndex; } @@ -1147,7 +1147,7 @@ // update progress if (progress != null) { int progressPercent = (int)((double)lineIndex / (double)total * 100.0); - progress.setText(_("coser.business.control.step.crossFileChech", progressPercent)); + progress.setText(t("coser.business.control.step.crossFileChech", progressPercent)); progress.setCurrent(lineIndex); ++lineIndex; } @@ -1170,8 +1170,8 @@ error.setCategory(Category.CATCH); error.addLineNumber(catchData[Catch.INDEX_LINE]); error.setLevel(ValidationLevel.ERROR); - error.setMessage(_("coser.business.control.error.nonExistantSpecies")); - error.setDetailMessage(_("coser.business.control.error.nonExistantSpeciesDetail", catchData[Catch.INDEX_SPECIES])); + error.setMessage(t("coser.business.control.error.nonExistantSpecies")); + error.setDetailMessage(t("coser.business.control.error.nonExistantSpeciesDetail", catchData[Catch.INDEX_SPECIES])); crossFilesErrors.add(error); } } @@ -1181,7 +1181,7 @@ // update progress if (progress != null) { int progressPercent = (int)((double)lineIndex / (double)total * 100.0); - progress.setText(_("coser.business.control.step.crossFileChech", progressPercent)); + progress.setText(t("coser.business.control.step.crossFileChech", progressPercent)); progress.setCurrent(lineIndex); ++lineIndex; } @@ -1204,8 +1204,8 @@ error.setCategory(Category.LENGTH); error.addLineNumber(lengthData[Length.INDEX_LINE]); error.setLevel(ValidationLevel.ERROR); - error.setMessage(_("coser.business.control.error.nonExistantSpecies")); - error.setDetailMessage(_("coser.business.control.error.nonExistantSpeciesDetail", lengthData[Length.INDEX_SPECIES])); + error.setMessage(t("coser.business.control.error.nonExistantSpecies")); + error.setDetailMessage(t("coser.business.control.error.nonExistantSpeciesDetail", lengthData[Length.INDEX_SPECIES])); crossFilesErrors.add(error); } @@ -1235,10 +1235,10 @@ error.setCategory(Category.LENGTH); error.addLineNumber(lengthData[Length.INDEX_LINE]); error.setLevel(ValidationLevel.WARNING); - error.setMessage(_("coser.business.control.error.invalidLengthLengthStep")); - error.setDetailMessage(_("coser.business.control.error.invalidLengthLengthStepDetail", + error.setMessage(t("coser.business.control.error.invalidLengthLengthStep")); + error.setDetailMessage(t("coser.business.control.error.invalidLengthLengthStepDetail", lengthData[Length.INDEX_LENGTH], project.getDisplaySpeciesText(species))); - error.setTipMessage(_("coser.business.control.error.invalidLengthLengthStepTip")); + error.setTipMessage(t("coser.business.control.error.invalidLengthLengthStepTip")); crossFilesErrors.add(error); } } @@ -1250,8 +1250,8 @@ if (!catchYear.equals(lengthYear) || !haulYear.equals(lengthYear)) { ControlError error = new ControlError(); error.setLevel(ValidationLevel.FATAL); - error.setMessage(_("coser.business.control.error.yearsNotEquals")); - //error.setDetailMessage(_("coser.business.control.error.yearsNotEquals")); + error.setMessage(t("coser.business.control.error.yearsNotEquals")); + //error.setDetailMessage(t("coser.business.control.error.yearsNotEquals")); crossFilesErrors.add(error); } @@ -1259,8 +1259,8 @@ if (surveyNames.size() != 1) { ControlError error = new ControlError(); error.setLevel(ValidationLevel.FATAL); - error.setMessage(_("coser.business.control.error.surveyNotEquals")); - //error.setDetailMessage(_("coser.business.control.error.surveyNotEquals")); + error.setMessage(t("coser.business.control.error.surveyNotEquals")); + //error.setDetailMessage(t("coser.business.control.error.surveyNotEquals")); crossFilesErrors.add(error); } @@ -1271,9 +1271,9 @@ for (String missingSpeciesCatchTuple : missingSpeciesCatchTuples) { ControlError error = new ControlError(); error.setLevel(ValidationLevel.FATAL); - error.setMessage(_("coser.business.control.error.missingYearHaulSpeciesForCatchData")); - error.setDetailMessage(_("coser.business.control.error.missingYearHaulSpeciesForCatchDataDetail", missingSpeciesCatchTuple)); - error.setTipMessage(_("coser.business.control.error.missingYearHaulSpeciesForCatchDataTip")); + error.setMessage(t("coser.business.control.error.missingYearHaulSpeciesForCatchData")); + error.setDetailMessage(t("coser.business.control.error.missingYearHaulSpeciesForCatchDataDetail", missingSpeciesCatchTuple)); + error.setTipMessage(t("coser.business.control.error.missingYearHaulSpeciesForCatchDataTip")); crossFilesErrors.add(error); } @@ -1284,9 +1284,9 @@ for (String missingHaulLengthTuple : missingHaulLengthTuples) { ControlError error = new ControlError(); error.setLevel(ValidationLevel.FATAL); - error.setMessage(_("coser.business.control.error.missingYearHaulForLengthData")); - error.setDetailMessage(_("coser.business.control.error.missingYearHaulForLengthDataDetail", missingHaulLengthTuple)); - error.setTipMessage(_("coser.business.control.error.missingYearHaulForLengthDataTip")); + error.setMessage(t("coser.business.control.error.missingYearHaulForLengthData")); + error.setDetailMessage(t("coser.business.control.error.missingYearHaulForLengthDataDetail", missingHaulLengthTuple)); + error.setTipMessage(t("coser.business.control.error.missingYearHaulForLengthDataTip")); crossFilesErrors.add(error); } @@ -1297,9 +1297,9 @@ for (String missingHaulCatchTuple : missingHaulCatchTuples) { ControlError error = new ControlError(); error.setLevel(ValidationLevel.FATAL); - error.setMessage(_("coser.business.control.error.missingYearHaulForCatchData")); - error.setDetailMessage(_("coser.business.control.error.missingYearHaulForCatchDataDetail", missingHaulCatchTuple)); - error.setTipMessage(_("coser.business.control.error.missingYearHaulForCatchDataTip")); + error.setMessage(t("coser.business.control.error.missingYearHaulForCatchData")); + error.setDetailMessage(t("coser.business.control.error.missingYearHaulForCatchDataDetail", missingHaulCatchTuple)); + error.setTipMessage(t("coser.business.control.error.missingYearHaulForCatchDataTip")); crossFilesErrors.add(error); } @@ -1310,9 +1310,9 @@ for (String missingStrataStrataName : missingStrataStrataNames) { ControlError error = new ControlError(); error.setLevel(ValidationLevel.FATAL); - error.setMessage(_("coser.business.control.error.missingStrataStrataFromHaul")); - error.setDetailMessage(_("coser.business.control.error.missingStrataStrataFromHaulDetail", missingStrataStrataName)); - error.setTipMessage(_("coser.business.control.error.missingStrataStrataFromHaulTip")); + error.setMessage(t("coser.business.control.error.missingStrataStrataFromHaul")); + error.setDetailMessage(t("coser.business.control.error.missingStrataStrataFromHaulDetail", missingStrataStrataName)); + error.setTipMessage(t("coser.business.control.error.missingStrataStrataFromHaulTip")); crossFilesErrors.add(error); } @@ -1323,9 +1323,9 @@ for (String missingHaulStrataStrataName : missingHaulStrataStrataNames) { ControlError error = new ControlError(); error.setLevel(ValidationLevel.WARNING); - error.setMessage(_("coser.business.control.error.missingHaulStrataFromStrata")); - error.setDetailMessage(_("coser.business.control.error.missingHaulStrataFromStrataDetail", missingHaulStrataStrataName)); - error.setTipMessage(_("coser.business.control.error.missingHaulStrataFromStrataTip")); + error.setMessage(t("coser.business.control.error.missingHaulStrataFromStrata")); + error.setDetailMessage(t("coser.business.control.error.missingHaulStrataFromStrataDetail", missingHaulStrataStrataName)); + error.setTipMessage(t("coser.business.control.error.missingHaulStrataFromStrataTip")); crossFilesErrors.add(error); } @@ -1336,9 +1336,9 @@ for (String missingHaulHaulName : missingHaulHaulNames) { ControlError error = new ControlError(); error.setLevel(ValidationLevel.FATAL); - error.setMessage(_("coser.business.control.error.missingHaulHaulFromCatch")); - error.setDetailMessage(_("coser.business.control.error.missingHaulHaulFromCatchDetail", missingHaulHaulName)); - error.setTipMessage(_("coser.business.control.error.missingHaulHaulFromCatchTip")); + error.setMessage(t("coser.business.control.error.missingHaulHaulFromCatch")); + error.setDetailMessage(t("coser.business.control.error.missingHaulHaulFromCatchDetail", missingHaulHaulName)); + error.setTipMessage(t("coser.business.control.error.missingHaulHaulFromCatchTip")); crossFilesErrors.add(error); } @@ -1349,9 +1349,9 @@ for (String missingCatchHaulName : missingCatchHaulNames) { ControlError error = new ControlError(); error.setLevel(ValidationLevel.WARNING); - error.setMessage(_("coser.business.control.error.missingCatchHaulFromHaul")); - error.setDetailMessage(_("coser.business.control.error.missingCatchHaulFromHaulDetail", missingCatchHaulName)); - error.setTipMessage(_("coser.business.control.error.missingCatchHaulFromHaulTip")); + error.setMessage(t("coser.business.control.error.missingCatchHaulFromHaul")); + error.setDetailMessage(t("coser.business.control.error.missingCatchHaulFromHaulDetail", missingCatchHaulName)); + error.setTipMessage(t("coser.business.control.error.missingCatchHaulFromHaulTip")); crossFilesErrors.add(error); } @@ -1362,9 +1362,9 @@ for (String missingCatchHaulForLengthName : missingCatchHaulForLengthNames) { ControlError error = new ControlError(); error.setLevel(ValidationLevel.FATAL); - error.setMessage(_("coser.business.control.error.missingCatchHaulFromLength")); - error.setDetailMessage(_("coser.business.control.error.missingCatchHaulFromLengthDetail", missingCatchHaulForLengthName)); - error.setTipMessage(_("coser.business.control.error.missingCatchHaulFromLengthTip")); + error.setMessage(t("coser.business.control.error.missingCatchHaulFromLength")); + error.setDetailMessage(t("coser.business.control.error.missingCatchHaulFromLengthDetail", missingCatchHaulForLengthName)); + error.setTipMessage(t("coser.business.control.error.missingCatchHaulFromLengthTip")); crossFilesErrors.add(error); } @@ -1375,9 +1375,9 @@ for (String missingLengthHaulName : missingLengthHaulNames) { ControlError error = new ControlError(); error.setLevel(ValidationLevel.WARNING); - error.setMessage(_("coser.business.control.error.missingLengthHaulFromCatch")); - error.setDetailMessage(_("coser.business.control.error.missingLengthHaulFromCatchDetail", missingLengthHaulName)); - error.setTipMessage(_("coser.business.control.error.missingLengthHaulFromCatchTip")); + error.setMessage(t("coser.business.control.error.missingLengthHaulFromCatch")); + error.setDetailMessage(t("coser.business.control.error.missingLengthHaulFromCatchDetail", missingLengthHaulName)); + error.setTipMessage(t("coser.business.control.error.missingLengthHaulFromCatchTip")); crossFilesErrors.add(error); } @@ -1389,10 +1389,10 @@ SpeciesControlError error = new SpeciesControlError(); error.setLevel(ValidationLevel.FATAL); error.setSpecies(missingCatchSpeciesName); - error.setMessage(_("coser.business.control.error.missingCatchSpeciesFromLength")); - error.setDetailMessage(_("coser.business.control.error.missingCatchSpeciesFromLengthDetail", + error.setMessage(t("coser.business.control.error.missingCatchSpeciesFromLength")); + error.setDetailMessage(t("coser.business.control.error.missingCatchSpeciesFromLengthDetail", project.getDisplaySpeciesText(missingCatchSpeciesName))); - error.setTipMessage(_("coser.business.control.error.missingCatchSpeciesFromLengthTip")); + error.setTipMessage(t("coser.business.control.error.missingCatchSpeciesFromLengthTip")); crossFilesErrors.add(error); } @@ -1404,10 +1404,10 @@ SpeciesControlError error = new SpeciesControlError(); error.setLevel(ValidationLevel.WARNING); error.setSpecies(missingLengthSpeciesName); - error.setMessage(_("coser.business.control.error.missingLengthSpeciesFromCatch")); - error.setDetailMessage(_("coser.business.control.error.missingLengthSpeciesFromCatchDetail", + error.setMessage(t("coser.business.control.error.missingLengthSpeciesFromCatch")); + error.setDetailMessage(t("coser.business.control.error.missingLengthSpeciesFromCatchDetail", project.getDisplaySpeciesText(missingLengthSpeciesName))); - error.setTipMessage(_("coser.business.control.error.missingLengthSpeciesFromCatchTip")); + error.setTipMessage(t("coser.business.control.error.missingLengthSpeciesFromCatchTip")); crossFilesErrors.add(error); } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -25,8 +25,8 @@ package fr.ifremer.coser.services; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; import java.beans.Introspector; import java.io.BufferedOutputStream; @@ -59,8 +59,8 @@ import java.util.regex.Pattern; import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.ListUtils; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.ListUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ArrayUtils; @@ -177,7 +177,7 @@ String projectName = project.getName(); File projectDirectory = new File(projectsDirectory, projectName); if (projectDirectory.exists()) { - throw new CoserBusinessException(_("Project %s already exist", project.getName())); + throw new CoserBusinessException(t("Project %s already exist", project.getName())); } // set project date @@ -207,7 +207,7 @@ // test file existence if (!dataFile.exists()) { - throw new CoserBusinessException(_("Can't read file %s for category %s", dataFile.getAbsolutePath(), _(category.getTranslationKey()))); + throw new CoserBusinessException(t("Can't read file %s for category %s", dataFile.getAbsolutePath(), t(category.getTranslationKey()))); } DataStorage dataStorage = commonService.loadCSVFile(project, category, dataFile, progress, true); @@ -250,9 +250,9 @@ try { FileUtils.deleteDirectory(projectDirectory); } catch (IOException e) { - throw new CoserBusinessException(_("Can't create project"), ex); + throw new CoserBusinessException(t("Can't create project"), ex); } - throw new CoserBusinessException(_("Can't create project"), ex); + throw new CoserBusinessException(t("Can't create project"), ex); } } @@ -401,7 +401,7 @@ } File projectDirectory = new File(projectsDirectory, projectName); if (!projectDirectory.isDirectory()) { - throw new CoserBusinessException(_("Project %s doesn't exists !", projectName)); + throw new CoserBusinessException(t("Project %s doesn't exists !", projectName)); } Project project = new Project(projectName); @@ -418,7 +418,7 @@ else { // si on arrive ici et qu'un fichier de reference // n'existe pas, c'est grave - throw new CoserBusinessException(_("Missing file %s", inputFile)); + throw new CoserBusinessException(t("Missing file %s", inputFile)); } } } @@ -670,7 +670,7 @@ else { // si on arrive ici et qu'un fichier original // n'existe pas, c'est grave - throw new CoserBusinessException(_("Missing file %s", storageDataFile)); + throw new CoserBusinessException(t("Missing file %s", storageDataFile)); } // deleted data @@ -755,7 +755,7 @@ addProjectContent(project, selection, category, dataStorage, false); } else { - throw new CoserBusinessException(_("Missing file %s", inputFile)); + throw new CoserBusinessException(t("Missing file %s", inputFile)); } } } @@ -912,7 +912,7 @@ // le control doit être validé if (!project.getControl().isValidated()) { - throw new CoserBusinessException(_("coser.business.selection.notValidatedControl")); + throw new CoserBusinessException(t("coser.business.selection.notValidatedControl")); } Project localProject = project; @@ -1023,7 +1023,7 @@ File selectionDirectory = new File(selectionsDirectory, selection.getName()); if (selectionDirectory.isDirectory()) { - throw new CoserBusinessException(_("Selection %s already exists", selection.getName())); + throw new CoserBusinessException(t("Selection %s already exists", selection.getName())); } else { selectionDirectory.mkdirs(); @@ -1119,7 +1119,7 @@ // save it if (rsufiResultDirectory.exists()) { - throw new CoserBusinessException(_("coser.business.result.rsufiResultAlreadyExists", rsufiResult.getName())); + throw new CoserBusinessException(t("coser.business.result.rsufiResultAlreadyExists", rsufiResult.getName())); } else { rsufiResultDirectory.mkdirs(); @@ -2209,7 +2209,7 @@ public Project mergeSpecies(Project project, Selection selection, String newSpeciesName, String comment, String... speciesNames) throws CoserBusinessException { if (!isSpeciesNameExist(project, newSpeciesName)) { - throw new CoserBusinessException(_("Species %s doesn't exist in referential", + throw new CoserBusinessException(t("Species %s doesn't exist in referential", project.getDisplaySpeciesText(newSpeciesName))); } @@ -2218,7 +2218,7 @@ List<String> selectionSpecies = getProjectSpecies(selection, project, null); if (selectionSpecies.contains(newSpeciesName) && !ArrayUtils.contains(speciesNames, newSpeciesName)) { - throw new CoserBusinessException(_("Species %s already exists in current selection", + throw new CoserBusinessException(t("Species %s already exists in current selection", project.getDisplaySpeciesText(newSpeciesName))); } @@ -2289,7 +2289,7 @@ if (!lineNames2.isEmpty() && !columnsNames2.isEmpty()) { Collections.sort(lineNames2); Collections.sort(columnsNames2); - matrix = MatrixFactory.getInstance().create(n_("coser.business.matrix.samplingeffort"), new List<?>[] { + matrix = MatrixFactory.getInstance().create(n("coser.business.matrix.samplingeffort"), new List<?>[] { lineNames2 , columnsNames2}); for (Map.Entry<String, Map<String, Double>> dynMatrixEntry : dynMatrix.entrySet()) { @@ -2385,7 +2385,7 @@ Collections.sort(lineNames2); List<String> columnsNames2 = new ArrayList<String>(columns); Collections.sort(columnsNames2); - MatrixND matrix = MatrixFactory.getInstance().create(n_("coser.business.matrix.occurrence"), new List<?>[] { + MatrixND matrix = MatrixFactory.getInstance().create(n("coser.business.matrix.occurrence"), new List<?>[] { lineNames2 , columnsNames2}); for (Map.Entry<String, Map<String, Set<String>>> dynMatrixEntry : dynMatrix.entrySet()) { @@ -2572,7 +2572,7 @@ Collections.sort(sortedSpecies); List<String> sortedYears = new ArrayList<String>(yearsList); Collections.sort(sortedYears); - MatrixND matrix = MatrixFactory.getInstance().create(n_("coser.business.matrix.density"), new List<?>[] { + MatrixND matrix = MatrixFactory.getInstance().create(n("coser.business.matrix.density"), new List<?>[] { sortedSpecies , sortedYears}); for (Map.Entry<String, Map<String, Map<String, Set<Double>>>> dynMatrixEntry : densityPerSpecyStrataYear.entrySet()) { @@ -2699,15 +2699,15 @@ Collections.sort(yearsSem); if (log.isDebugEnabled()) { - log.debug(_("Creating matrix : %d*%d*%d*%d", lengthSem.size(), speciesSem.size(), strataSem.size(), yearsSem.size())); + log.debug(t("Creating matrix : %d*%d*%d*%d", lengthSem.size(), speciesSem.size(), strataSem.size(), yearsSem.size())); } - MatrixND matrix = MatrixFactory.getInstance().createProxy(n_("coser.business.matrix.lengthstructure"), + MatrixND matrix = MatrixFactory.getInstance().createProxy(n("coser.business.matrix.lengthstructure"), new List<?>[] { lengthSem , speciesSem, strataSem, yearsSem}, - new String[] {n_("coser.business.common.length"), - n_("coser.business.common.species"), - n_("coser.business.common.strata"), - n_("coser.business.common.years")}, + new String[] {n("coser.business.common.length"), + n("coser.business.common.species"), + n("coser.business.common.strata"), + n("coser.business.common.years")}, new LengthStructureMatrixProvider(project, dataContainer)); return matrix; @@ -2888,14 +2888,14 @@ try { out = new PrintStream(new BufferedOutputStream(new FileOutputStream(informationFile))); - out.println(_("coser.business.extract.projectName") + project.getName()); - out.println(_("coser.business.extract.projectAuthor") + project.getAuthor()); - out.println(_("coser.business.extract.projectComment") + project.getComment()); - out.println(_("coser.business.extract.selectionName") + selection.getName()); + out.println(t("coser.business.extract.projectName") + project.getName()); + out.println(t("coser.business.extract.projectAuthor") + project.getAuthor()); + out.println(t("coser.business.extract.projectComment") + project.getComment()); + out.println(t("coser.business.extract.selectionName") + selection.getName()); // date de creation du projet DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.SHORT, config.getLocale()); - out.println(_("coser.business.extract.creationdate") + dateFormat.format(project.getCreationDate())); + out.println(t("coser.business.extract.creationdate") + dateFormat.format(project.getCreationDate())); // add selection additional files File projectsDirectory = config.getProjectsDirectory(); @@ -3026,7 +3026,7 @@ double dlat = Double.parseDouble(lat); double dlong = Double.parseDouble(longi); - String name = _("coser.business.map.haulname", stratum, year, haul, depth); + String name = t("coser.business.map.haulname", stratum, year, haul, depth); int serieIndex = serieCache.indexOf(strata); Coordinate coordinate = new Coordinate(serieIndex, name, dlat, dlong); hauls.add(coordinate); @@ -3092,12 +3092,12 @@ File projectsDirectory = config.getProjectsDirectory(); File projectDirectory = new File(projectsDirectory, projectName); if (!projectDirectory.isDirectory()) { - throw new CoserBusinessException(_("Project %s doesn't exists !", projectName)); + throw new CoserBusinessException(t("Project %s doesn't exists !", projectName)); } File selectionsDirectory = new File(projectDirectory, CoserConstants.STORAGE_SELECTION_DIRECTORY); File selectionDirectory = new File(selectionsDirectory, selectionName); if (!projectDirectory.isDirectory()) { - throw new CoserBusinessException(_("Selection %s doesn't exists !", projectName)); + throw new CoserBusinessException(t("Selection %s doesn't exists !", projectName)); } Selection selection = new Selection(); Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -25,7 +25,7 @@ package fr.ifremer.coser.services; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Color; import java.awt.Shape; @@ -50,9 +50,9 @@ import java.util.Set; import java.util.TreeMap; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.keyvalue.MultiKey; -import org.apache.commons.collections.map.MultiKeyMap; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.keyvalue.MultiKey; +import org.apache.commons.collections4.map.MultiKeyMap; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -240,7 +240,7 @@ //if (catchNumber == null) { // catchNumber = 0.0; //} - dataset.setValue(catchNumber, _(Category.CATCH.getTranslationKey()), (Integer)year); + dataset.setValue(catchNumber, t(Category.CATCH.getTranslationKey()), (Integer)year); if (lengthNumbers != null) { Double lengthNumber = lengthNumbers.get(String.valueOf(year)); @@ -248,11 +248,11 @@ //if (lengthNumber == null) { // lengthNumber = 0.0; //} - dataset.setValue(lengthNumber, _(Category.LENGTH.getTranslationKey()), (Integer)year); + dataset.setValue(lengthNumber, t(Category.LENGTH.getTranslationKey()), (Integer)year); } } - JFreeChart chart = displayGraph(dataset, _("coser.business.chart.compareCatchLengthNumberTitle", + JFreeChart chart = displayGraph(dataset, t("coser.business.chart.compareCatchLengthNumberTitle", project.getDisplaySpeciesText(species))); charts.put(species, chart); } @@ -262,11 +262,11 @@ protected JFreeChart displayGraph(CategoryDataset categoryDataSet, String title) { - CategoryAxis categoryAxis = new CategoryAxis(_("coser.business.common.year")); + CategoryAxis categoryAxis = new CategoryAxis(t("coser.business.common.year")); categoryAxis.setCategoryMargin(0); // label horizontaux //categoryAxis.setCategoryLabelPositions(CategoryLabelPositions.UP_90); - ValueAxis valueAxis = new NumberAxis(_("coser.business.common.number")); + ValueAxis valueAxis = new NumberAxis(t("coser.business.common.number")); valueAxis.setUpperMargin(0.1); CategoryItemRenderer renderer = new LineAndShapeRenderer(); @@ -345,7 +345,7 @@ imageDirectory.deleteOnExit(); out.write("<html><head>"); - out.write("<title>" + _("coser.business.publication.errorexporttitle", project.getName())+ "</title>"); + out.write("<title>" + t("coser.business.publication.errorexporttitle", project.getName())+ "</title>"); out.write("<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />"); out.write("</head><body>"); @@ -354,7 +354,7 @@ Map<ControlErrorGroup, List<ControlError>> validationErrorsChilds = new HashMap<ControlErrorGroup, List<ControlError>>(); for (ControlError validationError : validationErrors) { - String category = validationError.getCategory() == null ? _("coser.business.control.error.allCategories") : _(validationError.getCategory().getTranslationKey()); + String category = validationError.getCategory() == null ? t("coser.business.control.error.allCategories") : t(validationError.getCategory().getTranslationKey()); List<ControlErrorGroup> errorGroup = validationCategoryChild.get(category); if (errorGroup == null) { errorGroup = new ArrayList<ControlErrorGroup>(); @@ -378,7 +378,7 @@ Map<String, JFreeChart> charts = getCompareCatchLengthGraph(project, container, speciesGraph); // render output html - out.write("<h1 style='text-align:center'>" + _("coser.business.publication.errorexporttitle", project.getName()) + "</h1>"); + out.write("<h1 style='text-align:center'>" + t("coser.business.publication.errorexporttitle", project.getName()) + "</h1>"); if (includeProjectInfo) { // partie detail @@ -408,16 +408,16 @@ out.write("green"); break; } - out.write(";font-weight:bold'>" + _(group.getMessage())); + out.write(";font-weight:bold'>" + t(group.getMessage())); out.write("</span>"); out.write("<ul>"); for (ControlError error : validationErrorsChilds.get(group)) { out.write("<li type='circle'>"); - out.write(_(error.getDetailMessage())); + out.write(t(error.getDetailMessage())); List<String> lineNumbers = error.getLineNumbers(); if (CollectionUtils.isNotEmpty(lineNumbers)) { - out.write(" (" + _("coser.business.publication.errorexportlines") + " : "); + out.write(" (" + t("coser.business.publication.errorexportlines") + " : "); Iterator<String> itLineNumbers = lineNumbers.iterator(); while (itLineNumbers.hasNext()) { out.write(itLineNumbers.next()); @@ -432,10 +432,10 @@ if (error instanceof DiffCatchLengthControlError) { DiffCatchLengthControlError diffError = (DiffCatchLengthControlError)error; String species = diffError.getSpecies(); - out.write(" (<a href='#graph" + species + "'>" + _("coser.business.publication.errorgraph") + "</a>)"); + out.write(" (<a href='#graph" + species + "'>" + t("coser.business.publication.errorgraph") + "</a>)"); } - String tipMessage = _(error.getTipMessage()); + String tipMessage = t(error.getTipMessage()); if (StringUtils.isNotEmpty(error.getTipMessage())) { out.write("<p style='font-style:italic'>" + tipMessage + "</p>"); } @@ -448,7 +448,7 @@ out.write("</ul>"); } - out.write("<h2>" + _("coser.business.publication.errorgraphs") + "</h2>"); + out.write("<h2>" + t("coser.business.publication.errorgraphs") + "</h2>"); out.write("<ul>"); // generation des graphiques for (Map.Entry<String, JFreeChart> chartEntry : charts.entrySet()) { @@ -506,12 +506,12 @@ */ protected void extractControlLogAsHTML(Project project, Control control, Writer out) throws CoserBusinessException, IOException { out.write("<html><head>"); - out.write("<title>" + _("coser.business.publication.controllogexporttitle", project.getName())+ "</title>"); + out.write("<title>" + t("coser.business.publication.controllogexporttitle", project.getName())+ "</title>"); out.write("<meta http-equiv='Content-Type' content='text/html; charset=utf-8'/>"); out.write("</head><body>"); // header - out.write("<h1 style='text-align:center'>" + _("coser.business.publication.controllogexporttitle", project.getName()) + "</h1>"); + out.write("<h1 style='text-align:center'>" + t("coser.business.publication.controllogexporttitle", project.getName()) + "</h1>"); // partie detail extractProjectReport(project, out); @@ -614,12 +614,12 @@ */ protected void extractSelectionLogAsHTML(Project project, Selection selection, Writer out) throws IOException, CoserBusinessException { out.write("<html><head>"); - out.write("<title>" + _("coser.business.publication.selectionlogexporttitle", selection.getName(), project.getName())+ "</title>"); + out.write("<title>" + t("coser.business.publication.selectionlogexporttitle", selection.getName(), project.getName())+ "</title>"); out.write("<meta http-equiv='Content-Type' content='text/html; charset=utf-8'/>"); out.write("</head><body>"); // header - out.write("<h1 style='text-align:center'>" + _("coser.business.publication.selectionlogexporttitle", selection.getName(), project.getName()) + "</h1>"); + out.write("<h1 style='text-align:center'>" + t("coser.business.publication.selectionlogexporttitle", selection.getName(), project.getName()) + "</h1>"); // partie detail extractProjectReport(project, out); @@ -634,11 +634,11 @@ } // partie resumé de selection - out.write("<h2>" + _("coser.business.publication.selectionchoices") + "</h2>"); + out.write("<h2>" + t("coser.business.publication.selectionchoices") + "</h2>"); out.write("<ul>"); - out.write("<li>" + _("coser.business.common.years") + " : " + StringUtils.join(selection.getSelectedYears(), ", ") + "</li>"); - out.write("<li>" + _("coser.business.common.strata") + " : " + StringUtils.join(selection.getSelectedStrata(), ", ") + "</li>"); - out.write("<li>" + _("coser.business.common.species") + " : " + speciesBuilder + "</li>"); + out.write("<li>" + t("coser.business.common.years") + " : " + StringUtils.join(selection.getSelectedYears(), ", ") + "</li>"); + out.write("<li>" + t("coser.business.common.strata") + " : " + StringUtils.join(selection.getSelectedStrata(), ", ") + "</li>"); + out.write("<li>" + t("coser.business.common.species") + " : " + speciesBuilder + "</li>"); out.write("</ul>"); // partie specific : commandes @@ -660,20 +660,20 @@ // date du rapport out.write("<div style='text-align:right;font-style:italic'>" + - _("coser.business.publication.date") +" : " + + t("coser.business.publication.date") +" : " + dateFormat.format(new Date()) + "</div>"); // partie projet - out.write("<h2>" + _("coser.business.publication.projectdetails") + "</h2>"); + out.write("<h2>" + t("coser.business.publication.projectdetails") + "</h2>"); out.write("<ul>"); - out.write("<li>" + _("coser.business.publication.creationdate") + " : " + dateFormat.format(project.getCreationDate()) + "</li>"); - out.write("<li>" + _("coser.business.publication.author") + " : " + project.getAuthor() + "</li>"); - out.write("<li>" + _("coser.business.publication.catchfilename") + " : " + commonService.getDataStorageFileName(project, Category.CATCH, null) + "</li>"); - out.write("<li>" + _("coser.business.publication.lengthfilename") + " : " + commonService.getDataStorageFileName(project, Category.LENGTH, null) + "</li>"); - out.write("<li>" + _("coser.business.publication.haulfilename") + " : " + commonService.getDataStorageFileName(project, Category.HAUL, null) + "</li>"); - out.write("<li>" + _("coser.business.publication.stratafilename") + " : " + commonService.getDataStorageFileName(project, Category.STRATA, null) + "</li>"); + out.write("<li>" + t("coser.business.publication.creationdate") + " : " + dateFormat.format(project.getCreationDate()) + "</li>"); + out.write("<li>" + t("coser.business.publication.author") + " : " + project.getAuthor() + "</li>"); + out.write("<li>" + t("coser.business.publication.catchfilename") + " : " + commonService.getDataStorageFileName(project, Category.CATCH, null) + "</li>"); + out.write("<li>" + t("coser.business.publication.lengthfilename") + " : " + commonService.getDataStorageFileName(project, Category.LENGTH, null) + "</li>"); + out.write("<li>" + t("coser.business.publication.haulfilename") + " : " + commonService.getDataStorageFileName(project, Category.HAUL, null) + "</li>"); + out.write("<li>" + t("coser.business.publication.stratafilename") + " : " + commonService.getDataStorageFileName(project, Category.STRATA, null) + "</li>"); if (StringUtils.isNotEmpty(project.getComment())) { - out.write("<li>" + _("coser.business.publication.comment") + " : " + project.getComment() + "</li>"); + out.write("<li>" + t("coser.business.publication.comment") + " : " + project.getComment() + "</li>"); } out.write("</ul>"); } @@ -770,7 +770,7 @@ Map<String, String[]> strataContent = commonService.getOriginalContent(project, Category.STRATA, strataLines); // third, generate html report - out.write("<h2>" + _("coser.business.publication.datamodification") + "</h2>"); + out.write("<h2>" + t("coser.business.publication.datamodification") + "</h2>"); out.write("<ol>"); for (Command command : container.getHistoryCommands()) { Category category = null; @@ -956,9 +956,9 @@ } // configure chart - //CategoryAxis categoryAxis = new CategoryAxis(_("coser.business.common.year")); + //CategoryAxis categoryAxis = new CategoryAxis(t("coser.business.common.year")); // FIXME echatellier 20110414 hack just for year, need a real locale object here - // to call _(locale, i18nkey) + // to call t(locale, i18nkey) String yearAxis = "Year"; if ("fr".equals(locale.getLanguage())) { yearAxis = "Ann\u00E9e"; @@ -1100,9 +1100,9 @@ // configure chart - //CategoryAxis categoryAxis = new CategoryAxis(_("coser.business.common.year")); + //CategoryAxis categoryAxis = new CategoryAxis(t("coser.business.common.year")); // FIXME echatellier 20110414 hack just for year, need a real locale object here - // to call _(locale, i18nkey) + // to call t(locale, i18nkey) String yearAxis = "Year"; if ("fr".equals(locale.getLanguage())) { yearAxis = "Ann\u00E9e"; @@ -1315,9 +1315,9 @@ } // configure chart - //CategoryAxis categoryAxis = new CategoryAxis(_("coser.business.common.year")); + //CategoryAxis categoryAxis = new CategoryAxis(t("coser.business.common.year")); // FIXME echatellier 20110414 hack just for year, need a real locale object here - // to call _(locale, i18nkey) + // to call t(locale, i18nkey) String yearAxis = "Year"; if ("fr".equals(locale.getLanguage())) { yearAxis = "Ann\u00E9e"; @@ -1494,9 +1494,9 @@ // configure chart - //CategoryAxis categoryAxis = new CategoryAxis(_("coser.business.common.year")); + //CategoryAxis categoryAxis = new CategoryAxis(t("coser.business.common.year")); // FIXME echatellier 20110414 hack just for year, need a real locale object here - // to call _(locale, i18nkey) + // to call t(locale, i18nkey) String yearAxis = "Year"; if ("fr".equals(locale.getLanguage())) { yearAxis = "Ann\u00E9e"; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -25,8 +25,8 @@ package fr.ifremer.coser.services; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.l; import java.io.File; import java.io.FileFilter; @@ -58,10 +58,10 @@ import java.util.TreeSet; import java.util.regex.Matcher; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.MapUtils; -import org.apache.commons.collections.keyvalue.MultiKey; -import org.apache.commons.collections.map.MultiKeyMap; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.collections4.keyvalue.MultiKey; +import org.apache.commons.collections4.map.MultiKeyMap; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringEscapeUtils; @@ -428,18 +428,18 @@ // and selection with only selected results progress.setCurrent(0); - progress.setText(_("coser.business.uploadresult.modifyResultOptions")); + progress.setText(t("coser.business.uploadresult.modifyResultOptions")); modifyRSufiResults(selectedResults, indicatorsResults, mapResults, publishDataResults); - progress.setText(_("coser.business.uploadresult.checkcollision")); + progress.setText(t("coser.business.uploadresult.checkcollision")); checkDataCollision(selectedResults); - progress.setText(_("coser.business.uploadresult.preparezip")); + progress.setText(t("coser.business.uploadresult.preparezip")); // default extract to temp directory with data sources File prepareZip = performResultExtract(selectedResults, publishDataResults, null); - progress.setText(_("coser.business.uploadresult.sendzip")); + progress.setText(t("coser.business.uploadresult.sendzip")); progress.setTotal((int)prepareZip.length()); // then upload zip file to website @@ -563,7 +563,7 @@ // on creer une clé composé pour l'id du resultat String resultZoneTypeId = rsufiResult.getZone() + String.valueOf(rsufiResult.isMapsResult()); if (resultZoneTypeIds.contains(resultZoneTypeId)) { - throw new CoserBusinessException(_("coser.business.resultupload.duplicatedresult", + throw new CoserBusinessException(t("coser.business.resultupload.duplicatedresult", project.getName(), selection.getName(), rsufiResult.getName(), rsufiResult.getZone())); } else { resultZoneTypeIds.add(resultZoneTypeId); @@ -762,10 +762,10 @@ StringBuilder content = new StringBuilder(); int count = 0; - content.append(_("coser.business.notificationmail.mapsresults") + "\n"); + content.append(t("coser.business.notificationmail.mapsresults") + "\n"); for (Map.Entry<String, String> noMapsResultZoneId : noMapsResultZoneIds.entrySet()) { if (mapsResults.containsValue(noMapsResultZoneId.getValue())) { - content.append(" - " + _("coser.business.notificationmail.deleted", + content.append(" - " + t("coser.business.notificationmail.deleted", getZoneFullName(noMapsResultZoneId.getKey()), noMapsResultZoneId.getValue()) + "\n"); count++; @@ -773,7 +773,7 @@ } for (Map.Entry<String, String> mapsResultZoneId : mapsResultZoneIds.entrySet()) { if (!mapsResults.containsValue(mapsResultZoneId.getValue())) { - content.append(" - " + _("coser.business.notificationmail.added", + content.append(" - " + t("coser.business.notificationmail.added", getZoneFullName(mapsResultZoneId.getKey()), mapsResultZoneId.getValue()) + "\n"); count++; @@ -781,10 +781,10 @@ } content.append("\n"); - content.append(_("coser.business.notificationmail.indicatorsresults") + "\n"); + content.append(t("coser.business.notificationmail.indicatorsresults") + "\n"); for (Map.Entry<String, String> noIndicatorsResultZoneId : noIndicatorsResultZoneIds.entrySet()) { if (indicatorResults.containsValue(noIndicatorsResultZoneId.getValue())) { - content.append(" - " + _("coser.business.notificationmail.deleted", + content.append(" - " + t("coser.business.notificationmail.deleted", getZoneFullName(noIndicatorsResultZoneId.getKey()), noIndicatorsResultZoneId.getValue()) + "\n"); count++; @@ -793,7 +793,7 @@ } for (Map.Entry<String, String> indicatorsResultZoneId : indicatorsResultZoneIds.entrySet()) { if (!indicatorResults.containsValue(indicatorsResultZoneId.getValue())) { - content.append(" - " + _("coser.business.notificationmail.added", + content.append(" - " + t("coser.business.notificationmail.added", getZoneFullName(indicatorsResultZoneId.getKey()), indicatorsResultZoneId.getValue()) + "\n"); count++; @@ -801,10 +801,10 @@ } content.append("\n"); - content.append(_("coser.business.notificationmail.dataresults") + "\n"); + content.append(t("coser.business.notificationmail.dataresults") + "\n"); for (Map.Entry<String, String> noDataResultZoneId : noDataResultZoneIds.entrySet()) { if (dataResults.containsValue(noDataResultZoneId.getValue())) { - content.append(" - " + _("coser.business.notificationmail.deleted", + content.append(" - " + t("coser.business.notificationmail.deleted", getZoneFullName(noDataResultZoneId.getKey()), noDataResultZoneId.getValue()) + "\n"); count++; @@ -813,7 +813,7 @@ } for (Map.Entry<String, String> dataResultZoneId : dataResultZoneIds.entrySet()) { if (!dataResults.containsValue(dataResultZoneId.getValue())) { - content.append(" - " + _("coser.business.notificationmail.added", + content.append(" - " + t("coser.business.notificationmail.added", getZoneFullName(dataResultZoneId.getKey()), dataResultZoneId.getValue()) + "\n"); count++; @@ -1132,8 +1132,8 @@ emailPart.setHostName(config.getSmtpHost()); emailPart.addTo(email); emailPart.setFrom("noreply-coser@ifremer.fr", "Coser"); - emailPart.setSubject(_("coser.business.notificationmail.subject", count)); - emailPart.setContent(_("coser.business.notificationmail.body", login, detail), "text/plain; charset=ISO-8859-9"); + emailPart.setSubject(t("coser.business.notificationmail.subject", count)); + emailPart.setContent(t("coser.business.notificationmail.body", login, detail), "text/plain; charset=ISO-8859-9"); // send mail emailPart.send(); @@ -2832,7 +2832,7 @@ try { StringBuilder htmlContent = new StringBuilder(); htmlContent.append("<html><head>"); - htmlContent.append("<title>" + l_(locale, "coser.business.extract.extracttitle")+ "</title>"); + htmlContent.append("<title>" + l(locale, "coser.business.extract.extracttitle")+ "</title>"); htmlContent.append("<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />"); htmlContent.append("</head><body>"); @@ -2862,7 +2862,7 @@ htmlContent.append("<div style='page-break-after: always'>"); htmlContent.append("<img src='file://" + chartFile.getAbsolutePath() + "' />"); htmlContent.append("<br />"); - htmlContent.append(l_(locale, "coser.business.extract.extractdata") + " :"); + htmlContent.append(l(locale, "coser.business.extract.extractdata") + " :"); htmlContent.append("<pre>").append(content).append("</pre>"); htmlContent.append("</div>"); Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -25,7 +25,7 @@ package fr.ifremer.coser.services; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.io.IOException; @@ -133,7 +133,7 @@ Assert.assertTrue(fileContent.indexOf("Test fatal") > 0); Assert.assertTrue(fileContent.indexOf("Test warning and graph") > 0); Assert.assertTrue(fileContent.indexOf("Test error") > 0); - Assert.assertTrue(fileContent.indexOf(_("coser.business.control.error.allCategories")) > 0); + Assert.assertTrue(fileContent.indexOf(t("coser.business.control.error.allCategories")) > 0); // clean all htmlExport.delete(); Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -34,7 +34,7 @@ import java.util.Locale; import java.util.Map; -import org.apache.commons.collections.map.MultiKeyMap; +import org.apache.commons.collections4.map.MultiKeyMap; import org.apache.commons.io.FileUtils; import org.junit.Assert; import org.junit.Before; Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/pom.xml 2014-02-24 15:14:55 UTC (rev 1124) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -11,7 +10,25 @@ <groupId>fr.ifremer.coser</groupId> <artifactId>coser-ui</artifactId> + <packaging>jar</packaging> + <name>Coser :: UI</name> + <description>Coser ui module</description> + <licenses> + <license> + <name>GNU General Public License</name> + <url>http://www.gnu.org/licenses/gpl.html</url> + <distribution>repo</distribution> + </license> + </licenses> + + <properties> + <maven.jar.main.class>fr.ifremer.coser.Coser</maven.jar.main.class> + <license.licenseName>gpl_v3</license.licenseName> + + <redmine.releaseFiles>target/coser-${project.version}-bin.zip</redmine.releaseFiles> + </properties> + <dependencies> <dependency> <groupId>${project.groupId}</groupId> @@ -33,14 +50,18 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + </dependency> + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> </dependency> @@ -85,14 +106,14 @@ <artifactId>jaxx-widgets</artifactId> </dependency> <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-extra</artifactId> + </dependency> + <dependency> <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-core</artifactId> </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-widgets</artifactId> - </dependency> - <dependency> <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> </dependency> @@ -110,26 +131,6 @@ </dependency> </dependencies> - <name>Coser :: UI</name> - <description>Coser ui module</description> - - <packaging>jar</packaging> - - <licenses> - <license> - <name>GNU General Public License</name> - <url>http://www.gnu.org/licenses/gpl.html</url> - <distribution>repo</distribution> - </license> - </licenses> - - <properties> - <maven.jar.main.class>fr.ifremer.coser.Coser</maven.jar.main.class> - <license.licenseName>gpl_v3</license.licenseName> - - <redmine.releaseFiles>target/coser-${project.version}-bin.zip</redmine.releaseFiles> - </properties> - <build> <resources> <resource> @@ -146,7 +147,6 @@ </excludes> </resource> </resources> - <pluginManagement> <plugins> Modified: trunk/coser-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/coser-ui/src/license/THIRD-PARTY.properties 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/license/THIRD-PARTY.properties 2014-02-24 15:14:55 UTC (rev 1124) @@ -1,7 +1,6 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache License # - Apache Software License, Version 2.0 # - BSD License # - BSD-style license @@ -9,6 +8,7 @@ # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - GNU Affero General Public License v3 +# - GNU GENERAL PUBLIC LICENSE version 2 or higher # - GNU General Public License - Version 2 with the class path exception # - GNU Lesser General Public Licence # - GNU Lesser General Public License (LGPL), version 2.1 @@ -27,10 +27,10 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jan 29 15:44:52 CET 2013 -commons-jxpath--commons-jxpath--1.3=Apache Software License, Version 2.0 -commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0 +#Mon Feb 24 15:58:04 CET 2014 +commons-jxpath--commons-jxpath--1.3=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javassist--javassist--3.8.0.GA=GNU Lesser General Public License javax.mail--mail--1.4.1=License Agreement for JavaMail(TM) API -org.apache.commons--commons-email--1.2=Apache Software License, Version 2.0 -regexp--regexp--1.3=The Apache Software License, Version 2.0 +org.apache.commons--commons-email--1.2=The Apache Software License, Version 2.0 +org.nuiton.thirdparty--sdoc--0.5.0-beta-patchcl=GNU GENERAL PUBLIC LICENSE version 2 or higher Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -31,13 +31,13 @@ import jaxx.runtime.context.DefaultApplicationContext; +import jaxx.runtime.swing.session.SwingSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.i18n.init.DefaultI18nInitializer; -import org.nuiton.util.ArgumentsParserException; -import org.nuiton.widget.SwingSession; +import org.nuiton.config.ArgumentsParserException; import com.bbn.openmap.MapBean; Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -25,7 +25,7 @@ package fr.ifremer.coser; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Font; import java.util.Enumeration; @@ -35,6 +35,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.config.ConfigOptionDef; /** * Coser application configuration. @@ -99,14 +100,14 @@ } } - public static enum CoserOption implements OptionDef { + public static enum CoserOption implements ConfigOptionDef { - CONFIG_FILE(CONFIG_FILE_NAME, _("coser.config.config.file.description"), "coser.properties", String.class, true, true), - LOOKANDFEEL("coser.lookandfeel", _("coser.config.lookandfeel.description"), null, String.class, false, false), - APPLICATION_VERSION("coser.application.version", _("coser.config.application.version.description"), null, String.class, false, false), - SUPPORT_EMAIL("coser.support.email", _("coser.config.support.email.description"), "support@codelutin.com", String.class, false, false), - WEBSITE_URL("coser.website", _("coser.config.website.description"), "http://maven-site.forge.codelutin.com/coser/", String.class, false, false), - SWING_FONT_SIZE("coser.swingfontsize", _("coser.config.swingfontsize.description"), "12", Integer.class, false, false); + CONFIG_FILE(CONFIG_FILE_NAME, t("coser.config.config.file.description"), "coser.properties", String.class, true, true), + LOOKANDFEEL("coser.lookandfeel", t("coser.config.lookandfeel.description"), null, String.class, false, false), + APPLICATION_VERSION("coser.application.version", t("coser.config.application.version.description"), null, String.class, false, false), + SUPPORT_EMAIL("coser.support.email", t("coser.config.support.email.description"), "support@codelutin.com", String.class, false, false), + WEBSITE_URL("coser.website", t("coser.config.website.description"), "http://maven-site.forge.codelutin.com/coser/", String.class, false, false), + SWING_FONT_SIZE("coser.swingfontsize", t("coser.config.swingfontsize.description"), "12", Integer.class, false, false); protected String key; protected String description; Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -23,7 +23,7 @@ package fr.ifremer.coser.ui; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.BorderLayout; import java.awt.Color; @@ -43,12 +43,12 @@ import jaxx.runtime.JAXXContext; +import jaxx.runtime.swing.session.SwingSession; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.Resource; -import org.nuiton.widget.AboutFrame; -import org.nuiton.widget.SwingSession; +import org.nuiton.jaxx.widgets.extra.AboutFrame; import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserConfig; @@ -105,8 +105,8 @@ CoserConfig config = frame.getContextValue(CoserConfig.class); config.setLocale(newLocale); config.saveForUser(); - JOptionPane.showMessageDialog(frame, _("coser.ui.locale.mustRestart"), - _("coser.ui.locale.title"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(frame, t("coser.ui.locale.mustRestart"), + t("coser.ui.locale.title"), JOptionPane.INFORMATION_MESSAGE); } /** @@ -233,8 +233,8 @@ /* Logo doesn't not display with that version AboutPanel aboutPanel = new AboutPanel(view); aboutPanel.setIconPath("/icons/logo300.png"); - aboutPanel.setTitle(_("coser.ui.about.title")); - aboutPanel.setAboutText(_("coser.ui.about.about", config.getApplicationVersion())); + aboutPanel.setTitle(t("coser.ui.about.title")); + aboutPanel.setAboutText(t("coser.ui.about.about", config.getApplicationVersion())); aboutPanel.setLicenseFile("META-INF/coser-ui-LICENSE.txt"); aboutPanel.setThirdpartyFile("META-INF/coser-ui-THIRD-PARTY.txt"); aboutPanel.init(); @@ -248,8 +248,8 @@ return new JScrollPane(textArea); } }; - aboutFrame.setTitle(_("coser.ui.about.title")); - aboutFrame.setAboutHtmlText(_("coser.ui.about.about", config.getApplicationVersion())); + aboutFrame.setTitle(t("coser.ui.about.title")); + aboutFrame.setAboutHtmlText(t("coser.ui.about.about", config.getApplicationVersion())); aboutFrame.setIconPath("/icons/logo300.png"); aboutFrame.setIconImage(Resource.getIcon("/icons/logo300.png").getImage()); InputStream licenseStream = getClass().getResourceAsStream("/META-INF/coser-ui-LICENSE.txt"); @@ -302,7 +302,7 @@ */ public void closeProject() { projectLoaded(null); - view.setTitle(_("coser.ui.mainview.titleempty")); + view.setTitle(t("coser.ui.mainview.titleempty")); showHomeView(); } @@ -315,7 +315,7 @@ view.setProject(project); if (project != null) { view.setContextValue(project); - view.setTitle(_("coser.ui.mainview.titleproject", project.getName())); + view.setTitle(t("coser.ui.mainview.titleproject", project.getName())); } else { view.removeContextValue(Project.class); } @@ -378,8 +378,8 @@ // #667 : Empecher l'accès à l'étape de contrôle si des sélections existent if (!project.getSelections().isEmpty()) { - JOptionPane.showMessageDialog(view, _("coser.ui.mainview.accesswontrolwithselection"), - _("coser.ui.control.controlTitle"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(view, t("coser.ui.mainview.accesswontrolwithselection"), + t("coser.ui.control.controlTitle"), JOptionPane.ERROR_MESSAGE); return; } @@ -532,7 +532,7 @@ @Override public String getDescription() { - return _("coser.ui.selection.selectionFilterDescription"); + return t("coser.ui.selection.selectionFilterDescription"); } } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenu.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenu.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenu.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -23,7 +23,7 @@ package fr.ifremer.coser.ui; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Font; import java.awt.event.ActionEvent; @@ -95,7 +95,7 @@ if (project != null) { if (!project.getControl().isValidated()) { - JMenuItem menuItem = new JMenuItem(_("coser.ui.mainframe.menu.data.noValidation")); + JMenuItem menuItem = new JMenuItem(t("coser.ui.mainframe.menu.data.noValidation")); menuItem.setFont(menuItem.getFont().deriveFont(Font.ITALIC)); menuItem.setEnabled(false); add(menuItem); @@ -104,7 +104,7 @@ Map<String, Selection> selections = project.getSelections(); if (selections == null || selections.isEmpty()) { - JMenuItem menuItem = new JMenuItem(_("coser.ui.mainframe.menu.data.noSelection")); + JMenuItem menuItem = new JMenuItem(t("coser.ui.mainframe.menu.data.noSelection")); menuItem.setFont(menuItem.getFont().deriveFont(Font.ITALIC)); menuItem.setEnabled(false); add(menuItem); @@ -123,7 +123,7 @@ add(new JSeparator()); // new selection - JMenuItem newMenuItem = new JMenuItem(_("coser.ui.mainframe.menu.data.newSelection")); + JMenuItem newMenuItem = new JMenuItem(t("coser.ui.mainframe.menu.data.newSelection")); // les chaines ne doivent pas poser pb, on ne peut pas // avoir de selection avec espace newMenuItem.setActionCommand("$new selection$"); @@ -131,7 +131,7 @@ add(newMenuItem); // replay selection - JMenuItem replayMenuItem = new JMenuItem(_("coser.ui.mainframe.menu.data.replaySelection")); + JMenuItem replayMenuItem = new JMenuItem(t("coser.ui.mainframe.menu.data.replaySelection")); // les chaines ne doivent pas poser pb, on ne peut pas // avoir de selection avec espace replayMenuItem.setActionCommand("$replay selection$"); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -23,7 +23,7 @@ package fr.ifremer.coser.ui.common; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; import java.awt.Cursor; @@ -102,8 +102,8 @@ if (log.isWarnEnabled()) { log.warn("Can't open generated report at " + report.getAbsolutePath(), ex); } - JOptionPane.showMessageDialog(parentComponent, _("coser.ui.error.htmlReportCantBeOpened", report.getAbsolutePath()), - _("coser.ui.error.htmlReportError"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(parentComponent, t("coser.ui.error.htmlReportCantBeOpened", report.getAbsolutePath()), + t("coser.ui.error.htmlReportError"), JOptionPane.WARNING_MESSAGE); } } } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -23,7 +23,7 @@ package fr.ifremer.coser.ui.common; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; import java.util.Collections; @@ -34,11 +34,11 @@ import jaxx.runtime.JAXXContext; +import jaxx.runtime.swing.session.SwingSession; import org.nuiton.math.matrix.MatrixND; import org.nuiton.math.matrix.viewer.MatrixViewerPanel; import org.nuiton.math.matrix.viewer.renderer.MatrixChartRenderer; import org.nuiton.math.matrix.viewer.renderer.MatrixPanelRenderer; -import org.nuiton.widget.SwingSession; import fr.ifremer.coser.bean.AbstractDataContainer; import fr.ifremer.coser.bean.Project; @@ -83,7 +83,7 @@ } // display matrix viewer component - JFrame matrixViewerFrame = new JFrame(_("coser.ui.graph.lengthStructure")); + JFrame matrixViewerFrame = new JFrame(t("coser.ui.graph.lengthStructure")); matrixViewerFrame.setName("lengthstructureframe"); MatrixViewerPanel panel = new MatrixViewerPanel(); panel.addMatrixRenderer(new MatrixChartRenderer()); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlCategoryListRenderer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlCategoryListRenderer.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlCategoryListRenderer.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -25,7 +25,7 @@ package fr.ifremer.coser.ui.control; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; @@ -53,7 +53,7 @@ int index, boolean isSelected, boolean cellHasFocus) { Category category = (Category)value; - String stringValue = _(category.getTranslationKey()); + String stringValue = t(category.getTranslationKey()); return super.getListCellRendererComponent(list, stringValue, index, isSelected, cellHasFocus); } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -23,7 +23,7 @@ package fr.ifremer.coser.ui.control; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import fr.ifremer.coser.CoserConstants.Category; import fr.ifremer.coser.bean.Project; @@ -99,7 +99,7 @@ String name = header[column]; // only for column 0 (line index) if (column == 0) { - name = _(name); + name = t(name); } return name; } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDuplicatedLineTableModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDuplicatedLineTableModel.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDuplicatedLineTableModel.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -33,7 +33,7 @@ import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlErrorTreeRenderer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlErrorTreeRenderer.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlErrorTreeRenderer.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -23,7 +23,7 @@ package fr.ifremer.coser.ui.control; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; @@ -82,10 +82,10 @@ String tooltipText = null; if (userObject instanceof String) { - text = _((String)userObject) + " (" + model.getChildCount(value) + ")"; + text = t((String)userObject) + " (" + model.getChildCount(value) + ")"; } else if (userObject instanceof Category) { - text = _(((Category)userObject).getTranslationKey()) + " (" + model.getChildCount(value) + ")"; + text = t(((Category)userObject).getTranslationKey()) + " (" + model.getChildCount(value) + ")"; } else if (userObject instanceof ControlErrorGroup) { ControlErrorGroup validationErrorGroup = (ControlErrorGroup)userObject; @@ -106,7 +106,7 @@ } String message = validationErrorGroup.getMessage(); - text = _(message) + " (" + model.getChildCount(value) + ")"; + text = t(message) + " (" + model.getChildCount(value) + ")"; } else if (userObject instanceof ControlError) { ControlError validationError = (ControlError)userObject; @@ -130,7 +130,7 @@ if (message == null) { message = validationError.getMessage(); } - text = _(message); + text = t(message); tooltipText = validationError.getTipMessage(); } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -23,7 +23,7 @@ package fr.ifremer.coser.ui.control; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.BorderLayout; import java.awt.GridBagConstraints; @@ -63,6 +63,7 @@ import jaxx.runtime.JAXXUtil; import jaxx.runtime.SwingUtil; +import jaxx.runtime.swing.session.SwingSession; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.beanutils.PropertyUtils; @@ -74,7 +75,6 @@ import org.jdesktop.swingx.treetable.TreeTableNode; import org.jfree.chart.ChartPanel; import org.jfree.chart.JFreeChart; -import org.nuiton.widget.SwingSession; import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserConfig; @@ -202,7 +202,7 @@ int[] dataSelectedRows = displayedTable.getSelectedRows(); final int columnIndex = displayedTable.getColumnModel().getColumnIndexAtX(event.getX()); - JPopupMenu popupMenu = new JPopupMenu(_("coser.ui.control.dataMenuLabel")); + JPopupMenu popupMenu = new JPopupMenu(t("coser.ui.control.dataMenuLabel")); // plusieurs lignes selectionnées et pas la premiere colonne (Line index) if (dataSelectedRows.length > 0 && columnIndex > 0) { @@ -211,7 +211,7 @@ final String firstValue = (String)controlDataModel.getValueAt(dataSelectedRows[0], columnIndex); // replace in selection - JMenuItem replaceMenu = new JMenuItem(_("coser.ui.control.dataMenuReplace", columnName)); + JMenuItem replaceMenu = new JMenuItem(t("coser.ui.control.dataMenuReplace", columnName)); replaceMenu.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -231,7 +231,7 @@ // replace in everywhere if (columnIndex > 0) { final String columnName = displayedTable.getColumnName(columnIndex); - JMenuItem replaceAllMenu = new JMenuItem(_("coser.ui.control.dataMenuReplaceAll", columnName)); + JMenuItem replaceAllMenu = new JMenuItem(t("coser.ui.control.dataMenuReplaceAll", columnName)); replaceAllMenu.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -249,7 +249,7 @@ // delete selected if (dataSelectedRows.length > 0) { - JMenuItem deleteSelectedMenu = new JMenuItem(_("coser.ui.control.dataMenuDeleteSelected")); + JMenuItem deleteSelectedMenu = new JMenuItem(t("coser.ui.control.dataMenuDeleteSelected")); deleteSelectedMenu.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -274,8 +274,8 @@ int[] selectedLines = controlDataTable.getSelectedRows(); if (ArrayUtils.isNotEmpty(selectedLines)) { - int response = JOptionPane.showConfirmDialog(controlView, _("coser.ui.control.confirmDeletionsMessage", selectedLines.length), - _("coser.ui.control.confirmDeletionTitle"), + int response = JOptionPane.showConfirmDialog(controlView, t("coser.ui.control.confirmDeletionsMessage", selectedLines.length), + t("coser.ui.control.confirmDeletionTitle"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (response == JOptionPane.YES_OPTION) { @@ -380,8 +380,8 @@ } // message de confirmation - JOptionPane.showMessageDialog(replaceView, _("coser.ui.control.replace.replacedCount", replaceCount), - _("coser.ui.control.replace.title"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(replaceView, t("coser.ui.control.replace.replacedCount", replaceCount), + t("coser.ui.control.replace.title"), JOptionPane.INFORMATION_MESSAGE); } catch (CoserBusinessException ex) { throw new CoserException("Can't replace field value", ex); @@ -603,7 +603,7 @@ // selectall n'a d'interet que pour les groupes d'erreurs if (lastNode.getChildCount() > 0) { - JMenuItem replaceMenu = new JMenuItem(_("coser.ui.control.globalErrorMenuSelectAll")); + JMenuItem replaceMenu = new JMenuItem(t("coser.ui.control.globalErrorMenuSelectAll")); replaceMenu.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -618,7 +618,7 @@ // fix potentail NPE if (errorTable.getRowCount() > 0) { - JMenuItem generateHtmlMenu = new JMenuItem(_("coser.ui.control.globalErrorMenuGenerateHTML")); + JMenuItem generateHtmlMenu = new JMenuItem(t("coser.ui.control.globalErrorMenuGenerateHTML")); generateHtmlMenu.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -848,7 +848,7 @@ if (!reftaxSpecies.containsKey(fieldValue)) { domain.add(0, fieldValue); } - ListComboBoxModel<String> speciesComboModel = new ListComboBoxModel<String>(domain); + ListComboBoxModel speciesComboModel = new ListComboBoxModel(domain); JComboBox speciesCombo = new JComboBox(speciesComboModel); speciesCombo.setRenderer(new SpeciesListRenderer(reftaxSpecies)); speciesCombo.setSelectedItem(fieldValue); @@ -946,8 +946,8 @@ */ public void saveControl(ControlView view) { saveProjectControl(view); - JOptionPane.showMessageDialog(view, _("coser.ui.control.controlSaved"), - _("coser.ui.control.controlTitle"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(view, t("coser.ui.control.controlSaved"), + t("coser.ui.control.controlTitle"), JOptionPane.INFORMATION_MESSAGE); } /** @@ -1123,8 +1123,8 @@ * @param view view */ public void deleteData(ControlView view) { - int response = JOptionPane.showConfirmDialog(view, _("coser.ui.control.confirmDeletionMessage"), - _("coser.ui.control.confirmDeletionTitle"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); + int response = JOptionPane.showConfirmDialog(view, t("coser.ui.control.confirmDeletionMessage"), + t("coser.ui.control.confirmDeletionTitle"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); if (response == JOptionPane.YES_OPTION) { // disableValidAction @@ -1173,8 +1173,8 @@ try { List<ControlError> controlErrors = view.getGlobalControlErrorModel().getControlErrors(); service.validControl(project, controlErrors); - JOptionPane.showMessageDialog(view, _("coser.ui.control.controlValidated"), - _("coser.ui.control.controlTitle"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(view, t("coser.ui.control.controlValidated"), + t("coser.ui.control.controlTitle"), JOptionPane.INFORMATION_MESSAGE); } catch (CoserBusinessException ex) { throw new CoserException("Can't generate html report", ex); } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalControlErrorModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalControlErrorModel.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalControlErrorModel.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -23,8 +23,8 @@ package fr.ifremer.coser.ui.control; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; import java.util.HashMap; import java.util.HashSet; @@ -83,7 +83,7 @@ for (ControlError validationError : validationErrors) { Object category = validationError.getCategory() == null ? - n_("coser.ui.control.error.allCategories") : validationError.getCategory(); + n("coser.ui.control.error.allCategories") : validationError.getCategory(); // definition du noeud categorie DefaultMutableTreeTableNode categoryNode = nodeCache.get(category); @@ -108,7 +108,7 @@ if (validationError instanceof DiffCatchLengthControlError) { DiffCatchLengthControlError diffCatchError = (DiffCatchLengthControlError)validationError; String species = diffCatchError.getSpecies(); - String speciesCategory = _("coser.ui.control.error.diffcatchlenghtspecies", + String speciesCategory = t("coser.ui.control.error.diffcatchlenghtspecies", project.getDisplaySpeciesText(species)); ControlErrorGroup group = new ControlErrorGroup(validationError.getCategory(), validationError.getLevel(), speciesCategory); @@ -145,7 +145,7 @@ switch (columnIndex) { case 0: - result = _("coser.ui.control.global.message"); + result = t("coser.ui.control.global.message"); break; } return result; Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -22,7 +22,7 @@ */ package fr.ifremer.coser.ui.freize; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Color; import java.awt.Component; @@ -144,18 +144,18 @@ // step 2 model.setStep2Enabled(true); if (!project.getSelections().isEmpty()) { - view.getControlStatus().setText(_("coser.ui.freize.locked")); - view.getControlStatus().setToolTipText(_("coser.ui.freize.controllockedtip")); + view.getControlStatus().setText(t("coser.ui.freize.locked")); + view.getControlStatus().setToolTipText(t("coser.ui.freize.controllockedtip")); view.getControlStatus().setIcon(LOCKED_ICON); } else { - view.getControlStatus().setText(_("coser.ui.freize.validated")); + view.getControlStatus().setText(t("coser.ui.freize.validated")); view.getControlStatus().setIcon(OK_ICON); } Selection selection = model.getSelection(); if (selection != null && selection.isValidated()) { view.getSelectionStatus().setIcon(OK_ICON); - view.getSelectionStatus().setText(_("coser.ui.freize.validated")); + view.getSelectionStatus().setText(t("coser.ui.freize.validated")); view.getStep2Panel().setBackground(COMPLETE_COLOR); // step 3 @@ -172,12 +172,12 @@ } else { view.getStep2Panel().setBackground(PENDING_COLOR); view.getSelectionStatus().setIcon(BAD_ICON); - view.getSelectionStatus().setText(_("coser.ui.freize.unvalidated")); + view.getSelectionStatus().setText(t("coser.ui.freize.unvalidated")); } } else { view.getStep1Panel().setBackground(PENDING_COLOR); view.getControlStatus().setIcon(BAD_ICON); - view.getControlStatus().setText(_("coser.ui.freize.unvalidated")); + view.getControlStatus().setText(t("coser.ui.freize.unvalidated")); } } else { view.getStep0Panel().setBackground(PENDING_COLOR); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/ConfigurationView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/ConfigurationView.jaxx 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/ConfigurationView.jaxx 2014-02-24 15:14:55 UTC (rev 1124) @@ -35,7 +35,7 @@ <Table> <row> <cell fill="both" columns="2"> - <Table border='{BorderFactory.createTitledBorder(_("coser.ui.configuration.category.path"))}'> + <Table border='{BorderFactory.createTitledBorder(t("coser.ui.configuration.category.path"))}'> <row> <cell fill="horizontal"> <JLabel text="{CoserBusinessOption.PROJECTS_DIRECTORY.getDescription()}" /> @@ -109,7 +109,7 @@ </row> <row> <cell fill="both" columns="2"> - <Table border='{BorderFactory.createTitledBorder(_("coser.ui.configuration.category.controlselection"))}'> + <Table border='{BorderFactory.createTitledBorder(t("coser.ui.configuration.category.controlselection"))}'> <row> <cell fill="horizontal"> <JLabel text="{CoserBusinessOption.CONTROL_NOBSMIN.getDescription()}" /> @@ -163,7 +163,7 @@ </row> <row> <cell fill="both" columns="2"> - <Table border='{BorderFactory.createTitledBorder(_("coser.ui.configuration.category.misc"))}'> + <Table border='{BorderFactory.createTitledBorder(t("coser.ui.configuration.category.misc"))}'> <row> <cell fill="horizontal"> <JLabel text="{CoserBusinessOption.SMTP_HOST.getDescription()}" /> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/NoCopiedLayerUI.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/NoCopiedLayerUI.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/NoCopiedLayerUI.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -23,7 +23,7 @@ package fr.ifremer.coser.ui.option; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Color; import java.awt.FlowLayout; @@ -58,7 +58,7 @@ public NoCopiedLayerUI(ValidatorDialog view) { this.view = view; setLocked(true); - copyToDiskButton = new JButton(_("coser.ui.validators.copyToDisk")); + copyToDiskButton = new JButton(t("coser.ui.validators.copyToDisk")); copyToDiskButton.addActionListener(this); } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/OptionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/OptionHandler.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/OptionHandler.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -23,7 +23,7 @@ package fr.ifremer.coser.ui.option; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.io.IOException; @@ -68,8 +68,8 @@ */ public void restoreDefaults(ValidatorDialog view) { - int answer = JOptionPane.showConfirmDialog(view, _("coser.ui.validators.confirmRestore"), - _("coser.ui.validators.title"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); + int answer = JOptionPane.showConfirmDialog(view, t("coser.ui.validators.confirmRestore"), + t("coser.ui.validators.title"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (answer == JOptionPane.YES_OPTION) { CoserConfig config = view.getContextValue(CoserConfig.class); @@ -95,8 +95,8 @@ */ public void copyDefaultValidators(ValidatorDialog view) { - int answer = JOptionPane.showConfirmDialog(view, _("coser.ui.validators.confirmCopyToDisk"), - _("coser.ui.validators.title"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); + int answer = JOptionPane.showConfirmDialog(view, t("coser.ui.validators.confirmCopyToDisk"), + t("coser.ui.validators.title"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); if (answer != JOptionPane.YES_OPTION) { view.dispose(); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/ValidatorDialog.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/ValidatorDialog.jaxx 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/ValidatorDialog.jaxx 2014-02-24 15:14:55 UTC (rev 1124) @@ -23,8 +23,12 @@ #L% --> <JDialog title="coser.ui.validators.title"> + <import> + org.jdesktop.jxlayer.JXLayer + org.nuiton.jaxx.widgets.extra.editor.Editor + </import> <OptionHandler id="handler" javaBean="null" /> - <org.jdesktop.jxlayer.JXLayer id="noCopiedToDiskLayer"> + <JXLayer id="noCopiedToDiskLayer"> <Table> <row> <cell columns="2" fill="horizontal"> @@ -49,7 +53,7 @@ </JScrollPane> </cell> <cell weightx="2" weighty="1" fill="both"> - <org.nuiton.widget.editor.Editor id="validationEditor" /> + <Editor id="validationEditor" /> </cell> </row> <row> @@ -64,5 +68,5 @@ </cell> </row> </Table> - </org.jdesktop.jxlayer.JXLayer> + </JXLayer> </JDialog> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/ValidatorsTreeRenderer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/ValidatorsTreeRenderer.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/ValidatorsTreeRenderer.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -23,7 +23,7 @@ package fr.ifremer.coser.ui.option; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; @@ -57,11 +57,11 @@ Object stringValue = value; if (value instanceof Category) { - stringValue = _(((Category)value).getTranslationKey()); + stringValue = t(((Category)value).getTranslationKey()); } else if (value instanceof ValidationLevel) { // en attendant mieux - stringValue = _(((ValidationLevel)value).getXWorkContext()); + stringValue = t(((ValidationLevel)value).getXWorkContext()); } return super.getTreeCellRendererComponent(tree, stringValue, sel, expanded, leaf, row, hasFocus); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectCreationView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectCreationView.jaxx 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectCreationView.jaxx 2014-02-24 15:14:55 UTC (rev 1124) @@ -45,7 +45,7 @@ </BeanValidator> <script><![CDATA[ - JCheckBox customReferenceCheckBox = new JCheckBox(_("coser.ui.project.useCustomReferenceSpeciesFile")); + JCheckBox customReferenceCheckBox = new JCheckBox(t("coser.ui.project.useCustomReferenceSpeciesFile")); void $afterCompleteSetup() { fr.ifremer.coser.ui.widgets.ComponentTitledBorder componentBorder = new fr.ifremer.coser.ui.widgets.ComponentTitledBorder(customReferenceCheckBox, useCustomReferenceFilePanel, BorderFactory.createEtchedBorder()); @@ -58,7 +58,7 @@ <row> <cell weightx="1" fill="horizontal"> - <Table border='{BorderFactory.createTitledBorder(_("coser.ui.project.newProject"))}'> + <Table border='{BorderFactory.createTitledBorder(t("coser.ui.project.newProject"))}'> <row> <cell anchor="west"> <JLabel text="coser.ui.project.projectname" /> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectEditView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectEditView.jaxx 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectEditView.jaxx 2014-02-24 15:14:55 UTC (rev 1124) @@ -42,7 +42,7 @@ <row> <cell weightx="1" fill="horizontal"> - <Table border='{BorderFactory.createTitledBorder(_("coser.ui.project.editProject"))}'> + <Table border='{BorderFactory.createTitledBorder(t("coser.ui.project.editProject"))}'> <row> <cell anchor="west"> <JLabel text="coser.ui.project.projectname" /> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -23,7 +23,7 @@ package fr.ifremer.coser.ui.project; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.event.MouseEvent; import java.io.File; @@ -206,13 +206,13 @@ // check some files existences if (!reftaxSpeciesFile.isFile()) { - JOptionPane.showMessageDialog(projectView, _("coser.ui.project.createProjectMissingReftax"), - _("coser.ui.project.missingFile"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(projectView, t("coser.ui.project.createProjectMissingReftax"), + t("coser.ui.project.missingFile"), JOptionPane.ERROR_MESSAGE); return; } if (!codeTypeEspeceFile.isFile()) { - JOptionPane.showMessageDialog(projectView, _("coser.ui.project.createProjectMissingCodeTypeSpecies"), - _("coser.ui.project.missingFile"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(projectView, t("coser.ui.project.createProjectMissingCodeTypeSpecies"), + t("coser.ui.project.missingFile"), JOptionPane.ERROR_MESSAGE); return; } @@ -324,7 +324,7 @@ if (log.isErrorEnabled()) { log.error("Can't open project", ex); } - JOptionPane.showMessageDialog(projectView, ex.getMessage(), _("coser.ui.project.openError"), + JOptionPane.showMessageDialog(projectView, ex.getMessage(), t("coser.ui.project.openError"), JOptionPane.ERROR_MESSAGE); } finally { setDefaultCursor(projectView); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectOpenView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectOpenView.jaxx 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectOpenView.jaxx 2014-02-24 15:14:55 UTC (rev 1124) @@ -27,7 +27,7 @@ <row> <cell weightx="1" fill="horizontal"> - <Table border='{BorderFactory.createTitledBorder(_("coser.ui.project.openProjectTitle"))}'> + <Table border='{BorderFactory.createTitledBorder(t("coser.ui.project.openProjectTitle"))}'> <row> <cell anchor="north"> <JLabel text="coser.ui.project.project" /> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx 2014-02-24 15:14:55 UTC (rev 1124) @@ -29,7 +29,7 @@ <row> <cell weightx="1" fill="horizontal"> - <Table border='{BorderFactory.createTitledBorder(_("coser.ui.project.summary.title"))}'> + <Table border='{BorderFactory.createTitledBorder(t("coser.ui.project.summary.title"))}'> <row> <cell anchor="west"> <JLabel text="coser.ui.project.summary.path" /> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/SpeciesFieldTypeListRenderer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/SpeciesFieldTypeListRenderer.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/SpeciesFieldTypeListRenderer.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -25,7 +25,7 @@ package fr.ifremer.coser.ui.project; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; @@ -56,13 +56,13 @@ // add another human comment switch (type) { case C_Valide: - text += " (" + _("coser.ui.project.cValideSpeciesTypeDesc") + ")"; + text += " (" + t("coser.ui.project.cValideSpeciesTypeDesc") + ")"; break; case C_PERM: - text += " (" + _("coser.ui.project.cPermSpeciesTypeDesc") + ")"; + text += " (" + t("coser.ui.project.cPermSpeciesTypeDesc") + ")"; break; case L_Valide: - text += " (" + _("coser.ui.project.lValideSpeciesTypeDesc") + ")"; + text += " (" + t("coser.ui.project.lValideSpeciesTypeDesc") + ")"; break; } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ExportUploadDialog.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ExportUploadDialog.jaxx 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ExportUploadDialog.jaxx 2014-02-24 15:14:55 UTC (rev 1124) @@ -28,7 +28,7 @@ <row> <cell weightx="1" weighty="1" fill="both"> - <Table border='{BorderFactory.createTitledBorder(_("coser.ui.uploadresult.extractChoice"))}'> + <Table border='{BorderFactory.createTitledBorder(t("coser.ui.uploadresult.extractChoice"))}'> <row> <cell fill="horizontal"> <JLabel text="coser.ui.uploadresult.extractTo" /> @@ -52,7 +52,7 @@ </row> <row> <cell weightx="1" weighty="1" fill="both"> - <Table border='{BorderFactory.createTitledBorder(_("coser.ui.uploadresult.uploadChoice"))}'> + <Table border='{BorderFactory.createTitledBorder(t("coser.ui.uploadresult.uploadChoice"))}'> <row> <cell fill="horizontal"> <JLabel text="coser.ui.uploadresult.uploadLogin" /> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -23,7 +23,7 @@ package fr.ifremer.coser.ui.result; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.io.File; import java.util.ArrayList; @@ -38,7 +38,7 @@ import jaxx.runtime.JAXXUtil; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import fr.ifremer.coser.CoserBusinessException; @@ -192,12 +192,12 @@ String status = get(); if (StringUtils.isNotEmpty(status)) { - JOptionPane.showMessageDialog(view, _("coser.ui.uploadresult.resultsuploaderror", status), - _("coser.ui.uploadresult.title"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(view, t("coser.ui.uploadresult.resultsuploaderror", status), + t("coser.ui.uploadresult.title"), JOptionPane.ERROR_MESSAGE); } else { - JOptionPane.showMessageDialog(view, _("coser.ui.uploadresult.resultsuploaded"), - _("coser.ui.uploadresult.title"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(view, t("coser.ui.uploadresult.resultsuploaded"), + t("coser.ui.uploadresult.title"), JOptionPane.INFORMATION_MESSAGE); } view.dispose(); @@ -236,8 +236,8 @@ setWaitCursor(view); webService.performResultExtract(selectedResult, publishDataResults, extractDirectory); - JOptionPane.showMessageDialog(view, _("coser.ui.uploadresult.resultsextracted"), - _("coser.ui.uploadresult.title"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(view, t("coser.ui.uploadresult.resultsextracted"), + t("coser.ui.uploadresult.title"), JOptionPane.INFORMATION_MESSAGE); view.dispose(); } catch (CoserBusinessException ex) { Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableModel.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableModel.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -23,7 +23,7 @@ package fr.ifremer.coser.ui.result; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -79,25 +79,25 @@ switch (column) { case 0: - name = _("coser.ui.result.table.resultName"); + name = t("coser.ui.result.table.resultName"); break; case 1: - name = _("coser.ui.result.table.rsufiVersion"); + name = t("coser.ui.result.table.rsufiVersion"); break; case 2: - name = _("coser.ui.result.table.zone"); + name = t("coser.ui.result.table.zone"); break; case 3: - name = _("coser.ui.result.table.estComIndFile"); + name = t("coser.ui.result.table.estComIndFile"); break; case 4: - name = _("coser.ui.result.table.estPopIndFile"); + name = t("coser.ui.result.table.estPopIndFile"); break; case 5: - name = _("coser.ui.result.table.maps"); + name = t("coser.ui.result.table.maps"); break; case 6: - name = _("coser.ui.result.table.otherfiles"); + name = t("coser.ui.result.table.otherfiles"); break; } return name; Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableRenderer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableRenderer.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableRenderer.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -23,7 +23,7 @@ package fr.ifremer.coser.ui.result; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; @@ -77,10 +77,10 @@ case 6: boolean availale = (Boolean)value; if (availale) { - localValue = _("coser.ui.common.yes"); + localValue = t("coser.ui.common.yes"); } else { - localValue = _("coser.ui.common.no"); + localValue = t("coser.ui.common.no"); } break; } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/RsufiResultTableModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/RsufiResultTableModel.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/RsufiResultTableModel.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -23,7 +23,7 @@ package fr.ifremer.coser.ui.result; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.Date; import java.util.HashSet; @@ -114,22 +114,22 @@ String result = null; switch(column) { case 0: - result = _("coser.ui.uploadresult.creationDate"); + result = t("coser.ui.uploadresult.creationDate"); break; case 1: - result = _("coser.ui.uploadresult.path"); + result = t("coser.ui.uploadresult.path"); break; case 2: - result = _("coser.ui.uploadresult.zone"); + result = t("coser.ui.uploadresult.zone"); break; case 3: - result = _("coser.ui.uploadresult.indicatorResult"); + result = t("coser.ui.uploadresult.indicatorResult"); break; case 4: - result = _("coser.ui.uploadresult.mapResult"); + result = t("coser.ui.uploadresult.mapResult"); break; case 5: - result = _("coser.ui.uploadresult.publishData"); + result = t("coser.ui.uploadresult.publishData"); break; } return result; Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2014-02-24 15:14:55 UTC (rev 1124) @@ -152,18 +152,18 @@ <Table> <row> <cell fill="horizontal"> - <JLabel id="strataLabel" text='{_("coser.ui.selection.details.strata", 0, 0)}' /> + <JLabel id="strataLabel" text='{t("coser.ui.selection.details.strata", 0, 0)}' /> </cell> </row> <row> <cell weightx="1" weighty="2" fill="both" rows="2"> <JScrollPane> <StrataListModel id="strataListModel" - onContentsChanged='strataLabel.setText(_("coser.ui.selection.details.strata", strataList.getSelectedIndices().length, strataList.getModel().getSize()))'/> + onContentsChanged='strataLabel.setText(t("coser.ui.selection.details.strata", strataList.getSelectedIndices().length, strataList.getModel().getSize()))'/> <JList id="strataList" model="{strataListModel}" onMouseClicked="getHandler().showStrataContextMenu(this, event)" selectionModel="{new CoserListSelectionModel(strataList.getSelectionModel(), strataListModel)}" - onValueChanged='setStrataValidated(false); strataLabel.setText(_("coser.ui.selection.details.strata", strataList.getSelectedIndices().length, strataList.getModel().getSize()))'/> + onValueChanged='setStrataValidated(false); strataLabel.setText(t("coser.ui.selection.details.strata", strataList.getSelectedIndices().length, strataList.getModel().getSize()))'/> </JScrollPane> </cell> <cell anchor="northeast"> @@ -188,19 +188,19 @@ <Table> <row> <cell fill="horizontal" columns="4"> - <JLabel id="typeSpeciesLabel" text='{_("coser.ui.selection.details.type", typeSpeciesList.getSelectedIndices().length, typeSpeciesList.getModel().getSize())}' /> + <JLabel id="typeSpeciesLabel" text='{t("coser.ui.selection.details.type", typeSpeciesList.getSelectedIndices().length, typeSpeciesList.getModel().getSize())}' /> </cell> </row> <row> <cell fill="both" weightx="1" weighty="1" columns="2"> <JScrollPane> <SpeciesTypesListModel id="typeSpeciesModel" constructorParams="this" - onContentsChanged='typeSpeciesLabel.setText(_("coser.ui.selection.details.type", typeSpeciesList.getSelectedIndices().length, typeSpeciesList.getModel().getSize()))'/> + onContentsChanged='typeSpeciesLabel.setText(t("coser.ui.selection.details.type", typeSpeciesList.getSelectedIndices().length, typeSpeciesList.getModel().getSize()))'/> <JList id="typeSpeciesList" model="{typeSpeciesModel}" cellRenderer="{new SpeciesTypesRenderer()}" selectionModel="{new CoserListSelectionModel(typeSpeciesList.getSelectionModel(), typeSpeciesModel)}" enabled="{isYearsValidated() && isStrataValidated()}" - onValueChanged='validFilterButton.setEnabled(true); typeSpeciesLabel.setText(_("coser.ui.selection.details.type", typeSpeciesList.getSelectedIndices().length, typeSpeciesList.getModel().getSize()))' /> + onValueChanged='validFilterButton.setEnabled(true); typeSpeciesLabel.setText(t("coser.ui.selection.details.type", typeSpeciesList.getSelectedIndices().length, typeSpeciesList.getModel().getSize()))' /> </JScrollPane> </cell> <cell anchor="south" columns="2"> @@ -214,22 +214,22 @@ <Table> <row> <cell fill="horizontal" columns="2"> - <JLabel id="filteredSpeciesLabel" text='{_("coser.ui.selection.details.filteredSpecies", 0, 0)}' /> + <JLabel id="filteredSpeciesLabel" text='{t("coser.ui.selection.details.filteredSpecies", 0, 0)}' /> </cell> <cell fill="horizontal"> - <JLabel id="selectedSpeciesLabel" text='{_("coser.ui.selection.details.selectedSpecies", 0, 0)}' /> + <JLabel id="selectedSpeciesLabel" text='{t("coser.ui.selection.details.selectedSpecies", 0, 0)}' /> </cell> </row> <row> <cell weightx="1" weighty="1" fill="both"> <JScrollPane> <SpeciesListModel id="filteredSpeciesListModel" - onContentsChanged='filteredSpeciesLabel.setText(_("coser.ui.selection.details.filteredSpecies", filteredSpeciesList.getSelectedIndices().length, filteredSpeciesList.getModel().getSize()))'/> + onContentsChanged='filteredSpeciesLabel.setText(t("coser.ui.selection.details.filteredSpecies", filteredSpeciesList.getSelectedIndices().length, filteredSpeciesList.getModel().getSize()))'/> <JList id="filteredSpeciesList" model="{filteredSpeciesListModel}" onMouseClicked="getHandler().showFilteredSpeciesContextMenu(this, event)" selectionModel="{new CoserListSelectionModel(filteredSpeciesList.getSelectionModel(), filteredSpeciesListModel)}" enabled="{isYearsValidated() && isStrataValidated()}" - onValueChanged='filteredSpeciesLabel.setText(_("coser.ui.selection.details.filteredSpecies", filteredSpeciesList.getSelectedIndices().length, filteredSpeciesList.getModel().getSize()))' /> + onValueChanged='filteredSpeciesLabel.setText(t("coser.ui.selection.details.filteredSpecies", filteredSpeciesList.getSelectedIndices().length, filteredSpeciesList.getModel().getSize()))' /> <ListSelectionModel id="filteredSpeciesListSelectionModel" javaBean="filteredSpeciesList.getSelectionModel()" /> </JScrollPane> </cell> @@ -292,12 +292,12 @@ <cell weightx="1" weighty="1" fill="both"> <JScrollPane> <SpeciesListModel id="selectedSpeciesListModel" - onContentsChanged='setSpeciesValidated(false);selectedSpeciesLabel.setText(_("coser.ui.selection.details.selectedSpecies", selectedSpeciesList.getSelectedIndices().length, selectedSpeciesList.getModel().getSize()))'/> + onContentsChanged='setSpeciesValidated(false);selectedSpeciesLabel.setText(t("coser.ui.selection.details.selectedSpecies", selectedSpeciesList.getSelectedIndices().length, selectedSpeciesList.getModel().getSize()))'/> <JList id="selectedSpeciesList" model="{selectedSpeciesListModel}" onMouseClicked="getHandler().showSelectedSpeciesContextMenu(this, event)" selectionModel="{new CoserListSelectionModel(selectedSpeciesList.getSelectionModel(), selectedSpeciesListModel)}" enabled="{isYearsValidated() && isStrataValidated()}" - onValueChanged='selectedSpeciesLabel.setText(_("coser.ui.selection.details.selectedSpecies", selectedSpeciesList.getSelectedIndices().length, selectedSpeciesList.getModel().getSize()))'/> + onValueChanged='selectedSpeciesLabel.setText(t("coser.ui.selection.details.selectedSpecies", selectedSpeciesList.getSelectedIndices().length, selectedSpeciesList.getModel().getSize()))'/> <ListSelectionModel id="selectedSpeciesListSelectionModel" javaBean="selectedSpeciesList.getSelectionModel()" /> </JScrollPane> </cell> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -23,7 +23,7 @@ package fr.ifremer.coser.ui.selection; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; import java.awt.GridBagConstraints; @@ -53,6 +53,7 @@ import jaxx.runtime.JAXXUtil; +import jaxx.runtime.swing.session.SwingSession; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -61,7 +62,6 @@ import org.jfree.chart.JFreeChart; import org.nuiton.math.matrix.MatrixND; import org.nuiton.math.matrix.gui.MatrixTableModelND; -import org.nuiton.widget.SwingSession; import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserConfig; @@ -289,8 +289,8 @@ */ public void reloadControlData(SelectionDetailsView view) { - int response = JOptionPane.showConfirmDialog(view, _("coser.ui.selection.detail.confirmcontrolreload"), - _("coser.ui.selection.selectionTitle"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); + int response = JOptionPane.showConfirmDialog(view, t("coser.ui.selection.detail.confirmcontrolreload"), + t("coser.ui.selection.selectionTitle"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (response == JOptionPane.YES_OPTION) { Project project = view.getContextValue(Project.class); @@ -304,8 +304,8 @@ view.getValidDatesButton().setEnabled(true); view.getDetailAccordionPane().setSelected(1); - JOptionPane.showMessageDialog(view, _("coser.ui.selection.detail.controldatareloaded"), - _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(view, t("coser.ui.selection.detail.controldatareloaded"), + t("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); } catch (CoserBusinessException ex) { throw new CoserException("Can't reload control data", ex); @@ -375,8 +375,8 @@ // update sampling effort data table showSamplingEffort(view); - JOptionPane.showMessageDialog(view, _("coser.ui.selection.detail.yearsvalidated"), - _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(view, t("coser.ui.selection.detail.yearsvalidated"), + t("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); // auto select strata accordion pane view.getDetailAccordionPane().setSelected(2); @@ -483,8 +483,8 @@ // update sampling effort data table showSamplingEffort(view); - JOptionPane.showMessageDialog(view, _("coser.ui.selection.detail.stratavalidated"), - _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(view, t("coser.ui.selection.detail.stratavalidated"), + t("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); // auto select species accordion pane view.getDetailAccordionPane().setSelected(3); @@ -556,8 +556,8 @@ // to remove from view, non available species updateSelectionSpecies(view); - JOptionPane.showMessageDialog(view, _("coser.ui.selection.detail.speciesvalidated"), - _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(view, t("coser.ui.selection.detail.speciesvalidated"), + t("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); } finally { setDefaultCursor(view); @@ -578,7 +578,7 @@ JPopupMenu popupMenu = new JPopupMenu(); // select all menu - JMenuItem selectAllMenu = new JMenuItem(_("coser.ui.common.selectAll")); + JMenuItem selectAllMenu = new JMenuItem(t("coser.ui.common.selectAll")); selectAllMenu.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -589,7 +589,7 @@ popupMenu.add(selectAllMenu); // unselect all menu - JMenuItem unselectAllMenu = new JMenuItem(_("coser.ui.common.unselectAll")); + JMenuItem unselectAllMenu = new JMenuItem(t("coser.ui.common.unselectAll")); unselectAllMenu.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -616,7 +616,7 @@ JPopupMenu popupMenu = new JPopupMenu(); // select all menu - JMenuItem selectAllMenu = new JMenuItem(_("coser.ui.common.selectAll")); + JMenuItem selectAllMenu = new JMenuItem(t("coser.ui.common.selectAll")); selectAllMenu.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -627,7 +627,7 @@ popupMenu.add(selectAllMenu); // unselect all menu - JMenuItem unselectAllMenu = new JMenuItem(_("coser.ui.common.unselectAll")); + JMenuItem unselectAllMenu = new JMenuItem(t("coser.ui.common.unselectAll")); unselectAllMenu.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -657,7 +657,7 @@ int[] selectedRows = view.getFilteredSpeciesList().getSelectedIndices(); if (selectedRows.length > 0) { // merge menu - JMenuItem fusionMenu = new JMenuItem(_("coser.ui.selection.speciesMenuFusion")); + JMenuItem fusionMenu = new JMenuItem(t("coser.ui.selection.speciesMenuFusion")); fusionMenu.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -667,7 +667,7 @@ popupMenu.add(fusionMenu); // graph - JMenuItem graphMenu = new JMenuItem(_("coser.ui.selection.details.displayDiffCatchLengthGraph")); + JMenuItem graphMenu = new JMenuItem(t("coser.ui.selection.details.displayDiffCatchLengthGraph")); graphMenu.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -678,7 +678,7 @@ } // select all menu - JMenuItem selectAllMenu = new JMenuItem(_("coser.ui.common.selectAll")); + JMenuItem selectAllMenu = new JMenuItem(t("coser.ui.common.selectAll")); selectAllMenu.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -689,7 +689,7 @@ popupMenu.add(selectAllMenu); // unselect all menu - JMenuItem unselectAllMenu = new JMenuItem(_("coser.ui.common.unselectAll")); + JMenuItem unselectAllMenu = new JMenuItem(t("coser.ui.common.unselectAll")); unselectAllMenu.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -719,7 +719,7 @@ int[] selectedRows = view.getSelectedSpeciesList().getSelectedIndices(); if (selectedRows.length > 0) { // graph - JMenuItem graphMenu = new JMenuItem(_("coser.ui.selection.details.displayDiffCatchLengthGraph")); + JMenuItem graphMenu = new JMenuItem(t("coser.ui.selection.details.displayDiffCatchLengthGraph")); graphMenu.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -730,7 +730,7 @@ } // select all menu - JMenuItem selectAllMenu = new JMenuItem(_("coser.ui.common.selectAll")); + JMenuItem selectAllMenu = new JMenuItem(t("coser.ui.common.selectAll")); selectAllMenu.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -741,7 +741,7 @@ popupMenu.add(selectAllMenu); // unselect all menu - JMenuItem unselectAllMenu = new JMenuItem(_("coser.ui.common.unselectAll")); + JMenuItem unselectAllMenu = new JMenuItem(t("coser.ui.common.unselectAll")); unselectAllMenu.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -766,7 +766,7 @@ // fill species combo box with reftax species list Map<String, String> reftaxSpecies = project.getRefTaxSpeciesMap(); - ListComboBoxModel<String> speciesComboModel = new ListComboBoxModel<String>(new ArrayList<String>(reftaxSpecies.keySet())); + ListComboBoxModel speciesComboModel = new ListComboBoxModel(new ArrayList<String>(reftaxSpecies.keySet())); speciesFusionDialog.getSpeciesCombo().setModel(speciesComboModel); speciesFusionDialog.getSpeciesCombo().setRenderer(new SpeciesListRenderer(reftaxSpecies)); @@ -776,9 +776,9 @@ Object[] selectedValues = view.getFilteredSpeciesList().getSelectedValues(); if (selectedValues.length == 1) { - speciesFusionDialog.setTitle(_("coser.ui.selection.fusion.rename.title")); + speciesFusionDialog.setTitle(t("coser.ui.selection.fusion.rename.title")); } else { - speciesFusionDialog.setTitle(_("coser.ui.selection.fusion.title")); + speciesFusionDialog.setTitle(t("coser.ui.selection.fusion.title")); } speciesFusionDialog.setLocationRelativeTo(view); @@ -833,20 +833,20 @@ projectService.createProjectSelection(project, selection); selectionView.setCreationState(false); - JOptionPane.showMessageDialog(view, _("coser.ui.selection.selectionCreated"), - _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(view, t("coser.ui.selection.selectionCreated"), + t("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); } else { projectService.saveProjectSelection(project, selection); - JOptionPane.showMessageDialog(view, _("coser.ui.selection.selectionSaved"), - _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(view, t("coser.ui.selection.selectionSaved"), + t("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); } } catch (CoserBusinessException ex) { if (log.isErrorEnabled()) { log.error("Can't save selection", ex); } - JOptionPane.showMessageDialog(view, ex.getMessage(), _("coser.ui.selection.saveError"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(view, ex.getMessage(), t("coser.ui.selection.saveError"), JOptionPane.ERROR_MESSAGE); } // enable tabs @@ -904,8 +904,8 @@ try { saveSelectionLists(view, selection); service.validSelection(project, selection); - JOptionPane.showMessageDialog(view, _("coser.ui.selection.selectionValidated"), - _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(view, t("coser.ui.selection.selectionValidated"), + t("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); // enable tabs SelectionView selectionView = view.getParentContainer(SelectionView.class); @@ -914,7 +914,7 @@ if (log.isErrorEnabled()) { log.error("Can't save selection", ex); } - JOptionPane.showMessageDialog(view, ex.getMessage(), _("coser.ui.selection.saveError"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(view, ex.getMessage(), t("coser.ui.selection.saveError"), JOptionPane.ERROR_MESSAGE); } } } @@ -941,8 +941,8 @@ if (!currentOccDensSelection.equals(originalOccDensSelection) && StringUtils.isBlank(selection.getSelectedSpeciesOccDensComment())) { - JOptionPane.showMessageDialog(view, _("coser.ui.selection.nonJustifiedOccurenceDensity"), - _("coser.ui.selection.nonJustifiedTitle"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(view, t("coser.ui.selection.nonJustifiedOccurenceDensity"), + t("coser.ui.selection.nonJustifiedTitle"), JOptionPane.ERROR_MESSAGE); view.getOccurrenceDensityCommentField().requestFocus(); canValidate = false; } @@ -953,8 +953,8 @@ int[] sizeAllYearSpeciesSelection = view.getSelectionSizeAllYearList().getSelectedIndices(); if (sizeAllYearSpeciesSelection.length < sizeAllYearSpeciesInModel && StringUtils.isBlank(selection.getSelectedSpeciesSizeAllYearComment())) { - JOptionPane.showMessageDialog(view, _("coser.ui.selection.nonJustifiedSizeAllYear"), - _("coser.ui.selection.nonJustifiedTitle"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(view, t("coser.ui.selection.nonJustifiedSizeAllYear"), + t("coser.ui.selection.nonJustifiedTitle"), JOptionPane.ERROR_MESSAGE); view.getSizeAllYearCommentField().requestFocus(); canValidate = false; } @@ -966,8 +966,8 @@ int[] maturitySpeciesSelection = view.getSelectionMaturityList().getSelectedIndices(); if (maturitySpeciesSelection.length < maturitySpeciesInModel && StringUtils.isBlank(selection.getSelectedSpeciesMaturityComment())) { - JOptionPane.showMessageDialog(view, _("coser.ui.selection.nonJustifiedMaturity"), - _("coser.ui.selection.nonJustifiedTitle"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(view, t("coser.ui.selection.nonJustifiedMaturity"), + t("coser.ui.selection.nonJustifiedTitle"), JOptionPane.ERROR_MESSAGE); view.getMaturityCommentField().requestFocus(); canValidate = false; } @@ -1073,16 +1073,16 @@ parent.getFilteredSpeciesListSelectionModel().clearSelection(); if (speciesCodes.length == 1) { - JOptionPane.showMessageDialog(view, _("coser.ui.selection.speciesRenamed"), - _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(view, t("coser.ui.selection.speciesRenamed"), + t("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); } else { - JOptionPane.showMessageDialog(view, _("coser.ui.selection.speciesMerged"), - _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(view, t("coser.ui.selection.speciesMerged"), + t("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); } } catch (CoserBusinessException ex) { JOptionPane.showMessageDialog(view, ex.getMessage(), - _("coser.ui.selection.fusion.title"), JOptionPane.ERROR_MESSAGE); + t("coser.ui.selection.fusion.title"), JOptionPane.ERROR_MESSAGE); } view.dispose(); @@ -1347,7 +1347,7 @@ projectService.saveRsufiResults(project, selection, newResult, otherFiles); view.dispose(); } catch (CoserBusinessException ex) { - JOptionPane.showMessageDialog(view, ex.getMessage(), _("coser.ui.result.saveError"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(view, ex.getMessage(), t("coser.ui.result.saveError"), JOptionPane.ERROR_MESSAGE); } finally { setDefaultCursor(view); } @@ -1390,7 +1390,7 @@ List<File> newOthersFile = view.getOtherDataFileListModel().getFiles(); projectService.editRsufiResults(project, selection, editedResult, newOthersFile); } catch (CoserBusinessException ex) { - JOptionPane.showMessageDialog(view, ex.getMessage(), _("coser.ui.result.saveError"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(view, ex.getMessage(), t("coser.ui.result.saveError"), JOptionPane.ERROR_MESSAGE); } view.dispose(); } @@ -1406,8 +1406,8 @@ RSufiResult result = view.getSelectionResultsTableModel().getValue(selectedRow); int confirm = JOptionPane.showConfirmDialog(view, - _("coser.ui.result.confirmDeleteResult", result.getName()), - _("coser.ui.result.resultTitle"), JOptionPane.YES_NO_OPTION, + t("coser.ui.result.confirmDeleteResult", result.getName()), + t("coser.ui.result.resultTitle"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (confirm == JOptionPane.YES_OPTION) { Project project = view.getContextValue(Project.class); @@ -1460,8 +1460,8 @@ projectService.extractRSUfiData(project, selection, directory, false); - JOptionPane.showMessageDialog(view, _("coser.ui.selection.rsufidataextracted"), - _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(view, t("coser.ui.selection.rsufidataextracted"), + t("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); } catch (CoserBusinessException ex) { throw new CoserException("Can't extract rsufi files", ex); } finally { @@ -1633,7 +1633,7 @@ List<File> newOthersFile = view.getSelectionFilesListModel().getFiles(); projectService.editSelectionOptions(project, selection, newOthersFile); } catch (CoserBusinessException ex) { - JOptionPane.showMessageDialog(view, ex.getMessage(), _("coser.ui.result.saveError"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(view, ex.getMessage(), t("coser.ui.result.saveError"), JOptionPane.ERROR_MESSAGE); } view.dispose(); } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2014-02-24 15:14:55 UTC (rev 1124) @@ -67,16 +67,16 @@ </row> <row> <cell fill="horizontal" columns="2"> - <JXTitledSeparator id="allSpeciesLabel" title='{_("coser.ui.selection.allSpecies", 0, 0)}' /> + <JXTitledSeparator id="allSpeciesLabel" title='{t("coser.ui.selection.allSpecies", 0, 0)}' /> </cell> <cell fill="horizontal" columns="2"> - <JXTitledSeparator id="occurrenceDensitySpeciesLabel" title='{_("coser.ui.selection.occurrenceDensitySpecies", 0, 0)}' /> + <JXTitledSeparator id="occurrenceDensitySpeciesLabel" title='{t("coser.ui.selection.occurrenceDensitySpecies", 0, 0)}' /> </cell> <cell fill="horizontal" columns="2"> - <JXTitledSeparator id="sizeAllYearSpeciesLabel" title='{_("coser.ui.selection.sizeAllYearSpecies", 0, 0)}' /> + <JXTitledSeparator id="sizeAllYearSpeciesLabel" title='{t("coser.ui.selection.sizeAllYearSpecies", 0, 0)}' /> </cell> <cell fill="horizontal" columns="2"> - <JXTitledSeparator id="maturitySpeciesLabel" title='{_("coser.ui.selection.maturitySpecies", 0, 0)}' /> + <JXTitledSeparator id="maturitySpeciesLabel" title='{t("coser.ui.selection.maturitySpecies", 0, 0)}' /> </cell> </row> <row> @@ -127,38 +127,38 @@ <cell weighty="1" weightx="1" fill="both" columns="2"> <JScrollPane> <SpeciesListModel id="selectionAllSpeciesListModel" - onContentsChanged='allSpeciesLabel.setTitle(_("coser.ui.selection.allSpecies", selectionAllSpeciesList.getSelectedIndices().length, selectionAllSpeciesList.getModel().getSize()))' /> + onContentsChanged='allSpeciesLabel.setTitle(t("coser.ui.selection.allSpecies", selectionAllSpeciesList.getSelectedIndices().length, selectionAllSpeciesList.getModel().getSize()))' /> <JList id="selectionAllSpeciesList" model="{selectionAllSpeciesListModel}" selectionModel="{new CoserListSelectionModel(selectionAllSpeciesList.getSelectionModel(), selectionAllSpeciesListModel)}" enabled="false" - onValueChanged='allSpeciesLabel.setTitle(_("coser.ui.selection.allSpecies", selectionAllSpeciesList.getSelectedIndices().length, selectionAllSpeciesList.getModel().getSize()))' /> + onValueChanged='allSpeciesLabel.setTitle(t("coser.ui.selection.allSpecies", selectionAllSpeciesList.getSelectedIndices().length, selectionAllSpeciesList.getModel().getSize()))' /> </JScrollPane> </cell> <cell weightx="1" fill="both" columns="2"> <JScrollPane> <OccurrenceDensitySpeciesListModel id="selectionOccurrenceDensityListModel" - onContentsChanged='occurrenceDensitySpeciesLabel.setTitle(_("coser.ui.selection.occurrenceDensitySpecies", selectionOccurrenceDensityList.getSelectedIndices().length, selectionOccurrenceDensityList.getModel().getSize()))' /> + onContentsChanged='occurrenceDensitySpeciesLabel.setTitle(t("coser.ui.selection.occurrenceDensitySpecies", selectionOccurrenceDensityList.getSelectedIndices().length, selectionOccurrenceDensityList.getModel().getSize()))' /> <JList id="selectionOccurrenceDensityList" model="{selectionOccurrenceDensityListModel}" selectionModel="{new CoserListSelectionModel(selectionOccurrenceDensityList.getSelectionModel(), selectionOccurrenceDensityListModel)}" - onValueChanged='applyOccDensFilter.setEnabled(true); occurrenceDensitySpeciesLabel.setTitle(_("coser.ui.selection.occurrenceDensitySpecies", selectionOccurrenceDensityList.getSelectedIndices().length, selectionOccurrenceDensityList.getModel().getSize()))' /> + onValueChanged='applyOccDensFilter.setEnabled(true); occurrenceDensitySpeciesLabel.setTitle(t("coser.ui.selection.occurrenceDensitySpecies", selectionOccurrenceDensityList.getSelectedIndices().length, selectionOccurrenceDensityList.getModel().getSize()))' /> </JScrollPane> </cell> <cell weightx="1" fill="both" columns="2"> <JScrollPane> <SizeAllYearSpeciesListModel id="selectionSizeAllYearListModel" - onContentsChanged='sizeAllYearSpeciesLabel.setTitle(_("coser.ui.selection.sizeAllYearSpecies", selectionSizeAllYearList.getSelectedIndices().length, selectionSizeAllYearList.getModel().getSize()))' /> + onContentsChanged='sizeAllYearSpeciesLabel.setTitle(t("coser.ui.selection.sizeAllYearSpecies", selectionSizeAllYearList.getSelectedIndices().length, selectionSizeAllYearList.getModel().getSize()))' /> <JList id="selectionSizeAllYearList" model="{selectionSizeAllYearListModel}" selectionModel="{new CoserListSelectionModel(selectionSizeAllYearList.getSelectionModel(), selectionSizeAllYearListModel)}" - onValueChanged='sizeAllYearSpeciesLabel.setTitle(_("coser.ui.selection.sizeAllYearSpecies", selectionSizeAllYearList.getSelectedIndices().length, selectionSizeAllYearList.getModel().getSize()))' /> + onValueChanged='sizeAllYearSpeciesLabel.setTitle(t("coser.ui.selection.sizeAllYearSpecies", selectionSizeAllYearList.getSelectedIndices().length, selectionSizeAllYearList.getModel().getSize()))' /> </JScrollPane> </cell> <cell weightx="1" fill="both" columns="2"> <JScrollPane> <MaturitySpeciesListModel id="selectionMaturityListModel" - onContentsChanged='maturitySpeciesLabel.setTitle(_("coser.ui.selection.maturitySpecies", selectionMaturityList.getSelectedIndices().length, selectionMaturityList.getModel().getSize()))' /> + onContentsChanged='maturitySpeciesLabel.setTitle(t("coser.ui.selection.maturitySpecies", selectionMaturityList.getSelectedIndices().length, selectionMaturityList.getModel().getSize()))' /> <JList id="selectionMaturityList" model="{selectionMaturityListModel}" selectionModel="{new CoserListSelectionModel(selectionMaturityList.getSelectionModel(), selectionMaturityListModel)}" - onValueChanged='maturitySpeciesLabel.setTitle(_("coser.ui.selection.maturitySpecies", selectionMaturityList.getSelectedIndices().length, selectionMaturityList.getModel().getSize()))' /> + onValueChanged='maturitySpeciesLabel.setTitle(t("coser.ui.selection.maturitySpecies", selectionMaturityList.getSelectedIndices().length, selectionMaturityList.getModel().getSize()))' /> </JScrollPane> </cell> </row> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionRsufiView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionRsufiView.jaxx 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionRsufiView.jaxx 2014-02-24 15:14:55 UTC (rev 1124) @@ -32,7 +32,7 @@ <SelectionHandler id="handler" javaBean="null" /> <row> <cell weightx="1" fill="horizontal"> - <Table border='{BorderFactory.createTitledBorder(_("coser.ui.selection.option.optionTitle"))}'> + <Table border='{BorderFactory.createTitledBorder(t("coser.ui.selection.option.optionTitle"))}'> <row> <cell weightx="1" anchor="west"> <JButton text="coser.ui.selection.option.editFiles" @@ -44,7 +44,7 @@ </row> <row> <cell weightx="1" fill="horizontal"> - <Table border='{BorderFactory.createTitledBorder(_("coser.ui.result.extractDataTitle"))}'> + <Table border='{BorderFactory.createTitledBorder(t("coser.ui.result.extractDataTitle"))}'> <row> <cell> <JLabel text="coser.ui.result.extractDataLabel" /> @@ -74,7 +74,7 @@ </row> <row> <cell weightx="1" weighty="2" fill="both"> - <Table border='{BorderFactory.createTitledBorder(_("coser.ui.result.availableDataTitle"))}'> + <Table border='{BorderFactory.createTitledBorder(t("coser.ui.result.availableDataTitle"))}'> <row> <cell columns="3" weightx="1" weighty="1" fill="both"> <JScrollPane> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SpeciesListOccDensRenderer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SpeciesListOccDensRenderer.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SpeciesListOccDensRenderer.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -25,7 +25,7 @@ package fr.ifremer.coser.ui.selection; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; import java.util.Map; @@ -71,7 +71,7 @@ if (reftaxSpecies.containsKey(species)) { speciesText = reftaxSpecies.get(species); } - String stringValue = _("coser.ui.selection.occurrencedensityrenderer", speciesText, occurrence, density); + String stringValue = t("coser.ui.selection.occurrencedensityrenderer", speciesText, occurrence, density); return super.getListCellRendererComponent(list, stringValue, index, isSelected, cellHasFocus); } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayHandler.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayHandler.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -23,7 +23,7 @@ package fr.ifremer.coser.ui.selection.replay; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.util.ArrayList; import java.util.Collection; @@ -36,7 +36,7 @@ import jaxx.runtime.JAXXUtil; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -119,7 +119,7 @@ Collection<String> remaindYear = CollectionUtils.subtract(replayedSelection.getSelectedYears(), selection.getAllYears()); if (!remaindYear.isEmpty()) { String yearsAsString = StringUtils.join(remaindYear, ", "); - String message = _("coser.ui.selection.replay.missingyears", yearsAsString); + String message = t("coser.ui.selection.replay.missingyears", yearsAsString); view.getMessageArea2().setText(message); } @@ -172,7 +172,7 @@ Collection<String> remaindStrata = CollectionUtils.subtract(replayedSelection.getSelectedStrata(), strata); if (!remaindStrata.isEmpty()) { String strataAsString = StringUtils.join(remaindStrata, ", "); - String message = _("coser.ui.selection.replay.missingstrata", strataAsString); + String message = t("coser.ui.selection.replay.missingstrata", strataAsString); view.getMessageArea3().setText(message); } @@ -274,7 +274,7 @@ speciesBuilder.append(project.getDisplaySpeciesText(species)); separator = ", "; } - String message = _("coser.ui.selection.replay.missingspecies", speciesBuilder.toString()); + String message = t("coser.ui.selection.replay.missingspecies", speciesBuilder.toString()); view.getMessageArea5().setText(message); } @@ -344,8 +344,8 @@ // autoselection de l'onglet "listes" parent.getHandler().showSelectionView(selection, 1); - JOptionPane.showMessageDialog(view, _("coser.ui.selection.selectionCreated"), - _("coser.ui.selection.replay.replayTitle"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(view, t("coser.ui.selection.selectionCreated"), + t("coser.ui.selection.replay.replayTitle"), JOptionPane.INFORMATION_MESSAGE); // hide current frame view.dispose(); @@ -354,7 +354,7 @@ if (log.isErrorEnabled()) { log.error("Can't save selection", ex); } - JOptionPane.showMessageDialog(view, ex.getMessage(), _("coser.ui.selection.saveError"), + JOptionPane.showMessageDialog(view, ex.getMessage(), t("coser.ui.selection.saveError"), JOptionPane.ERROR_MESSAGE); } finally { setDefaultCursor(view); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayView.jaxx 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayView.jaxx 2014-02-24 15:14:55 UTC (rev 1124) @@ -69,7 +69,7 @@ <row> <cell weightx="1" fill="horizontal" columns="3"> <JTextArea id="messageArea1" rows="3" editable="false" - text='{_("coser.ui.selection.replay.noerrordetected")}' /> + text='{t("coser.ui.selection.replay.noerrordetected")}' /> </cell> </row> <row> @@ -110,7 +110,7 @@ <row> <cell weightx="1" fill="horizontal" columns="3"> <JTextArea id="messageArea2" rows="3" editable="false" - text='{_("coser.ui.selection.replay.noerrordetected")}' /> + text='{t("coser.ui.selection.replay.noerrordetected")}' /> </cell> </row> <row> @@ -151,7 +151,7 @@ <row> <cell weightx="1" fill="horizontal" columns="3"> <JTextArea id="messageArea3" rows="3" editable="false" - text='{_("coser.ui.selection.replay.noerrordetected")}' /> + text='{t("coser.ui.selection.replay.noerrordetected")}' /> </cell> </row> <row> @@ -190,7 +190,7 @@ <row> <cell weightx="1" fill="horizontal" columns="3"> <JTextArea id="messageArea4" rows="3" editable="false" - text='{_("coser.ui.selection.replay.noerrordetected")}' /> + text='{t("coser.ui.selection.replay.noerrordetected")}' /> </cell> </row> <row> @@ -230,7 +230,7 @@ <row> <cell weightx="1" fill="horizontal" columns="3"> <JTextArea id="messageArea5" rows="3" editable="false" - text='{_("coser.ui.selection.replay.noerrordetected")}' /> + text='{t("coser.ui.selection.replay.noerrordetected")}' /> </cell> </row> <row> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/CoserProgressBar.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/CoserProgressBar.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/CoserProgressBar.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -23,7 +23,7 @@ package fr.ifremer.coser.ui.util; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import javax.swing.JProgressBar; @@ -93,7 +93,7 @@ if (stepCount <= 1) { setString(text); } else { - setString(_("coser.ui.control.progressStep", step +1, stepCount, text)); + setString(t("coser.ui.control.progressStep", step +1, stepCount, text)); } } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/ErrorHelper.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/ErrorHelper.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/ErrorHelper.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -23,7 +23,7 @@ package fr.ifremer.coser.ui.util; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; import java.io.PrintWriter; @@ -78,8 +78,8 @@ public void showErrorDialog(Component parent, String message, Throwable cause) { JXErrorPane pane = new JXErrorPane(); - ErrorInfo info = new ErrorInfo(_("coser.ui.error.title"), - _("coser.ui.error.htmlmessage", message), null, null, + ErrorInfo info = new ErrorInfo(t("coser.ui.error.title"), + t("coser.ui.error.htmlmessage", message), null, null, cause, null, null); pane.setErrorInfo(info); pane.setErrorReporter(this); @@ -156,7 +156,7 @@ // send mail email.send(); - JOptionPane.showMessageDialog(null, _("coser.ui.error.reportSendTo", emailTo)); + JOptionPane.showMessageDialog(null, t("coser.ui.error.reportSendTo", emailTo)); } catch (EmailException ex) { if (log.isErrorEnabled()) { log.error("Can't send report email" ,ex); Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2014-02-24 15:14:55 UTC (rev 1124) @@ -15,9 +15,9 @@ coser.ui.common.unselectAll.short=None coser.ui.common.valid=Valid coser.ui.common.yes=Yes -coser.ui.configuration.category.controlselection=Control and selection -coser.ui.configuration.category.misc=Misc -coser.ui.configuration.category.path=Paths +coser.ui.configuration.category.controlselection= +coser.ui.configuration.category.misc= +coser.ui.configuration.category.path= coser.ui.configuration.title=Configuration coser.ui.control.categorylabel=Displayed data \: coser.ui.control.checkData=Check data @@ -123,16 +123,16 @@ coser.ui.project.createProjectMissingReftax=File 'Reftax' is not valid \!\n(check configuration \: coser.reference.species) coser.ui.project.customReferenceSpeciesFile=New taxonomy reference file \: coser.ui.project.displaySpeciesType=Display field \: -coser.ui.project.editProject=Edit project +coser.ui.project.editProject= coser.ui.project.haulFile=Haul file \: coser.ui.project.lValideSpeciesTypeDesc=Species latin name coser.ui.project.lengthFile=Length file \: coser.ui.project.maps=Maps \: coser.ui.project.missingFile=Missing file -coser.ui.project.newProject=New project +coser.ui.project.newProject= coser.ui.project.openError=Open error coser.ui.project.openProject=Open -coser.ui.project.openProjectTitle=Open existing project +coser.ui.project.openProjectTitle= coser.ui.project.outputSpeciesType=Output field \: coser.ui.project.project=Project \: coser.ui.project.projectauthor=Author \: @@ -150,13 +150,13 @@ coser.ui.project.summary.resultCount=Result count \: coser.ui.project.summary.selectionCount=Selection count \: coser.ui.project.summary.strataFileName=Strata file name \: -coser.ui.project.summary.title=Project summary +coser.ui.project.summary.title= coser.ui.project.summary.validated=Control validated \: -coser.ui.project.useCustomReferenceSpeciesFile=Use custom taxonomy reference file +coser.ui.project.useCustomReferenceSpeciesFile= coser.ui.project.usedReferenceSpeciesFile=Current reference file (Reffax) \: coser.ui.result.addNewResult=Save result coser.ui.result.addOtherDataFile=Add file -coser.ui.result.availableDataTitle=Available results \: +coser.ui.result.availableDataTitle= coser.ui.result.cancel=Cancel coser.ui.result.confirmDeleteResult=Do you want to delete result %s ? coser.ui.result.creationDate=Result date \: @@ -166,7 +166,7 @@ coser.ui.result.estPopIndFile=ESTPOPind file \: coser.ui.result.extractDataButton=Export in Rsufi format coser.ui.result.extractDataLabel=Export directory \: -coser.ui.result.extractDataTitle=Export RSufi input data +coser.ui.result.extractDataTitle= coser.ui.result.mapsDirectory=Maps directory \: coser.ui.result.newResult=New Result coser.ui.result.otherDataFile=Other files \: @@ -190,7 +190,7 @@ coser.ui.result.validEditResult=Modify result coser.ui.result.validNewResult=Add this result coser.ui.result.zone=Zone \: -coser.ui.selection.allSpecies=L1 \: All species (%d/%d) +coser.ui.selection.allSpecies= coser.ui.selection.comment=Comment \: coser.ui.selection.detail.confirmcontrolreload=Are you sure you want to reload controled data ?\nAll modifications done on current selection will be lost. coser.ui.selection.detail.controldatareloaded=Controled data reloaded. @@ -206,19 +206,19 @@ coser.ui.selection.details.description=Description \: coser.ui.selection.details.displayDiffCatchLengthGraph=Comparison catch/length graphs coser.ui.selection.details.displayDiffCatchLengthGraphTip=Comparison catch/length graphs -coser.ui.selection.details.filteredSpecies=Filtered species (%d/%d) \: +coser.ui.selection.details.filteredSpecies= coser.ui.selection.details.mergeSpeciesTip=Merge/Rename coser.ui.selection.details.name=Selection name \: coser.ui.selection.details.removeFromSelectedListTip=Remove selected species from selected species list coser.ui.selection.details.saveSelection=Save selection coser.ui.selection.details.selectAllSpeciesTip=Select all -coser.ui.selection.details.selectedSpecies=L1 \: Selected species (%d/%d) \: +coser.ui.selection.details.selectedSpecies= coser.ui.selection.details.showMapTip=Display strata map coser.ui.selection.details.showSpeciesTip= coser.ui.selection.details.speciesDataDescription=Haul count by strata and year \: coser.ui.selection.details.speciescontextmenu=For more options, use species lists contextual menu -coser.ui.selection.details.strata=Strata (%d/%d) \: -coser.ui.selection.details.type=Filter by type (%d/%d) \: +coser.ui.selection.details.strata= +coser.ui.selection.details.type= coser.ui.selection.details.unSelectAllSpeciesTip=Unselect all coser.ui.selection.details.validFilter=Valid filter coser.ui.selection.details.validSelection=Valid selection @@ -236,18 +236,18 @@ coser.ui.selection.fusion.name=New name \: coser.ui.selection.fusion.rename.title=Rename coser.ui.selection.fusion.title=Merge -coser.ui.selection.maturitySpecies=L4 \: Species with maturity (%d/%d) +coser.ui.selection.maturitySpecies= coser.ui.selection.nonJustifiedMaturity=Maturity species list is not all selected.\nYou must justify this selection with a comment. coser.ui.selection.nonJustifiedOccurenceDensity=Filtered list selection doesn't match filter selection.\nYou must justify this selection with a comment. coser.ui.selection.nonJustifiedSizeAllYear=Size all year species list is not all selected.\nYou must justify this selection with a comment. coser.ui.selection.nonJustifiedTitle=Unjustified selection -coser.ui.selection.occurrenceDensitySpecies=L2 \: Filtered species (%d/%d) +coser.ui.selection.occurrenceDensitySpecies= coser.ui.selection.occurrencedensityrenderer=<html>%s<span style\='font-size\:85%%;color\:gray;'>(Occ\=%.2f, Dens\=%.2f)</span></html> coser.ui.selection.option.addSelectionFile=Add coser.ui.selection.option.editFiles=Selection files coser.ui.selection.option.editFilesTitle=Edit files coser.ui.selection.option.filesDetails=This files will be saved into current selection and copied into RSufi export. -coser.ui.selection.option.optionTitle=Options +coser.ui.selection.option.optionTitle= coser.ui.selection.option.removeSelectionFile=Remove coser.ui.selection.option.validSelectionFiles=Save coser.ui.selection.reloadcontroldata=Reload controled data @@ -261,7 +261,7 @@ coser.ui.selection.replay.missingstrata=Some strata are missing in current selection \: %s coser.ui.selection.replay.missingyears=Some years are missing in current selection \: %s coser.ui.selection.replay.nextstep=Next step -coser.ui.selection.replay.noerrordetected=No errors detected. +coser.ui.selection.replay.noerrordetected= coser.ui.selection.replay.replayTitle=Replay selection coser.ui.selection.replay.selectioninfos=Selection information \: coser.ui.selection.rsufidataextracted=RSufi data extracted. @@ -274,7 +274,7 @@ coser.ui.selection.selectionTitle=Selection step coser.ui.selection.selectionValidated=Selection validated and saved. coser.ui.selection.selectionreport=Selection report -coser.ui.selection.sizeAllYearSpecies=L3 \: Species with size all year (%d/%d) +coser.ui.selection.sizeAllYearSpecies= coser.ui.selection.speciesMenuFusion=Merge/Rename coser.ui.selection.speciesMerged=Species merged. coser.ui.selection.speciesRenamed=Species renamed. @@ -288,7 +288,7 @@ coser.ui.uploadresult.exportUploadTitle=Export/Upload coser.ui.uploadresult.exportupload=Extract/Upload coser.ui.uploadresult.extract=Extract -coser.ui.uploadresult.extractChoice=Extract to directory +coser.ui.uploadresult.extractChoice= coser.ui.uploadresult.extractTo=Extract directory \: coser.ui.uploadresult.filter.beginDate=Begin date \: coser.ui.uploadresult.filter.endDate=End date \: @@ -304,7 +304,7 @@ coser.ui.uploadresult.selectedResults=Selected results \: coser.ui.uploadresult.title=Results publication coser.ui.uploadresult.upload=Send results -coser.ui.uploadresult.uploadChoice=Upload to server +coser.ui.uploadresult.uploadChoice= coser.ui.uploadresult.uploadLogin=Admin login \: coser.ui.uploadresult.uploadPassword=Admin password \: coser.ui.uploadresult.zone=Zone Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2014-02-24 15:14:55 UTC (rev 1124) @@ -15,9 +15,9 @@ coser.ui.common.unselectAll.short=Aucun coser.ui.common.valid=Valider coser.ui.common.yes=Oui -coser.ui.configuration.category.controlselection=Contrôle et sélection -coser.ui.configuration.category.misc=Divers -coser.ui.configuration.category.path=Chemins +coser.ui.configuration.category.controlselection= +coser.ui.configuration.category.misc= +coser.ui.configuration.category.path= coser.ui.configuration.title=Configuration coser.ui.control.categorylabel=Données affichées \: coser.ui.control.checkData=Vérifier les données @@ -123,16 +123,16 @@ coser.ui.project.createProjectMissingReftax=Le fichier 'Reftax' n'est pas valide \!\n(vérifiez la configuration \: coser.reference.species) coser.ui.project.customReferenceSpeciesFile=Nouveau fichier de référence taxonomique \: coser.ui.project.displaySpeciesType=Champ pour affichage \: -coser.ui.project.editProject=Modifier le projet +coser.ui.project.editProject= coser.ui.project.haulFile=Fichier des traits \: coser.ui.project.lValideSpeciesTypeDesc=Nom latin des espèces coser.ui.project.lengthFile=Fichier des tailles \: coser.ui.project.maps=Cartes \: coser.ui.project.missingFile=Fichier manquant -coser.ui.project.newProject=Nouveau projet +coser.ui.project.newProject= coser.ui.project.openError=Erreur d'ouverture coser.ui.project.openProject=Ouvrir -coser.ui.project.openProjectTitle=Ouvrir un projet existant +coser.ui.project.openProjectTitle= coser.ui.project.outputSpeciesType=Champ de sortie \: coser.ui.project.project=Projet \: coser.ui.project.projectauthor=Auteur \: @@ -150,13 +150,13 @@ coser.ui.project.summary.resultCount=Nombre de résultats \: coser.ui.project.summary.selectionCount=Nombre de sélections \: coser.ui.project.summary.strataFileName=Nom du fichier strates \: -coser.ui.project.summary.title=Résumé du projet +coser.ui.project.summary.title= coser.ui.project.summary.validated=Contrôle validé \: -coser.ui.project.useCustomReferenceSpeciesFile=Utiliser un autre fichier de référence taxonomique +coser.ui.project.useCustomReferenceSpeciesFile= coser.ui.project.usedReferenceSpeciesFile=Fichier de référence utilisé (Reftax) \: coser.ui.result.addNewResult=Ajouter un résultat coser.ui.result.addOtherDataFile=Ajouter un fichier -coser.ui.result.availableDataTitle=Résultats disponibles +coser.ui.result.availableDataTitle= coser.ui.result.cancel=Annuler coser.ui.result.confirmDeleteResult=Êtes vous sûr de vouloir supprimer le résultat %s ? coser.ui.result.creationDate=Date du résultats \: @@ -166,7 +166,7 @@ coser.ui.result.estPopIndFile=Fichier ESTPOPind \: coser.ui.result.extractDataButton=Export au format RSufi coser.ui.result.extractDataLabel=Dossier d'export \: -coser.ui.result.extractDataTitle=Export des données en entrée de RSufi +coser.ui.result.extractDataTitle= coser.ui.result.mapsDirectory=Répertoire des cartes \: coser.ui.result.newResult=Nouveau résultat coser.ui.result.otherDataFile=Autre fichiers \: @@ -190,7 +190,7 @@ coser.ui.result.validEditResult=Modifier le résultat coser.ui.result.validNewResult=Ajouter le résultat coser.ui.result.zone=Zone \: -coser.ui.selection.allSpecies=L1 \: Toutes les espèces (%d/%d) +coser.ui.selection.allSpecies= coser.ui.selection.comment=Commentaire \: coser.ui.selection.detail.confirmcontrolreload=Êtes vous sûr de vouloir recharger les données contrôlées ?\nToutes les modifications de la sélection en cours seront perdues. coser.ui.selection.detail.controldatareloaded=Données contrôlées rechargées. @@ -206,19 +206,19 @@ coser.ui.selection.details.description=Description \: coser.ui.selection.details.displayDiffCatchLengthGraph=Graphiques des différences captures/tailles coser.ui.selection.details.displayDiffCatchLengthGraphTip=Graphiques des différences captures/tailles -coser.ui.selection.details.filteredSpecies=Espèces filtrées (%d/%d) \: +coser.ui.selection.details.filteredSpecies= coser.ui.selection.details.mergeSpeciesTip=Fusion/Renommage coser.ui.selection.details.name=Nom de la sélection \: coser.ui.selection.details.removeFromSelectedListTip=Retire les espèces sélectionnées de la liste des espèces sélectionnées coser.ui.selection.details.saveSelection=Sauvegarder la sélection coser.ui.selection.details.selectAllSpeciesTip=Sélectionner tout -coser.ui.selection.details.selectedSpecies=L1 \: Espèces sélectionnées (%d/%d) \: +coser.ui.selection.details.selectedSpecies= coser.ui.selection.details.showMapTip=Afficher la carte des strates coser.ui.selection.details.showSpeciesTip=Afficher la table de l'effort d'échantillonage coser.ui.selection.details.speciesDataDescription=Nombre de traits par strate par année \: coser.ui.selection.details.speciescontextmenu=Pour plus d'options, utilisez le menu contextuel sur les listes d'espèces -coser.ui.selection.details.strata=Strates (%d/%d) \: -coser.ui.selection.details.type=Filtrer par type (%d/%d) \: +coser.ui.selection.details.strata= +coser.ui.selection.details.type= coser.ui.selection.details.unSelectAllSpeciesTip=Désélectionner tout coser.ui.selection.details.validFilter=Valider les filtres coser.ui.selection.details.validSelection=Valider la sélection @@ -236,18 +236,18 @@ coser.ui.selection.fusion.name=Nouveau nom \: coser.ui.selection.fusion.rename.title=Renommage coser.ui.selection.fusion.title=Fusion -coser.ui.selection.maturitySpecies=L4 \: Espèces avec maturité (%d/%d) +coser.ui.selection.maturitySpecies= coser.ui.selection.nonJustifiedMaturity=La liste espèces avec maturité n'est pas entièrement sélectionnée.\nVous devez justifier cette sélection par un commentaire. coser.ui.selection.nonJustifiedOccurenceDensity=La sélection de la liste filtrée ne correspond pas à la sélection opérée par le filtre.\nVous devez justifier cette sélection par un commentaire. coser.ui.selection.nonJustifiedSizeAllYear=La liste espèces avec des tailles pour toutes les années n'est pas entièrement sélectionnée.\nVous devez justifier cette sélection par un commentaire. coser.ui.selection.nonJustifiedTitle=Sélection non justifiée -coser.ui.selection.occurrenceDensitySpecies=L2 \: Espèces filtrées (%d/%d) +coser.ui.selection.occurrenceDensitySpecies= coser.ui.selection.occurrencedensityrenderer=<html>%s<span style\='font-size\:85%%;color\:gray;'>(Occ\=%.2f, Dens\=%.2f)</span></html> coser.ui.selection.option.addSelectionFile=Ajouter coser.ui.selection.option.editFiles=Fichiers de la sélection coser.ui.selection.option.editFilesTitle=Modifier les fichiers coser.ui.selection.option.filesDetails=Les fichiers suivants seront sauvegardés dans la sélection courante et copier dans l'export RSufi. -coser.ui.selection.option.optionTitle=Options +coser.ui.selection.option.optionTitle= coser.ui.selection.option.removeSelectionFile=Supprimer coser.ui.selection.option.validSelectionFiles=Sauver coser.ui.selection.reloadcontroldata=Recharger les données contrôlées @@ -261,7 +261,7 @@ coser.ui.selection.replay.missingstrata=Certaines strates de la séléction à rejouer sont manquantes \: %s coser.ui.selection.replay.missingyears=Certaines années de la séléction à rejouer sont manquantes \: %s coser.ui.selection.replay.nextstep=Étape suivante -coser.ui.selection.replay.noerrordetected=Aucune erreur détéctée. +coser.ui.selection.replay.noerrordetected= coser.ui.selection.replay.replayTitle=Rejouer une sélection coser.ui.selection.replay.selectioninfos=Information sur la sélection \: coser.ui.selection.rsufidataextracted=Données RSufi extraites. @@ -274,7 +274,7 @@ coser.ui.selection.selectionTitle=Étape de sélection coser.ui.selection.selectionValidated=Sélection validée et sauvée. coser.ui.selection.selectionreport=Rapport de la sélection -coser.ui.selection.sizeAllYearSpecies=L3 \: Espèces avec taille pour toutes les années (%d/%d) +coser.ui.selection.sizeAllYearSpecies= coser.ui.selection.speciesMenuFusion=Fusion/Renommage coser.ui.selection.speciesMerged=Espèces fusionnées. coser.ui.selection.speciesRenamed=Espèce renommée. @@ -288,7 +288,7 @@ coser.ui.uploadresult.exportUploadTitle=Exporter/Uploader coser.ui.uploadresult.exportupload=Exporter/Uploader coser.ui.uploadresult.extract=Extraire -coser.ui.uploadresult.extractChoice=Extraire vers un dossier +coser.ui.uploadresult.extractChoice= coser.ui.uploadresult.extractTo=Dossier d'extraction \: coser.ui.uploadresult.filter.beginDate=Date de début \: coser.ui.uploadresult.filter.endDate=Date de fin \: @@ -304,7 +304,7 @@ coser.ui.uploadresult.selectedResults=Résultats sélectionnés \: coser.ui.uploadresult.title=Publication des résultats coser.ui.uploadresult.upload=Envoyer les résultats -coser.ui.uploadresult.uploadChoice=Envoyer sur le serveur +coser.ui.uploadresult.uploadChoice= coser.ui.uploadresult.uploadLogin=Login admin \: coser.ui.uploadresult.uploadPassword=Mot de passe admin \: coser.ui.uploadresult.zone=Zone Modified: trunk/coser-web/LICENSE.txt =================================================================== --- trunk/coser-web/LICENSE.txt 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-web/LICENSE.txt 2014-02-24 15:14:55 UTC (rev 1124) @@ -658,4 +658,4 @@ You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-web/pom.xml 2014-02-24 15:14:55 UTC (rev 1124) @@ -1,17 +1,36 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> <artifactId>coser-web</artifactId> + <packaging>war</packaging> + <name>Coser :: Web</name> + <description>Coser web module</description> + <licenses> + <license> + <name>GNU Affero General Public License</name> + <url>http://www.gnu.org/licenses/agpl.html</url> + <distribution>repo</distribution> + </license> + </licenses> + + <properties> + <license.licenseName>agpl_v3</license.licenseName> + <redmine.releaseFiles>target/coser-${project.version}.war</redmine.releaseFiles> + <deployFiles>target/coser-${project.version}.war</deployFiles> + + <!-- Post Release configuration --> + <skipPostRelease>false</skipPostRelease> + </properties> + <dependencies> <dependency> <groupId>${project.groupId}</groupId> @@ -29,8 +48,8 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -41,12 +60,16 @@ <artifactId>nuiton-utils</artifactId> </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + </dependency> + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> </dependency> <dependency> <groupId>org.apache.struts</groupId> @@ -67,31 +90,8 @@ </dependency> </dependencies> - <name>Coser :: Web</name> - <description>Coser web module</description> - - <licenses> - <license> - <name>GNU Affero General Public License</name> - <url>http://www.gnu.org/licenses/agpl.html</url> - <distribution>repo</distribution> - </license> - </licenses> - - <packaging>war</packaging> - - <properties> - <license.licenseName>agpl_v3</license.licenseName> - <redmine.releaseFiles>target/coser-${project.version}.war</redmine.releaseFiles> - <deployFiles>target/coser-${project.version}.war</deployFiles> - - <!-- Post Release configuration --> - <skipPostRelease>false</skipPostRelease> - </properties> - <build> <finalName>coser-${project.version}</finalName> - <resources> <resource> <directory>src/main/resources</directory> @@ -107,7 +107,6 @@ </excludes> </resource> </resources> - <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> @@ -123,4 +122,5 @@ </plugin> </plugins> </build> + </project> Modified: trunk/coser-web/src/license/THIRD-PARTY.properties =================================================================== --- trunk/coser-web/src/license/THIRD-PARTY.properties 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-web/src/license/THIRD-PARTY.properties 2014-02-24 15:14:55 UTC (rev 1124) @@ -1,8 +1,6 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache License -# - Apache Software License, Version 2.0 # - BSD License # - BSD-style license # - Bouncy Castle License @@ -14,7 +12,6 @@ # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 -# - License Agreement for Java(TM) Servlet API Specification Interface Classes # - MIT License # - Mozilla Public License # - The Apache Software License, Version 1.1 @@ -23,8 +20,7 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jan 29 16:10:36 CET 2013 -commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0 +#Mon Feb 24 16:05:06 CET 2014 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javassist--javassist--3.8.0.GA=GNU Lesser General Public License -javax.servlet--servlet-api--2.5=License Agreement for Java(TM) Servlet API Specification Interface Classes -regexp--regexp--1.3=The Apache Software License, Version 2.0 +javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -22,7 +22,7 @@ package fr.ifremer.coser.web; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import fr.ifremer.coser.CoserBusinessConfig; @@ -97,12 +97,12 @@ CONTEXT_NAME(APP_NAME, null, "coser"), // see : http://www.nuiton.org/issues/1862 ENCODING_HACK(CONTEXT_NAME.getDefaultValue() + "." + CONFIG_ENCODING, null, "UTF-8"), - CONFIG_FILE(CONTEXT_NAME.defaultValue + "." + CONFIG_FILE_NAME, _("coser.config.config.file.description"), "coserweb.properties"), - APPLICATION_VERSION("coser.application.version", _("coser.config.application.version.description"), null), - ADMIN_EMAIL("coser.admin.email", _("coser.config.config.file.description"), "harmonie@ifremer.fr"), - ADMIN_LOGIN("coser.admin.login", _("coser.config.admin.login.description"), null), - ADMIN_PASSWORD("coser.admin.password", _("coser.config.admin.password.description"), null), - ANALYTICS_ID("coser.analytics.id", _("coser.config.analytics.id.description"), "UA-27739588-1"); + CONFIG_FILE(CONTEXT_NAME.defaultValue + "." + CONFIG_FILE_NAME, t("coser.config.config.file.description"), "coserweb.properties"), + APPLICATION_VERSION("coser.application.version", t("coser.config.application.version.description"), null), + ADMIN_EMAIL("coser.admin.email", t("coser.config.config.file.description"), "harmonie@ifremer.fr"), + ADMIN_LOGIN("coser.admin.login", t("coser.config.admin.login.description"), null), + ADMIN_PASSWORD("coser.admin.password", t("coser.config.admin.password.description"), null), + ANALYTICS_ID("coser.analytics.id", t("coser.config.analytics.id.description"), "UA-27739588-1"); protected String key; protected String description; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/ServiceFactory.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/ServiceFactory.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/ServiceFactory.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -25,7 +25,7 @@ import java.util.Locale; import org.nuiton.i18n.I18n; -import org.nuiton.util.ArgumentsParserException; +import org.nuiton.config.ArgumentsParserException; import fr.ifremer.coser.services.WebService; @@ -58,7 +58,7 @@ if (coserConfig == null) { coserConfig = new CoserWebConfig(); try { - coserConfig.parse(new String[0]); + coserConfig.parse(); } catch (ArgumentsParserException ex) { throw new CoserWebException("Can't read configuration", ex); } Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/admin/DeleteProjectsAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/admin/DeleteProjectsAction.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/admin/DeleteProjectsAction.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -24,7 +24,7 @@ import java.util.List; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.convention.annotation.InterceptorRef; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/search/ExtractAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/search/ExtractAction.java 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/search/ExtractAction.java 2014-02-24 15:14:55 UTC (rev 1124) @@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletRequest; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/pom.xml 2014-02-24 15:14:55 UTC (rev 1124) @@ -1,25 +1,68 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>4.1</version> + <version>4.7</version> </parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5-SNAPSHOT</version> <packaging>pom</packaging> + <name>Coser</name> + <description>Contrôle et Sélection R­Sufi</description> + <url>http://maven-site.forge.codelutin.com/coser</url> + <inceptionYear>2010</inceptionYear> + <organization> + <name>Ifremer</name> + <url>http://www.ifremer.fr/</url> + </organization> + <licenses> + <license> + <name>GNU Lesser General Public License</name> + <url>http://www.gnu.org/licenses/lgpl.html</url> + <distribution>repo</distribution> + </license> + </licenses> + + <developers> + <developer> + <id>echatellier</id> + <name>Eric Chatellier</name> + <email>chatellier@codelutin.com</email> + <organization>CodeLutin</organization> + <roles> + <role>Développeur</role> + </roles> + <timezone>Europe/Paris</timezone> + </developer> + <developer> + <id>tchemit</id> + <name>Tony Chemit</name> + <email>chemit@codelutin.com</email> + <organization>CodeLutin</organization> + <roles> + <role>Développeur</role> + </roles> + <timezone>Europe/Paris</timezone> + </developer> + </developers> + <modules> <module>coser-business</module> <module>coser-ui</module> <module>coser-web</module> </modules> + <scm> + <connection>scm:svn:https://forge.codelutin.com/svn/coser/trunk</connection> + <developerConnection>scm:svn:https://forge.codelutin.com/svn/coser/trunk</developerConnection> + <url>https://forge.codelutin.com/repositories/browse/coser/trunk</url> + </scm> <distributionManagement> <site> <id>${platform}</id> @@ -27,17 +70,31 @@ </site> </distributionManagement> + <properties> + <projectId>coser</projectId> + <platform>forge.codelutin.com</platform> + + <license.licenseName>lgpl_v3</license.licenseName> + <license.organizationName>Ifremer, Codelutin</license.organizationName> + + <!-- Versions --> + <jaxxVersion>2.8.2-SNAPSHOT</jaxxVersion> + <nuitonI18nVersion>3.0</nuitonI18nVersion> + <nuitonMatrixVersion>2.4-SNAPSHOT</nuitonMatrixVersion> + <struts.version>2.3.8</struts.version> + </properties> + + <repositories> + <repository> + <id>nuiton-public</id> + <url>http://nexus.nuiton.org/nexus/content/groups/public</url> + </repository> + </repositories> + <dependencyManagement> <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.11</version> - <scope>test</scope> - </dependency> - - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.17</version> @@ -45,128 +102,75 @@ </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - <scope>compile</scope> - </dependency> - - <dependency> <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> <artifactId>commons-math</artifactId> <version>2.2</version> - <scope>compile</scope> </dependency> <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.8.3</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.4</version> - <scope>compile</scope> - </dependency> - - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> <version>1.2</version> - <scope>compile</scope> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - <version>4.2.3</version> - <scope>compile</scope> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>3.0-rc-2</version> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>4.2.3</version> - <scope>compile</scope> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + <version>3.0-alpha-2</version> </dependency> - - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpmime</artifactId> - <version>4.2.3</version> - <scope>compile</scope> - </dependency> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>2.6.6</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>2.6.6</version> - <scope>compile</scope> + <version>3.0-rc-1</version> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.3.2</version> - <scope>compile</scope> + <version>${nuitonMatrixVersion}</version> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.3.2</version> - <scope>compile</scope> + <version>${nuitonMatrixVersion}</version> </dependency> <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> - <version>${i18n.version}</version> - <scope>compile</scope> + <version>${nuitonI18nVersion}</version> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> - <version>${jaxx.version}</version> - <scope>compile</scope> + <version>${jaxxVersion}</version> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-validator</artifactId> - <version>${jaxx.version}</version> - <scope>compile</scope> + <version>${jaxxVersion}</version> </dependency> - + <dependency> <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-extra</artifactId> + <version>${jaxxVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets</artifactId> - <version>${jaxx.version}</version> + <version>${jaxxVersion}</version> <scope>runtime</scope> </dependency> @@ -174,21 +178,18 @@ <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-core</artifactId> <version>1.6.4</version> - <scope>compile</scope> </dependency> <dependency> <groupId>net.sf.opencsv</groupId> <artifactId>opencsv</artifactId> <version>2.3</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.jfree</groupId> <artifactId>jfreechart</artifactId> <version>1.0.14</version> - <scope>compile</scope> <exclusions> <exclusion> <artifactId>xml-apis</artifactId> @@ -201,17 +202,9 @@ <groupId>org.jfree</groupId> <artifactId>jcommon</artifactId> <version>1.0.17</version> - <scope>compile</scope> </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-widgets</artifactId> - <version>1.1.1</version> - <scope>compile</scope> - </dependency> - - <dependency> <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> <version>2.0.2</version> @@ -222,42 +215,36 @@ <groupId>com.bbn</groupId> <artifactId>openmap</artifactId> <version>5.0</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.swinglabs</groupId> <artifactId>jxlayer</artifactId> <version>3.0.4</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> <version>${struts.version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-convention-plugin</artifactId> <version>${struts.version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-sitemesh-plugin</artifactId> <version>${struts.version}</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> <version>${struts.version}</version> - <scope>compile</scope> </dependency> <dependency> @@ -278,106 +265,40 @@ <groupId>com.itextpdf</groupId> <artifactId>itextpdf</artifactId> <version>5.3.4</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.xhtmlrenderer</groupId> <artifactId>flying-saucer-pdf-itext5</artifactId> <version>9.0.1</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> <version>2.3.19</version> - <scope>compile</scope> </dependency> </dependencies> </dependencyManagement> - <name>Coser</name> - <description>Contrôle et Sélection R­Sufi</description> - <inceptionYear>2010</inceptionYear> - <url>http://maven-site.forge.codelutin.com/coser</url> - - <organization> - <name>Ifremer</name> - <url>http://www.ifremer.fr/</url> - </organization> - - <developers> - <developer> - <id>echatellier</id> - <name>Eric Chatellier</name> - <email>chatellier@codelutin.com</email> - <organization>CodeLutin</organization> - <roles> - <role>Développeur</role> - </roles> - <timezone>Europe/Paris</timezone> - </developer> - <developer> - <id>tchemit</id> - <name>Tony Chemit</name> - <email>chemit@codelutin.com</email> - <organization>CodeLutin</organization> - <roles> - <role>Développeur</role> - </roles> - <timezone>Europe/Paris</timezone> - </developer> - </developers> - - <licenses> - <license> - <name>GNU Lesser General Public License</name> - <url>http://www.gnu.org/licenses/lgpl.html</url> - <distribution>repo</distribution> - </license> - </licenses> - - <properties> - <projectId>coser</projectId> - <platform>forge.codelutin.com</platform> - - <license.licenseName>lgpl_v3</license.licenseName> - <license.organizationName>Ifremer, Codelutin</license.organizationName> - - <!-- Versions --> - <jaxx.version>2.5.9</jaxx.version> - <i18n.version>2.5</i18n.version> - <struts.version>2.3.16</struts.version> - </properties> - - <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/coser/trunk</url> - </scm> - <build> <pluginManagement> <plugins> <plugin> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-maven-plugin</artifactId> - <version>${jaxx.version}</version> + <version>${jaxxVersion}</version> </plugin> <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> - <version>${i18n.version}</version> - <configuration> - <strictMode>true</strictMode> - </configuration> + <version>${nuitonI18nVersion}</version> </plugin> <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>8.1.8.v20121106</version> + <version>${jettyPluginVersion}</version> </plugin> <plugin> <artifactId>maven-site-plugin</artifactId> @@ -403,11 +324,5 @@ </plugins> </pluginManagement> </build> - - <repositories> - <repository> - <id>nuiton-public</id> - <url>http://nexus.nuiton.org/nexus/content/groups/public</url> - </repository> - </repositories> + </project> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/src/site/site_en.xml 2014-02-24 15:14:55 UTC (rev 1124) @@ -29,7 +29,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.2.2</version> + <version>${fluidoSkinVersion}</version> </skin> <publishDate format="MM-dd-yyyy" position="right"/> @@ -51,6 +51,15 @@ <body> + <head> + <script type="text/javascript" + src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/> + </head> + <breadcrumbs> <item name="${project.name}" href="${project.url}" /> </breadcrumbs> @@ -85,6 +94,21 @@ <menu ref="reports"/> + <footer> + + <div id='projectMetas' locale='en' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.developerConnection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles="true"> + </div> + </footer> </body> </project> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2013-12-12 09:25:56 UTC (rev 1123) +++ trunk/src/site/site_fr.xml 2014-02-24 15:14:55 UTC (rev 1124) @@ -29,7 +29,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.2.2</version> + <version>${fluidoSkinVersion}</version> </skin> <publishDate format="dd/MM/yyyy" position="right"/> @@ -51,6 +51,15 @@ <body> + <head> + <script type="text/javascript" + src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/> + </head> + <breadcrumbs> <item name="${project.name}" href="${project.url}" /> </breadcrumbs> @@ -86,6 +95,21 @@ <menu ref="reports"/> + <footer> + + <div id='projectMetas' locale='fr' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.developerConnection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles="true"> + </div> + </footer> </body> </project>