This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit cbd0626e7e14c35de3abd17c717ee336f75a99cf Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 13:52:04 2016 +0200 On ne propose plus de choisir le context de validation (puisqu'il en reste plus qu'un seul --- .../main/java/fr/ird/observe/ui/admin/AdminUIModel.java | 6 +----- .../ird/observe/ui/admin/validate/ValidateConfigUI.jaxx | 11 ----------- .../ird/observe/ui/admin/validate/ValidateConfigUI.jcss | 16 ---------------- .../fr/ird/observe/ui/admin/validate/ValidateModel.java | 16 +--------------- 4 files changed, 2 insertions(+), 47 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java index 09d428d..7aa0014 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java @@ -21,7 +21,6 @@ */ package fr.ird.observe.ui.admin; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; @@ -41,7 +40,6 @@ import fr.ird.observe.services.service.DatabaseDestroyNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.service.actions.synchro.referential.ReferentialSynchronizeMode; import fr.ird.observe.services.service.actions.validate.ValidateService; -import fr.ird.observe.services.service.actions.validate.ValidateServiceUtils; import fr.ird.observe.services.service.longline.TripLonglineService; import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.ui.admin.config.ConfigUI; @@ -576,9 +574,7 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { getValidateModel().addPropertyChangeListener(listenValidationModified); getValidateModel().addScope(NuitonValidatorScope.ERROR); getValidateModel().setModelMode(ValidationModelMode.DATA); - ImmutableSet<String> availableContextNames = ValidateServiceUtils.getAvailableContextNames(); - getValidateModel().setAllContextNames(availableContextNames.toArray(new String[availableContextNames.size()])); - getValidateModel().setContextName(ValidateService.N1_UPDATE_CONTEXT); + getValidateModel().setContextName(ValidateService.SERVICE_VALIDATION_CONTEXT); getValidateModel().setGenerateReport(true); if (!config.getValidationReportDirectory().exists()) { boolean b = config.getValidationReportDirectory().mkdirs(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateConfigUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateConfigUI.jaxx index 6bd47ab..3ab8d74 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateConfigUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateConfigUI.jaxx @@ -97,17 +97,6 @@ protected void finalize() throws Throwable { </cell> </row> - <!-- validation context name --> - <row> - <cell anchor="west"> - <JLabel id='validateContextNameLabel'/> - </cell> - <cell weightx='1' fill="horizontal"> - <JComboBox id="validateContextName" - onItemStateChanged='validateModel.setContextName(getStringValue(((JComboBox)event.getSource()).getSelectedItem()))'/> - </cell> - </row> - <!-- validation scopes --> <row> <cell anchor="west"> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateConfigUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateConfigUI.jcss index 4c07dc0..ca00285 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateConfigUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateConfigUI.jcss @@ -31,15 +31,6 @@ text:"observe.actions.validate.select.mode"; toolTipText:"observe.actions.validate.select.mode.tip"; } -#validateContextName { - model:{getHandler().updateComboModel(validateModel.getAllContextNames())}; - selectedItem:{getStringValue(validateModel.getContextName())}; -} - -#validateContextNameLabel { - text:"observe.actions.validate.select.context"; - toolTipText:"observe.actions.validate.select.context.tip"; -} #validateScopesLabel { text:"observe.actions.validate.select.scope"; @@ -61,13 +52,6 @@ text:{getHandler().updateValidatorResumeLabel(model.isValidStep())}; } -/*#ALL{ - buttonGroup:"validateContentModel"; - value:{ValidationModelMode.ALL}; - text:{ValidationModelMode.ALL.getLabel()}; - selected:{validateModel.getModelMode() == ValidationModelMode.ALL}; -}*/ - #REFERENTIEL { buttonGroup:"validateContentModel"; value:{ValidationModelMode.REFERENTIEL}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateModel.java index 0e1d4d6..c4b9cba 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateModel.java @@ -74,9 +74,6 @@ public class ValidateModel extends AdminActionModel { /** les scopes a utiliser */ protected final EnumSet<NuitonValidatorScope> scopes; - /** l'ensemble des contexts autorises */ - protected String[] allContextNames; - /** le lastName du context de validation */ protected String contextName; @@ -139,17 +136,6 @@ public class ValidateModel extends AdminActionModel { return scopes; } - public String[] getAllContextNames() { - return allContextNames; - } - - public void setAllContextNames(String[] allContextNames) { - this.allContextNames = allContextNames; - firePropertyChange(PROPERTY_ALL_CONTEXT_NAMES, null, allContextNames); - // reset du context - setContextName(null); - } - public boolean isGenerateReport() { return generateReport; } @@ -204,7 +190,7 @@ public class ValidateModel extends AdminActionModel { public Set<Class<? extends IdDto>> getMessageTypes() { Set<Class<? extends IdDto>> result; - if (messages != null && ! messages.isEmpty()) { + if (messages != null && !messages.isEmpty()) { result = messages.keySet(); } else { result = Sets.newHashSet(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.