May 2014 - Tutti-commits - mailman.cloud.codelutin.com

r1746 - in branches/tutti-3.4.x: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by tchemit＠users.forge.codelutin.com May 5, 2014

May 5, 2014

Author: tchemit Date: 2014-05-05 15:17:39 +0200 (Mon, 05 May 2014) New Revision: 1746 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1746 Log: prepare release 3.4.1 Modified: branches/tutti-3.4.x/pom.xml branches/tutti-3.4.x/tutti-ichtyometer/pom.xml branches/tutti-3.4.x/tutti-persistence/pom.xml branches/tutti-3.4.x/tutti-service/pom.xml branches/tutti-3.4.x/tutti-ui-swing/pom.xml Modified: branches/tutti-3.4.x/pom.xml =================================================================== --- branches/tutti-3.4.x/pom.xml 2014-05-05 13:13:22 UTC (rev 1745) +++ branches/tutti-3.4.x/pom.xml 2014-05-05 13:17:39 UTC (rev 1746) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.4</version> + <version>3.4.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> @@ -99,13 +99,13 @@ <scm> <url> - https://forge.codelutin.com/projects/tutti/repository/tags/tutti-3.4 + https://forge.codelutin.com/projects/tutti/repository/branches/tutti-3.4.x </url> <connection> - scm:svn:http://svn.codelutin.com/tutti/tags/tutti-3.4 + scm:svn:http://svn.codelutin.com/tutti/branches/tutti-3.4.x </connection> <developerConnection> - scm:svn:https://svn.codelutin.com/tutti/tags/tutti-3.4 + scm:svn:https://svn.codelutin.com/tutti/branches/tutti-3.4.x </developerConnection> </scm> <distributionManagement> Modified: branches/tutti-3.4.x/tutti-ichtyometer/pom.xml =================================================================== --- branches/tutti-3.4.x/tutti-ichtyometer/pom.xml 2014-05-05 13:13:22 UTC (rev 1745) +++ branches/tutti-3.4.x/tutti-ichtyometer/pom.xml 2014-05-05 13:17:39 UTC (rev 1746) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.4</version> + <version>3.4.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: branches/tutti-3.4.x/tutti-persistence/pom.xml =================================================================== --- branches/tutti-3.4.x/tutti-persistence/pom.xml 2014-05-05 13:13:22 UTC (rev 1745) +++ branches/tutti-3.4.x/tutti-persistence/pom.xml 2014-05-05 13:17:39 UTC (rev 1746) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.4</version> + <version>3.4.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: branches/tutti-3.4.x/tutti-service/pom.xml =================================================================== --- branches/tutti-3.4.x/tutti-service/pom.xml 2014-05-05 13:13:22 UTC (rev 1745) +++ branches/tutti-3.4.x/tutti-service/pom.xml 2014-05-05 13:17:39 UTC (rev 1746) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.4</version> + <version>3.4.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: branches/tutti-3.4.x/tutti-ui-swing/pom.xml =================================================================== --- branches/tutti-3.4.x/tutti-ui-swing/pom.xml 2014-05-05 13:13:22 UTC (rev 1745) +++ branches/tutti-3.4.x/tutti-ui-swing/pom.xml 2014-05-05 13:17:39 UTC (rev 1746) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.4</version> + <version>3.4.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1745 - in branches/tutti-3.4.x: tutti-service/src/main/java/fr/ifremer/tutti/service tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util
by tchemit＠users.forge.codelutin.com May 5, 2014

May 5, 2014

Author: tchemit Date: 2014-05-05 15:13:22 +0200 (Mon, 05 May 2014) New Revision: 1745 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1745 Log: fixes #5033 Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java =================================================================== --- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2014-05-05 12:47:09 UTC (rev 1744) +++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2014-05-05 13:13:22 UTC (rev 1745) @@ -63,6 +63,7 @@ public static final String CARACTERISTIC_PARAMETER_ONLY = "parameterOnly"; + public static final String WITH_SURVEY_CODE = "withSurveyCode"; public static final String FROM_PROTOCOL = "fromProtocol"; public static final String GEAR_WITH_RANK_ORDER = "gearWithrankOrder"; @@ -141,6 +142,7 @@ registerTuttiDecorator(Program.class, ONLY_NAME, "${name}$s", SEPARATOR, " - "); registerDecorator(new SpeciesDecorator()); + registerDecorator(WITH_SURVEY_CODE, new SpeciesDecoratorWithSurveyCode()); registerDecorator(FROM_PROTOCOL, new SpeciesFromProtocolDecorator()); registerDecorator(CARACTERISTIC_WITH_UNIT, new SimpleCaracteristicDecorator("${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s")); @@ -217,6 +219,31 @@ } } + public static class SpeciesDecoratorWithSurveyCode extends TuttiDecorator<Species> implements Cloneable { + + private static final long serialVersionUID = 1L; + + public SpeciesDecoratorWithSurveyCode() throws IllegalArgumentException, NullPointerException { + super(Species.class, "${surveyCode}$s#${name}$s", DecoratorService.SEPARATOR, " - "); + } + + @Override + protected Object onNullValue(Species bean, String token) { + Object result = null; + if (Species.PROPERTY_SURVEY_CODE.equals(token)) { + + // try with refTaxCode + result = bean.getRefTaxCode(); + + if (result ==null) { + + result = t("tutti.propety.no.species.speciesCode"); + } + } + return result; + } + } + public static class SimpleCaracteristicDecorator extends TuttiDecorator<Caracteristic> implements Cloneable { private static final long serialVersionUID = 1L; Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java =================================================================== --- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2014-05-05 12:47:09 UTC (rev 1744) +++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2014-05-05 13:13:22 UTC (rev 1745) @@ -414,7 +414,7 @@ String prefix, String suffix) { return buildReminderLabelTitle( - decorate(species), + decorate(species, DecoratorService.WITH_SURVEY_CODE), categories, prefix, suffix);

1 0

r1744 - branches
by tchemit＠users.forge.codelutin.com May 5, 2014

May 5, 2014

Author: tchemit Date: 2014-05-05 14:47:09 +0200 (Mon, 05 May 2014) New Revision: 1744 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1744 Log: for quick fixes on version 3.4.x Added: branches/tutti-3.4.x/

1 0

r1743 - branches
by tchemit＠users.forge.codelutin.com May 5, 2014

May 5, 2014

Author: tchemit Date: 2014-05-05 14:43:41 +0200 (Mon, 05 May 2014) New Revision: 1743 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1743 Log: for quick fixes on version 3.4 Added: branches/3.4.1/

1 0

r1742 - branches
by tchemit＠users.forge.codelutin.com May 5, 2014

May 5, 2014

Author: tchemit Date: 2014-05-05 12:16:43 +0200 (Mon, 05 May 2014) New Revision: 1742 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1742 Log: for quick fixes on version 3.3.5 Added: branches/3.3.6/

1 0