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

Commits:

10 changed files:

Changes:

  • client-configuration/pom.xml
    ... ... @@ -201,6 +201,47 @@
    201 201 
                   <artifactId>services</artifactId>
    202 202 
                   <version>${project.version}</version>
    203 203 
                 </dependency>
    204 
    +            <dependency>
    205 
    +              <groupId>io.ultreia.java4all.jaxx</groupId>
    206 
    +              <artifactId>jaxx-widgets-gis</artifactId>
    207 
    +              <version>${lib.version.java4all.jaxx}</version>
    208 
    +              <scope>compile</scope>
    209 
    +            </dependency>
    210 
    +            <dependency>
    211 
    +              <groupId>io.ultreia.java4all.jaxx</groupId>
    212 
    +              <artifactId>jaxx-widgets-temperature</artifactId>
    213 
    +              <version>${lib.version.java4all.jaxx}</version>
    214 
    +              <scope>compile</scope>
    215 
    +            </dependency>
    216 
    +            <dependency>
    217 
    +              <groupId>io.ultreia.java4all.jaxx</groupId>
    218 
    +              <artifactId>jaxx-widgets-number</artifactId>
    219 
    +              <version>${lib.version.java4all.jaxx}</version>
    220 
    +              <scope>compile</scope>
    221 
    +            </dependency>
    222 
    +            <dependency>
    223 
    +              <groupId>io.ultreia.java4all.jaxx</groupId>
    224 
    +              <artifactId>jaxx-widgets-select</artifactId>
    225 
    +              <version>${lib.version.java4all.jaxx}</version>
    226 
    +              <scope>compile</scope>
    227 
    +            </dependency>
    228 
    +            <dependency>
    229 
    +              <groupId>io.ultreia.java4all.jaxx</groupId>
    230 
    +              <artifactId>jaxx-validator</artifactId>
    231 
    +              <version>${lib.version.java4all.jaxx}</version>
    232 
    +              <scope>compile</scope>
    233 
    +            </dependency>
    234 
    +            <dependency>
    235 
    +              <groupId>fr.ird.observe.toolkit</groupId>
    236 
    +              <artifactId>common-dto</artifactId>
    237 
    +              <version>${observeToolkitVersion}</version>
    238 
    +            </dependency>
    239 
    +            <dependency>
    240 
    +              <groupId>fr.ird.observe.toolkit</groupId>
    241 
    +              <artifactId>common-validation</artifactId>
    242 
    +              <version>${observeToolkitVersion}</version>
    243 
    +              <scope>compile</scope>
    244 
    +            </dependency>
    204 245 
               </dependencies>
    205 246 
             </plugin>
    206 247 
           </plugins>

  • client-core/pom.xml
    ... ... @@ -718,6 +718,47 @@
    718 718 
                   <artifactId>client-configuration</artifactId>
    719 719 
                   <version>${project.version}</version>
    720 720 
                 </dependency>
    721 
    +            <dependency>
    722 
    +              <groupId>io.ultreia.java4all.jaxx</groupId>
    723 
    +              <artifactId>jaxx-widgets-gis</artifactId>
    724 
    +              <version>${lib.version.java4all.jaxx}</version>
    725 
    +              <scope>compile</scope>
    726 
    +            </dependency>
    727 
    +            <dependency>
    728 
    +              <groupId>io.ultreia.java4all.jaxx</groupId>
    729 
    +              <artifactId>jaxx-widgets-temperature</artifactId>
    730 
    +              <version>${lib.version.java4all.jaxx}</version>
    731 
    +              <scope>compile</scope>
    732 
    +            </dependency>
    733 
    +            <dependency>
    734 
    +              <groupId>io.ultreia.java4all.jaxx</groupId>
    735 
    +              <artifactId>jaxx-widgets-number</artifactId>
    736 
    +              <version>${lib.version.java4all.jaxx}</version>
    737 
    +              <scope>compile</scope>
    738 
    +            </dependency>
    739 
    +            <dependency>
    740 
    +              <groupId>io.ultreia.java4all.jaxx</groupId>
    741 
    +              <artifactId>jaxx-widgets-select</artifactId>
    742 
    +              <version>${lib.version.java4all.jaxx}</version>
    743 
    +              <scope>compile</scope>
    744 
    +            </dependency>
    745 
    +            <dependency>
    746 
    +              <groupId>io.ultreia.java4all.jaxx</groupId>
    747 
    +              <artifactId>jaxx-validator</artifactId>
    748 
    +              <version>${lib.version.java4all.jaxx}</version>
    749 
    +              <scope>compile</scope>
    750 
    +            </dependency>
    751 
    +            <dependency>
    752 
    +              <groupId>fr.ird.observe.toolkit</groupId>
    753 
    +              <artifactId>common-dto</artifactId>
    754 
    +              <version>${observeToolkitVersion}</version>
    755 
    +            </dependency>
    756 
    +            <dependency>
    757 
    +              <groupId>fr.ird.observe.toolkit</groupId>
    758 
    +              <artifactId>common-validation</artifactId>
    759 
    +              <version>${observeToolkitVersion}</version>
    760 
    +              <scope>compile</scope>
    761 
    +            </dependency>
    721 762 
               </dependencies>
    722 763 
             </plugin>
    723 764

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/TranslateAction.java
    ... ... @@ -29,10 +29,10 @@ import fr.ird.observe.client.ui.ObserveUICallback;
    29 29 
     import fr.ird.observe.client.ui.actions.main.menu.MenuActionSupport;
    30 30 
     import fr.ird.observe.client.ui.util.UIHelper;
    31 31 
     import io.ultreia.java4all.i18n.I18n;
    32 
    +import io.ultreia.java4all.i18n.editor.model.Project;
    33 
    +import io.ultreia.java4all.i18n.editor.ui.ProjectUI;
    32 34 
     import org.apache.logging.log4j.LogManager;
    33 35 
     import org.apache.logging.log4j.Logger;
    34 
    -import org.nuiton.i18n.editor.model.Project;
    35 
    -import org.nuiton.i18n.editor.ui.ProjectUI;
    36 36
    37 37 
     import java.awt.event.ActionEvent;
    38 38 
     import java.awt.event.WindowAdapter;

  • dto/pom.xml
    ... ... @@ -232,6 +232,49 @@
    232 232 
                 </execution>
    233 233
    234 234 
               </executions>
    235 
    +          <dependencies>
    236 
    +            <dependency>
    237 
    +              <groupId>io.ultreia.java4all.jaxx</groupId>
    238 
    +              <artifactId>jaxx-widgets-gis</artifactId>
    239 
    +              <version>${lib.version.java4all.jaxx}</version>
    240 
    +              <scope>compile</scope>
    241 
    +            </dependency>
    242 
    +            <dependency>
    243 
    +              <groupId>io.ultreia.java4all.jaxx</groupId>
    244 
    +              <artifactId>jaxx-widgets-temperature</artifactId>
    245 
    +              <version>${lib.version.java4all.jaxx}</version>
    246 
    +              <scope>compile</scope>
    247 
    +            </dependency>
    248 
    +            <dependency>
    249 
    +              <groupId>io.ultreia.java4all.jaxx</groupId>
    250 
    +              <artifactId>jaxx-widgets-number</artifactId>
    251 
    +              <version>${lib.version.java4all.jaxx}</version>
    252 
    +              <scope>compile</scope>
    253 
    +            </dependency>
    254 
    +            <dependency>
    255 
    +              <groupId>io.ultreia.java4all.jaxx</groupId>
    256 
    +              <artifactId>jaxx-widgets-select</artifactId>
    257 
    +              <version>${lib.version.java4all.jaxx}</version>
    258 
    +              <scope>compile</scope>
    259 
    +            </dependency>
    260 
    +            <dependency>
    261 
    +              <groupId>io.ultreia.java4all.jaxx</groupId>
    262 
    +              <artifactId>jaxx-validator</artifactId>
    263 
    +              <version>${lib.version.java4all.jaxx}</version>
    264 
    +              <scope>compile</scope>
    265 
    +            </dependency>
    266 
    +            <dependency>
    267 
    +              <groupId>fr.ird.observe.toolkit</groupId>
    268 
    +              <artifactId>common-dto</artifactId>
    269 
    +              <version>${observeToolkitVersion}</version>
    270 
    +            </dependency>
    271 
    +            <dependency>
    272 
    +              <groupId>fr.ird.observe.toolkit</groupId>
    273 
    +              <artifactId>common-validation</artifactId>
    274 
    +              <version>${observeToolkitVersion}</version>
    275 
    +              <scope>compile</scope>
    276 
    +            </dependency>
    277 
    +          </dependencies>
    235 278 
             </plugin>
    236 279 
           </plugins>
    237 280 
         </pluginManagement>

  • dto/src/main/i18n/getters/java-enumeration.getter
    ... ... @@ -10,6 +10,8 @@ observe.constant.NonTargetCatchReleaseStatus.M
    10 10 
     observe.constant.NonTargetCatchReleaseStatus.P
    11 11 
     observe.constant.NonTargetCatchReleaseStatus.S
    12 12 
     observe.constant.NonTargetCatchReleaseStatus.U
    13 
    +observe.constant.ObserveModelType.LL.description
    14 
    +observe.constant.ObserveModelType.PS.description
    13 15 
     observe.constant.Ownership.autreVessel
    14 16 
     observe.constant.Ownership.ceVessel
    15 17 
     observe.constant.Ownership.unknown

  • observe-i18n/pom.xml
    ... ... @@ -61,6 +61,19 @@
    61 61 
               <groupId>io.ultreia.java4all.i18n</groupId>
    62 62 
               <artifactId>i18n-maven-plugin</artifactId>
    63 63 
               <dependencies>
    64 
    +
    65 
    +            <dependency>
    66 
    +              <groupId>fr.ird.observe.toolkit</groupId>
    67 
    +              <artifactId>common-dto</artifactId>
    68 
    +              <version>${observeToolkitVersion}</version>
    69 
    +            </dependency>
    70 
    +            <dependency>
    71 
    +              <groupId>fr.ird.observe.toolkit</groupId>
    72 
    +              <artifactId>common-validation</artifactId>
    73 
    +              <version>${observeToolkitVersion}</version>
    74 
    +              <scope>compile</scope>
    75 
    +            </dependency>
    76 
    +
    64 77 
                 <dependency>
    65 78 
                 <groupId>io.ultreia.java4all.jaxx</groupId>
    66 79 
                 <artifactId>jaxx-widgets-about</artifactId>

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -377,7 +377,7 @@ observe.common.ActivityLonglineDto.titles=Activities
    377 377 
     observe.common.ActivityLonglineDto.type=Activity
    378 378 
     observe.common.ActivityLonglineDto.types=Activities
    379 379 
     observe.common.ActivityLonglineDto.vesselActivityLongline=Vessel activity
    380 
    -observe.common.ActivitySeineDto.action.addFloatingObject=Add FAD
    380 
    +observe.common.ActivitySeineDto.action.addFloatingObject=Declare a new floatting object (FOB)
    381 381 
     observe.common.ActivitySeineDto.action.addFloatingObject.tip=Add a FAD to the activity
    382 382 
     observe.common.ActivitySeineDto.action.addSet=Add a Set
    383 383 
     observe.common.ActivitySeineDto.action.addSet.tip=Add the set to the activity
    ... ... @@ -654,7 +654,7 @@ observe.common.FloatingObjectDto.notComputed=Not computed
    654 654 
     observe.common.FloatingObjectDto.objectOperation=Object operation
    655 655 
     observe.common.FloatingObjectDto.supportVesselName=Support vessel name
    656 656 
     observe.common.FloatingObjectDto.table.type=Type
    657 
    -observe.common.FloatingObjectDto.title=DCP
    657 
    +observe.common.FloatingObjectDto.title=Floatting object
    658 658 
     observe.common.FloatingObjectDto.type=Floating object
    659 659 
     observe.common.FloatingObjectDto.types=Floating objects
    660 660 
     observe.common.FloatingObjectPartDto.title=Floating object parts
    ... ... @@ -1878,7 +1878,7 @@ observe.constant.StorageStep.ROLES=Security
    1878 1878 
     observe.constant.StorageStep.ROLES.description=Applya security on database roles
    1879 1879 
     observe.constant.StorageStep.SELECT_DATA=Data selection
    1880 1880 
     observe.constant.StorageStep.SELECT_DATA.description=Select data to export in backup
    1881 
    -observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=No Beacon
    1881 
    +observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=No Beacon associated to object
    1882 1882 
     observe.constant.TypeTransmittingBuoyOperation.pose=Posing
    1883 1883 
     observe.constant.TypeTransmittingBuoyOperation.recuperation=Grab
    1884 1884 
     observe.constant.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Grab and change
    ... ... @@ -2171,7 +2171,7 @@ observe.type.action.save=Save %s
    2171 2171 
     observe.type.action.view=View selected %s
    2172 2172 
     observe.type.activityLongline.unsaved=New activity
    2173 2173 
     observe.type.activitySeine.unsaved=New activity
    2174 
    -observe.type.floatingObject.unsaved=New DCP
    2174 
    +observe.type.floatingObject.unsaved=New floating object (FOB)
    2175 2175 
     observe.type.list=List of %s
    2176 2176 
     observe.type.management=Management of %s
    2177 2177 
     observe.type.reference.common=Common Referential

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    ... ... @@ -377,7 +377,7 @@ observe.common.ActivityLonglineDto.titles=Actividades
    377 377 
     observe.common.ActivityLonglineDto.type=Actividad
    378 378 
     observe.common.ActivityLonglineDto.types=Actividades
    379 379 
     observe.common.ActivityLonglineDto.vesselActivityLongline=Actividad barco
    380 
    -observe.common.ActivitySeineDto.action.addFloatingObject=Añadir un FOB
    380 
    +observe.common.ActivitySeineDto.action.addFloatingObject=Añadir un objeto flotante (FOB)
    381 381 
     observe.common.ActivitySeineDto.action.addFloatingObject.tip=Añadir un objeto flotante a la actividad
    382 382 
     observe.common.ActivitySeineDto.action.addSet=Añadir un lance
    383 383 
     observe.common.ActivitySeineDto.action.addSet.tip=Añadir el lance de la actividad
    ... ... @@ -954,8 +954,8 @@ observe.common.ObjectMaterialDto.childrenMultiSelectable=Selección múltiple da
    954 954 
     observe.common.ObjectMaterialDto.legacyCode=Código antiguo
    955 955 
     observe.common.ObjectMaterialDto.legacyCodeStandardCode=Código antiguo / Código estándar
    956 956 
     observe.common.ObjectMaterialDto.objectMaterialType=Tipo
    957 
    -observe.common.ObjectMaterialDto.parent=Parent \#TODO
    958 
    -observe.common.ObjectMaterialDto.parentCode=Parent \#TODO
    957 
    +observe.common.ObjectMaterialDto.parent=Padre
    958 
    +observe.common.ObjectMaterialDto.parentCode=Padre
    959 959 
     observe.common.ObjectMaterialDto.standardCode=Código estándar
    960 960 
     observe.common.ObjectMaterialDto.type=Componente del objeto flotante
    961 961 
     observe.common.ObjectMaterialDto.types=Componentes del objeto flotante
    ... ... @@ -1878,7 +1878,7 @@ observe.constant.StorageStep.ROLES=Seguridad
    1878 1878 
     observe.constant.StorageStep.ROLES.description=Configuración de la seguridad
    1879 1879 
     observe.constant.StorageStep.SELECT_DATA=Selección de datos
    1880 1880 
     observe.constant.StorageStep.SELECT_DATA.description=Seleccionar los datos a exportar en la copia de seguridad
    1881 
    -observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=DCP sin baliza
    1881 
    +observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=Objeto sin baliza
    1882 1882 
     observe.constant.TypeTransmittingBuoyOperation.pose=Colocación de nueva baliza
    1883 1883 
     observe.constant.TypeTransmittingBuoyOperation.recuperation=Recogida de baliza sin regreso al agua
    1884 1884 
     observe.constant.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Recuperación y colocación de una nueva baliza
    ... ... @@ -2171,7 +2171,7 @@ observe.type.action.save=Guardar las modificaciones sobre el elemento de tipo '%
    2171 2171 
     observe.type.action.view=Ver los detalles del objeto de tipo '%s' seleccionado
    2172 2172 
     observe.type.activityLongline.unsaved=Nueva actividad
    2173 2173 
     observe.type.activitySeine.unsaved=Nueva actividad
    2174 
    -observe.type.floatingObject.unsaved=Nuevo FOB
    2174 
    +observe.type.floatingObject.unsaved=Nuevo objeto flotante (FOB)
    2175 2175 
     observe.type.list=Lista de %s
    2176 2176 
     observe.type.management=Gestión de %s
    2177 2177 
     observe.type.reference.common=Referencial común

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -377,7 +377,7 @@ observe.common.ActivityLonglineDto.titles=Activités
    377 377 
     observe.common.ActivityLonglineDto.type=Activité
    378 378 
     observe.common.ActivityLonglineDto.types=Activités
    379 379 
     observe.common.ActivityLonglineDto.vesselActivityLongline=Activité bateau
    380 
    -observe.common.ActivitySeineDto.action.addFloatingObject=Ajouter un DCP
    380 
    +observe.common.ActivitySeineDto.action.addFloatingObject=Déclarer un objet flottant (FOB)
    381 381 
     observe.common.ActivitySeineDto.action.addFloatingObject.tip=Ajouter un objet flottant à l'activité
    382 382 
     observe.common.ActivitySeineDto.action.addSet=Ajouter la calée
    383 383 
     observe.common.ActivitySeineDto.action.addSet.tip=Ajouter la calée de l'activité
    ... ... @@ -1878,7 +1878,7 @@ observe.constant.StorageStep.ROLES=Sécurité
    1878 1878 
     observe.constant.StorageStep.ROLES.description=Mise en place de la sécurité
    1879 1879 
     observe.constant.StorageStep.SELECT_DATA=Sélection données
    1880 1880 
     observe.constant.StorageStep.SELECT_DATA.description=Sélectionner les données à exporter dans la sauvegarde
    1881 
    -observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=Pas de balise liée au DCP
    1881 
    +observe.constant.TypeTransmittingBuoyOperation.pasDeBalise=Pas de balise liée à l'objet
    1882 1882 
     observe.constant.TypeTransmittingBuoyOperation.pose=Pose d'une nouvelle balise
    1883 1883 
     observe.constant.TypeTransmittingBuoyOperation.recuperation=Récupération d'une balise sans remise à l'eau
    1884 1884 
     observe.constant.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Récupération et pose d'une nouvelle balise
    ... ... @@ -2171,7 +2171,7 @@ observe.type.action.save=Sauver les modifications sur l'objet de type '%s'
    2171 2171 
     observe.type.action.view=Voir les détails de l'objet de type '%s' sélectionné
    2172 2172 
     observe.type.activityLongline.unsaved=Nouvelle activité
    2173 2173 
     observe.type.activitySeine.unsaved=Nouvelle activité
    2174 
    -observe.type.floatingObject.unsaved=Nouveau DCP
    2174 
    +observe.type.floatingObject.unsaved=Nouvel objet flottant (FOB)
    2175 2175 
     observe.type.list=Liste des %s
    2176 2176 
     observe.type.management=Gestion des %s
    2177 2177 
     observe.type.reference.common=Référentiel commun

  • pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>io.ultreia.maven</groupId>
    28 28 
         <artifactId>pom</artifactId>
    29 
    -    <version>2018.8.8</version>
    29 
    +    <version>2018.8.10</version>
    30 30 
       </parent>
    31 31
    32 32 
       <groupId>fr.ird.observe</groupId>
    ... ... @@ -155,7 +155,7 @@
    155 155 
         <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
    156 156 
         <buildDate>${maven.build.timestamp}</buildDate>
    157 157
    158 
    -    <observeToolkitVersion>3.7.13</observeToolkitVersion>
    158 
    +    <observeToolkitVersion>3.7.14</observeToolkitVersion>
    159 159 
         <!--<lib.version.java4all.http>1.0.13</lib.version.java4all.http>-->
    160 160 
         <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
    161 161 
         <!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>-->
    ... ... @@ -164,7 +164,7 @@
    164 164 
         <!--can't use 1.4.197 (date has changed + blob also-->
    165 165 
         <lib.version.h2>1.4.196</lib.version.h2>
    166 166 
         <!--<lib.version.java4all.jaxx>3.0-alpha-47-SNAPSHOT</lib.version.java4all.jaxx>-->
    167 
    -    <!--<lib.version.java4all.i18n>4.0-beta-6-SNAPSHOT</lib.version.java4all.i18n>-->
    167 
    +    <!--<lib.version.java4all.i18n>4.0-beta-8-SNAPSHOT</lib.version.java4all.i18n>-->
    168 168
    169 169 
         <!--<lib.version.nuiton.topia>3.6-SNAPSHOT</lib.version.nuiton.topia>-->
    170 170 
         <!--<lib.version.java4all.eugene>3.0-alpha-21</lib.version.java4all.eugene>-->

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