Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

8 changed files:

Changes:

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jaxx
    ... ... @@ -25,6 +25,8 @@
    25 25
    26 26 
       <import>
    27 27 
         fr.ird.observe.dto.data.DataDto
    28 
    +
    29 
    +    fr.ird.observe.client.datasource.validation.ObserveSwingValidator
    28 30 
       </import>
    29 31
    30 32 
       <ContentEditUIModel id='model' genericType='D'/>
    ... ... @@ -34,6 +36,9 @@
    34 36 
         @Override
    35 37 
         public abstract ContentEditUIHandler<D, U> getHandler();
    36 38
    39 
    +    @Override
    40 
    +    public abstract ObserveSwingValidator<D> getValidator();
    41 
    +
    37 42 
     @Override
    38 43 
     public void resetEdit() {
    39 44 
         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 @@
    25 25
    26 26 
       <import>
    27 27 
         fr.ird.observe.dto.data.DataDto
    28 
    +    fr.ird.observe.client.datasource.validation.ObserveSwingValidator
    28 29 
       </import>
    29 30
    30 31 
       <ContentOpenableUIModel id='model' genericType='D'/>
    ... ... @@ -35,6 +36,9 @@
    35 36 
         @Override
    36 37 
         public abstract ContentOpenableUIHandler<D, U> getHandler();
    37 38
    39 
    +    @Override
    40 
    +    public abstract ObserveSwingValidator<D> getValidator();
    41 
    +
    38 42 
     @Override
    39 43 
     public void resetEdit() {
    40 44 
         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 @@
    25 25
    26 26 
       <import>
    27 27 
         fr.ird.observe.dto.data.DataDto
    28 
    +    fr.ird.observe.client.datasource.validation.ObserveSwingValidator
    28 29 
       </import>
    29 30
    30 31 
       <ContentSimpleUIModel id='model' genericType='D'/>
    ... ... @@ -35,6 +36,9 @@
    35 36 
         @Override
    36 37 
       public abstract ContentSimpleUIHandler<D, U> getHandler();
    37 38
    39 
    +    @Override
    40 
    +    public abstract ObserveSwingValidator<D> getValidator();
    41 
    +
    38 42 
     @Override
    39 43 
     public void resetEdit() {
    40 44 
         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 @@
    46 46 
         <DataDto id='tableEditBean' initializer='getStates().getTableEditBean()'/>
    47 47
    48 48 
         <!-- selection model in table -->
    49 
    -    <ListSelectionModel id='selectionModel' initializer='getTableModel().getSelectionModel()'
    50 
    -                        onValueChanged='getHandler().updateEditor(event)'/>
    49 
    +    <ListSelectionModel id='selectionModel' initializer='getTableModel().getSelectionModel()' onValueChanged='getHandler().updateEditor(event)'/>
    51 50
    52 51 
         <!-- to block entry editor -->
    53 52 
         <ContentTableEditorLayerUI id='editorBlockLayerUI' constructorParams="this" styleClass="blockBlockLayerUI"/>
    ... ... @@ -57,6 +56,9 @@
    57 56 
     @Override
    58 57 
     public abstract ContentTableUIHandler<D, C, U> getHandler();
    59 58
    59 
    +@Override
    60 
    +public abstract ObserveSwingValidator<D> getValidator();
    61 
    +
    60 62 
     public abstract SwingValidator<C> getValidatorTable();
    61 63
    62 64 
     @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();
    60 60 
     @Override
    61 61 
     public abstract ContentReferentialUIHandler<D, R, U> getHandler();
    62 62
    63 
    +@Override
    64 
    +public abstract ObserveSwingValidator<D> getValidator();
    65 
    +
    63 66 
     @Override
    64 67 
     public void resetEdit() {
    65 68 
         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 @@
    45 45 
             static io.ultreia.java4all.i18n.I18n.n
    46 46 
         </import>
    47 47
    48 
    +    <script><![CDATA[
    49 
    +    @Override
    50 
    +    public ObserveSwingValidator<LandingDto> getValidator() {
    51 
    +        return getParentUI().getValidator();
    52 
    +    }
    53 
    +]]></script>
    48 54 
         <LandingPartUIModel id='model' initializer="getContextValue(LandingPartUIModel.class)"/>
    49 55 
         <LandingPartUITableModel id='tableModel' initializer="getContextValue(LandingPartUITableModel.class)"/>
    50 56 
         <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 @@
    47 47 
             static io.ultreia.java4all.i18n.I18n.n
    48 48 
         </import>
    49 49
    50 
    +    <script><![CDATA[
    51 
    +    @Override
    52 
    +    public ObserveSwingValidator<SampleDto> getValidator() {
    53 
    +        return getParentUI().getValidator();
    54 
    +    }
    55 
    +]]></script>
    50 56 
         <SamplePartUIModel id='model' initializer="getContextValue(SamplePartUIModel.class)"/>
    51 57 
         <ContentTableUIModelStates id='states' genericType='SampleDto, SamplePartDto'/>
    52 58 
         <SamplePartUITableModel id='tableModel' initializer="getContextValue(SamplePartUITableModel.class)"/>

  • pom.xml
    ... ... @@ -155,7 +155,7 @@
    155 155
    156 156 
     <!--    <lib.version.java4all.topia>1.36-SNAPSHOT</lib.version.java4all.topia>-->
    157 157 
         <!--    <lib.version.java4all.eugene>3.0-alpha-38</lib.version.java4all.eugene>-->
    158 
    -        <lib.version.java4all.jaxx>3.0-alpha-88</lib.version.java4all.jaxx>
    158 
    +        <lib.version.java4all.jaxx>3.0-alpha-89-SNAPSHOT</lib.version.java4all.jaxx>
    159 159 
         <!--<lib.version.java4all.application-context>1.0.3-SNAPSHOT</lib.version.java4all.application-context>-->
    160 160 
         <!--<lib.version.java4all.application-template>1.0.2-SNAPSHOT</lib.version.java4all.application-template>-->
    161 161 
         <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>-->

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.