branch feature/6688 updated (b040b43 -> 903b37d)
This is an automated email from the git hooks/post-receive script. New change to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git from b040b43 prepare test mecanism new 61aa270 do not log when using progression model new d6a5667 fix export check cruise new 903b37d fix i18n The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 903b37ddc7140f00ffeae4fb9946f61a9ab513f8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 23 11:49:23 2015 +0100 fix i18n commit d6a5667f4f9e8326e5213d0cf31e1b88b0f3021d Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 23 11:49:14 2015 +0100 fix export check cruise commit 61aa270650912edcceaf62205347ced61aea85d3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 23 11:48:56 2015 +0100 do not log when using progression model Summary of changes: .../tutti/service/genericformat/GenericFormatExportContext.java | 4 ---- .../tutti/service/genericformat/GenericFormatExportService.java | 3 +-- .../ui/swing/action/ImportGenericFormatProgramCruisesAction.java | 2 +- .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 4 ++-- 4 files changed, 4 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit 61aa270650912edcceaf62205347ced61aea85d3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 23 11:48:56 2015 +0100 do not log when using progression model --- .../tutti/service/genericformat/GenericFormatExportContext.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportContext.java index d947d00..4d66eda 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportContext.java @@ -289,9 +289,5 @@ public class GenericFormatExportContext implements Closeable { public void increments(String message) { progressionModel.increments(message); - - if (log.isInfoEnabled()) { - log.info(message); - } } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit d6a5667f4f9e8326e5213d0cf31e1b88b0f3021d Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 23 11:49:14 2015 +0100 fix export check cruise --- .../tutti/service/genericformat/GenericFormatExportService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportService.java index 5750514..0b24f9d 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportService.java @@ -669,7 +669,7 @@ public class GenericFormatExportService extends GenericFormatServiceSupport { String result; - if (errors.isEmpty()) { + if (!errors.isEmpty()) { StringBuilder errorMessageBuilder = new StringBuilder(); @@ -707,7 +707,6 @@ public class GenericFormatExportService extends GenericFormatServiceSupport { Set<String> errorsForOperation = checkFishingOperation(fishingOperationId); if (!errorsForOperation.isEmpty()) { - String fishingOperationStr = fishingOperationDecorator.toString(fishingOperation); StringBuilder sb = new StringBuilder(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit 903b37ddc7140f00ffeae4fb9946f61a9ab513f8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 23 11:49:23 2015 +0100 fix i18n --- .../ui/swing/action/ImportGenericFormatProgramCruisesAction.java | 2 +- .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportGenericFormatProgramCruisesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportGenericFormatProgramCruisesAction.java index 4a2a2d0..2608764 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportGenericFormatProgramCruisesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportGenericFormatProgramCruisesAction.java @@ -42,7 +42,7 @@ public class ImportGenericFormatProgramCruisesAction extends AbstractTuttiAction file = chooseFile( t("tutti.selectCruise.title.choose.importGenericFormatFile"), t("tutti.selectCruise.action.importGenericformat"), - "^.+\\.zip$", t("tutti.common.file.genericFormat") + "^.+\\.zip$", t("tutti.common.file.zip") ); doAction = file != null; diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 7824bb7..144bca3 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -81,7 +81,7 @@ tutti.common.askBeforeUpdate.help=Que voulez-vous faire ?<ul><li><strong>Annuler tutti.common.cancel=Annuler tutti.common.cancel.mnemonic=A tutti.common.file.csv=Extension d'un fichier csv -tutti.common.file.genericFormat= +tutti.common.file.genericFormat=Extension d'une archive zip tutti.common.file.iwa=Fichier d'import Psion tutti.common.file.pdf=Extension d'un fichier pdf tutti.common.file.protocol=Extension d'un fichier de protocole Allegro Campagne @@ -91,7 +91,7 @@ tutti.common.file.tuttiCatch=Fichier d'import/export des poids de capture tutti.common.file.tuttiIndividualObservation=Fichier d'import/export des lots d'observations individuelles tutti.common.file.tuttiMarineLitter=Fichier d'import/export des lots de déchets tutti.common.file.tuttiSpecies=Fichier d'import/export des lots d'espèces -tutti.common.file.zip=Extension d'une archive zip +tutti.common.file.zip= tutti.common.referential.gear=Engin tutti.common.referential.person=utilisateur tutti.common.referential.species=Espèce -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm