branch feature/refactor_reference updated (82a8ed4 -> ad00d80)
This is an automated email from the git hooks/post-receive script. New change to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git from 82a8ed4 Bien recharger les referenceSets lors de l'ouverture d'une donnée (mais cela n'est pas optimal, il faudra refaire une passe pour trouver le meilleur moment pour déclancher cette opération) new dcf0d4e fix log level in dev mode new 2ffac67 Fix i18n new 3c0ed78 remerge from develop :( new ad00d80 little improvments The 4 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 ad00d80857c68bc97138171f77ae484843eab767 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 20 11:34:38 2015 +0100 little improvments commit 3c0ed789d78147ec59d973ae0621db3c254d8e81 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 20 11:34:28 2015 +0100 remerge from develop :( commit 2ffac67d7e9311513722fe4e12f652681f16e1c7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 20 11:33:35 2015 +0100 Fix i18n commit dcf0d4e1cc61c5b30f70cd2822a7cfffac623102 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 20 11:33:28 2015 +0100 fix log level in dev mode Summary of changes: .../src/main/java/fr/ird/observe/ObserveRunner.java | 3 ++- .../java/fr/ird/observe/ObserveSwingApplicationContext.java | 6 ++++++ .../main/java/fr/ird/observe/ui/content/ContentUIHandler.java | 11 +++++++---- .../resources/i18n/observe-application-swing_fr_FR.properties | 2 +- observe-application-swing/src/main/resources/log4j.properties | 2 +- 5 files changed, 17 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git commit dcf0d4e1cc61c5b30f70cd2822a7cfffac623102 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 20 11:33:28 2015 +0100 fix log level in dev mode --- observe-application-swing/src/main/resources/log4j.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/resources/log4j.properties b/observe-application-swing/src/main/resources/log4j.properties index 756b870..28f9047 100644 --- a/observe-application-swing/src/main/resources/log4j.properties +++ b/observe-application-swing/src/main/resources/log4j.properties @@ -45,7 +45,7 @@ log4j.logger.fr.ird.observe.entities.Entities=DEBUG log4j.logger.fr.ird.observe.validation.field=WARN log4j.logger.fr.ird.observe.ui.tree=INFO -log4j.logger.fr.ird.observe.decorator.ObserveDecorator=ERROR +log4j.logger.fr.ird.observe.ui.util.decorator=ERROR log4j.logger.org.nuiton.config=INFO log4j.logger.org.nuiton.topia.migration=INFO -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git commit 2ffac67d7e9311513722fe4e12f652681f16e1c7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 20 11:33:35 2015 +0100 Fix i18n --- .../src/main/resources/i18n/observe-application-swing_fr_FR.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 514d226..73dc619 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -1630,7 +1630,7 @@ observe.routes.title=Routes observe.runner.config.loaded=Configuration d'ObServe v. %1$s chargée. observe.runner.config.migrate.file=Le fichier de configuration %1$s a été déplacée de \n%2$s\nvers\n%3$s observe.runner.context.loaded=Initialisation du contexte terminée en %1$s. -observe.runner.copy.default.logConfigurationFile.file=Création du fichier de configuration des logs $1. +observe.runner.copy.default.logConfigurationFile.file=Création du fichier de configuration des logs %1$s. observe.runner.copy.default.map.file= observe.runner.copy.default.report.file=Création du fichier de reports %1$s. observe.runner.copy.default.ui.file=Création du fichier de cosmétique %1$s. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git commit 3c0ed789d78147ec59d973ae0621db3c254d8e81 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 20 11:34:28 2015 +0100 remerge from develop :( --- .../main/java/fr/ird/observe/ObserveSwingApplicationContext.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java index 8fcd31e..6a6a015 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java @@ -27,6 +27,9 @@ import com.google.common.collect.Lists; import fr.ird.observe.db.DataContext; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.ui.actions.shared.MoveActivityLonglinesUIAction; +import fr.ird.observe.ui.actions.shared.MoveActivitySeinesUIAction; +import fr.ird.observe.ui.actions.shared.MoveRoutesUIAction; import fr.ird.observe.util.gps.GPSService; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.ObserveSwingDataSource; @@ -918,6 +921,9 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im registerMainAction(actionMap, new DeleteReferenceUIAction(ui)); registerMainAction(actionMap, new MoveTripLonglinesUIAction(ui)); registerMainAction(actionMap, new MoveTripSeinesUIAction(ui)); + registerMainAction(actionMap, new MoveRoutesUIAction(ui)); + registerMainAction(actionMap, new MoveActivitySeinesUIAction(ui)); + registerMainAction(actionMap, new MoveActivityLonglinesUIAction(ui)); } public void registerMainAction(ActionMap actionMap, AbstractUIAction action) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git commit ad00d80857c68bc97138171f77ae484843eab767 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 20 11:34:38 2015 +0100 little improvments --- .../src/main/java/fr/ird/observe/ObserveRunner.java | 3 ++- .../main/java/fr/ird/observe/ui/content/ContentUIHandler.java | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java index be74bfe..104ceef 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java @@ -35,6 +35,7 @@ import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.beanutils.Converter; import org.apache.commons.beanutils.converters.DateConverter; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.log4j.LogManager; @@ -327,7 +328,7 @@ public abstract class ObserveRunner extends ApplicationRunner { Boolean.class, ObserveCLAction.ActionDefinition.H2_SERVER_MODE.name()); - if (h2ServerMode != null && h2ServerMode) { + if (BooleanUtils.isTrue(h2ServerMode)) { // starts in h2 server mode diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java index 5f1c03f..8ea91ce 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java @@ -50,6 +50,7 @@ import jaxx.runtime.swing.editor.bean.BeanComboBox; import jaxx.runtime.swing.editor.bean.BeanListHeader; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import jaxx.runtime.validator.swing.SwingValidatorUtil; +import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.reflect.ConstructorUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -888,10 +889,12 @@ public abstract class ContentUIHandler<E extends IdDto> { List<ReferenceDto<R>> data; FormDto<E> formDto = getModel().getFormDto(); - if (noLoad != null && noLoad || formDto == null) { + String propertyName = comboBox.getProperty(); + + if (BooleanUtils.isTrue(noLoad) || formDto == null) { if (log.isInfoEnabled()) { - log.info("Skip loading of entity list [" + dtoClass.getName() + "] (listNoLoad property found)"); + log.info(String.format("Skip loading of entity list [%s-%s] (listNoLoad property found or form is null)", dtoClass.getSimpleName(), propertyName)); } data = Collections.emptyList(); @@ -900,7 +903,7 @@ public abstract class ContentUIHandler<E extends IdDto> { data = new ArrayList<>(); // get complete data list from service - Optional<ReferenceSetDto<R>> optionalReferenceSetDto = formDto.tryToGetReferenceSetDto(dtoClass, comboBox.getProperty()); + Optional<ReferenceSetDto<R>> optionalReferenceSetDto = formDto.tryToGetReferenceSetDto(dtoClass, propertyName); if (optionalReferenceSetDto.isPresent()) { @@ -913,7 +916,7 @@ public abstract class ContentUIHandler<E extends IdDto> { } if (log.isInfoEnabled()) { - log.info("entity list [" + dtoClass.getName() + "] : " + data.size()); + log.info(String.format("entity list [%s-%s] : %d", dtoClass.getSimpleName(), propertyName, data.size())); } comboBox.setData(data); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm