This is an automated email from the git hooks/post-receive script. New commit to branch feature/7739 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 32ac58a65909308945cedc986a25d2826725fe40 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jul 19 12:19:33 2016 +0200 Dernier ajustement d'interface graphique --- .../src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java | 2 ++ .../synchronize/ObsoleteReferentialReferenceListCellRenderer.java | 4 ++-- .../fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java | 7 ++++++- 3 files changed, 10 insertions(+), 3 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 4d6c174..d0af9d5 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 @@ -1208,6 +1208,8 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { validate &= validate(AdminStep.SELECT_DATA); break; case SYNCHRONIZE: + validate = getStepState(s) == WizardState.SUCCESSED; + break; case IMPORT_GPS: //FIXME //validate &= getStepState(s) == diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteReferentialReferenceListCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteReferentialReferenceListCellRenderer.java index ff15ad6..6b1b349 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteReferentialReferenceListCellRenderer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteReferentialReferenceListCellRenderer.java @@ -59,11 +59,11 @@ public class ObsoleteReferentialReferenceListCellRenderer extends DefaultListCel String type = t(DecoratorService.getEntityLabel(referentialReferenceType)); Decorator<?> decorator = service.getReferentialReferenceDecorator(referentialReferenceType); - String text = type + " " + service.decorate(referentialReference); + String text = type + " : " + decorator.toString(referentialReference.getReferentialReference()); return super.getListCellRendererComponent( list, - value, + text, index, isSelected, cellHasFocus diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java index 28aa641..93b0a6f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java @@ -191,13 +191,18 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { getStepModel().getObsoleteReferences().removeElement(obsoleteRef); + // on supprime la sélection de la liste des remplacements + + safeComboBox.setSelectedItem(null); + // S'il ne reste plus de référentiel à corriger, on peut terminer le traitement if (getStepModel().getObsoleteReferences().isEmpty()) { beforeSuccess(); - updateState(getUi(), WizardState.SUCCESSED); + getModel().setStepState(WizardState.SUCCESSED); +// updateState(getUi(), WizardState.SUCCESSED); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.