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

Commits:

23 changed files:

Changes:

  • t3-actions/src/main/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.java
    ... ... @@ -160,7 +160,7 @@ public class AnalyzeInputSourceAction extends T3Action<AnalyzeInputSourceConfigu
    160 160 
                 LoadingTripHitModel hitModel = new LoadingTripHitModel();
    161 161 
                 hitModel.addPropertyChangeListener(LoadingTripHitModel.NB_TRIP_LOADED, evt -> incrementsProgression());
    162 162 
                 TripType tripType = getConfiguration().getTripType();
    163 
    -            boolean samplesOnly = tripType == TripType.SAMPLES_ONLY;
    163 
    +            boolean samplesOnly = tripType == TripType.SAMPLEONLY;
    164 164 
                 tripsLoaded = inputPilot.loadTrips(hitModel);
    165 165 
                 boolean createVessel = getConfiguration().isCanCreateVessel();
    166 166 
                 Map<Integer, Vessel> vessels = null;

  • t3-actions/src/main/java/fr/ird/t3/actions/io/input/it/AnalyzeInputSourceActionITSupport.java
    ... ... @@ -120,7 +120,7 @@ public abstract class AnalyzeInputSourceActionITSupport {
    120 120 
                     fixture.nbUnsafe(),
    121 121 
                     fixture.nbSafeWithoutWell(),
    122 122 
                     fixture.nbUnsafeWithoutwell(),
    123 
    -                TripType.NORMAL,
    123 
    +                TripType.STANDARD,
    124 124 
                     false,
    125 125 
                     false
    126 126 
             );
    ... ... @@ -136,7 +136,7 @@ public abstract class AnalyzeInputSourceActionITSupport {
    136 136 
                     nbUnsafe,
    137 137 
                     nbSafeWithoutwell,
    138 138 
                     nbUnsafeWithoutWell,
    139 
    -                TripType.NORMAL,
    139 
    +                TripType.STANDARD,
    140 140 
                     false,
    141 141 
                     false
    142 142 
             );

  • t3-actions/src/main/java/fr/ird/t3/actions/io/input/it/ImportInputSourceActionITSupport.java
    ... ... @@ -89,11 +89,11 @@ public abstract class ImportInputSourceActionITSupport {
    89 89 
         }
    90 90
    91 91 
         public void testExecute(OceanFixtures fixtures) throws Exception {
    92 
    -        testExecute(fixtures.nbSafeWithoutWell(), fixtures.nbUnsafeWithoutwell(), TripType.NORMAL, false, false);
    92 
    +        testExecute(fixtures.nbSafeWithoutWell(), fixtures.nbUnsafeWithoutwell(), TripType.STANDARD, false, false);
    93 93 
         }
    94 94
    95 95 
         public void testExecute(int nbSafe, int nbUnsafe) throws Exception {
    96 
    -        testExecute(nbSafe, nbUnsafe, TripType.NORMAL, false, false);
    96 
    +        testExecute(nbSafe, nbUnsafe, TripType.STANDARD, false, false);
    97 97 
         }
    98 98
    99 99 
         public void testExecute(int nbSafe, int nbUnsafe,

  • t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/AnalyzeInputSourceActionTestSupport.java
    ... ... @@ -91,7 +91,7 @@ public abstract class AnalyzeInputSourceActionTestSupport {
    91 91 
         }
    92 92
    93 93 
         protected void testExecute(OceanFixtures fixture) throws Exception {
    94 
    -        testExecute(fixture, TripType.NORMAL);
    94 
    +        testExecute(fixture, TripType.STANDARD);
    95 95 
         }
    96 96
    97 97 
         protected void testExecute(OceanFixtures fixture, TripType tripType) throws Exception {

  • t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/ImportInputSourceActionTestSupport.java
    ... ... @@ -81,7 +81,7 @@ public abstract class ImportInputSourceActionTestSupport {
    81 81 
         }
    82 82
    83 83 
         protected void testExecute(OceanFixtures fixture) throws Exception {
    84 
    -        testExecute(fixture, TripType.NORMAL);
    84 
    +        testExecute(fixture, TripType.STANDARD);
    85 85 
         }
    86 86
    87 87 
         protected void testExecute(OceanFixtures fixture, TripType tripType) throws Exception {

  • t3-actions/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionResumeTest.java
    ... ... @@ -50,7 +50,7 @@ public class AnalyzeInputSourceActionResumeTest extends AbstractActionResumeTest
    50 50 
         protected void prepareConfiguration(AnalyzeInputSourceConfiguration conf) {
    51 51 
             configuration.setInputFile(new File("inputSource"));
    52 52 
             configuration.setUseWells(true);
    53 
    -        configuration.setTripType(TripType.NORMAL);
    53 
    +        configuration.setTripType(TripType.STANDARD);
    54 54 
             configuration.setInputProvider(serviceContext.newService(T3InputService.class).getProviders()[0]);
    55 55 
             configuration.setCanCreateVessel(true);
    56 56 
             configuration.setCreateVirtualVessel(true);

  • t3-actions/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionResumeTest.java
    ... ... @@ -48,7 +48,7 @@ public class ImportInputSourceActionResumeTest extends AbstractActionResumeTest<
    48 48 
         protected void prepareConfiguration(ImportInputSourceConfiguration conf) {
    49 49 
             configuration.setInputFile(new File("inputSource"));
    50 50 
             configuration.setUseWells(true);
    51 
    -        configuration.setTripType(TripType.NORMAL);
    51 
    +        configuration.setTripType(TripType.STANDARD);
    52 52 
             configuration.setInputProvider(serviceContext.newService(T3InputService.class).getProviders()[0]);
    53 53 
             configuration.setCanCreateVessel(true);
    54 54 
             configuration.setCreateVirtualVessel(true);

  • t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractTripTopiaDao.java
    ... ... @@ -80,9 +80,9 @@ public class AbstractTripTopiaDao<E extends Trip> extends GeneratedTripTopiaDao<
    80 80 
                 return "";
    81 81 
             }
    82 82 
             if (samplesOnly) {
    83 
    -            return " " + prefix + " t.tripType = 'SAMPLES_ONLY'";
    83 
    +            return " " + prefix + " t.tripType = 'SAMPLEONLY'";
    84 84 
             }
    85 
    -        return " " + prefix + " t.tripType != 'SAMPLES_ONLY'";
    85 
    +        return " " + prefix + " t.tripType != 'SAMPLEONLY'";
    86 86 
         }
    87 87
    88 88 
         public static <E extends Trip> Collection<E> getAllTripsWithNoDataComputed(Collection<E> trips) {

  • t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java
    ... ... @@ -83,12 +83,12 @@ public class TripImpl extends TripAbstract {
    83 83
    84 84 
         @Override
    85 85 
         public boolean isSamplesOnly() {
    86 
    -        return TripType.SAMPLES_ONLY == getTripType();
    86 
    +        return TripType.SAMPLEONLY == getTripType();
    87 87 
         }
    88 88
    89 89 
         @Override
    90 90 
         public boolean isWithoutLogbook() {
    91 
    -        return TripType.WITHOUT_LOGBOOK == getTripType();
    91 
    +        return TripType.LOGBOOKMISSING == getTripType();
    92 92 
         }
    93 93
    94 94 
         public boolean isLevel2Computed() {

  • t3-domain/src/main/java/fr/ird/t3/entities/data/TripType.java
    ... ... @@ -26,9 +26,9 @@ import fr.ird.t3.t3.domain.I18nEnumHelper;
    26 26 
     import static org.nuiton.i18n.I18n.t;
    27 27
    28 28 
     public enum TripType {
    29 
    -    NORMAL,
    30 
    -    SAMPLES_ONLY,
    31 
    -    WITHOUT_LOGBOOK;
    29 
    +    STANDARD,
    30 
    +    SAMPLEONLY,
    31 
    +    LOGBOOKMISSING;
    32 32
    33 33 
         public String getLabel() {
    34 34 
             return I18nEnumHelper.getLabel(this);

  • t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3InputMSAccess.java
    ... ... @@ -91,8 +91,8 @@ public abstract class AbstractT3InputMSAccess implements T3Input {
    91 91 
             T3AccessHitModel hitModel = new T3AccessHitModel();
    92 92 
             hitModel.addPropertyChangeListener(new LoadDbPropertyChangeListener(t3DataTypes));
    93 93 
             // analyse data source
    94 
    -        if (configuration.getTripType() == TripType.WITHOUT_LOGBOOK) {
    95 
    -            dataSource.analyzeDb(TripType.WITHOUT_LOGBOOK, hitModel);
    94 
    +        if (configuration.getTripType() == TripType.LOGBOOKMISSING) {
    95 
    +            dataSource.analyzeDb(TripType.LOGBOOKMISSING, hitModel);
    96 96 
             } else {
    97 97 
                 dataSource.analyzeDb(hitModel);
    98 98 
             }

  • t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java
    ... ... @@ -144,11 +144,11 @@ public class T3AccessDataSource extends AbstractAccessDataSource<T3EntityEnum, T
    144 144 
                     // on ne veut charger que les données observateurs, pas le referentiel
    145 145 
                     continue;
    146 146 
                 }
    147 
    -            if (TripType.WITHOUT_LOGBOOK == tripType && meta.getType() == T3EntityEnum.Activity) {
    147 
    +            if (TripType.LOGBOOKMISSING == tripType && meta.getType() == T3EntityEnum.Activity) {
    148 148 
                     //FIXME-116 Just to test remove this ASAP
    149 149 
                     cache.put(meta, new Map[]{});
    150 150 
                 }
    151 
    -            if (TripType.WITHOUT_LOGBOOK == tripType && meta.getType() == T3EntityEnum.WellPlan) {
    151 
    +            if (TripType.LOGBOOKMISSING == tripType && meta.getType() == T3EntityEnum.WellPlan) {
    152 152 
                     //FIXME-116 Just to test remove this ASAP
    153 153 
                     cache.put(meta, new Map[]{});
    154 154 
                 }

  • t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AvdthDataEntityVisitor.java
    ... ... @@ -63,7 +63,7 @@ public abstract class T3AvdthDataEntityVisitor extends T3DataEntityVisitor {
    63 63 
             super(dataSource, referentiel);
    64 64 
             wellPlanReverse = newReverseAssociationGetter(Trip.class, WellPlan.class, Activity.class, Trip.PROPERTY_ACTIVITY, WellPlan.PROPERTY_ACTIVITY);
    65 65 
             sampleReverse = newReverseAssociationGetter(Trip.class, Sample.class, Well.class, Trip.PROPERTY_WELL, Sample.PROPERTY_WELL);
    66 
    -        if (TripType.WITHOUT_LOGBOOK == configuration.getTripType()) {
    66 
    +        if (TripType.LOGBOOKMISSING == configuration.getTripType()) {
    67 67 
                 sampleSetReverse = new ReverseAssociationGetter<Trip, SampleSet, Activity>(Trip.class, SampleSet.class, Activity.class, Trip.PROPERTY_ACTIVITY, SampleSet.PROPERTY_ACTIVITY) {
    68 68 
                     @Override
    69 69 
                     void onReverseNotFound(Trip parent, T3AccessEntity entity, Object[] pKey) {

  • t3-domain/src/main/resources/db/migration/V2_3_01_add-Trip-tripType.sql
    ... ... @@ -18,7 +18,7 @@
    18 18 
     -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
    19 19 
     -- #L%
    20 20 
     ---
    21 
    -ALTER TABLE Trip ADD COLUMN tripType VARCHAR(255) DEFAULT 'NORMAL' NOT NULL;
    22 
    -UPDATE Trip set tripType = 'SAMPLES_ONLY' WHERE samplesonly = TRUE;
    21 
    +ALTER TABLE Trip ADD COLUMN tripType VARCHAR(255) DEFAULT 'STANDARD' NOT NULL;
    22 
    +UPDATE Trip set tripType = 'SAMPLEONLY' WHERE samplesonly = TRUE;
    23 23 
     CREATE INDEX idx_trip_tripType ON Trip(tripType);
    24 24 
     ALTER TABLE Trip DROP COLUMN  samplesonly;
    \ No newline at end of file

  • t3-domain/src/main/resources/i18n/t3-domain_en_GB.properties
    ... ... @@ -162,9 +162,9 @@ t3.config.rfTot.maximum.description=Default maximum acceptable for rfTot
    162 162 
     t3.config.stratum.weightRatio.description=Default weight ratio to accept while building level 2 or 3 stratum
    163 163 
     t3.config.treatment.working.directory.description=Location of treatment directory
    164 164 
     t3.config.users.file.description=Application users file
    165 
    -t3.enum.fr.ird.t3.entities.data.TripType.NORMAL=Normal
    166 
    -t3.enum.fr.ird.t3.entities.data.TripType.SAMPLES_ONLY=Samples only
    167 
    -t3.enum.fr.ird.t3.entities.data.TripType.WITHOUT_LOGBOOK=Without Logbook
    165 
    +t3.enum.fr.ird.t3.entities.data.TripType.LOGBOOKMISSING=Without Logbook
    166 
    +t3.enum.fr.ird.t3.entities.data.TripType.SAMPLEONLY=Samples only
    167 
    +t3.enum.fr.ird.t3.entities.data.TripType.STANDARD=Standard
    168 168 
     t3.output.operations=Operations
    169 169 
     t3.output.outputProvider=Output Pilot
    170 170 
     t3.user.log.directory.description=Location of directory where to store user logs

  • t3-domain/src/main/resources/i18n/t3-domain_fr_FR.properties
    ... ... @@ -162,9 +162,9 @@ t3.config.rfTot.maximum.description=Seuil maximum acceptable pour le calcul du r
    162 162 
     t3.config.stratum.weightRatio.description=Ratio du poids capturé / celui échantillonné acceptable dans une strate échantillon
    163 163 
     t3.config.treatment.working.directory.description=Répertoire de travail
    164 164 
     t3.config.users.file.description=Fichier contenant les utilisateurs de l'application
    165 
    -t3.enum.fr.ird.t3.entities.data.TripType.NORMAL=Normal
    166 
    -t3.enum.fr.ird.t3.entities.data.TripType.SAMPLES_ONLY=Echantillons uniquement
    167 
    -t3.enum.fr.ird.t3.entities.data.TripType.WITHOUT_LOGBOOK=Sans logbook
    165 
    +t3.enum.fr.ird.t3.entities.data.TripType.LOGBOOKMISSING=Sans logbook
    166 
    +t3.enum.fr.ird.t3.entities.data.TripType.SAMPLEONLY=Echantillons uniquement
    167 
    +t3.enum.fr.ird.t3.entities.data.TripType.STANDARD=Standard
    168 168 
     t3.output.operations=Opérations
    169 169 
     t3.output.outputProvider=Pilote de sortie
    170 170 
     t3.user.log.directory.description=Répertoire où sont conservés les logs des utilisateurs

  • t3-domain/src/main/xmi/t3-persistence.zargo
    No preview for this file type
  • t3-domain/src/test/java/fr/ird/t3/entities/data/TripTopiaDaoTest.java
    ... ... @@ -59,8 +59,8 @@ public class TripTopiaDaoTest extends AbstractDatabaseTest {
    59 59 
             T3Date startDate = T3Date.newDate(1, 2010);
    60 60 
             T3Date endDate = T3Date.newDate(1, 2011);
    61 61
    62 
    -        Trip trip = T3PersistenceFixtures.newTrip(tx, 0, startDate.toBeginDate(), TripType.NORMAL);
    63 
    -        Trip trip1 = T3PersistenceFixtures.newTrip(tx, 1, endDate.toBeginDate(), TripType.SAMPLES_ONLY);
    62 
    +        Trip trip = T3PersistenceFixtures.newTrip(tx, 0, startDate.toBeginDate(), TripType.STANDARD);
    63 
    +        Trip trip1 = T3PersistenceFixtures.newTrip(tx, 1, endDate.toBeginDate(), TripType.SAMPLEONLY);
    64 64
    65 65 
             List<Trip> result;
    66 66

  • t3-input-avdthv33/src/test/java/fr/ird/t3/actions/io/input/it/AnalyzeInputSourceActionIT.java
    ... ... @@ -131,7 +131,7 @@ public class AnalyzeInputSourceActionIT implements T3AVDTHV33Test {
    131 131 
                     nbUnsafe,
    132 132 
                     nbSafeWithoutWell,
    133 133 
                     nbUnsafeWithoutWell,
    134 
    -                TripType.NORMAL,
    134 
    +                TripType.STANDARD,
    135 135 
                     false,
    136 136 
                     false
    137 137 
             );
    ... ... @@ -355,30 +355,30 @@ public class AnalyzeInputSourceActionIT implements T3AVDTHV33Test {
    355 355 
         @Test
    356 356 
         @Override
    357 357 
         public void testExecute_ESATL_2006() throws Exception {
    358 
    -        testExecute(70, 27, 97, 0, TripType.SAMPLES_ONLY, true, true);
    358 
    +        testExecute(70, 27, 97, 0, TripType.SAMPLEONLY, true, true);
    359 359 
         }
    360 360
    361 361 
         @Test
    362 362 
         @Override
    363 363 
         public void testExecute_ESATL_2007() throws Exception {
    364 
    -        testExecute(273, 27, 238, 0, TripType.SAMPLES_ONLY, true, true);
    364 
    +        testExecute(273, 27, 238, 0, TripType.SAMPLEONLY, true, true);
    365 365 
         }
    366 366
    367 367 
         @Test
    368 368 
         @Override
    369 369 
         public void testExecute_ESATL_2008() throws Exception {
    370 
    -        testExecute(46, 14, 60, 0, TripType.SAMPLES_ONLY, true, true);
    370 
    +        testExecute(46, 14, 60, 0, TripType.SAMPLEONLY, true, true);
    371 371 
         }
    372 372
    373 373 
         @Test
    374 374 
         @Override
    375 375 
         public void testExecute_ESATL_2009() throws Exception {
    376 
    -        testExecute(64, 21, 85, 0, TripType.SAMPLES_ONLY, true, true);
    376 
    +        testExecute(64, 21, 85, 0, TripType.SAMPLEONLY, true, true);
    377 377 
         }
    378 378
    379 379 
         @Test
    380 380 
         @Override
    381 381 
         public void testExecute_ESATL_2010() throws Exception {
    382 
    -        testExecute(75, 13, 80, 8, TripType.SAMPLES_ONLY, true, true);
    382 
    +        testExecute(75, 13, 80, 8, TripType.SAMPLEONLY, true, true);
    383 383 
         }
    384 384 
     }

  • t3-input-avdthv33/src/test/java/fr/ird/t3/actions/io/input/it/ImportInputSourceActionIT.java
    ... ... @@ -104,7 +104,7 @@ public class ImportInputSourceActionIT implements T3AVDTHV33Test {
    104 104 
         }
    105 105
    106 106 
         public void testExecute(int nbSafe, int nbUnsafe) throws Exception {
    107 
    -        testExecute(nbSafe, nbUnsafe, TripType.NORMAL, false, false);
    107 
    +        testExecute(nbSafe, nbUnsafe, TripType.STANDARD, false, false);
    108 108 
         }
    109 109
    110 110 
         public void testExecute(int nbSafe, int nbUnsafe,
    ... ... @@ -314,30 +314,30 @@ public class ImportInputSourceActionIT implements T3AVDTHV33Test {
    314 314 
         @Test
    315 315 
         @Override
    316 316 
         public void testExecute_ESATL_2006() throws Exception {
    317 
    -        testExecute(70, 27, TripType.SAMPLES_ONLY, true, true);
    317 
    +        testExecute(70, 27, TripType.SAMPLEONLY, true, true);
    318 318 
         }
    319 319
    320 320 
         @Test
    321 321 
         @Override
    322 322 
         public void testExecute_ESATL_2007() throws Exception {
    323 
    -        testExecute(53, 27, TripType.SAMPLES_ONLY, true, true);
    323 
    +        testExecute(53, 27, TripType.SAMPLEONLY, true, true);
    324 324 
         }
    325 325
    326 326 
         @Test
    327 327 
         @Override
    328 328 
         public void testExecute_ESATL_2008() throws Exception {
    329 
    -        testExecute(46, 14, TripType.SAMPLES_ONLY, true, true);
    329 
    +        testExecute(46, 14, TripType.SAMPLEONLY, true, true);
    330 330 
         }
    331 331
    332 332 
         @Test
    333 333 
         @Override
    334 334 
         public void testExecute_ESATL_2009() throws Exception {
    335 
    -        testExecute(64, 21, TripType.SAMPLES_ONLY, true, true);
    335 
    +        testExecute(64, 21, TripType.SAMPLEONLY, true, true);
    336 336 
         }
    337 337
    338 338 
         @Test
    339 339 
         @Override
    340 340 
         public void testExecute_ESATL_2010() throws Exception {
    341 
    -        testExecute(75, 13, TripType.SAMPLES_ONLY, true, true);
    341 
    +        testExecute(75, 13, TripType.SAMPLEONLY, true, true);
    342 342 
         }
    343 343 
     }

  • t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java
    ... ... @@ -54,13 +54,13 @@ public class AnalyzeInputSourceActionTest extends AnalyzeInputSourceActionTestSu
    54 54 
         @Ignore
    55 55 
         @Test
    56 56 
         public void testExecute_OA_2000_withoutLogbook() throws Exception {
    57 
    -        testExecute(AtlanticOceanFixtures.OA_2000, TripType.WITHOUT_LOGBOOK);
    57 
    +        testExecute(AtlanticOceanFixtures.OA_2000, TripType.LOGBOOKMISSING);
    58 58 
         }
    59 59
    60 60 
         @Ignore
    61 61 
         @Test
    62 62 
         public void testExecute_OI_2002_withoutLogbook() throws Exception {
    63 
    -        testExecute(IndianOceanFixtures.OI_2002,TripType.WITHOUT_LOGBOOK);
    63 
    +        testExecute(IndianOceanFixtures.OI_2002,TripType.LOGBOOKMISSING);
    64 64 
         }
    65 65
    66 66 
     }

  • t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionTest.java
    ... ... @@ -53,13 +53,13 @@ public class ImportInputSourceActionTest extends ImportInputSourceActionTestSupp
    53 53 
         @Ignore
    54 54 
         @Test
    55 55 
         public void testExecute_OA_2000_withoutLogbook() throws Exception {
    56 
    -        testExecute(AtlanticOceanFixtures.OA_2000, TripType.WITHOUT_LOGBOOK);
    56 
    +        testExecute(AtlanticOceanFixtures.OA_2000, TripType.LOGBOOKMISSING);
    57 57 
         }
    58 58
    59 59 
         @Ignore
    60 60 
         @Test
    61 61 
         public void testExecute_OI_2002_withoutLogbook() throws Exception {
    62 
    -        testExecute(IndianOceanFixtures.OI_2002, TripType.WITHOUT_LOGBOOK);
    62 
    +        testExecute(IndianOceanFixtures.OI_2002, TripType.LOGBOOKMISSING);
    63 63 
         }
    64 64
    65 65 
     }

  • t3-web/src/main/java/fr/ird/t3/web/actions/io/input/ConfigureImportDataAction.java
    ... ... @@ -70,7 +70,7 @@ public class ConfigureImportDataAction extends AbstractConfigureAction<AnalyzeIn
    70 70 
          *
    71 71 
          * @since 2.3
    72 72 
          */
    73 
    -    private TripType tripType = TripType.NORMAL;
    73 
    +    private TripType tripType = TripType.STANDARD;
    74 74 
         /**
    75 75 
          * flag to authorize creation of missing vessels.
    76 76 
          *

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