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

Commits:

30 changed files:

Changes:

  • client-configuration/pom.xml
    ... ... @@ -130,9 +130,10 @@
    130 130
             <artifactId>i18n-maven-plugin</artifactId>
    
    131 131
             <executions>
    
    132 132
               <execution>
    
    133
    -            <id>generateI18nEnumHelper</id>
    
    134 133
                 <goals>
    
    135
    -              <goal>generateI18nEnumHelper</goal>
    
    134
    +              <goal>parse-java-enumerations</goal>
    
    135
    +              <goal>parse-java</goal>
    
    136
    +              <goal>generate</goal>
    
    136 137
                 </goals>
    
    137 138
                 <configuration>
    
    138 139
                   <enumerationSets>
    
    ... ... @@ -163,15 +164,6 @@
    163 164
                       </enums>
    
    164 165
                     </enumerationSet>
    
    165 166
                   </enumerationSets>
    
    166
    -            </configuration>
    
    167
    -          </execution>
    
    168
    -          <execution>
    
    169
    -            <id>scan-sources</id>
    
    170
    -            <goals>
    
    171
    -              <goal>parse-java</goal>
    
    172
    -              <goal>generate</goal>
    
    173
    -            </goals>
    
    174
    -            <configuration>
    
    175 167
                   <entries>
    
    176 168
                     <entry>
    
    177 169
                       <basedir>${project.build.directory}/generated-sources/java</basedir>
    

  • client/pom.xml
    ... ... @@ -718,9 +718,9 @@
    718 718
             <artifactId>i18n-maven-plugin</artifactId>
    
    719 719
             <executions>
    
    720 720
               <execution>
    
    721
    -            <id>generateI18nEnumHelper</id>
    
    721
    +            <id>default-parse-java-enumerations</id>
    
    722 722
                 <goals>
    
    723
    -              <goal>generateI18nEnumHelper</goal>
    
    723
    +              <goal>parse-java-enumerations</goal>
    
    724 724
                 </goals>
    
    725 725
                 <configuration>
    
    726 726
                   <enumerationSets>
    
    ... ... @@ -748,7 +748,7 @@
    748 748
                 </configuration>
    
    749 749
               </execution>
    
    750 750
               <execution>
    
    751
    -            <id>check-convergence</id>
    
    751
    +            <id>default-check-i18n-artifacts</id>
    
    752 752
                 <goals>
    
    753 753
                   <goal>check-i18n-artifacts</goal>
    
    754 754
                 </goals>
    
    ... ... @@ -760,16 +760,16 @@
    760 760
                   <goal>generate</goal>
    
    761 761
                 </goals>
    
    762 762
                 <configuration>
    
    763
    -              <entries>
    
    763
    +              <copyToClasses>false</copyToClasses>
    
    764
    +              <!--entries>
    
    764 765
                     <entry>
    
    765
    -                  <specificGoal>parse-java</specificGoal>
    
    766 766
                       <basedir>${project.build.directory}/generated-sources/java/</basedir>
    
    767 767
                     </entry>
    
    768
    -              </entries>
    
    768
    +              </entries-->
    
    769 769
                 </configuration>
    
    770 770
               </execution>
    
    771 771
               <execution>
    
    772
    -            <id>make-bundle</id>
    
    772
    +            <id>default-bundle</id>
    
    773 773
                 <goals>
    
    774 774
                   <goal>bundle</goal>
    
    775 775
                 </goals>
    

  • client/src/main/assembly/i18n.xml
    ... ... @@ -37,7 +37,7 @@
    37 37
         </fileSet>
    
    38 38
     
    
    39 39
         <fileSet>
    
    40
    -      <directory>target/generated-sources/resources/META-INF</directory>
    
    40
    +      <directory>target/classes/META-INF</directory>
    
    41 41
           <outputDirectory/>
    
    42 42
           <includes>
    
    43 43
             <include>observe-i18n*</include>
    

  • client/src/main/i18n/client_en_GB.properties
    ... ... @@ -354,7 +354,6 @@ observe.common.ActivityLonglineObsDto.message.nonForTrip=< No activity for curre
    354 354
     observe.common.ActivityLonglineObsDto.message.not.open=Activity is not opened, no edit possible.
    
    355 355
     observe.common.ActivityLonglineObsDto.message.updating=Updating an activity
    
    356 356
     observe.common.ActivityLonglineObsDto.timeStamp=timestamp
    
    357
    -observe.common.ActivityLonglineObsDto.titles=Activities
    
    358 357
     observe.common.ActivitySeineDto.action.addFloatingObject=Add FAD
    
    359 358
     observe.common.ActivitySeineDto.action.addFloatingObject.tip=Add a FAD to the activity
    
    360 359
     observe.common.ActivitySeineDto.action.addSet=Add a Set
    
    ... ... @@ -377,7 +376,6 @@ observe.common.ActivitySeineDto.message.not.open=Activity is not opened, no edit
    377 376
     observe.common.ActivitySeineDto.message.updating=Updating an activity
    
    378 377
     observe.common.ActivitySeineDto.observedSystemTab=Observed systems
    
    379 378
     observe.common.ActivitySeineDto.selectedObservedSystem=Selected observed systems
    
    380
    -observe.common.ActivitySeineDto.titles=Activities
    
    381 379
     observe.common.ActivitySeineDto.vesselActivitySeine.comment=Only activity of type %s allows you to fill a set.
    
    382 380
     observe.common.BaitsCompositionObsDto.action.create=Insert this bait
    
    383 381
     observe.common.BaitsCompositionObsDto.action.create.tip=Insert this bait
    
    ... ... @@ -487,7 +485,6 @@ observe.common.DataDto.action.reset.tip=Cancel modifications
    487 485
     observe.common.DataDto.action.reset.well.tip=Reset
    
    488 486
     observe.common.DataDto.action.resetTagNumber=Reset tag number
    
    489 487
     observe.common.DataDto.message.historical.data=Historical data (can be closed, even if not valid)
    
    490
    -observe.common.Dto.label.usage.data.title=Data '%1$s' (%2$d occurrences)
    
    491 488
     observe.common.Dto.label.usage.referential.title=Referentiel '%1$s' (%2$d occurrences)
    
    492 489
     observe.common.Dto.lastUpdateDate=Last update date
    
    493 490
     observe.common.Dto.technicalInformations=Technical information of %1$s
    
    ... ... @@ -827,7 +824,6 @@ observe.common.RouteDto.message.not.open=Current route is not open, no modificat
    827 824
     observe.common.RouteDto.message.updating=Route is in editing mode.
    
    828 825
     observe.common.RouteDto.noneForTrip=< No route fo current trip >
    
    829 826
     observe.common.RouteDto.title=Route
    
    830
    -observe.common.RouteDto.titles=Routes
    
    831 827
     observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Use default size measure type
    
    832 828
     observe.common.Sample.length.computed.tip=Length was computed
    
    833 829
     observe.common.Sample.length.observed.tip=Length was observed
    
    ... ... @@ -1006,7 +1002,6 @@ observe.common.TdrDto.dataLocation.tip=Data location
    1006 1002
     observe.common.TdrDto.delete.data.message=Confirm to delete saved data
    
    1007 1003
     observe.common.TdrDto.deleteData=Delete
    
    1008 1004
     observe.common.TdrDto.deleteData.tip=Delete data
    
    1009
    -observe.common.TdrDto.deployementStart=Deployement start
    
    1010 1005
     observe.common.TdrDto.enableTimestamp=Use timestamp
    
    1011 1006
     observe.common.TdrDto.enableTimestamp.tip=Use timestamp for this recorder
    
    1012 1007
     observe.common.TdrDto.exportData=Export
    
    ... ... @@ -1111,7 +1106,6 @@ observe.common.directory=Directory
    1111 1106
     observe.common.exist.on.remote=%1$s (already exist)
    
    1112 1107
     observe.common.file=File
    
    1113 1108
     observe.common.global.progression.description=Global progression
    
    1114
    -observe.common.label=Label
    
    1115 1109
     observe.common.ocean=Ocean
    
    1116 1110
     observe.common.operation.resume=Summary of operations
    
    1117 1111
     observe.common.resume=Summary
    
    ... ... @@ -1419,7 +1413,6 @@ observe.title.welcome.admin=ObServe
    1419 1413
     observe.type.activityLongline.unsaved=New activity
    
    1420 1414
     observe.type.activitySeine.unsaved=New activity
    
    1421 1415
     observe.type.floatingObject.unsaved=New DCP
    
    1422
    -observe.type.management=Management of %s
    
    1423 1416
     observe.type.reference.common=Common Referential
    
    1424 1417
     observe.type.reference.longline=Longline Referential
    
    1425 1418
     observe.type.reference.seine=Seine Referential
    
    ... ... @@ -1454,7 +1447,6 @@ observe.usage.usageTitle=Founded references
    1454 1447
     observe.validator.field.tip=Property '%1$s'
    
    1455 1448
     observe.validator.message.tip=Message\: %1$s
    
    1456 1449
     observe.validator.scope.tip=Message type\: '%1$s'
    
    1457
    -observe.view.message=Messages
    
    1458 1450
     observe.view.navigation=Navigation
    
    1459 1451
     observe.view.server=Local database in server mode
    
    1460 1452
     observe.warning.nimbus.landf=Could not use Look and Fell Nimbus, need at least version 1.6u10 of java.
    

  • client/src/main/i18n/client_es_ES.properties
    ... ... @@ -354,7 +354,6 @@ observe.common.ActivityLonglineObsDto.message.nonForTrip=< Ninguna actividad por
    354 354
     observe.common.ActivityLonglineObsDto.message.not.open=La actividad no está abierta, imposible modificar.
    
    355 355
     observe.common.ActivityLonglineObsDto.message.updating=Se está modificando la actividad actual.
    
    356 356
     observe.common.ActivityLonglineObsDto.timeStamp=Timestamp
    
    357
    -observe.common.ActivityLonglineObsDto.titles=Actividades
    
    358 357
     observe.common.ActivitySeineDto.action.addFloatingObject=Añadir un DCP
    
    359 358
     observe.common.ActivitySeineDto.action.addFloatingObject.tip=Añadir un objeto flotante a la actividad
    
    360 359
     observe.common.ActivitySeineDto.action.addSet=Añadir un lance
    
    ... ... @@ -377,7 +376,6 @@ observe.common.ActivitySeineDto.message.not.open=La actividad no está abierta,
    377 376
     observe.common.ActivitySeineDto.message.updating=Se está modificando la actividad actual.
    
    378 377
     observe.common.ActivitySeineDto.observedSystemTab=Sistema observado
    
    379 378
     observe.common.ActivitySeineDto.selectedObservedSystem=Sistemas observados seleccionados
    
    380
    -observe.common.ActivitySeineDto.titles=Actividades
    
    381 379
     observe.common.ActivitySeineDto.vesselActivitySeine.comment=Solo la actividad %1$s permite introducir un lance
    
    382 380
     observe.common.BaitsCompositionObsDto.action.create=Insertar este cebo
    
    383 381
     observe.common.BaitsCompositionObsDto.action.create.tip=Insertar este cebo
    
    ... ... @@ -487,7 +485,6 @@ observe.common.DataDto.action.reset.tip=Cancelar las modificaciones
    487 485
     observe.common.DataDto.action.reset.well.tip=Reiniciar
    
    488 486
     observe.common.DataDto.action.resetTagNumber=Réinitialiser le numéro d'échantillon \#TODO
    
    489 487
     observe.common.DataDto.message.historical.data=Datos históricos (puede cerrarse incluso sin validar)
    
    490
    -observe.common.Dto.label.usage.data.title=Datos '%1$s' (%2$d ocurrencias)
    
    491 488
     observe.common.Dto.label.usage.referential.title=Referencial '%1$s' (%2$d ocurrencias)
    
    492 489
     observe.common.Dto.lastUpdateDate=Last update date
    
    493 490
     observe.common.Dto.technicalInformations=Informaciones técnicas del referencial %1$s
    
    ... ... @@ -827,7 +824,6 @@ observe.common.RouteDto.message.not.open=la ruta actual no está abierta, no se
    827 824
     observe.common.RouteDto.message.updating=Se está modificando la ruta actual.
    
    828 825
     observe.common.RouteDto.noneForTrip=Ninguna ruta en la marea actual
    
    829 826
     observe.common.RouteDto.title=Ruta
    
    830
    -observe.common.RouteDto.titles=Rutas
    
    831 827
     observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Utiliser le type de mensuration par défaut \#TODO
    
    832 828
     observe.common.Sample.length.computed.tip=Longitud calculada
    
    833 829
     observe.common.Sample.length.observed.tip=Longitud observada
    
    ... ... @@ -1006,7 +1002,6 @@ observe.common.TdrDto.dataLocation.tip=ubicación del archivo de datos
    1006 1002
     observe.common.TdrDto.delete.data.message=Confirmar la eliminación del archivo de datos
    
    1007 1003
     observe.common.TdrDto.deleteData=Eliminar
    
    1008 1004
     observe.common.TdrDto.deleteData.tip=Eliminar el archivo de datos
    
    1009
    -observe.common.TdrDto.deployementStart=Inicio de despliegue
    
    1010 1005
     observe.common.TdrDto.enableTimestamp=Activar el timestamp
    
    1011 1006
     observe.common.TdrDto.enableTimestamp.tip=Activar el timestamp para este registrador
    
    1012 1007
     observe.common.TdrDto.exportData=Exportar
    
    ... ... @@ -1111,7 +1106,6 @@ observe.common.directory=Carpeta
    1111 1106
     observe.common.exist.on.remote=%1$s (ya existe)
    
    1112 1107
     observe.common.file=Archivo
    
    1113 1108
     observe.common.global.progression.description=Progresión global
    
    1114
    -observe.common.label=Texto
    
    1115 1109
     observe.common.ocean=Océano
    
    1116 1110
     observe.common.operation.resume=Resumen de operaciones
    
    1117 1111
     observe.common.resume=Resumen de la configuración
    
    ... ... @@ -1419,7 +1413,6 @@ observe.title.welcome.admin=ObServe
    1419 1413
     observe.type.activityLongline.unsaved=Nueva actividad
    
    1420 1414
     observe.type.activitySeine.unsaved=Nueva actividad
    
    1421 1415
     observe.type.floatingObject.unsaved=Nuevo DCP
    
    1422
    -observe.type.management=Gestión de %s
    
    1423 1416
     observe.type.reference.common=Referencial commun
    
    1424 1417
     observe.type.reference.longline=Referencial Palangre
    
    1425 1418
     observe.type.reference.seine=Referencial Senne
    
    ... ... @@ -1454,7 +1447,6 @@ observe.usage.usageTitle=Referencias encontradas
    1454 1447
     observe.validator.field.tip=Propriedad '%1$s'
    
    1455 1448
     observe.validator.message.tip=Mensaje \: %1$s
    
    1456 1449
     observe.validator.scope.tip=Tipo de mensaje \: '%1$s'
    
    1457
    -observe.view.message=Mensajes
    
    1458 1450
     observe.view.navigation=Navegación
    
    1459 1451
     observe.view.server=Base locale en modo servidor
    
    1460 1452
     observe.warning.nimbus.landf=El look and Feel Nimbus no fue encontrado, se necesita a minimo la versión 1.6u10 de java.
    

  • client/src/main/i18n/client_fr_FR.properties
    ... ... @@ -354,7 +354,6 @@ observe.common.ActivityLonglineObsDto.message.nonForTrip=< Aucune activité pour
    354 354
     observe.common.ActivityLonglineObsDto.message.not.open=L'opération de pêche n'est pas ouverte, aucune modification possible.
    
    355 355
     observe.common.ActivityLonglineObsDto.message.updating=L'activité est en cours de modification.
    
    356 356
     observe.common.ActivityLonglineObsDto.timeStamp=Horodatage
    
    357
    -observe.common.ActivityLonglineObsDto.titles=Activités
    
    358 357
     observe.common.ActivitySeineDto.action.addFloatingObject=Ajouter un DCP
    
    359 358
     observe.common.ActivitySeineDto.action.addFloatingObject.tip=Ajouter un objet flottant à l'activité
    
    360 359
     observe.common.ActivitySeineDto.action.addSet=Ajouter la calée
    
    ... ... @@ -377,7 +376,6 @@ observe.common.ActivitySeineDto.message.not.open=L'activité n'est pas ouverte,
    377 376
     observe.common.ActivitySeineDto.message.updating=L'activité est en cours de modification.
    
    378 377
     observe.common.ActivitySeineDto.observedSystemTab=Systèmes observés
    
    379 378
     observe.common.ActivitySeineDto.selectedObservedSystem=Systèmes observés sélectionnés
    
    380
    -observe.common.ActivitySeineDto.titles=Activités
    
    381 379
     observe.common.ActivitySeineDto.vesselActivitySeine.comment=Seule l'activité %1$s permet de saisir une calée.
    
    382 380
     observe.common.BaitsCompositionObsDto.action.create=Insérer cet appât
    
    383 381
     observe.common.BaitsCompositionObsDto.action.create.tip=Insérer cet appât
    
    ... ... @@ -487,7 +485,6 @@ observe.common.DataDto.action.reset.tip=Annuler les modifications
    487 485
     observe.common.DataDto.action.reset.well.tip=Réinitialiser
    
    488 486
     observe.common.DataDto.action.resetTagNumber=Réinitialiser le numéro d'échantillon
    
    489 487
     observe.common.DataDto.message.historical.data=Donnée historique (peut-être clôturé même si non valide)
    
    490
    -observe.common.Dto.label.usage.data.title=Donnée '%1$s' (%2$d occurrences)
    
    491 488
     observe.common.Dto.label.usage.referential.title=Référentiel '%1$s' (%2$d occurrences)
    
    492 489
     observe.common.Dto.lastUpdateDate=Date de dernière mise à jour
    
    493 490
     observe.common.Dto.technicalInformations=Informations techniques de l'objet de type '%1$s'
    
    ... ... @@ -827,7 +824,6 @@ observe.common.RouteDto.message.not.open=La route courante n'est pas ouverte, au
    827 824
     observe.common.RouteDto.message.updating=La route est en cours de modification.
    
    828 825
     observe.common.RouteDto.noneForTrip=< Aucune route pour la marée courante >
    
    829 826
     observe.common.RouteDto.title=Route
    
    830
    -observe.common.RouteDto.titles=Routes
    
    831 827
     observe.common.Sample.action.resetDefaultSizeMeasureType.tip=Utiliser le type de mensuration par défaut
    
    832 828
     observe.common.Sample.length.computed.tip=La longueur a été calculée
    
    833 829
     observe.common.Sample.length.observed.tip=La longueur a été observée
    
    ... ... @@ -1006,7 +1002,6 @@ observe.common.TdrDto.dataLocation.tip=Hébergement du fichier de données
    1006 1002
     observe.common.TdrDto.delete.data.message=Confirmer la suppression du fichier de données
    
    1007 1003
     observe.common.TdrDto.deleteData=Supprimer
    
    1008 1004
     observe.common.TdrDto.deleteData.tip=Supprimer le fichier de données
    
    1009
    -observe.common.TdrDto.deployementStart=Début déploiement
    
    1010 1005
     observe.common.TdrDto.enableTimestamp=Activer l'horodatage
    
    1011 1006
     observe.common.TdrDto.enableTimestamp.tip=Activer l'horodatage pour cet enregistreur
    
    1012 1007
     observe.common.TdrDto.exportData=Exporter
    
    ... ... @@ -1111,7 +1106,6 @@ observe.common.directory=Répertoire
    1111 1106
     observe.common.exist.on.remote=%1$s (déjà existante)
    
    1112 1107
     observe.common.file=Fichier
    
    1113 1108
     observe.common.global.progression.description=Progression globale
    
    1114
    -observe.common.label=Libellé
    
    1115 1109
     observe.common.ocean=Océan
    
    1116 1110
     observe.common.operation.resume=Résumé des opérations
    
    1117 1111
     observe.common.resume=Résumé de la configuration
    
    ... ... @@ -1419,7 +1413,6 @@ observe.title.welcome.admin=ObServe
    1419 1413
     observe.type.activityLongline.unsaved=Nouvelle activité
    
    1420 1414
     observe.type.activitySeine.unsaved=Nouvelle activité
    
    1421 1415
     observe.type.floatingObject.unsaved=Nouveau DCP
    
    1422
    -observe.type.management=Gestion des %s
    
    1423 1416
     observe.type.reference.common=Référentiel commun
    
    1424 1417
     observe.type.reference.longline=Référentiel Palangre
    
    1425 1418
     observe.type.reference.seine=Référentiel Senne
    
    ... ... @@ -1454,7 +1447,6 @@ observe.usage.usageTitle=Références trouvées
    1454 1447
     observe.validator.field.tip=Propriété '%1$s'
    
    1455 1448
     observe.validator.message.tip=Message \: %1$s
    
    1456 1449
     observe.validator.scope.tip=Type de message \: '%1$s'
    
    1457
    -observe.view.message=Messages
    
    1458 1450
     observe.view.navigation=Navigation
    
    1459 1451
     observe.view.server=Base locale en mode serveur
    
    1460 1452
     observe.warning.nimbus.landf=Le look and Feel Nimbus n'a pas été trouvé, il faut au moins la version 1.6u10 de java.
    

  • client/src/main/java/fr/ird/observe/client/form/FormUIApplicationContext.java
    ... ... @@ -67,7 +67,7 @@ public class FormUIApplicationContext {
    67 67
             return decoratorService.get();
    
    68 68
         }
    
    69 69
     
    
    70
    -    public NavigationTree getNavigation() {
    
    70
    +    public final NavigationTree getNavigation() {
    
    71 71
             return navigation.get();
    
    72 72
         }
    
    73 73
     }

  • client/src/main/java/fr/ird/observe/client/form/openlist/ObserveOpenDataListFormUIHandler.java
    ... ... @@ -115,7 +115,6 @@ public abstract class ObserveOpenDataListFormUIHandler<D extends OpenableDto, R
    115 115
     
    
    116 116
         @Override
    
    117 117
         protected void initialize(FormUIInitializerContext<U> initializerContext) {
    
    118
    -        validationManager = new FormUIValidationMessageManager(model.getBeanType(), ui);
    
    119 118
             super.initialize(initializerContext);
    
    120 119
     
    
    121 120
             OpenableDataDtoListCellRenderer<D, R> cellRenderer = new OpenableDataDtoListCellRenderer<>(ui.getList().getCellRenderer(), navigation);
    
    ... ... @@ -166,7 +165,7 @@ public abstract class ObserveOpenDataListFormUIHandler<D extends OpenableDto, R
    166 165
         @Override
    
    167 166
         public void onDataSelected(MouseEvent event) {
    
    168 167
             if (event.getClickCount() > 1) {
    
    169
    -            if (getModel().isOneSelectedData()) {
    
    168
    +            if (model.isOneSelectedData()) {
    
    170 169
                     gotoChild(ui.getSelectedData());
    
    171 170
                 }
    
    172 171
             }
    

  • client/src/main/java/fr/ird/observe/client/form/openlist/longline/ActivityLonglineObsListUI.jaxx
    ... ... @@ -48,7 +48,7 @@
    48 48
     
    
    49 49
       <ObserveMainUI id="mainUI"/>
    
    50 50
     
    
    51
    -  <ActivityLonglineObsListUIModel id='model' title='observe.common.ActivityLonglineObsDto.titles'
    
    51
    +  <ActivityLonglineObsListUIModel id='model' title='observe.common.ActivityLonglineObsDto.types'
    
    52 52
                                       listText='{n("observe.common.ActivityDto.list")}'
    
    53 53
                                       emptyListMessage='{n("observe.common.ActivityLonglineObsDto.message.nonForTrip")}'/>
    
    54 54
     
    

  • client/src/main/java/fr/ird/observe/client/form/openlist/longline/TripLonglineListUI.jaxx
    ... ... @@ -46,7 +46,7 @@
    46 46
       <ObserveMainUI id="mainUI"/>
    
    47 47
     
    
    48 48
       <TripLonglineListUIModel id='model'
    
    49
    -                           title='observe.common.TripLonglineDto.titles'
    
    49
    +                           title='observe.common.TripLonglineDto.types'
    
    50 50
                                listText='{n("observe.common.TripDto.list")}'
    
    51 51
                                emptyListMessage='{n("observe.common.TripDto.message.noneForTrip")}'/>
    
    52 52
     
    

  • client/src/main/java/fr/ird/observe/client/form/openlist/seine/ActivitySeineListUI.jaxx
    ... ... @@ -50,7 +50,7 @@
    50 50
       <ObserveMainUI id="mainUI"/>
    
    51 51
     
    
    52 52
       <ActivitySeineListUIModel id='model'
    
    53
    -                            title='observe.common.ActivitySeineDto.titles'
    
    53
    +                            title='observe.common.ActivitySeineDto.types'
    
    54 54
                                 listText='{n("observe.common.ActivityDto.list")}'
    
    55 55
                                 emptyListMessage='{n("observe.common.ActivitySeineDto.message.noneForRoute")}'/>
    
    56 56
     
    

  • client/src/main/java/fr/ird/observe/client/form/openlist/seine/RouteListUI.jaxx
    ... ... @@ -46,7 +46,7 @@
    46 46
     
    
    47 47
       <ObserveMainUI id="mainUI"/>
    
    48 48
     
    
    49
    -  <RouteListUIModel id='model' title='observe.common.RouteDto.titles'
    
    49
    +  <RouteListUIModel id='model' title='observe.common.RouteDto.types'
    
    50 50
                         listText='{n("observe.common.RouteDto.list")}'
    
    51 51
                         emptyListMessage='{n("observe.common.RouteDto.noneForTrip")}'/>
    
    52 52
     
    

  • client/src/main/java/fr/ird/observe/client/form/openlist/seine/TripSeineListUI.jaxx
    ... ... @@ -47,7 +47,7 @@
    47 47
       <ObserveMainUI id="mainUI"/>
    
    48 48
     
    
    49 49
       <TripSeineListUIModel id='model'
    
    50
    -                        title='observe.common.TripSeineDto.titles'
    
    50
    +                        title='observe.common.TripSeineDto.types'
    
    51 51
                             listText='{n("observe.common.TripDto.list")}'
    
    52 52
                             emptyListMessage='{n("observe.common.TripDto.message.noneForTrip")}'/>
    
    53 53
     
    

  • client/src/main/java/fr/ird/observe/client/form/table/ObserveDataTableFormUIHandler.java
    ... ... @@ -35,6 +35,8 @@ import fr.ird.observe.client.form.spi.ReferentialReferencesFilter;
    35 35
     import fr.ird.observe.client.form.spi.init.CoordinatesEditorInitializer;
    
    36 36
     import fr.ird.observe.client.form.spi.init.TabInfoInitializer;
    
    37 37
     import fr.ird.observe.client.form.table.longline.set.WeightMeasuresTableModel;
    
    38
    +import fr.ird.observe.client.spi.ClientDataContext;
    
    39
    +import fr.ird.observe.client.tree.navigation.nodes.NavigationTreeNodeSupport;
    
    38 40
     import fr.ird.observe.client.util.UIHelper;
    
    39 41
     import fr.ird.observe.client.util.table.EditableTableModelSupport;
    
    40 42
     import fr.ird.observe.client.util.table.InlineTableAutotSelectRowAndShowPopupAction;
    
    ... ... @@ -42,6 +44,7 @@ import fr.ird.observe.client.validation.ClientValidationContext;
    42 44
     import fr.ird.observe.dto.data.DataDto;
    
    43 45
     import fr.ird.observe.dto.data.DataListDto;
    
    44 46
     import fr.ird.observe.dto.data.seine.TargetCatchDto;
    
    47
    +import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper;
    
    45 48
     import fr.ird.observe.dto.referential.SpeciesReference;
    
    46 49
     import fr.ird.observe.dto.referential.seine.WeightCategoryReference;
    
    47 50
     import java.awt.BorderLayout;
    
    ... ... @@ -73,6 +76,7 @@ import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor;
    73 76
     import org.nuiton.jaxx.widgets.select.BeanListHeader;
    
    74 77
     
    
    75 78
     
    
    79
    +import static org.nuiton.i18n.I18n.n;
    
    76 80
     import static org.nuiton.i18n.I18n.t;
    
    77 81
     
    
    78 82
     /**
    
    ... ... @@ -135,14 +139,15 @@ public abstract class ObserveDataTableFormUIHandler<D extends DataDto, C extends
    135 139
     //
    
    136 140
     //    }
    
    137 141
     //
    
    142
    +
    
    138 143
     //    @Override
    
    139
    -//    public void computeUpdateMessages(ClientDataContext dataContext, FormUIValidationMessageManager validationManager) {
    
    140
    -//        String message = n("observe.entity.message.updating");
    
    141
    -//        NavigationTreeNodeSupport node = navigation.getSelectedNode();
    
    142
    -//        String entityLabel = ObserveI18nDecoratorHelper.getTypeI18nKey(node.getParent().getBeanType());
    
    143
    -//        message = t(message, t(entityLabel));
    
    144
    -//        validationManager.addInfoMessage(node.getParent().getBeanType(), message);
    
    145
    -//    }
    
    144
    +    public void computeUpdateMessages(ClientDataContext dataContext, FormUIValidationMessageManager validationManager) {
    
    145
    +        String message = n("observe.entity.message.updating");
    
    146
    +        NavigationTreeNodeSupport node = navigation.getSelectedNode();
    
    147
    +        String entityLabel = ObserveI18nDecoratorHelper.getTypeI18nKey(node.getParent().getDataType());
    
    148
    +        message = t(message, t(entityLabel));
    
    149
    +        validationManager.addInfoMessage(node.getParent().getDataType(), message);
    
    150
    +    }
    
    146 151
     //
    
    147 152
     //    @Override
    
    148 153
     //    public FormUIMode computeContentMode(ClientDataContext dataContext, OpenDtoManager openDataManager) {
    

  • client/src/main/java/fr/ird/observe/client/form/table/seine/catches/NonTargetCatchReleaseUIHandler.java
    ... ... @@ -58,6 +58,7 @@ import org.nuiton.jaxx.runtime.swing.JTables;
    58 58
     
    
    59 59
     import static fr.ird.observe.client.db.ObserveSwingDataSource.MAIN;
    
    60 60
     import static org.nuiton.i18n.I18n.n;
    
    61
    +import static org.nuiton.i18n.I18n.t;
    
    61 62
     
    
    62 63
     /**
    
    63 64
      * @author Tony Chemit - dev@tchemit.fr
    
    ... ... @@ -157,8 +158,8 @@ public class NonTargetCatchReleaseUIHandler extends ObserveDataTableFormUIHandle
    157 158
         }
    
    158 159
     
    
    159 160
     //    FIXME!!!
    
    160
    -//    @Override
    
    161
    -//    protected void loadEditBean(String beanId) {
    
    161
    +    @Override
    
    162
    +    protected void loadEditBean(String beanId) {
    
    162 163
     //        loadForm(beanId);
    
    163 164
     //
    
    164 165
     //        boolean showData = !model.getFormUIContext().getReferentialReferences(NonTargetCatchReleaseDto.PROPERTY_SPECIES).isEmpty();
    
    ... ... @@ -171,11 +172,11 @@ public class NonTargetCatchReleaseUIHandler extends ObserveDataTableFormUIHandle
    171 172
     //
    
    172 173
     //            validationManager.removeAllMessages();
    
    173 174
     //
    
    174
    -//            validationManager.addInfoMessage(
    
    175
    -//                    SetSeineDto.class,
    
    176
    -//                    t("observe.common.SetSeineDto.message.no.nonTargetCatchRelease"));
    
    175
    +            validationManager.addInfoMessage(
    
    176
    +                    SetSeineDto.class,
    
    177
    +                    t("observe.common.SetSeineDto.message.no.nonTargetCatchRelease"));
    
    177 178
     //        }
    
    178
    -//    }
    
    179
    +    }
    
    179 180
     
    
    180 181
         @Override
    
    181 182
         public void onSelectedRowChanged(int editingRow, NonTargetCatchReleaseDto bean, boolean create) {
    

  • client/src/main/java/fr/ird/observe/client/form/table/seine/samples/AbstractSampleUI.jcss
    ... ... @@ -99,7 +99,7 @@ JToolBar {
    99 99
       disabledIcon: {iconDataObserve};
    
    100 100
       icon: {iconDataCalcule};
    
    101 101
       enabled: {tableEditBean.isIsLengthComputed()};
    
    102
    -  toolTipText:{getLengthDataTip(tableEditBean.isIsLengthComputed())};
    
    102
    +  toolTipText:{TargetSampleUIHandler.getLengthDataTip(tableEditBean.isIsLengthComputed())};
    
    103 103
     }
    
    104 104
     
    
    105 105
     #weightLabel {
    
    ... ... @@ -115,7 +115,7 @@ JToolBar {
    115 115
       disabledIcon: {iconDataObserve};
    
    116 116
       icon: {iconDataCalcule};
    
    117 117
       enabled: {tableEditBean.isIsWeightComputed()};
    
    118
    -  toolTipText:{getWeightDataTip(tableEditBean.isIsWeightComputed())};
    
    118
    +  toolTipText:{TargetSampleUIHandler.getWeightDataTip(tableEditBean.isIsWeightComputed())};
    
    119 119
     }
    
    120 120
     
    
    121 121
     #comment {
    

  • client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUI.jaxx
    ... ... @@ -68,27 +68,6 @@
    68 68
       <ButtonGroup id='acquisitionModeGroup'
    
    69 69
                    onStateChanged='getHandler().updateAcquisitionMode((AcquisitionMode) acquisitionModeGroup.getSelectedValue())'/>
    
    70 70
     
    
    71
    -  <script><![CDATA[
    
    72
    -
    
    73
    -public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip");
    
    74
    -public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip");
    
    75
    -public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip");
    
    76
    -public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip");
    
    77
    -
    
    78
    -public String getWeightDataTip(boolean computed) {
    
    79
    -    return computed ? t(POIDS_COMPUTED_TIP) : t(POIDS_OBSERVED_TIP);
    
    80
    -}
    
    81
    -
    
    82
    -public String getLengthDataTip(boolean computed) {
    
    83
    -    return computed ? t(LONGUEUR_COMPUTED_TIP) : t(LONGUEUR_OBSERVED_TIP);
    
    84
    -}
    
    85
    -
    
    86
    -public String getSpeciesFauneTypeTaille(SpeciesReference species) {
    
    87
    -    return species == null ? t("observe.message.no.species.selected") : species.getSizeMeasureTypeId();
    
    88
    -}
    
    89
    -]]>
    
    90
    -  </script>
    
    91
    -
    
    92 71
       <JLabel id='hideFormInformation' styleClass="skipI18n"/>
    
    93 72
     
    
    94 73
       <Table id='editorPanel' fill='both' insets='1'>
    

  • client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUI.jcss
    ... ... @@ -47,7 +47,7 @@
    47 47
     
    
    48 48
     #speciesTypeTaille {
    
    49 49
       font-weight:"bold";
    
    50
    -  text:{getSpeciesFauneTypeTaille(tableEditBean.getSpecies())};
    
    50
    +  text:{TargetSampleUIHandler.getSpeciesFauneTypeTaille(tableEditBean.getSpecies())};
    
    51 51
     }
    
    52 52
     
    
    53 53
     #hideFormInformation {
    

  • client/src/main/java/fr/ird/observe/client/form/table/seine/samples/NonTargetSampleUIHandler.java
    ... ... @@ -24,12 +24,16 @@ package fr.ird.observe.client.form.table.seine.samples;
    24 24
     import com.google.common.collect.ImmutableMap;
    
    25 25
     import com.google.common.collect.Lists;
    
    26 26
     import fr.ird.observe.client.constants.AcquisitionMode;
    
    27
    +import fr.ird.observe.client.form.FormUIMode;
    
    27 28
     import fr.ird.observe.client.form.spi.ReferentialReferencesFilter;
    
    28 29
     import fr.ird.observe.client.form.table.ContentTableModel;
    
    29 30
     import fr.ird.observe.client.form.table.ObserveDataTableFormUIHandler;
    
    31
    +import fr.ird.observe.client.spi.ClientDataContext;
    
    32
    +import fr.ird.observe.client.spi.OpenDtoManager;
    
    30 33
     import fr.ird.observe.client.util.UIHelper;
    
    31 34
     import fr.ird.observe.dto.data.seine.NonTargetLengthDto;
    
    32 35
     import fr.ird.observe.dto.data.seine.NonTargetSampleDto;
    
    36
    +import fr.ird.observe.dto.data.seine.SetSeineDto;
    
    33 37
     import fr.ird.observe.dto.data.seine.TargetLengthDto;
    
    34 38
     import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet;
    
    35 39
     import fr.ird.observe.dto.referential.SexReference;
    
    ... ... @@ -48,6 +52,7 @@ import org.apache.commons.logging.LogFactory;
    48 52
     
    
    49 53
     
    
    50 54
     import static org.nuiton.i18n.I18n.n;
    
    55
    +import static org.nuiton.i18n.I18n.t;
    
    51 56
     
    
    52 57
     /**
    
    53 58
      * @author Tony Chemit - dev@tchemit.fr
    
    ... ... @@ -148,9 +153,9 @@ public class NonTargetSampleUIHandler extends ObserveDataTableFormUIHandler<NonT
    148 153
             UIHelper.setTableColumnRenderer(table, 7, renderer);
    
    149 154
         }
    
    150 155
     
    
    151
    -//    FIXME!!!
    
    156
    +    //    FIXME!!!
    
    152 157
     //    @Override
    
    153
    -//    public FormUIMode computeContentMode(ClientDataContext dataContext, OpenDtoManager openDataManager) {
    
    158
    +    public FormUIMode computeContentMode(ClientDataContext dataContext, OpenDtoManager openDataManager) {
    
    154 159
     //        FormUIMode mode = super.computeContentMode(dataContext, openDataManager);
    
    155 160
     //
    
    156 161
     //        String setId = dataContext.getSelectedSetId();
    
    ... ... @@ -164,10 +169,11 @@ public class NonTargetSampleUIHandler extends ObserveDataTableFormUIHandler<NonT
    164 169
     //            // on repasse en mode resteint car on ne peut pas éditer l'écran
    
    165 170
     //            mode = FormUIMode.READ;
    
    166 171
     //
    
    167
    -//            validationManager.addInfoMessage(SetSeineDto.class, t("observe.common.SetSeineDto.message.no.nonTargetDiscarded"));
    
    172
    +        validationManager.addInfoMessage(SetSeineDto.class, t("observe.common.SetSeineDto.message.no.nonTargetDiscarded"));
    
    168 173
     //        }
    
    169 174
     //        return mode;
    
    170
    -//    }
    
    175
    +        return null;
    
    176
    +    }
    
    171 177
     
    
    172 178
         @SuppressWarnings("unchecked")
    
    173 179
         @Override
    

  • client/src/main/java/fr/ird/observe/client/form/table/seine/samples/TargetSampleUI.jaxx
    ... ... @@ -64,22 +64,6 @@
    64 64
       <ButtonGroup id='acquisitionModeGroup'
    
    65 65
                    onStateChanged='TargetSampleUIHandler.updateAcquisitionMode(this, (AcquisitionMode) acquisitionModeGroup.getSelectedValue())'/>
    
    66 66
     
    
    67
    -  <script><![CDATA[
    
    68
    -
    
    69
    -public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip");
    
    70
    -public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip");
    
    71
    -public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip");
    
    72
    -public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip");
    
    73
    -
    
    74
    -public String getWeightDataTip(boolean computed) {
    
    75
    -    return computed ? t(POIDS_COMPUTED_TIP) : t(POIDS_OBSERVED_TIP);
    
    76
    -}
    
    77
    -
    
    78
    -public String getLengthDataTip(boolean computed) {
    
    79
    -    return computed ? t(LONGUEUR_COMPUTED_TIP) : t(LONGUEUR_OBSERVED_TIP);
    
    80
    -}
    
    81
    -]]>
    
    82
    -  </script>
    
    83 67
       <Table id='editorPanel' fill='both' insets='1'>
    
    84 68
     
    
    85 69
         <!-- mode de saisie -->
    

  • client/src/main/java/fr/ird/observe/client/form/table/seine/samples/TargetSampleUIHandler.java
    ... ... @@ -50,6 +50,7 @@ import org.apache.commons.logging.LogFactory;
    50 50
     
    
    51 51
     
    
    52 52
     import static org.nuiton.i18n.I18n.n;
    
    53
    +import static org.nuiton.i18n.I18n.t;
    
    53 54
     
    
    54 55
     /**
    
    55 56
      * @author Tony Chemit - dev@tchemit.fr
    
    ... ... @@ -60,6 +61,11 @@ public abstract class TargetSampleUIHandler<M extends ObserveDataTableFormUIMode
    60 61
         /** Logger */
    
    61 62
         private static final Log log = LogFactory.getLog(TargetSampleUIHandler.class);
    
    62 63
     
    
    64
    +    public static final String POIDS_COMPUTED_TIP = n("observe.common.Sample.weight.computed.tip");
    
    65
    +    public static final String POIDS_OBSERVED_TIP = n("observe.common.Sample.weight.observed.tip");
    
    66
    +    public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.Sample.length.computed.tip");
    
    67
    +    public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.Sample.length.observed.tip");
    
    68
    +
    
    63 69
         /**
    
    64 70
          * Ecoute les modifications de la propriété {@link TargetLengthDto#getWeight()},
    
    65 71
          * et repasser alors le flag {@link TargetLengthDto#isIsWeightComputed()} à
    
    ... ... @@ -332,4 +338,16 @@ public abstract class TargetSampleUIHandler<M extends ObserveDataTableFormUIMode
    332 338
             return result;
    
    333 339
         }
    
    334 340
     
    
    341
    +    public static String getWeightDataTip(boolean computed) {
    
    342
    +        return computed ? t(POIDS_COMPUTED_TIP) : t(POIDS_OBSERVED_TIP);
    
    343
    +    }
    
    344
    +
    
    345
    +    public static String getLengthDataTip(boolean computed) {
    
    346
    +        return computed ? t(LONGUEUR_COMPUTED_TIP) : t(LONGUEUR_OBSERVED_TIP);
    
    347
    +    }
    
    348
    +
    
    349
    +    public static String getSpeciesFauneTypeTaille(SpeciesReference species) {
    
    350
    +        return species == null ? t("observe.message.no.species.selected") : species.getSizeMeasureTypeId();
    
    351
    +    }
    
    352
    +
    
    335 353
     }

  • client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx
    ... ... @@ -39,6 +39,7 @@
    39 39
         javax.swing.JComboBox
    
    40 40
     
    
    41 41
         static fr.ird.observe.client.util.UIHelper.getStringValue
    
    42
    +    static org.nuiton.i18n.I18n.t
    
    42 43
       </import>
    
    43 44
     
    
    44 45
       <ReferentialSynchroUIHandler id='handler' initializer='getContextValue(ReferentialSynchroUIHandler.class)'/>
    

  • client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUI.jaxx
    ... ... @@ -48,21 +48,6 @@
    48 48
     
    
    49 49
       <CardLayout2Ext id='creationModeLayout' constructorParams='this, "creationModeContent"'/>
    
    50 50
     
    
    51
    -  <script><![CDATA[
    
    52
    -protected String updateMigrationPolicy(boolean canMigrate) {
    
    53
    -   if (canMigrate) {
    
    54
    -       return t("observe.storage.report.can.migrate", config.getModelVersion());
    
    55
    -   } else {
    
    56
    -       return t("observe.storage.report.can.not.migrate");
    
    57
    -   }
    
    58
    -}
    
    59
    -
    
    60
    -protected String updateCreationModeContent(DbMode mode) {
    
    61
    -    return mode == DbMode.CREATE_LOCAL ? "createMode" : "noCreateMode";
    
    62
    -}
    
    63
    -]]>
    
    64
    -  </script>
    
    65
    -
    
    66 51
       <JPanel id='content'>
    
    67 52
     
    
    68 53
         <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.NORTH'>
    

  • client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUI.jcss
    ... ... @@ -69,7 +69,7 @@
    69 69
     }
    
    70 70
     
    
    71 71
     #creationModeLayout {
    
    72
    -   selected:{updateCreationModeContent(model.getDbMode())};
    
    72
    +   selected:{handler.updateCreationModeContent(model.getDbMode())};
    
    73 73
     }
    
    74 74
     
    
    75 75
     #creationModeContent {
    
    ... ... @@ -130,7 +130,7 @@
    130 130
     }
    
    131 131
     
    
    132 132
     #migrationPolicy {
    
    133
    -   text:{updateMigrationPolicy(model.isCanMigrate())};
    
    133
    +   text:{handler.updateMigrationPolicy(model.isCanMigrate())};
    
    134 134
     }
    
    135 135
     
    
    136 136
     #showMigrationSql {
    

  • client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ChooseDbModeUIHandler.java
    ... ... @@ -25,6 +25,7 @@ package fr.ird.observe.client.ui.storage.tabs;
    25 25
     import fr.ird.observe.client.I18nEnumHelper;
    
    26 26
     import fr.ird.observe.client.ObserveClientApplicationContext;
    
    27 27
     import fr.ird.observe.client.constants.CreationMode;
    
    28
    +import fr.ird.observe.client.constants.DbMode;
    
    28 29
     import fr.ird.observe.client.tools.ObserveTextGenerator;
    
    29 30
     import fr.ird.observe.client.ui.storage.StorageStep;
    
    30 31
     import fr.ird.observe.client.ui.storage.StorageUIModel;
    
    ... ... @@ -97,4 +98,16 @@ public class ChooseDbModeUIHandler extends StorageTabUIHandler<ChooseDbModeUI> i
    97 98
             }
    
    98 99
             return visible;
    
    99 100
         }
    
    101
    +
    
    102
    +    String updateMigrationPolicy(boolean canMigrate) {
    
    103
    +        if (canMigrate) {
    
    104
    +            return t("observe.storage.report.can.migrate", ui.getConfig().getModelVersion());
    
    105
    +        } else {
    
    106
    +            return t("observe.storage.report.can.not.migrate");
    
    107
    +        }
    
    108
    +    }
    
    109
    +
    
    110
    +    String updateCreationModeContent(DbMode mode) {
    
    111
    +        return mode == DbMode.CREATE_LOCAL ? "createMode" : "noCreateMode";
    
    112
    +    }
    
    100 113
     }

  • client/src/main/java/fr/ird/observe/client/ui/storage/tabs/RolesUI.jaxx
    ... ... @@ -30,6 +30,8 @@
    30 30
         fr.ird.observe.client.ui.storage.tabs.SecurityModel
    
    31 31
         fr.ird.observe.client.ui.storage.StorageStep
    
    32 32
         fr.ird.observe.client.ui.storage.StorageUIModel
    
    33
    +
    
    34
    +    static org.nuiton.i18n.I18n.t
    
    33 35
       </import>
    
    34 36
     
    
    35 37
       <StorageStep id='step' initializer='StorageStep.ROLES'/>
    

  • dto/pom.xml
    ... ... @@ -249,9 +249,10 @@
    249 249
             <artifactId>i18n-maven-plugin</artifactId>
    
    250 250
             <executions>
    
    251 251
               <execution>
    
    252
    -            <id>generateI18nEnumHelper</id>
    
    253 252
                 <goals>
    
    254
    -              <goal>generateI18nEnumHelper</goal>
    
    253
    +              <goal>parse-java-enumerations</goal>
    
    254
    +              <goal>parse-java</goal>
    
    255
    +              <goal>generate</goal>
    
    255 256
                 </goals>
    
    256 257
                 <configuration>
    
    257 258
                   <enumerationSets>
    
    ... ... @@ -278,16 +279,6 @@
    278 279
                       </enums>
    
    279 280
                     </enumerationSet>
    
    280 281
                   </enumerationSets>
    
    281
    -            </configuration>
    
    282
    -          </execution>
    
    283
    -
    
    284
    -          <execution>
    
    285
    -            <id>scan-sources</id>
    
    286
    -            <goals>
    
    287
    -              <goal>parse-java</goal>
    
    288
    -              <goal>generate</goal>
    
    289
    -            </goals>
    
    290
    -            <configuration>
    
    291 282
                   <entries>
    
    292 283
                     <entry>
    
    293 284
                       <basedir>${project.build.directory}/generated-sources/java</basedir>
    

  • pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>io.ultreia.maven</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>2017.34</version>
    
    29
    +    <version>2017.36</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <groupId>fr.ird.observe</groupId>
    
    ... ... @@ -132,7 +132,7 @@
    132 132
       <distributionManagement>
    
    133 133
         <site>
    
    134 134
           <id>gitlab.com</id>
    
    135
    -      <url>scm:git:http://git@gitlab.com/${projectPath}.git</url>
    
    135
    +      <url>scm:git:https://git@gitlab.com/${projectPath}.git</url>
    
    136 136
         </site>
    
    137 137
       </distributionManagement>
    
    138 138
     
    
    ... ... @@ -156,7 +156,8 @@
    156 156
         <eugenePluginVersion>3.0-alpha-16</eugenePluginVersion>
    
    157 157
         <processorPluginVersion>1.3</processorPluginVersion>
    
    158 158
     
    
    159
    -    <nuitonI18nVersion>4.0-alpha-5-SNAPSHOT</nuitonI18nVersion>
    
    159
    +    <jaxx.version>3.0-alpha-17</jaxx.version>
    
    160
    +    <i18n.version>4.0-alpha-6</i18n.version>
    
    160 161
         <nuitonConfigVersion>3.3</nuitonConfigVersion>
    
    161 162
         <topiaVersion>3.3</topiaVersion>
    
    162 163
         <nuitonValidatorVersion>3.1</nuitonValidatorVersion>
    
    ... ... @@ -423,7 +424,7 @@
    423 424
           <dependency>
    
    424 425
             <groupId>io.ultreia.java4all.i18n</groupId>
    
    425 426
             <artifactId>i18n-api</artifactId>
    
    426
    -        <version>${nuitonI18nVersion}</version>
    
    427
    +        <version>${i18n.version}</version>
    
    427 428
             <scope>compile</scope>
    
    428 429
             <exclusions>
    
    429 430
               <exclusion>
    
    ... ... @@ -435,7 +436,7 @@
    435 436
           <dependency>
    
    436 437
             <groupId>io.ultreia.java4all.i18n</groupId>
    
    437 438
             <artifactId>i18n-editor</artifactId>
    
    438
    -        <version>${nuitonI18nVersion}</version>
    
    439
    +        <version>${i18n.version}</version>
    
    439 440
             <scope>compile</scope>
    
    440 441
           </dependency>
    
    441 442
     
    
    ... ... @@ -835,7 +836,7 @@
    835 836
             <plugin>
    
    836 837
               <groupId>io.ultreia.java4all.i18n</groupId>
    
    837 838
               <artifactId>i18n-maven-plugin</artifactId>
    
    838
    -          <version>${nuitonI18nVersion}</version>
    
    839
    +          <version>${i18n.version}</version>
    
    839 840
             </plugin>
    
    840 841
     
    
    841 842
             <plugin>
    

  • services-client/pom.xml
    ... ... @@ -50,12 +50,6 @@
    50 50
         </dependency>
    
    51 51
         <dependency>
    
    52 52
           <groupId>${project.groupId}</groupId>
    
    53
    -      <artifactId>validation</artifactId>
    
    54
    -      <version>${project.version}</version>
    
    55
    -      <scope>compile</scope>
    
    56
    -    </dependency>
    
    57
    -    <dependency>
    
    58
    -      <groupId>${project.groupId}</groupId>
    
    59 53
           <artifactId>test</artifactId>
    
    60 54
           <version>${project.version}</version>
    
    61 55
           <scope>test</scope>
    

  • validation/pom.xml
    ... ... @@ -43,11 +43,6 @@
    43 43
           <artifactId>dto</artifactId>
    
    44 44
           <version>${project.version}</version>
    
    45 45
         </dependency>
    
    46
    -    <!--dependency>
    
    47
    -      <groupId>${project.groupId}</groupId>
    
    48
    -      <artifactId>services</artifactId>
    
    49
    -      <version>${project.version}</version>
    
    50
    -    </dependency-->
    
    51 46
         <dependency>
    
    52 47
           <groupId>${project.groupId}</groupId>
    
    53 48
           <artifactId>test</artifactId>
    
    ... ... @@ -156,6 +151,7 @@
    156 151
     
    
    157 152
         <plugins>
    
    158 153
     
    
    154
    +
    
    159 155
           <plugin>
    
    160 156
             <groupId>fr.ird.observe.toolkit</groupId>
    
    161 157
             <artifactId>toolbox-maven-plugin</artifactId>
    
    ... ... @@ -165,27 +161,6 @@
    165 161
             </configuration>
    
    166 162
             <executions>
    
    167 163
               <execution>
    
    168
    -            <id>generate-i18n-validator-fields</id>
    
    169
    -            <goals>
    
    170
    -              <goal>generate-i18n-validator-fields</goal>
    
    171
    -            </goals>
    
    172
    -            <configuration>
    
    173
    -              <className>ClientI18nValidatorHelper</className>
    
    174
    -              <prefix>observe.common.</prefix>
    
    175
    -              <validatorsFile>${project.basedir}/main/resources/validators.xml</validatorsFile>
    
    176
    -              <sourceRoot>../validation/src/main/resources</sourceRoot>
    
    177
    -              <inheritanceMapping>
    
    178
    -                <fr.ird.observe.dto.referential.I18nReferentialDto>
    
    179
    -                  label1,label2,label3,label4,label5,label6,label7,label8
    
    180
    -                </fr.ird.observe.dto.referential.I18nReferentialDto>
    
    181
    -                <fr.ird.observe.dto.referential.ReferentialDto>
    
    182
    -                  code,status,uri,needComment
    
    183
    -                </fr.ird.observe.dto.referential.ReferentialDto>
    
    184
    -              </inheritanceMapping>
    
    185
    -            </configuration>
    
    186
    -          </execution>
    
    187
    -          <execution>
    
    188
    -            <id>generate-validators-descriptor</id>
    
    189 164
                 <goals>
    
    190 165
                   <goal>generate-validators-descriptor</goal>
    
    191 166
                 </goals>
    
    ... ... @@ -215,17 +190,32 @@
    215 190
             <artifactId>i18n-maven-plugin</artifactId>
    
    216 191
             <executions>
    
    217 192
               <execution>
    
    218
    -            <phase>process-classes</phase>
    
    219 193
                 <goals>
    
    220 194
                   <goal>parse-java</goal>
    
    221
    -              <goal>parse-validation</goal>
    
    195
    +              <goal>parse-validation-fields</goal>
    
    196
    +              <goal>parse-validation-messages</goal>
    
    222 197
                   <goal>generate</goal>
    
    223 198
                 </goals>
    
    224 199
                 <configuration>
    
    225
    -              <force>true</force>
    
    200
    +              <validationFieldPrefix>observe.common.</validationFieldPrefix>
    
    201
    +              <inheritanceMapping>
    
    202
    +                <fr.ird.observe.dto.referential.I18nReferentialDto>
    
    203
    +                  label1,label2,label3,label4,label5,label6,label7,label8
    
    204
    +                </fr.ird.observe.dto.referential.I18nReferentialDto>
    
    205
    +                <fr.ird.observe.dto.referential.ReferentialDto>
    
    206
    +                  code,status,uri,needComment
    
    207
    +                </fr.ird.observe.dto.referential.ReferentialDto>
    
    208
    +              </inheritanceMapping>
    
    226 209
                 </configuration>
    
    227 210
               </execution>
    
    228 211
             </executions>
    
    212
    +        <dependencies>
    
    213
    +          <dependency>
    
    214
    +            <groupId>${project.groupId}</groupId>
    
    215
    +            <artifactId>dto</artifactId>
    
    216
    +            <version>${project.version}</version>
    
    217
    +          </dependency>
    
    218
    +        </dependencies>
    
    229 219
           </plugin>
    
    230 220
     
    
    231 221
         </plugins>