Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 75460181 by Tony Chemit at 2021-01-06T18:34:40+01:00 Fix some bad binding in jaxx :( - - - - - 16179a26 by Tony Chemit at 2021-01-06T18:38:41+01:00 Problème si on supprime l'unique commentaire d'une commentaire, ça ne fonctionne pas bien! - Closes #1725 - - - - - 8 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingPartUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUI.jaxx - pom.xml Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jaxx ===================================== @@ -25,6 +25,8 @@ <import> fr.ird.observe.dto.data.DataDto + + fr.ird.observe.client.datasource.validation.ObserveSwingValidator </import> <ContentEditUIModel id='model' genericType='D'/> @@ -34,6 +36,9 @@ @Override public abstract ContentEditUIHandler<D, U> getHandler(); + @Override + public abstract ObserveSwingValidator<D> getValidator(); + @Override public void resetEdit() { getHandler().getResetAction().doReset(); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUI.jaxx ===================================== @@ -25,6 +25,7 @@ <import> fr.ird.observe.dto.data.DataDto + fr.ird.observe.client.datasource.validation.ObserveSwingValidator </import> <ContentOpenableUIModel id='model' genericType='D'/> @@ -35,6 +36,9 @@ @Override public abstract ContentOpenableUIHandler<D, U> getHandler(); + @Override + public abstract ObserveSwingValidator<D> getValidator(); + @Override public void resetEdit() { getHandler().getResetAction().doReset(); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUI.jaxx ===================================== @@ -25,6 +25,7 @@ <import> fr.ird.observe.dto.data.DataDto + fr.ird.observe.client.datasource.validation.ObserveSwingValidator </import> <ContentSimpleUIModel id='model' genericType='D'/> @@ -35,6 +36,9 @@ @Override public abstract ContentSimpleUIHandler<D, U> getHandler(); + @Override + public abstract ObserveSwingValidator<D> getValidator(); + @Override public void resetEdit() { getHandler().getResetAction().doReset(); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUI.jaxx ===================================== @@ -46,8 +46,7 @@ <DataDto id='tableEditBean' initializer='getStates().getTableEditBean()'/> <!-- selection model in table --> - <ListSelectionModel id='selectionModel' initializer='getTableModel().getSelectionModel()' - onValueChanged='getHandler().updateEditor(event)'/> + <ListSelectionModel id='selectionModel' initializer='getTableModel().getSelectionModel()' onValueChanged='getHandler().updateEditor(event)'/> <!-- to block entry editor --> <ContentTableEditorLayerUI id='editorBlockLayerUI' constructorParams="this" styleClass="blockBlockLayerUI"/> @@ -57,6 +56,9 @@ @Override public abstract ContentTableUIHandler<D, C, U> getHandler(); +@Override +public abstract ObserveSwingValidator<D> getValidator(); + public abstract SwingValidator<C> getValidatorTable(); @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUI.jaxx ===================================== @@ -60,6 +60,9 @@ public abstract NormalTextEditor getUri(); @Override public abstract ContentReferentialUIHandler<D, R, U> getHandler(); +@Override +public abstract ObserveSwingValidator<D> getValidator(); + @Override public void resetEdit() { getHandler().getResetAction().doReset(); ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingPartUI.jaxx ===================================== @@ -45,6 +45,12 @@ static io.ultreia.java4all.i18n.I18n.n </import> + <script><![CDATA[ + @Override + public ObserveSwingValidator<LandingDto> getValidator() { + return getParentUI().getValidator(); + } +]]></script> <LandingPartUIModel id='model' initializer="getContextValue(LandingPartUIModel.class)"/> <LandingPartUITableModel id='tableModel' initializer="getContextValue(LandingPartUITableModel.class)"/> <LandingDto id='bean'/> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUI.jaxx ===================================== @@ -47,6 +47,12 @@ static io.ultreia.java4all.i18n.I18n.n </import> + <script><![CDATA[ + @Override + public ObserveSwingValidator<SampleDto> getValidator() { + return getParentUI().getValidator(); + } +]]></script> <SamplePartUIModel id='model' initializer="getContextValue(SamplePartUIModel.class)"/> <ContentTableUIModelStates id='states' genericType='SampleDto, SamplePartDto'/> <SamplePartUITableModel id='tableModel' initializer="getContextValue(SamplePartUITableModel.class)"/> ===================================== pom.xml ===================================== @@ -155,7 +155,7 @@ <!-- <lib.version.java4all.topia>1.36-SNAPSHOT</lib.version.java4all.topia>--> <!-- <lib.version.java4all.eugene>3.0-alpha-38</lib.version.java4all.eugene>--> - <lib.version.java4all.jaxx>3.0-alpha-88</lib.version.java4all.jaxx> + <lib.version.java4all.jaxx>3.0-alpha-89-SNAPSHOT</lib.version.java4all.jaxx> <!--<lib.version.java4all.application-context>1.0.3-SNAPSHOT</lib.version.java4all.application-context>--> <!--<lib.version.java4all.application-template>1.0.2-SNAPSHOT</lib.version.java4all.application-template>--> <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>--> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4aac1786a41449b6c15c0130a... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4aac1786a41449b6c15c0130a... You're receiving this email because of your account on gitlab.com.
participants (1)
-
Tony CHEMIT