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

Commits:

13 changed files:

Changes:

  • client-datasource-actions/src/main/i18n/getters/java.getter
    ... ... @@ -124,10 +124,10 @@ observe.actions.synchro.referential.replaceBeforeDeactivate.title
    124 124 
     observe.actions.synchro.referential.replaceBeforeDelete.title
    125 125 
     observe.actions.synchro.referential.task.addToLeft
    126 126 
     observe.actions.synchro.referential.task.addToRight
    127 
    -observe.actions.synchro.referential.task.deactivateWithReplaceFromLeft
    128 
    -observe.actions.synchro.referential.task.deactivateWithReplaceFromLeftWithReplacement
    129 
    -observe.actions.synchro.referential.task.deactivateWithReplaceFromRight
    130 
    -observe.actions.synchro.referential.task.deactivateWithReplaceFromRightWithReplacement
    127 
    +observe.actions.synchro.referential.task.deactivateFromLeft
    128 
    +observe.actions.synchro.referential.task.deactivateFromLeftWithReplacement
    129 
    +observe.actions.synchro.referential.task.deactivateFromRight
    130 
    +observe.actions.synchro.referential.task.deactivateFromRightWithReplacement
    131 131 
     observe.actions.synchro.referential.task.deleteFromLeft
    132 132 
     observe.actions.synchro.referential.task.deleteFromRight
    133 133 
     observe.actions.synchro.referential.task.include.properties

  • client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchronizeResources.java
    ... ... @@ -142,8 +142,8 @@ public enum ReferentialSynchronizeResources {
    142 142 
         DEACTIVATE(
    143 143 
                 "deactivateFromLeft",
    144 144 
                 "deactivateFromRight",
    145 
    -            n("observe.actions.synchro.referential.task.deactivateWithReplaceFromLeft"),
    146 
    -            n("observe.actions.synchro.referential.task.deactivateWithReplaceFromRight"),
    145 
    +            n("observe.actions.synchro.referential.task.deactivateFromLeft"),
    146 
    +            n("observe.actions.synchro.referential.task.deactivateFromRight"),
    147 147 
                 n("observe.actions.synchro.referential.action.deactivateFromLeft.tip"),
    148 148 
                 n("observe.actions.synchro.referential.action.deactivateFromRight.tip"),
    149 149 
                 ReferentialSynchroModel.DEACTIVATE_LEFT_PROPERTY_NAME,
    ... ... @@ -155,8 +155,8 @@ public enum ReferentialSynchronizeResources {
    155 155 
         DEACTIVATE_WITH_REPLACEMENT(
    156 156 
                 "deactivateFromLeft",
    157 157 
                 "deactivateFromRight",
    158 
    -            n("observe.actions.synchro.referential.task.deactivateWithReplaceFromLeftWithReplacement"),
    159 
    -            n("observe.actions.synchro.referential.task.deactivateWithReplaceFromRightWithReplacement"),
    158 
    +            n("observe.actions.synchro.referential.task.deactivateFromLeftWithReplacement"),
    159 
    +            n("observe.actions.synchro.referential.task.deactivateFromRightWithReplacement"),
    160 160 
                 n("observe.actions.synchro.referential.action.deactivateFromLeftWithReplacement.tip"),
    161 161 
                 n("observe.actions.synchro.referential.action.deactivateFromRightWithReplacement.tip"),
    162 162 
                 ReferentialSynchroModel.DEACTIVATE_LEFT_PROPERTY_NAME,

  • client-datasource-editor-api/pom.xml
    ... ... @@ -280,6 +280,14 @@
    280 280 
                           <enum>fr.ird.observe.client.datasource.editor.wizard.ObstunaAdminAction</enum>
    281 281 
                         </enums>
    282 282 
                       </enumerationSet>
    283 
    +                  <enumerationSet>
    284 
    +                    <name>tip</name>
    285 
    +                    <!--suppress MavenModelInspection -->
    286 
    +                    <pattern>observe.Id.mode.@NAME@.tip</pattern>
    287 
    +                    <enums>
    288 
    +                      <enum>fr.ird.observe.client.datasource.editor.content.ContentMode</enum>
    289 
    +                    </enums>
    290 
    +                  </enumerationSet>
    283 291 
                     </enumerationSets>
    284 292 
                   </configuration>
    285 293 
                 </execution>

  • client-datasource-editor-api/src/main/i18n/getters/java-enumeration.getter
    1 
    +observe.Id.mode.CREATE.tip
    2 
    +observe.Id.mode.READ.tip
    3 
    +observe.Id.mode.UPDATE.tip
    1 4 
     observe.constant.ObstunaAdminAction.CREATE
    2 5 
     observe.constant.ObstunaAdminAction.CREATE.description
    3 6 
     observe.constant.ObstunaAdminAction.SECURITY

  • client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentMode.java
    ... ... @@ -21,6 +21,8 @@
    21 21 
      */
    22 22 
     package fr.ird.observe.client.datasource.editor.content;
    23 23
    24 
    +import fr.ird.observe.dto.I18nEnumHelper;
    25 
    +import io.ultreia.java4all.i18n.I18n;
    24 26 
     import org.nuiton.jaxx.runtime.swing.SwingUtil;
    25 27
    26 28 
     import javax.swing.Icon;
    ... ... @@ -46,6 +48,10 @@ public enum ContentMode {
    46 48 
             return icon == null ? icon = SwingUtil.createActionIcon("mode-" + name().toLowerCase()) : icon;
    47 49 
         }
    48 50
    51 
    +    public String getTip() {
    52 
    +        return I18n.t(String.format("observe.Id.mode.%s.tip", name()));
    53 
    +    }
    54 
    +
    49 55 
         public String getValidationContext() {
    50 56 
             return name().toLowerCase();
    51 57 
         }

  • client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUI.jaxx
    ... ... @@ -22,10 +22,7 @@
    22 22 
         abstract='true'
    23 23 
         contentContainer='{contentContainer}'
    24 24 
         leftDecoration='{titleLeft}'
    25 
    -    rightDecoration='{titleRightToolBar}'
    26 
    -    _READTip='t("observe.Id.mode.read.tip")'
    27 
    -    _CREATERip='t("observe.Id.mode.create.tip")'
    28 
    -    _UPDATETip='t("observe.Id.mode.update.tip")'>
    25 
    +    rightDecoration='{titleRightToolBar}'>
    29 26
    30 27 
       <import>
    31 28 
         fr.ird.observe.client.configuration.ClientConfig

  • client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java
    ... ... @@ -541,14 +541,12 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe
    541 541
    542 542 
         protected final void onModeChanged(ContentMode mode) {
    543 543 
             String tip = null;
    544 
    -        if (mode != null) {
    545 
    -            tip = (String) ui.getClientProperty(mode.name() + "Tip");
    546 
    -        }
    547 
    -        ui.getTitleRight().setToolTipText(tip);
    548 544 
             Icon icon = null;
    549 545 
             if (mode != null) {
    546 
    +            tip = mode.getTip();
    550 547 
                 icon = mode.getIcon();
    551 548 
             }
    549 
    +        ui.getTitleRight().setToolTipText(tip);
    552 550 
             ui.getTitleRight().setIcon(icon);
    553 551 
             getModel().setFormFocusOwner(null);
    554 552 
         }

  • client-datasource-editor-ll/src/main/i18n/getters/jaxx.getter
    ... ... @@ -24,7 +24,6 @@ observe.data.Data.timerTimeOnBoard
    24 24 
     observe.data.Data.traceCutOff
    25 25 
     observe.data.Data.vessel
    26 26 
     observe.data.Data.weightMeasureMethod
    27 
    -observe.data.Sample.action.resetDefaultSizeMeasureType.tip
    28 27 
     observe.data.ll.common.GearUseFeatures.gear
    29 28 
     observe.data.ll.common.GearUseFeatures.generalTab
    30 29 
     observe.data.ll.common.GearUseFeatures.measurementsTab
    ... ... @@ -97,7 +96,6 @@ observe.data.ll.logbook.Activity.titles
    97 96 
     observe.data.ll.logbook.Activity.vesselActivity
    98 97 
     observe.data.ll.logbook.Activity.wind
    99 98 
     observe.data.ll.logbook.Activity.windDirection
    100 
    -observe.data.ll.logbook.Activity.windSpeed
    101 99 
     observe.data.ll.logbook.BaitsComposition.action.create
    102 100 
     observe.data.ll.logbook.BaitsComposition.action.create.tip
    103 101 
     observe.data.ll.logbook.BaitsComposition.baitSettingStatus

  • client-datasource-editor-ps/src/main/i18n/getters/jaxx.getter
    ... ... @@ -22,7 +22,6 @@ observe.data.Data.speciesFate
    22 22 
     observe.data.Data.startDate
    23 23 
     observe.data.Data.vessel
    24 24 
     observe.data.Data.weightMeasureMethod
    25 
    -observe.data.Sample.action.resetDefaultSizeMeasureType.tip
    26 25 
     observe.data.ps.common.GearUseFeatures.action.create.tip
    27 26 
     observe.data.ps.common.GearUseFeatures.action.create.tip.tip
    28 27 
     observe.data.ps.common.GearUseFeatures.gear

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties The diff for this file was not included because it is too large.
  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties The diff for this file was not included because it is too large.
  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties The diff for this file was not included because it is too large.
  • validation/src/main/i18n/getters/validation-fields.getter
    ... ... @@ -58,7 +58,6 @@ observe.data.ll.logbook.Activity.startTimeStamp
    58 58 
     observe.data.ll.logbook.Activity.vesselActivity
    59 59 
     observe.data.ll.logbook.Activity.wind
    60 60 
     observe.data.ll.logbook.Activity.windDirection
    61 
    -observe.data.ll.logbook.Activity.windSpeed
    62 61 
     observe.data.ll.logbook.BaitsComposition.baitSettingStatus
    63 62 
     observe.data.ll.logbook.BaitsComposition.baitType
    64 63 
     observe.data.ll.logbook.BaitsComposition.individualSize

    • —
    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.