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

r655 - tags
by maven-release＠users.forge.codelutin.com 18 Mar '13

18 Mar '13

Author: maven-release Date: 2013-03-18 17:19:01 +0100 (Mon, 18 Mar 2013) New Revision: 655 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/655 Log: [maven-release-plugin] copy for tag tutti-1.1.1 Added: tags/tutti-1.1.1/

1 0

r654 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 18 Mar '13

18 Mar '13

Author: maven-release Date: 2013-03-18 17:18:52 +0100 (Mon, 18 Mar 2013) New Revision: 654 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/654 Log: [maven-release-plugin] prepare release tutti-1.1.1 Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-18 16:17:38 UTC (rev 653) +++ trunk/pom.xml 2013-03-18 16:18:52 UTC (rev 654) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.1.1</version> <modules> <module>tutti-persistence</module> @@ -89,12 +89,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.1.1</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.1.1 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.1.1 </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-03-18 16:17:38 UTC (rev 653) +++ trunk/tutti-persistence/pom.xml 2013-03-18 16:18:52 UTC (rev 654) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.1.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-03-18 16:17:38 UTC (rev 653) +++ trunk/tutti-service/pom.xml 2013-03-18 16:18:52 UTC (rev 654) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.1.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-03-18 16:17:38 UTC (rev 653) +++ trunk/tutti-ui-swing/pom.xml 2013-03-18 16:18:52 UTC (rev 654) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.1.1</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r653 - trunk
by maven-release＠users.forge.codelutin.com 18 Mar '13

18 Mar '13

Author: maven-release Date: 2013-03-18 17:17:38 +0100 (Mon, 18 Mar 2013) New Revision: 653 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/653 Log: fix space Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-18 16:00:03 UTC (rev 652) +++ trunk/pom.xml 2013-03-18 16:17:38 UTC (rev 653) @@ -71,7 +71,7 @@ <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com</organizationUrl> <roles> - <role>developer</role> + <role>developer</role> </roles> <timezone>Europe/Paris</timezone> </developer>

1 0

r652 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches
by kmorin＠users.forge.codelutin.com 18 Mar '13

18 Mar '13

Author: kmorin Date: 2013-03-18 17:00:03 +0100 (Mon, 18 Mar 2013) New Revision: 652 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/652 Log: fixes #2151 [CAPTURE] Especes - erreur ?\195?\160 l'?\195?\169l?\195?\169vation des poids des lots dont les fils sont des sous ?\195?\169chantillons Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-03-18 15:52:15 UTC (rev 651) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-03-18 16:00:03 UTC (rev 652) @@ -228,6 +228,7 @@ for (SpeciesBatchRowModel child : children) { child.getFinestCategory().setSubSample(subSample); } + sum = categoryWeight; } result = sum; }

1 0

r651 - trunk
by tchemit＠users.forge.codelutin.com 18 Mar '13

18 Mar '13

Author: tchemit Date: 2013-03-18 16:52:15 +0100 (Mon, 18 Mar 2013) New Revision: 651 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/651 Log: use last (working\!) nuiton-updater version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-18 15:44:25 UTC (rev 650) +++ trunk/pom.xml 2013-03-18 15:52:15 UTC (rev 651) @@ -121,7 +121,7 @@  <nuitonUtilsVersion>2.6.11</nuitonUtilsVersion> - <nuitonUpdaterVersion>2.6.11.1</nuitonUpdaterVersion> + <nuitonUpdaterVersion>2.6.11.2</nuitonUpdaterVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <eugenePluginVersion>2.6.1</eugenePluginVersion>

1 0

r650 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency
by kmorin＠users.forge.codelutin.com 18 Mar '13

18 Mar '13

Author: kmorin Date: 2013-03-18 16:44:25 +0100 (Mon, 18 Mar 2013) New Revision: 650 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/650 Log: fixes #2104 pas de la classe de taille absent du protocole Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-03-18 15:38:05 UTC (rev 649) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-03-18 15:44:25 UTC (rev 650) @@ -212,7 +212,7 @@ precision = model.getLengthStepCaracteristic().getPrecision(); } if (precision == null) { - precision = .5f; + precision = 1f; } model.setStep(precision);

1 0

r649 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/operation resources/fr/ifremer/tutti/ui/swing/content/operation
by kmorin＠users.forge.codelutin.com 18 Mar '13

18 Mar '13

Author: kmorin Date: 2013-03-18 16:38:05 +0100 (Mon, 18 Mar 2013) New Revision: 649 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/649 Log: fixes #2150 [TRAIT] Le saississeur n'est pas valide alors qu'il y en a un Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-warning-validation.xml trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-error-validation.xml Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-03-18 15:27:35 UTC (rev 648) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-03-18 15:38:05 UTC (rev 649) @@ -528,9 +528,9 @@ #recorderPersonList { property: recorderPerson; border: {BorderFactory.createTitledBorder(_("tutti.editFishingOperation.field.recorderPerson"))}; - _validatorLabel : {_("tutti.editFishingOperation.field.recorderPerson.tip")}; - toolTipText: "tutti.editFishingOperation.field.recorderPerson.tip"; - _help: {"tutti.editFishingOperation.field.recorderPerson.help"}; + _validatorLabel : {_("tutti.editFishingOperation.field.recorderPerson")}; + toolTipText: "tutti.editFishingOperation.field.recorderPerson.tip"; + _help: {"tutti.editFishingOperation.field.recorderPerson.help"}; } #commentPane { Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-warning-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-warning-validation.xml 2013-03-18 15:27:35 UTC (rev 648) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-warning-validation.xml 2013-03-18 15:38:05 UTC (rev 649) @@ -816,7 +816,7 @@ <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ saisisseur != null && !saisisseur.isEmpty() ]]> + <![CDATA[ recorderPerson != null && !recorderPerson.isEmpty() ]]> </param> <message>tutti.validator.error.fishingOperation.catcher.required</message> </field-validator> Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-error-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-error-validation.xml 2013-03-18 15:27:35 UTC (rev 648) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-error-validation.xml 2013-03-18 15:38:05 UTC (rev 649) @@ -912,7 +912,7 @@ <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ saisisseur != null && !saisisseur.isEmpty() ]]> + <![CDATA[ recorderPerson != null && !recorderPerson.isEmpty() ]]> </param> <message>tutti.validator.error.fishingOperation.catcher.required</message> </field-validator>

1 0

r648 - trunk
by tchemit＠users.forge.codelutin.com 18 Mar '13

18 Mar '13

Author: tchemit Date: 2013-03-18 16:27:35 +0100 (Mon, 18 Mar 2013) New Revision: 648 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/648 Log: fixes #2149: L'installation de la base et plus g?\195?\169n?\195?\169rale les mises jour ne fonctionnent pas sous windows Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-18 14:15:53 UTC (rev 647) +++ trunk/pom.xml 2013-03-18 15:27:35 UTC (rev 648) @@ -121,7 +121,7 @@  <nuitonUtilsVersion>2.6.11</nuitonUtilsVersion> - <nuitonUpdaterVersion>2.6.11.1-SNAPSHOT</nuitonUpdaterVersion> + <nuitonUpdaterVersion>2.6.11.1</nuitonUpdaterVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <eugenePluginVersion>2.6.1</eugenePluginVersion>

1 0

r647 - trunk
by tchemit＠users.forge.codelutin.com 18 Mar '13

18 Mar '13

Author: tchemit Date: 2013-03-18 15:15:53 +0100 (Mon, 18 Mar 2013) New Revision: 647 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/647 Log: refs #2149: L'installation de la base et plus g?\195?\169n?\195?\169rale les mises jour ne fonctionnent pas sous windows Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-18 14:15:16 UTC (rev 646) +++ trunk/pom.xml 2013-03-18 14:15:53 UTC (rev 647) @@ -121,6 +121,7 @@  <nuitonUtilsVersion>2.6.11</nuitonUtilsVersion> + <nuitonUpdaterVersion>2.6.11.1-SNAPSHOT</nuitonUpdaterVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <eugenePluginVersion>2.6.1</eugenePluginVersion> @@ -189,7 +190,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-updater</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>${nuitonUpdaterVersion}</version> </dependency> <dependency>

1 0

r646 - trunk/tutti-ui-swing/src/main/assembly/full
by tchemit＠users.forge.codelutin.com 18 Mar '13

18 Mar '13

Author: tchemit Date: 2013-03-18 15:15:16 +0100 (Mon, 18 Mar 2013) New Revision: 646 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/646 Log: fixes #2148: L'application ne d?\195?\169marrage pas sous windows Modified: trunk/tutti-ui-swing/src/main/assembly/full/tutti.bat Modified: trunk/tutti-ui-swing/src/main/assembly/full/tutti.bat =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/full/tutti.bat 2013-03-18 11:27:07 UTC (rev 645) +++ trunk/tutti-ui-swing/src/main/assembly/full/tutti.bat 2013-03-18 14:15:16 UTC (rev 646) @@ -3,22 +3,21 @@ set OLDDIR=%CD% cd /d %~dp0% -set TUTTI_BASEDIR=%CD% + +set TUTTI_BASEDIR="%CD%" set JAVA_HOME=%TUTTI_BASEDIR%\jre -set TUTTI_HOME=%TUTTI_BASEDIR%\tutti set JAVA_COMMAND=%JAVA_HOME%\bin\java set TUTTI_LOG_FILE=%TUTTI_BASEDIR%\data\tutti-${project.version}.log echo "tutti basedir: %TUTTI_BASEDIR%" -echo "tutti app home: %TUTTI_HOME%" echo "tutti jre home: %JAVA_HOME%" echo "tutti log file: %TUTTI_LOG_FILE%" -copy %TUTTI_HOME%\update.bat . +copy tutti\update.bat . call update.bat del update.bat copy tutti.config tutti -call %TUTTI_HOME%\launch.bat --option tutti.launch.mode full --option tutti.basedir %TUTTI_BASEDIR% +call tutti\launch.bat --option tutti.launch.mode full --option tutti.basedir %TUTTI_BASEDIR% if errorlevel 88 goto start cd %OLDDIR%

1 0