branch feature/7587 updated (1a1febd -> 7a12dcf)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7587 in repository observe. See http://git.codelutin.com/observe.git from 1a1febd début de migration de l'ecran (refs #7587) new 7a12dcf Renommage de ObserveValidator en ObserveSwingValidator The 1 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 7a12dcf96c7b8e79216919ebf5cd4e42400c6bd8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 6 11:57:41 2015 +0200 Renommage de ObserveValidator en ObserveSwingValidator Summary of changes: observe-application-swing/pom.xml | 2 +- .../observe/ObserveSwingApplicationContext.java | 4 ++-- .../business/ObserveApplicationContext.java | 4 ++-- ...veValidator.java => ObserveSwingValidator.java} | 26 +++++++++++----------- .../business/validation/ValidationContext.java | 2 +- .../observe/ui/content/ContentUIInitializer.java | 8 +++---- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 2 +- 7 files changed, 24 insertions(+), 24 deletions(-) rename observe-application-swing/src/main/java/fr/ird/observe/business/validation/{ObserveValidator.java => ObserveSwingValidator.java} (88%) -- 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/7587 in repository observe. See http://git.codelutin.com/observe.git commit 7a12dcf96c7b8e79216919ebf5cd4e42400c6bd8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 6 11:57:41 2015 +0200 Renommage de ObserveValidator en ObserveSwingValidator --- observe-application-swing/pom.xml | 2 +- .../observe/ObserveSwingApplicationContext.java | 4 ++-- .../business/ObserveApplicationContext.java | 4 ++-- ...veValidator.java => ObserveSwingValidator.java} | 26 +++++++++++----------- .../business/validation/ValidationContext.java | 2 +- .../observe/ui/content/ContentUIInitializer.java | 8 +++---- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 2 +- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/observe-application-swing/pom.xml b/observe-application-swing/pom.xml index 783b8f8..2577602 100644 --- a/observe-application-swing/pom.xml +++ b/observe-application-swing/pom.xml @@ -46,7 +46,7 @@ <jaxx.autoImportCss>true</jaxx.autoImportCss> <jaxx.autoRecurseInCss>false</jaxx.autoRecurseInCss> <jaxx.validatorFactoryFQN> - fr.ird.observe.business.validation.ObserveValidator + fr.ird.observe.business.validation.ObserveSwingValidator </jaxx.validatorFactoryFQN> <jaxx.commonCss> ${project.basedir}/src/main/java/fr/ird/observe/ui/ObserveCommon.css 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 98888d7..cdb0a6a 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 @@ -25,7 +25,7 @@ import com.google.common.base.Preconditions; import fr.ird.observe.business.BinderService; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.gps.GPSService; -import fr.ird.observe.business.validation.ObserveValidator; +import fr.ird.observe.business.validation.ObserveSwingValidator; import fr.ird.observe.business.validation.ValidationContext; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.ObserveSwingDataSource; @@ -337,7 +337,7 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { VALIDATION_CONTEXT_ENTRY_DEF.getContextValue(this); if (result == null) { result = new ValidationContext(); - ObserveValidator.setValidationContext(result); + ObserveSwingValidator.setValidationContext(result); result.setDataContext(getDataContext()); VALIDATION_CONTEXT_ENTRY_DEF.setContextValue(this, result); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/ObserveApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/business/ObserveApplicationContext.java index 846e44a..96e6a86 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/ObserveApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/ObserveApplicationContext.java @@ -21,11 +21,11 @@ */ package fr.ird.observe.business; +import fr.ird.observe.business.validation.ObserveSwingValidator; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.gps.GPSService; -import fr.ird.observe.business.validation.ObserveValidator; import fr.ird.observe.business.validation.ValidationContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.constants.ReferentialLocale; @@ -194,7 +194,7 @@ public class ObserveApplicationContext extends DefaultApplicationContext { VALIDATION_CONTEXT_ENTRY_DEF.getContextValue(this); if (result == null) { result = new ValidationContext(); - ObserveValidator.setValidationContext(result); + ObserveSwingValidator.setValidationContext(result); result.setDataContext(getDataContext()); VALIDATION_CONTEXT_ENTRY_DEF.setContextValue(this, result); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ObserveValidator.java b/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ObserveSwingValidator.java similarity index 88% rename from observe-application-swing/src/main/java/fr/ird/observe/business/validation/ObserveValidator.java rename to observe-application-swing/src/main/java/fr/ird/observe/business/validation/ObserveSwingValidator.java index 91f5bde..ae36b4c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ObserveValidator.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ObserveSwingValidator.java @@ -44,31 +44,31 @@ import org.nuiton.validator.xwork2.XWork2ValidatorUtil; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class ObserveValidator<B> extends SwingValidator<B> { +public class ObserveSwingValidator<B> extends SwingValidator<B> { /** Logger */ - private static final Log log = LogFactory.getLog(ObserveValidator.class); + private static final Log log = LogFactory.getLog(ObserveSwingValidator.class); /** un etat pour initialiser la stack une unique fois la stack */ private static boolean init; private static ValidationContext validationContext; - public static <B> ObserveValidator<B> newValidator(Class<B> type, + public static <B> ObserveSwingValidator<B> newValidator(Class<B> type, String context, NuitonValidatorScope... scopes) { - return new ObserveValidator<B>( + return new ObserveSwingValidator<>( type, context, scopes ); } - public static <B> ObserveValidator<B> newValidator(NuitonValidatorProvider provider, + public static <B> ObserveSwingValidator<B> newValidator(NuitonValidatorProvider provider, Class<B> type, String context, NuitonValidatorScope... scopes) { - return new ObserveValidator<B>( + return new ObserveSwingValidator<>( provider, type, context, @@ -76,17 +76,17 @@ public class ObserveValidator<B> extends SwingValidator<B> { ); } - public ObserveValidator( + public ObserveSwingValidator( Class<B> type, String context, NuitonValidatorScope... scopes) { super(NuitonValidatorFactory.getDefaultProvider(), type, context, scopes); } - public ObserveValidator(NuitonValidatorProvider provider, - Class<B> type, - String context, - NuitonValidatorScope... scopes) { + public ObserveSwingValidator(NuitonValidatorProvider provider, + Class<B> type, + String context, + NuitonValidatorScope... scopes) { super(provider, type, context, scopes); } @@ -168,7 +168,7 @@ public class ObserveValidator<B> extends SwingValidator<B> { } public static void setValidationContext(ValidationContext validationContext) { - ObserveValidator.validationContext = validationContext; + ObserveSwingValidator.validationContext = validationContext; // a chaque fois qu'on change le contexte de validation // il faudra reinitiliser la stack setInit(false); @@ -179,7 +179,7 @@ public class ObserveValidator<B> extends SwingValidator<B> { } private static void setInit(boolean init) { - ObserveValidator.init = init; + ObserveSwingValidator.init = init; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationContext.java index 8c5f73d..0efb9b6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationContext.java @@ -150,7 +150,7 @@ public class ValidationContext { log.info("Attach data context " + dataContext); } this.dataContext = dataContext; - ObserveValidator.reloadDataContext(this, false); + ObserveSwingValidator.reloadDataContext(this, false); } //FIXME diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java index 1e30526..ee43fbb 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java @@ -26,7 +26,7 @@ import com.google.common.base.Predicate; import com.google.common.collect.Collections2; import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.validation.ObserveValidator; +import fr.ird.observe.business.validation.ObserveSwingValidator; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; @@ -272,8 +272,8 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E continue; } - if (o instanceof ObserveValidator<?>) { - init(ui, (ObserveValidator<?>) o); + if (o instanceof ObserveSwingValidator<?>) { + init(ui, (ObserveSwingValidator<?>) o); continue; } @@ -334,7 +334,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E } - protected void init(UI ui, ObserveValidator<?> validator) { + protected void init(UI ui, ObserveSwingValidator<?> validator) { SwingValidatorUtil.listenValidatorContextNameAndRefreshFields( validator, (JAXXValidator) ui diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.jaxx index 683235a..1b6c48a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUI.jaxx @@ -40,7 +40,7 @@ fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto fr.ird.observe.ui.content.table.* - fr.ird.observe.business.validation.ObserveValidator + fr.ird.observe.business.validation.ObserveSwingValidator jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox -- 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