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

Commits:

6 changed files:

Changes:

  • application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectPartsTreeNode.java
    ... ... @@ -79,7 +79,18 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im
    79 79
     
    
    80 80
         @Override
    
    81 81
         public boolean isEditable(int column) {
    
    82
    -        return column > 0 && getUserObject().isSelectable();
    
    82
    +        boolean result = column > 0 && getUserObject().isSelectable();
    
    83
    +        if (result) {
    
    84
    +            switch (column) {
    
    85
    +                case 1: // when arriving
    
    86
    +                    result = model.isArriving();
    
    87
    +                    break;
    
    88
    +                case 2: // when leaving
    
    89
    +                    result = model.isLeaving();
    
    90
    +                    break;
    
    91
    +            }
    
    92
    +        }
    
    93
    +        return result;
    
    83 94
         }
    
    84 95
     
    
    85 96
         @Override
    

  • application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss
    ... ... @@ -45,11 +45,13 @@ BeanComboBox {
    45 45
     #fromLeftToRight {
    
    46 46
       _observeAction:{CopyFloatingObjectPartToRightAction.ACTION_NAME};
    
    47 47
       focusable:false;
    
    48
    +  enabled:{model.isLeaving() && model.isArriving()};
    
    48 49
     }
    
    49 50
     
    
    50 51
     #fromRightToLeft {
    
    51 52
       _observeAction:{CopyFloatingObjectPartToLeftAction.ACTION_NAME};
    
    52 53
       focusable:false;
    
    54
    +  enabled:{model.isLeaving() && model.isArriving()};
    
    53 55
     }
    
    54 56
     
    
    55 57
     #objectOperationLabel {
    

  • application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java
    ... ... @@ -35,7 +35,9 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeN
    35 35
     import fr.ird.observe.services.dto.FloatingObjectReference;
    
    36 36
     import fr.ird.observe.services.dto.form.Form;
    
    37 37
     import fr.ird.observe.services.dto.reference.DataReference;
    
    38
    +import fr.ird.observe.services.dto.reference.ReferentialReference;
    
    38 39
     import fr.ird.observe.services.dto.referential.seine.ObjectMaterialDto;
    
    40
    +import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto;
    
    39 41
     import fr.ird.observe.services.dto.result.SaveResultDto;
    
    40 42
     import fr.ird.observe.services.dto.seine.ActivitySeineDto;
    
    41 43
     import fr.ird.observe.services.dto.seine.FloatingObjectDto;
    
    ... ... @@ -338,6 +340,18 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto,
    338 340
                 }
    
    339 341
             });
    
    340 342
     
    
    343
    +        getBean().addPropertyChangeListener(FloatingObjectDto.PROPERTY_OBJECT_OPERATION, e -> updateMaterials((ReferentialReference) e.getNewValue()));
    
    344
    +
    
    345
    +    }
    
    346
    +
    
    347
    +    private void updateMaterials(ReferentialReference<ObjectOperationDto> operation) {
    
    348
    +        if (operation == null) {
    
    349
    +            getModel().setArriving(false);
    
    350
    +            getModel().setLeaving(false);
    
    351
    +        } else {
    
    352
    +            getModel().setArriving((Boolean) operation.getPropertyValue(ObjectOperationDto.PROPERTY_WHEN_ARRIVING));
    
    353
    +            getModel().setLeaving((Boolean) operation.getPropertyValue(ObjectOperationDto.PROPERTY_WHEN_LEAVING));
    
    354
    +        }
    
    341 355
         }
    
    342 356
     
    
    343 357
         private static final Icon ICON_NOT_A_REFERENCE = SwingUtil.createImageIcon("star-empty.png");
    

  • application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java
    ... ... @@ -39,6 +39,8 @@ import java.util.List;
    39 39
     import java.util.Map;
    
    40 40
     import java.util.Optional;
    
    41 41
     import java.util.Set;
    
    42
    +import org.apache.commons.logging.Log;
    
    43
    +import org.apache.commons.logging.LogFactory;
    
    42 44
     import org.jdesktop.swingx.treetable.DefaultMutableTreeTableNode;
    
    43 45
     import org.nuiton.decorator.Decorator;
    
    44 46
     
    
    ... ... @@ -59,6 +61,8 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> {
    59 61
     
    
    60 62
         private Map<String, ObjectMaterialDto> referentialMap;
    
    61 63
         private FloatingObjectReference reference;
    
    64
    +    private boolean arriving;
    
    65
    +    private boolean leaving;
    
    62 66
     
    
    63 67
         public FloatingObjectUIModel() {
    
    64 68
             super(FloatingObjectDto.class);
    
    ... ... @@ -74,6 +78,8 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> {
    74 78
     
    
    75 79
         private static final String PROPERTY_MATERIALS_TAB_VALID = "materialsTabValid";
    
    76 80
         public static final String PROPERTY_REFERENCE = "reference";
    
    81
    +    public static final String PROPERTY_ARRIVING = "arriving";
    
    82
    +    public static final String PROPERTY_LEAVING = "leaving";
    
    77 83
     
    
    78 84
         public static final Set<String> GENERAL_TAB_PROPERTIES =
    
    79 85
                 ImmutableSet.<String>builder().add(FloatingObjectDto.PROPERTY_OBJECT_OPERATION,
    
    ... ... @@ -115,8 +121,12 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> {
    115 121
             for (ObjectMaterialDto o : getAll()) {
    
    116 122
                 FloatingObjectPartDto partDto = new FloatingObjectPartDto();
    
    117 123
                 partDto.setObjectMaterial(referenceBinderEngine.transformReferentialDtoToReference(referentialLocale, o));
    
    118
    -            partDto.setWhenArriving(whenArriving.get(o));
    
    119
    -            partDto.setWhenLeaving(whenLeaving.get(o));
    
    124
    +            if (arriving) {
    
    125
    +                partDto.setWhenArriving(whenArriving.get(o));
    
    126
    +            }
    
    127
    +            if (leaving) {
    
    128
    +                partDto.setWhenLeaving(whenLeaving.get(o));
    
    129
    +            }
    
    120 130
                 result.add(partDto);
    
    121 131
             }
    
    122 132
             return result;
    
    ... ... @@ -195,4 +205,26 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> {
    195 205
             return value == null ? t("observe.common.notComputed") : value ? t("observe.common.boolean.true") : t("observe.common.boolean.false");
    
    196 206
         }
    
    197 207
     
    
    208
    +    public boolean isArriving() {
    
    209
    +        return arriving;
    
    210
    +    }
    
    211
    +
    
    212
    +    /** Logger. */
    
    213
    +    private static final Log log = LogFactory.getLog(FloatingObjectUIModel.class);
    
    214
    +
    
    215
    +    public void setArriving(boolean arriving) {
    
    216
    +        this.arriving = arriving;
    
    217
    +        log.info("setArriving: " + arriving);
    
    218
    +        firePropertyChange(PROPERTY_ARRIVING, arriving);
    
    219
    +    }
    
    220
    +
    
    221
    +    public boolean isLeaving() {
    
    222
    +        return leaving;
    
    223
    +    }
    
    224
    +
    
    225
    +    public void setLeaving(boolean leaving) {
    
    226
    +        this.leaving = leaving;
    
    227
    +        log.info("setLeaving: " + leaving);
    
    228
    +        firePropertyChange(PROPERTY_LEAVING, leaving);
    
    229
    +    }
    
    198 230
     }

  • services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectOperationBinder.java
    ... ... @@ -61,14 +61,14 @@ public class ObjectOperationBinder extends ReferentialBinderSupport<ObjectOperat
    61 61
         @Override
    
    62 62
         public ReferentialReference<ObjectOperationDto> toReferentialReference(ReferentialLocale referentialLocale, ObjectOperation entity) {
    
    63 63
     
    
    64
    -        return toReferentialReference(entity, entity.getCode(), getLabel(referentialLocale, entity));
    
    64
    +        return toReferentialReference(entity, entity.getCode(), getLabel(referentialLocale, entity), entity.isWhenArriving(), entity.isWhenLeaving());
    
    65 65
     
    
    66 66
         }
    
    67 67
     
    
    68 68
         @Override
    
    69 69
         public ReferentialReference<ObjectOperationDto> toReferentialReference(ReferentialLocale referentialLocale, ObjectOperationDto dto) {
    
    70 70
     
    
    71
    -        return toReferentialReference(dto, dto.getCode(), getLabel(referentialLocale, dto));
    
    71
    +        return toReferentialReference(dto, dto.getCode(), getLabel(referentialLocale, dto), dto.isWhenArriving(), dto.isWhenLeaving());
    
    72 72
     
    
    73 73
         }
    
    74 74
     }

  • services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java
    ... ... @@ -269,9 +269,7 @@ class ObserveDtoInitializer {
    269 269
     
    
    270 270
             @Override
    
    271 271
             public void initCountryDto() {
    
    272
    -
    
    273 272
                 n("observe.type.country");
    
    274
    -
    
    275 273
                 n("observe.type.countries");
    
    276 274
                 flushReferential(referentialDefaultDefinitionBuilder(CountryDto.class));
    
    277 275
     
    
    ... ... @@ -279,9 +277,7 @@ class ObserveDtoInitializer {
    279 277
     
    
    280 278
             @Override
    
    281 279
             public void initFpaZoneDto() {
    
    282
    -
    
    283 280
                 n("observe.type.fpaZone");
    
    284
    -
    
    285 281
                 n("observe.type.fpaZones");
    
    286 282
                 flushReferential(referentialDefaultDefinitionBuilder(FpaZoneDto.class));
    
    287 283
     
    
    ... ... @@ -289,9 +285,7 @@ class ObserveDtoInitializer {
    289 285
     
    
    290 286
             @Override
    
    291 287
             public void initGearCaracteristicTypeDto() {
    
    292
    -
    
    293 288
                 n("observe.type.gearCaracteristicType");
    
    294
    -
    
    295 289
                 n("observe.type.gearCaracteristicTypes");
    
    296 290
                 flushReferential(referentialDefaultDefinitionBuilder(GearCaracteristicTypeDto.class));
    
    297 291
     
    
    ... ... @@ -299,9 +293,7 @@ class ObserveDtoInitializer {
    299 293
     
    
    300 294
             @Override
    
    301 295
             public void initGearCaracteristicDto() {
    
    302
    -
    
    303 296
                 n("observe.type.gearCaracteristic");
    
    304
    -
    
    305 297
                 n("observe.type.gearCaracteristics");
    
    306 298
                 flushReferential(referentialDefaultDefinitionBuilder(GearCaracteristicDto.class)
    
    307 299
                                          .addProperty(String.class, GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE));
    
    ... ... @@ -309,20 +301,14 @@ class ObserveDtoInitializer {
    309 301
     
    
    310 302
             @Override
    
    311 303
             public void initGearDto() {
    
    312
    -
    
    313
    -
    
    314 304
                 n("observe.type.gear");
    
    315
    -
    
    316 305
                 n("observe.type.gears");
    
    317 306
                 flushReferential(referentialDefaultDefinitionBuilder(GearDto.class));
    
    318 307
             }
    
    319 308
     
    
    320 309
             @Override
    
    321 310
             public void initHarbourDto() {
    
    322
    -
    
    323
    -
    
    324 311
                 n("observe.type.harbour");
    
    325
    -
    
    326 312
                 n("observe.type.harbours");
    
    327 313
                 flushReferential(referentialDefinitionBuilder2(HarbourDto.class)
    
    328 314
                                          .addProperty(String.class, HarbourDto.PROPERTY_CODE)
    
    ... ... @@ -337,9 +323,7 @@ class ObserveDtoInitializer {
    337 323
     
    
    338 324
             @Override
    
    339 325
             public void initSizeMeasureTypeDto() {
    
    340
    -
    
    341 326
                 n("observe.type.sizeMeasureType");
    
    342
    -
    
    343 327
                 n("observe.type.sizeMeasureTypes");
    
    344 328
                 flushReferential(referentialDefaultDefinitionBuilder(SizeMeasureTypeDto.class));
    
    345 329
     
    
    ... ... @@ -347,9 +331,7 @@ class ObserveDtoInitializer {
    347 331
     
    
    348 332
             @Override
    
    349 333
             public void initOceanDto() {
    
    350
    -
    
    351 334
                 n("observe.type.ocean");
    
    352
    -
    
    353 335
                 n("observe.type.oceans");
    
    354 336
                 flushReferential(referentialDefaultDefinitionBuilder(OceanDto.class));
    
    355 337
     
    
    ... ... @@ -358,9 +340,7 @@ class ObserveDtoInitializer {
    358 340
     
    
    359 341
             @Override
    
    360 342
             public void initSpeciesGroupReleaseModeDto() {
    
    361
    -
    
    362 343
                 n("observe.type.speciesGroupReleaseMode");
    
    363
    -
    
    364 344
                 n("observe.type.speciesGroupReleaseModes");
    
    365 345
                 flushReferential(referentialDefaultDefinitionBuilder(SpeciesGroupReleaseModeDto.class));
    
    366 346
     
    
    ... ... @@ -368,14 +348,13 @@ class ObserveDtoInitializer {
    368 348
     
    
    369 349
             @Override
    
    370 350
             public void initSpeciesGroupDto() {
    
    371
    -
    
    372
    -
    
    351
    +            n("observe.type.speciesGroup");
    
    352
    +            n("observe.type.speciesGroups");
    
    373 353
                 flushReferential(referentialDefaultDefinitionBuilder(SpeciesGroupDto.class));
    
    374 354
             }
    
    375 355
     
    
    376 356
             @Override
    
    377 357
             public void initSpeciesDto() {
    
    378
    -
    
    379 358
                 n("observe.type.species");
    
    380 359
                 flushReferential(referentialDefinitionBuilder(SpeciesDto.class)
    
    381 360
                                          .addProperty(String.class, SpeciesDto.PROPERTY_FAO_CODE)
    
    ... ... @@ -387,16 +366,13 @@ class ObserveDtoInitializer {
    387 366
     
    
    388 367
             @Override
    
    389 368
             public void initSpeciesListDto() {
    
    390
    -
    
    391 369
                 n("observe.type.speciesList");
    
    392
    -
    
    393 370
                 n("observe.type.speciesLists");
    
    394 371
                 flushReferential(referentialDefaultDefinitionBuilder(SpeciesListDto.class));
    
    395 372
             }
    
    396 373
     
    
    397 374
             @Override
    
    398 375
             public void initSexDto() {
    
    399
    -
    
    400 376
                 n("observe.type.sex");
    
    401 377
                 n("observe.type.sexes");
    
    402 378
                 flushReferential(referentialDefaultDefinitionBuilder(SexDto.class));
    
    ... ... @@ -405,9 +381,7 @@ class ObserveDtoInitializer {
    405 381
     
    
    406 382
             @Override
    
    407 383
             public void initLengthLengthParameterDto() {
    
    408
    -
    
    409 384
                 n("observe.type.lengthLengthParameter");
    
    410
    -
    
    411 385
                 n("observe.type.lengthLengthParameters");
    
    412 386
                 flushReferential(referentialDefinitionBuilder(LengthLengthParameterDto.class)
    
    413 387
                                          .addProperty(String.class, LengthLengthParameterDto.PROPERTY_CODE)
    
    ... ... @@ -419,9 +393,7 @@ class ObserveDtoInitializer {
    419 393
     
    
    420 394
             @Override
    
    421 395
             public void initLengthWeightParameterDto() {
    
    422
    -
    
    423 396
                 n("observe.type.lengthWeightParameter");
    
    424
    -
    
    425 397
                 n("observe.type.lengthWeightParameters");
    
    426 398
                 flushReferential(referentialDefinitionBuilder2(LengthWeightParameterDto.class)
    
    427 399
                                          .addProperty(String.class, LengthWeightParameterDto.PROPERTY_CODE)
    
    ... ... @@ -435,18 +407,14 @@ class ObserveDtoInitializer {
    435 407
     
    
    436 408
             @Override
    
    437 409
             public void initOrganismDto() {
    
    438
    -
    
    439 410
                 n("observe.type.organism");
    
    440
    -
    
    441 411
                 n("observe.type.organisms");
    
    442 412
                 flushReferential(referentialDefaultDefinitionBuilder(OrganismDto.class));
    
    443 413
             }
    
    444 414
     
    
    445 415
             @Override
    
    446 416
             public void initPersonDto() {
    
    447
    -
    
    448 417
                 n("observe.type.person");
    
    449
    -
    
    450 418
                 n("observe.type.persons");
    
    451 419
                 flushReferential(referentialDefinitionBuilder2(PersonDto.class)
    
    452 420
                                          .addProperty(String.class, PersonDto.PROPERTY_FIRST_NAME)
    
    ... ... @@ -458,8 +426,6 @@ class ObserveDtoInitializer {
    458 426
     
    
    459 427
             @Override
    
    460 428
             public void initProgramDto() {
    
    461
    -
    
    462
    -
    
    463 429
                 n("observe.type.program");
    
    464 430
                 n("observe.type.programs");
    
    465 431
                 flushReferential(referentialDefinitionBuilder(ProgramDto.class)
    
    ... ... @@ -474,10 +440,7 @@ class ObserveDtoInitializer {
    474 440
     
    
    475 441
             @Override
    
    476 442
             public void initShipOwnerDto() {
    
    477
    -
    
    478
    -
    
    479 443
                 n("observe.type.shipOwner");
    
    480
    -
    
    481 444
                 n("observe.type.shipOwners");
    
    482 445
                 flushReferential(referentialDefaultDefinitionBuilder(ShipOwnerDto.class)
    
    483 446
                                          .addProperty(String.class, ShipOwnerDto.PROPERTY_LABEL));
    
    ... ... @@ -485,9 +448,7 @@ class ObserveDtoInitializer {
    485 448
     
    
    486 449
             @Override
    
    487 450
             public void initVesselSizeCategoryDto() {
    
    488
    -
    
    489 451
                 n("observe.type.vesselSizeCategory");
    
    490
    -
    
    491 452
                 n("observe.type.vesselSizeCategories");
    
    492 453
                 flushReferential(referentialDefinitionBuilder2(VesselSizeCategoryDto.class)
    
    493 454
                                          .addProperty(String.class, VesselSizeCategoryDto.PROPERTY_CODE)
    
    ... ... @@ -498,9 +459,7 @@ class ObserveDtoInitializer {
    498 459
     
    
    499 460
             @Override
    
    500 461
             public void initVesselTypeDto() {
    
    501
    -
    
    502 462
                 n("observe.type.vesselType");
    
    503
    -
    
    504 463
                 n("observe.type.vesselTypes");
    
    505 464
                 flushReferential(referentialDefaultDefinitionBuilder(VesselTypeDto.class));
    
    506 465
     
    
    ... ... @@ -508,9 +467,7 @@ class ObserveDtoInitializer {
    508 467
     
    
    509 468
             @Override
    
    510 469
             public void initVesselDto() {
    
    511
    -
    
    512 470
                 n("observe.type.vessel");
    
    513
    -
    
    514 471
                 n("observe.type.vessels");
    
    515 472
                 flushReferential(referentialDefaultDefinitionBuilder(VesselDto.class)
    
    516 473
                                          .addProperty(String.class, VesselDto.PROPERTY_VESSEL_TYPE));
    
    ... ... @@ -518,9 +475,7 @@ class ObserveDtoInitializer {
    518 475
     
    
    519 476
             @Override
    
    520 477
             public void initWeightMeasureTypeDto() {
    
    521
    -
    
    522 478
                 n("observe.type.weightMeasureType");
    
    523
    -
    
    524 479
                 n("observe.type.weightMeasureTypes");
    
    525 480
                 flushReferential(referentialDefaultDefinitionBuilder(WeightMeasureTypeDto.class));
    
    526 481
     
    
    ... ... @@ -528,9 +483,7 @@ class ObserveDtoInitializer {
    528 483
     
    
    529 484
             @Override
    
    530 485
             public void initBaitHaulingStatusDto() {
    
    531
    -
    
    532 486
                 n("observe.type.baitHaulingStatus");
    
    533
    -
    
    534 487
                 n("observe.type.baitHaulingStatuses");
    
    535 488
                 flushReferential(referentialDefaultDefinitionBuilder(BaitHaulingStatusDto.class));
    
    536 489
     
    
    ... ... @@ -538,9 +491,7 @@ class ObserveDtoInitializer {
    538 491
     
    
    539 492
             @Override
    
    540 493
             public void initBaitSettingStatusDto() {
    
    541
    -
    
    542 494
                 n("observe.type.baitSettingStatus");
    
    543
    -
    
    544 495
                 n("observe.type.baitSettingStatuses");
    
    545 496
                 flushReferential(referentialDefaultDefinitionBuilder(BaitSettingStatusDto.class));
    
    546 497
     
    
    ... ... @@ -548,9 +499,7 @@ class ObserveDtoInitializer {
    548 499
     
    
    549 500
             @Override
    
    550 501
             public void initBaitTypeDto() {
    
    551
    -
    
    552 502
                 n("observe.type.baitType");
    
    553
    -
    
    554 503
                 n("observe.type.baitTypes");
    
    555 504
                 flushReferential(referentialDefaultDefinitionBuilder(BaitTypeDto.class));
    
    556 505
     
    
    ... ... @@ -558,9 +507,7 @@ class ObserveDtoInitializer {
    558 507
     
    
    559 508
             @Override
    
    560 509
             public void initCatchFateLonglineDto() {
    
    561
    -
    
    562 510
                 n("observe.type.catchFateLongline");
    
    563
    -
    
    564 511
                 n("observe.type.catchFateLonglines");
    
    565 512
                 flushReferential(referentialDefaultDefinitionBuilder(CatchFateLonglineDto.class));
    
    566 513
     
    
    ... ... @@ -568,9 +515,7 @@ class ObserveDtoInitializer {
    568 515
     
    
    569 516
             @Override
    
    570 517
             public void initEncounterTypeDto() {
    
    571
    -
    
    572 518
                 n("observe.type.encounterType");
    
    573
    -
    
    574 519
                 n("observe.type.encounterTypes");
    
    575 520
                 flushReferential(referentialDefaultDefinitionBuilder(EncounterTypeDto.class));
    
    576 521
     
    
    ... ... @@ -578,7 +523,6 @@ class ObserveDtoInitializer {
    578 523
     
    
    579 524
             @Override
    
    580 525
             public void initHealthnessDto() {
    
    581
    -
    
    582 526
                 n("observe.type.healthness");
    
    583 527
                 n("observe.type.healthnesses");
    
    584 528
                 flushReferential(referentialDefaultDefinitionBuilder(HealthnessDto.class));
    
    ... ... @@ -587,9 +531,7 @@ class ObserveDtoInitializer {
    587 531
     
    
    588 532
             @Override
    
    589 533
             public void initHookPositionDto() {
    
    590
    -
    
    591 534
                 n("observe.type.hookPosition");
    
    592
    -
    
    593 535
                 n("observe.type.hookPositions");
    
    594 536
                 flushReferential(referentialDefaultDefinitionBuilder(HookPositionDto.class));
    
    595 537
     
    
    ... ... @@ -597,9 +539,7 @@ class ObserveDtoInitializer {
    597 539
     
    
    598 540
             @Override
    
    599 541
             public void initHookSizeDto() {
    
    600
    -
    
    601 542
                 n("observe.type.hookSize");
    
    602
    -
    
    603 543
                 n("observe.type.hookSizes");
    
    604 544
                 flushReferential(referentialDefaultDefinitionBuilder(HookSizeDto.class));
    
    605 545
     
    
    ... ... @@ -607,9 +547,7 @@ class ObserveDtoInitializer {
    607 547
     
    
    608 548
             @Override
    
    609 549
             public void initHookTypeDto() {
    
    610
    -
    
    611 550
                 n("observe.type.hookType");
    
    612
    -
    
    613 551
                 n("observe.type.hookTypes");
    
    614 552
                 flushReferential(referentialDefaultDefinitionBuilder(HookTypeDto.class));
    
    615 553
     
    
    ... ... @@ -617,9 +555,7 @@ class ObserveDtoInitializer {
    617 555
     
    
    618 556
             @Override
    
    619 557
             public void initItemHorizontalPositionDto() {
    
    620
    -
    
    621 558
                 n("observe.type.itemHorizontalPosition");
    
    622
    -
    
    623 559
                 n("observe.type.itemHorizontalPositions");
    
    624 560
                 flushReferential(referentialDefaultDefinitionBuilder(ItemHorizontalPositionDto.class));
    
    625 561
     
    
    ... ... @@ -627,9 +563,7 @@ class ObserveDtoInitializer {
    627 563
     
    
    628 564
             @Override
    
    629 565
             public void initItemVerticalPositionDto() {
    
    630
    -
    
    631 566
                 n("observe.type.itemVerticalPosition");
    
    632
    -
    
    633 567
                 n("observe.type.itemVerticalPositions");
    
    634 568
                 flushReferential(referentialDefaultDefinitionBuilder(ItemVerticalPositionDto.class));
    
    635 569
     
    
    ... ... @@ -637,9 +571,7 @@ class ObserveDtoInitializer {
    637 571
     
    
    638 572
             @Override
    
    639 573
             public void initLightsticksColorDto() {
    
    640
    -
    
    641 574
                 n("observe.type.lightsticksColor");
    
    642
    -
    
    643 575
                 n("observe.type.lightsticksColors");
    
    644 576
                 flushReferential(referentialDefaultDefinitionBuilder(LightsticksColorDto.class));
    
    645 577
     
    
    ... ... @@ -647,9 +579,7 @@ class ObserveDtoInitializer {
    647 579
     
    
    648 580
             @Override
    
    649 581
             public void initLightsticksTypeDto() {
    
    650
    -
    
    651 582
                 n("observe.type.lightsticksType");
    
    652
    -
    
    653 583
                 n("observe.type.lightsticksTypes");
    
    654 584
                 flushReferential(referentialDefaultDefinitionBuilder(LightsticksTypeDto.class));
    
    655 585
     
    
    ... ... @@ -657,9 +587,7 @@ class ObserveDtoInitializer {
    657 587
     
    
    658 588
             @Override
    
    659 589
             public void initLineTypeDto() {
    
    660
    -
    
    661 590
                 n("observe.type.lineType");
    
    662
    -
    
    663 591
                 n("observe.type.lineTypes");
    
    664 592
                 flushReferential(referentialDefaultDefinitionBuilder(LineTypeDto.class));
    
    665 593
     
    
    ... ... @@ -667,9 +595,7 @@ class ObserveDtoInitializer {
    667 595
     
    
    668 596
             @Override
    
    669 597
             public void initMaturityStatusDto() {
    
    670
    -
    
    671 598
                 n("observe.type.maturityStatus");
    
    672
    -
    
    673 599
                 n("observe.type.maturityStatuses");
    
    674 600
                 flushReferential(referentialDefaultDefinitionBuilder(MaturityStatusDto.class));
    
    675 601
     
    
    ... ... @@ -677,9 +603,7 @@ class ObserveDtoInitializer {
    677 603
     
    
    678 604
             @Override
    
    679 605
             public void initMitigationTypeDto() {
    
    680
    -
    
    681 606
                 n("observe.type.mitigationType");
    
    682
    -
    
    683 607
                 n("observe.type.mitigationTypes");
    
    684 608
                 flushReferential(referentialDefaultDefinitionBuilder(MitigationTypeDto.class));
    
    685 609
     
    
    ... ... @@ -687,9 +611,7 @@ class ObserveDtoInitializer {
    687 611
     
    
    688 612
             @Override
    
    689 613
             public void initSensorBrandDto() {
    
    690
    -
    
    691 614
                 n("observe.type.sensorBrand");
    
    692
    -
    
    693 615
                 n("observe.type.sensorBrands");
    
    694 616
                 flushReferential(referentialDefinitionBuilder2(SensorBrandDto.class)
    
    695 617
                                          .addProperty(String.class, SensorBrandDto.PROPERTY_CODE)
    
    ... ... @@ -699,9 +621,7 @@ class ObserveDtoInitializer {
    699 621
     
    
    700 622
             @Override
    
    701 623
             public void initSensorDataFormatDto() {
    
    702
    -
    
    703 624
                 n("observe.type.sensorDataFormat");
    
    704
    -
    
    705 625
                 n("observe.type.sensorDataFormats");
    
    706 626
                 flushReferential(referentialDefaultDefinitionBuilder(SensorDataFormatDto.class));
    
    707 627
     
    
    ... ... @@ -709,9 +629,7 @@ class ObserveDtoInitializer {
    709 629
     
    
    710 630
             @Override
    
    711 631
             public void initSensorTypeDto() {
    
    712
    -
    
    713 632
                 n("observe.type.sensorType");
    
    714
    -
    
    715 633
                 n("observe.type.sensorTypes");
    
    716 634
                 flushReferential(referentialDefaultDefinitionBuilder(SensorTypeDto.class));
    
    717 635
     
    
    ... ... @@ -719,9 +637,7 @@ class ObserveDtoInitializer {
    719 637
     
    
    720 638
             @Override
    
    721 639
             public void initSettingShapeDto() {
    
    722
    -
    
    723 640
                 n("observe.type.settingShape");
    
    724
    -
    
    725 641
                 n("observe.type.settingShapes");
    
    726 642
                 flushReferential(referentialDefaultDefinitionBuilder(SettingShapeDto.class));
    
    727 643
     
    
    ... ... @@ -729,9 +645,7 @@ class ObserveDtoInitializer {
    729 645
     
    
    730 646
             @Override
    
    731 647
             public void initStomacFullnessDto() {
    
    732
    -
    
    733 648
                 n("observe.type.stomacFullness");
    
    734
    -
    
    735 649
                 n("observe.type.stomacFullnesses");
    
    736 650
                 flushReferential(referentialDefaultDefinitionBuilder(StomacFullnessDto.class));
    
    737 651
     
    
    ... ... @@ -739,9 +653,7 @@ class ObserveDtoInitializer {
    739 653
     
    
    740 654
             @Override
    
    741 655
             public void initTripTypeDto() {
    
    742
    -
    
    743 656
                 n("observe.type.tripType");
    
    744
    -
    
    745 657
                 n("observe.type.tripTypes");
    
    746 658
                 flushReferential(referentialDefaultDefinitionBuilder(TripTypeDto.class));
    
    747 659
     
    
    ... ... @@ -749,9 +661,7 @@ class ObserveDtoInitializer {
    749 661
     
    
    750 662
             @Override
    
    751 663
             public void initVesselActivityLonglineDto() {
    
    752
    -
    
    753 664
                 n("observe.type.vesselActivityLongline");
    
    754
    -
    
    755 665
                 n("observe.type.vesselActivityLonglines");
    
    756 666
                 flushReferential(referentialDefaultDefinitionBuilder(VesselActivityLonglineDto.class));
    
    757 667
     
    
    ... ... @@ -759,9 +669,7 @@ class ObserveDtoInitializer {
    759 669
     
    
    760 670
             @Override
    
    761 671
             public void initDetectionModeDto() {
    
    762
    -
    
    763 672
                 n("observe.type.detectionMode");
    
    764
    -
    
    765 673
                 n("observe.type.detectionModes");
    
    766 674
                 flushReferential(referentialDefaultDefinitionBuilder(DetectionModeDto.class));
    
    767 675
     
    
    ... ... @@ -769,9 +677,7 @@ class ObserveDtoInitializer {
    769 677
     
    
    770 678
             @Override
    
    771 679
             public void initObjectMaterialTypeDto() {
    
    772
    -
    
    773 680
                 n("observe.type.objectMaterialType");
    
    774
    -
    
    775 681
                 n("observe.type.objectMaterialTypes");
    
    776 682
                 flushReferential(referentialDefaultDefinitionBuilder(ObjectMaterialTypeDto.class));
    
    777 683
     
    
    ... ... @@ -779,9 +685,7 @@ class ObserveDtoInitializer {
    779 685
     
    
    780 686
             @Override
    
    781 687
             public void initObjectMaterialDto() {
    
    782
    -
    
    783 688
                 n("observe.type.objectMaterial");
    
    784
    -
    
    785 689
                 n("observe.type.objectMaterials");
    
    786 690
                 flushReferential(referentialDefaultDefinitionBuilder(ObjectMaterialDto.class)
    
    787 691
                                          .addProperty(String.class, ObjectMaterialDto.PROPERTY_PARENT)
    
    ... ... @@ -791,19 +695,17 @@ class ObserveDtoInitializer {
    791 695
     
    
    792 696
             @Override
    
    793 697
             public void initObjectOperationDto() {
    
    794
    -
    
    795 698
                 n("observe.type.objectOperation");
    
    796
    -
    
    797 699
                 n("observe.type.objectOperations");
    
    798
    -            flushReferential(referentialDefaultDefinitionBuilder(ObjectOperationDto.class));
    
    700
    +            flushReferential(referentialDefaultDefinitionBuilder(ObjectOperationDto.class)
    
    701
    +                                     .addProperty(boolean.class, ObjectOperationDto.PROPERTY_WHEN_ARRIVING)
    
    702
    +                                     .addProperty(boolean.class, ObjectOperationDto.PROPERTY_WHEN_LEAVING));
    
    799 703
     
    
    800 704
             }
    
    801 705
     
    
    802 706
             @Override
    
    803 707
             public void initObjectTypeDto() {
    
    804
    -
    
    805 708
                 n("observe.type.objectType");
    
    806
    -
    
    807 709
                 n("observe.type.objectTypes");
    
    808 710
                 flushReferential(referentialDefaultDefinitionBuilder(ObjectTypeDto.class));
    
    809 711
     
    
    ... ... @@ -811,9 +713,7 @@ class ObserveDtoInitializer {
    811 713
     
    
    812 714
             @Override
    
    813 715
             public void initObservedSystemDto() {
    
    814
    -
    
    815 716
                 n("observe.type.observedSystem");
    
    816
    -
    
    817 717
                 n("observe.type.observedSystems");
    
    818 718
                 flushReferential(referentialDefaultDefinitionBuilder(ObservedSystemDto.class));
    
    819 719
     
    
    ... ... @@ -821,9 +721,7 @@ class ObserveDtoInitializer {
    821 721
     
    
    822 722
             @Override
    
    823 723
             public void initReasonForDiscardDto() {
    
    824
    -
    
    825 724
                 n("observe.type.reasonForDiscard");
    
    826
    -
    
    827 725
                 n("observe.type.reasonForDiscards");
    
    828 726
                 flushReferential(referentialDefaultDefinitionBuilder(ReasonForDiscardDto.class));
    
    829 727
     
    
    ... ... @@ -831,9 +729,7 @@ class ObserveDtoInitializer {
    831 729
     
    
    832 730
             @Override
    
    833 731
             public void initReasonForNoFishingDto() {
    
    834
    -
    
    835 732
                 n("observe.type.reasonForNoFishing");
    
    836
    -
    
    837 733
                 n("observe.type.reasonForNoFishings");
    
    838 734
                 flushReferential(referentialDefaultDefinitionBuilder(ReasonForNoFishingDto.class));
    
    839 735
     
    
    ... ... @@ -841,9 +737,7 @@ class ObserveDtoInitializer {
    841 737
     
    
    842 738
             @Override
    
    843 739
             public void initReasonForNullSetDto() {
    
    844
    -
    
    845 740
                 n("observe.type.reasonForNullSet");
    
    846
    -
    
    847 741
                 n("observe.type.reasonForNullSets");
    
    848 742
                 flushReferential(referentialDefaultDefinitionBuilder(ReasonForNullSetDto.class));
    
    849 743
     
    
    ... ... @@ -860,7 +754,6 @@ class ObserveDtoInitializer {
    860 754
     
    
    861 755
             @Override
    
    862 756
             public void initSpeciesStatusDto() {
    
    863
    -
    
    864 757
                 n("observe.type.speciesStatus");
    
    865 758
                 n("observe.type.speciesStatuses");
    
    866 759
                 flushReferential(referentialDefaultDefinitionBuilder(SpeciesStatusDto.class));
    
    ... ... @@ -869,7 +762,6 @@ class ObserveDtoInitializer {
    869 762
     
    
    870 763
             @Override
    
    871 764
             public void initSurroundingActivityDto() {
    
    872
    -
    
    873 765
                 n("observe.type.surroundingActivity");
    
    874 766
                 n("observe.type.surroundingActivities");
    
    875 767
                 flushReferential(referentialDefaultDefinitionBuilder(SurroundingActivityDto.class));
    
    ... ... @@ -878,9 +770,7 @@ class ObserveDtoInitializer {
    878 770
     
    
    879 771
             @Override
    
    880 772
             public void initTransmittingBuoyOperationDto() {
    
    881
    -
    
    882 773
                 n("observe.type.transmittingBuoyOperation");
    
    883
    -
    
    884 774
                 n("observe.type.transmittingBuoyOperations");
    
    885 775
                 flushReferential(referentialDefaultDefinitionBuilder(TransmittingBuoyOperationDto.class));
    
    886 776
     
    
    ... ... @@ -888,9 +778,7 @@ class ObserveDtoInitializer {
    888 778
     
    
    889 779
             @Override
    
    890 780
             public void initTransmittingBuoyTypeDto() {
    
    891
    -
    
    892 781
                 n("observe.type.transmittingBuoyType");
    
    893
    -
    
    894 782
                 n("observe.type.transmittingBuoyTypes");
    
    895 783
                 flushReferential(referentialDefaultDefinitionBuilder(TransmittingBuoyTypeDto.class));
    
    896 784
     
    
    ... ... @@ -898,9 +786,7 @@ class ObserveDtoInitializer {
    898 786
     
    
    899 787
             @Override
    
    900 788
             public void initVesselActivitySeineDto() {
    
    901
    -
    
    902 789
                 n("observe.type.vesselActivitySeine");
    
    903
    -
    
    904 790
                 n("observe.type.vesselActivitySeines");
    
    905 791
                 flushReferential(referentialDefaultDefinitionBuilder(VesselActivitySeineDto.class)
    
    906 792
                                          .addProperty(boolean.class, VesselActivitySeineDto.PROPERTY_ALLOW_FAD));
    
    ... ... @@ -909,9 +795,7 @@ class ObserveDtoInitializer {
    909 795
     
    
    910 796
             @Override
    
    911 797
             public void initWeightCategoryDto() {
    
    912
    -
    
    913 798
                 n("observe.type.weightCategory");
    
    914
    -
    
    915 799
                 n("observe.type.weightCategories");
    
    916 800
                 flushReferential(referentialDefinitionBuilder(WeightCategoryDto.class)
    
    917 801
                                          .addProperty(String.class, WeightCategoryDto.PROPERTY_CODE)
    
    ... ... @@ -920,9 +804,7 @@ class ObserveDtoInitializer {
    920 804
     
    
    921 805
             @Override
    
    922 806
             public void initWindDto() {
    
    923
    -
    
    924 807
                 n("observe.type.wind");
    
    925
    -
    
    926 808
                 n("observe.type.winds");
    
    927 809
                 flushReferential(referentialDefinitionBuilder2(WindDto.class)
    
    928 810
                                          .addProperty(String.class, WindDto.PROPERTY_CODE)
    
    ... ... @@ -975,10 +857,7 @@ class ObserveDtoInitializer {
    975 857
     
    
    976 858
             @Override
    
    977 859
             public void initBasketDto() {
    
    978
    -
    
    979
    -
    
    980 860
                 n("observe.type.basket");
    
    981
    -
    
    982 861
                 n("observe.type.baskets");
    
    983 862
                 flushData(dataDefinitionBuilder(BasketDto.class)
    
    984 863
                                   .addProperty(Integer.class, BasketDto.PROPERTY_SETTING_IDENTIFIER)
    
    ... ... @@ -993,10 +872,7 @@ class ObserveDtoInitializer {
    993 872
     
    
    994 873
             @Override
    
    995 874
             public void initBranchlineDto() {
    
    996
    -
    
    997
    -
    
    998 875
                 n("observe.type.branchline");
    
    999
    -
    
    1000 876
                 n("observe.type.branchlines");
    
    1001 877
                 flushData(dataDefinitionBuilder(BranchlineDto.class)
    
    1002 878
                                   .addProperty(Integer.class, BranchlineDto.PROPERTY_SETTING_IDENTIFIER)
    
    ... ... @@ -1010,10 +886,7 @@ class ObserveDtoInitializer {
    1010 886
     
    
    1011 887
             @Override
    
    1012 888
             public void initBranchlinesCompositionDto() {
    
    1013
    -
    
    1014
    -
    
    1015 889
                 n("observe.type.branchlinesComposition");
    
    1016
    -
    
    1017 890
                 n("observe.type.branchlinesCompositions");
    
    1018 891
                 flushData(dataDefinitionBuilder(BranchlinesCompositionDto.class)
    
    1019 892
                                   .addProperty(String.class, BranchlinesCompositionDto.PROPERTY_TOP_TYPE)
    
    ... ... @@ -1024,10 +897,7 @@ class ObserveDtoInitializer {
    1024 897
     
    
    1025 898
             @Override
    
    1026 899
             public void initCatchLonglineDto() {
    
    1027
    -
    
    1028
    -
    
    1029 900
                 n("observe.type.catchLongline");
    
    1030
    -
    
    1031 901
                 n("observe.type.catchLonglines");
    
    1032 902
                 flushData(dataDefinitionBuilder(CatchLonglineDto.class)
    
    1033 903
                                   .addProperty(String.class, CatchLonglineDto.PROPERTY_HOME_ID));
    
    ... ... @@ -1035,10 +905,7 @@ class ObserveDtoInitializer {
    1035 905
     
    
    1036 906
             @Override
    
    1037 907
             public void initEncounterDto() {
    
    1038
    -
    
    1039
    -
    
    1040 908
                 n("observe.type.encounter");
    
    1041
    -
    
    1042 909
                 n("observe.type.encounters");
    
    1043 910
                 flushData(dataDefinitionBuilder(EncounterDto.class)
    
    1044 911
                                   .addProperty(String.class, EncounterDto.PROPERTY_ENCOUNTER_TYPE)
    
    ... ... @@ -1047,10 +914,7 @@ class ObserveDtoInitializer {
    1047 914
     
    
    1048 915
             @Override
    
    1049 916
             public void initFloatlinesCompositionDto() {
    
    1050
    -
    
    1051
    -
    
    1052 917
                 n("observe.type.floatlinesComposition");
    
    1053
    -
    
    1054 918
                 n("observe.type.floatlinesCompositions");
    
    1055 919
                 flushData(dataDefinitionBuilder(FloatlinesCompositionDto.class)
    
    1056 920
                                   .addProperty(String.class, FloatlinesCompositionDto.PROPERTY_LINE_TYPE)
    
    ... ... @@ -1060,8 +924,6 @@ class ObserveDtoInitializer {
    1060 924
     
    
    1061 925
             @Override
    
    1062 926
             public void initGearUseFeaturesLonglineDto() {
    
    1063
    -
    
    1064
    -
    
    1065 927
                 n("observe.type.gearUseFeaturesLongline");
    
    1066 928
                 n("observe.type.gearUseFeaturesLonglines");
    
    1067 929
                 flushData(dataDefinitionBuilder(GearUseFeaturesLonglineDto.class));
    
    ... ... @@ -1069,8 +931,6 @@ class ObserveDtoInitializer {
    1069 931
     
    
    1070 932
             @Override
    
    1071 933
             public void initGearUseFeaturesMeasurementLonglineDto() {
    
    1072
    -
    
    1073
    -
    
    1074 934
                 n("observe.type.gearUseFeaturesMeasurementLongline");
    
    1075 935
                 n("observe.type.gearUseFeaturesMeasurementLonglines");
    
    1076 936
                 flushData(dataDefinitionBuilder(GearUseFeaturesMeasurementLonglineDto.class));
    
    ... ... @@ -1078,10 +938,7 @@ class ObserveDtoInitializer {
    1078 938
     
    
    1079 939
             @Override
    
    1080 940
             public void initHooksCompositionDto() {
    
    1081
    -
    
    1082
    -
    
    1083 941
                 n("observe.type.hooksComposition");
    
    1084
    -
    
    1085 942
                 n("observe.type.hooksCompositions");
    
    1086 943
                 flushData(dataDefinitionBuilder(HooksCompositionDto.class)
    
    1087 944
                                   .addProperty(String.class, HooksCompositionDto.PROPERTY_HOOK_TYPE)
    
    ... ... @@ -1092,10 +949,7 @@ class ObserveDtoInitializer {
    1092 949
     
    
    1093 950
             @Override
    
    1094 951
             public void initSectionDto() {
    
    1095
    -
    
    1096
    -
    
    1097 952
                 n("observe.type.section");
    
    1098
    -
    
    1099 953
                 n("observe.type.sections");
    
    1100 954
                 flushData(dataDefinitionBuilder(SectionDto.class)
    
    1101 955
                                   .addProperty(Integer.class, SectionDto.PROPERTY_SETTING_IDENTIFIER)
    
    ... ... @@ -1104,10 +958,7 @@ class ObserveDtoInitializer {
    1104 958
     
    
    1105 959
             @Override
    
    1106 960
             public void initSensorUsedDto() {
    
    1107
    -
    
    1108
    -
    
    1109 961
                 n("observe.type.sensorUsed");
    
    1110
    -
    
    1111 962
                 n("observe.type.sensorUseds");
    
    1112 963
                 flushData(dataDefinitionBuilder(SensorUsedDto.class)
    
    1113 964
                                   .addProperty(String.class, SensorUsedDto.PROPERTY_SENSOR_TYPE));
    
    ... ... @@ -1115,10 +966,7 @@ class ObserveDtoInitializer {
    1115 966
     
    
    1116 967
             @Override
    
    1117 968
             public void initSetLonglineDto() {
    
    1118
    -
    
    1119
    -
    
    1120 969
                 n("observe.type.setLongline");
    
    1121
    -
    
    1122 970
                 n("observe.type.setLonglines");
    
    1123 971
                 flushData(dataDefinitionBuilder(SetLonglineDto.class)
    
    1124 972
                                   .addProperty(String.class, SetLonglineDto.PROPERTY_HOME_ID));
    
    ... ... @@ -1126,8 +974,6 @@ class ObserveDtoInitializer {
    1126 974
     
    
    1127 975
             @Override
    
    1128 976
             public void initSetLonglineCatchDto() {
    
    1129
    -
    
    1130
    -
    
    1131 977
                 n("observe.type.setLonglineCatch");
    
    1132 978
                 n("observe.type.setLonglineCatches");
    
    1133 979
                 flushData(dataDefinitionBuilder(SetLonglineCatchDto.class));
    
    ... ... @@ -1175,10 +1021,7 @@ class ObserveDtoInitializer {
    1175 1021
     
    
    1176 1022
             @Override
    
    1177 1023
             public void initTripLonglineDto() {
    
    1178
    -
    
    1179
    -
    
    1180 1024
                 n("observe.type.tripLongline");
    
    1181
    -
    
    1182 1025
                 n("observe.type.tripLonglines");
    
    1183 1026
                 flushData(dataDefinitionBuilder(TripLonglineDto.class)
    
    1184 1027
                                   .addProperty(Date.class, TripLonglineDto.PROPERTY_START_DATE)
    
    ... ... @@ -1192,30 +1035,21 @@ class ObserveDtoInitializer {
    1192 1035
     
    
    1193 1036
             @Override
    
    1194 1037
             public void initTripLonglineActivityDto() {
    
    1195
    -
    
    1196
    -
    
    1197 1038
                 n("observe.type.tripLonglineActivity");
    
    1198
    -
    
    1199 1039
                 n("observe.type.tripLonglineActivities");
    
    1200 1040
                 flushData(dataDefinitionBuilder(TripLonglineActivityDto.class));
    
    1201 1041
             }
    
    1202 1042
     
    
    1203 1043
             @Override
    
    1204 1044
             public void initTripLonglineGearUseDto() {
    
    1205
    -
    
    1206
    -
    
    1207 1045
                 n("observe.type.tripLonglineGearUse");
    
    1208
    -
    
    1209 1046
                 n("observe.type.tripLonglineGearUses");
    
    1210 1047
                 flushData(dataDefinitionBuilder(TripLonglineGearUseDto.class));
    
    1211 1048
             }
    
    1212 1049
     
    
    1213 1050
             @Override
    
    1214 1051
             public void initWeightMeasureDto() {
    
    1215
    -
    
    1216
    -
    
    1217 1052
                 n("observe.type.weightMeasure");
    
    1218
    -
    
    1219 1053
                 n("observe.type.weightMeasures");
    
    1220 1054
                 flushData(dataDefinitionBuilder(WeightMeasureDto.class)
    
    1221 1055
                                   .addProperty(String.class, WeightMeasureDto.PROPERTY_WEIGHT_MEASURE_TYPE)
    
    ... ... @@ -1235,10 +1069,7 @@ class ObserveDtoInitializer {
    1235 1069
     
    
    1236 1070
             @Override
    
    1237 1071
             public void initActivitySeineDto() {
    
    1238
    -
    
    1239
    -
    
    1240 1072
                 n("observe.type.activitySeine");
    
    1241
    -
    
    1242 1073
                 n("observe.type.activitySeines");
    
    1243 1074
                 flushData(dataDefinitionBuilder(ActivitySeineDto.class)
    
    1244 1075
                                   .addProperty(Date.class, ActivitySeineDto.PROPERTY_TIME)
    
    ... ... @@ -1254,10 +1085,7 @@ class ObserveDtoInitializer {
    1254 1085
     
    
    1255 1086
             @Override
    
    1256 1087
             public void initFloatingObjectDto() {
    
    1257
    -
    
    1258
    -
    
    1259 1088
                 n("observe.type.floatingObject");
    
    1260
    -
    
    1261 1089
                 n("observe.type.floatingObjects");
    
    1262 1090
                 flushData(dataDefinitionBuilder(FloatingObjectDto.class)
    
    1263 1091
                                   .addProperty(String.class, FloatingObjectDto.PROPERTY_OBJECT_TYPE));
    
    ... ... @@ -1265,19 +1093,13 @@ class ObserveDtoInitializer {
    1265 1093
     
    
    1266 1094
             @Override
    
    1267 1095
             public void initFloatingObjectObservedSpeciesDto() {
    
    1268
    -
    
    1269
    -
    
    1270 1096
                 n("observe.type.floatingObjectObservedSpecies");
    
    1271
    -
    
    1272 1097
                 flushData(dataDefinitionBuilder(FloatingObjectObservedSpeciesDto.class));
    
    1273 1098
             }
    
    1274 1099
     
    
    1275 1100
             @Override
    
    1276 1101
             public void initFloatingObjectPartDto() {
    
    1277
    -
    
    1278
    -
    
    1279 1102
                 n("observe.type.floatingObjectPart");
    
    1280
    -
    
    1281 1103
                 n("observe.type.floatingObjectParts");
    
    1282 1104
                 flushData(dataDefinitionBuilder(FloatingObjectPartDto.class)
    
    1283 1105
                                   .addProperty(String.class, FloatingObjectPartDto.PROPERTY_OBJECT_MATERIAL + "Id")
    
    ... ... @@ -1288,10 +1110,7 @@ class ObserveDtoInitializer {
    1288 1110
     
    
    1289 1111
             @Override
    
    1290 1112
             public void initFloatingObjectSchoolEstimateDto() {
    
    1291
    -
    
    1292
    -
    
    1293 1113
                 n("observe.type.floatingObjectSchoolEstimate");
    
    1294
    -
    
    1295 1114
                 n("observe.type.floatingObjectSchoolEstimates");
    
    1296 1115
                 flushData(dataDefinitionBuilder(FloatingObjectSchoolEstimateDto.class));
    
    1297 1116
     
    
    ... ... @@ -1299,8 +1118,6 @@ class ObserveDtoInitializer {
    1299 1118
     
    
    1300 1119
             @Override
    
    1301 1120
             public void initFloatingObjectTransmittingBuoyDto() {
    
    1302
    -
    
    1303
    -
    
    1304 1121
                 n("observe.type.floatingObjectTransmittingBuoy");
    
    1305 1122
                 n("observe.type.floatingObjectTransmittingBuoys");
    
    1306 1123
                 flushData(dataDefinitionBuilder(FloatingObjectTransmittingBuoyDto.class));
    
    ... ... @@ -1308,8 +1125,6 @@ class ObserveDtoInitializer {
    1308 1125
     
    
    1309 1126
             @Override
    
    1310 1127
             public void initGearUseFeaturesMeasurementSeineDto() {
    
    1311
    -
    
    1312
    -
    
    1313 1128
                 n("observe.type.gearUseFeaturesMeasurementSeine");
    
    1314 1129
                 n("observe.type.gearUseFeaturesMeasurementSeines");
    
    1315 1130
                 flushData(dataDefinitionBuilder(GearUseFeaturesMeasurementSeineDto.class));
    
    ... ... @@ -1317,20 +1132,14 @@ class ObserveDtoInitializer {
    1317 1132
     
    
    1318 1133
             @Override
    
    1319 1134
             public void initGearUseFeaturesSeineDto() {
    
    1320
    -
    
    1321
    -
    
    1322 1135
                 n("observe.type.gearUseFeaturesSeine");
    
    1323
    -
    
    1324 1136
                 n("observe.type.gearUseFeaturesSeines");
    
    1325 1137
                 flushData(dataDefinitionBuilder(GearUseFeaturesSeineDto.class));
    
    1326 1138
             }
    
    1327 1139
     
    
    1328 1140
             @Override
    
    1329 1141
             public void initNonTargetCatchDto() {
    
    1330
    -
    
    1331
    -
    
    1332 1142
                 n("observe.type.nonTargetCatch");
    
    1333
    -
    
    1334 1143
                 n("observe.type.nonTargetCatches");
    
    1335 1144
                 flushData(dataDefinitionBuilder(NonTargetCatchDto.class)
    
    1336 1145
                                   .addProperty(String.class, NonTargetCatchDto.PROPERTY_SPECIES)
    
    ... ... @@ -1339,10 +1148,7 @@ class ObserveDtoInitializer {
    1339 1148
     
    
    1340 1149
             @Override
    
    1341 1150
             public void initNonTargetCatchReleaseDto() {
    
    1342
    -
    
    1343
    -
    
    1344 1151
                 n("observe.type.nonTargetCatchRelease");
    
    1345
    -
    
    1346 1152
                 n("observe.type.nonTargetCatchReleases");
    
    1347 1153
                 flushData(dataDefinitionBuilder(NonTargetCatchReleaseDto.class)
    
    1348 1154
                                   .addProperty(String.class, NonTargetCatchReleaseDto.PROPERTY_SPECIES)
    
    ... ... @@ -1354,10 +1160,7 @@ class ObserveDtoInitializer {
    1354 1160
     
    
    1355 1161
             @Override
    
    1356 1162
             public void initNonTargetLengthDto() {
    
    1357
    -
    
    1358
    -
    
    1359 1163
                 n("observe.type.nonTargetLength");
    
    1360
    -
    
    1361 1164
                 n("observe.type.nonTargetLengths");
    
    1362 1165
                 flushData(dataDefinitionBuilder(NonTargetLengthDto.class)
    
    1363 1166
                                   .addProperty(String.class, NonTargetLengthDto.PROPERTY_SPECIES)
    
    ... ... @@ -1366,18 +1169,13 @@ class ObserveDtoInitializer {
    1366 1169
     
    
    1367 1170
             @Override
    
    1368 1171
             public void initNonTargetSampleDto() {
    
    1369
    -
    
    1370
    -
    
    1371 1172
                 n("observe.type.nonTargetSample");
    
    1372
    -
    
    1373 1173
                 n("observe.type.nonTargetSamples");
    
    1374 1174
                 flushData(dataDefinitionBuilder(NonTargetSampleDto.class));
    
    1375 1175
             }
    
    1376 1176
     
    
    1377 1177
             @Override
    
    1378 1178
             public void initObjectObservedSpeciesDto() {
    
    1379
    -
    
    1380
    -
    
    1381 1179
                 n("observe.type.objectObservedSpecies");
    
    1382 1180
                 flushData(dataDefinitionBuilder(ObjectObservedSpeciesDto.class)
    
    1383 1181
                                   .addProperty(String.class, ObjectObservedSpeciesDto.PROPERTY_SPECIES)
    
    ... ... @@ -1395,10 +1193,7 @@ class ObserveDtoInitializer {
    1395 1193
     
    
    1396 1194
             @Override
    
    1397 1195
             public void initRouteDto() {
    
    1398
    -
    
    1399
    -
    
    1400 1196
                 n("observe.type.route");
    
    1401
    -
    
    1402 1197
                 n("observe.type.routes");
    
    1403 1198
                 flushData(dataDefinitionBuilder(RouteDto.class)
    
    1404 1199
                                   .addProperty(Date.class, RouteDto.PROPERTY_DATE)
    
    ... ... @@ -1412,10 +1207,7 @@ class ObserveDtoInitializer {
    1412 1207
     
    
    1413 1208
             @Override
    
    1414 1209
             public void initSchoolEstimateDto() {
    
    1415
    -
    
    1416
    -
    
    1417 1210
                 n("observe.type.schoolEstimate");
    
    1418
    -
    
    1419 1211
                 n("observe.type.schoolEstimates");
    
    1420 1212
                 flushData(dataDefinitionBuilder(SchoolEstimateDto.class)
    
    1421 1213
                                   .addProperty(String.class, SchoolEstimateDto.PROPERTY_SPECIES)
    
    ... ... @@ -1425,10 +1217,7 @@ class ObserveDtoInitializer {
    1425 1217
     
    
    1426 1218
             @Override
    
    1427 1219
             public void initSetSeineDto() {
    
    1428
    -
    
    1429
    -
    
    1430 1220
                 n("observe.type.setSeine");
    
    1431
    -
    
    1432 1221
                 n("observe.type.setSeines");
    
    1433 1222
                 flushData(dataDefinitionBuilder(SetSeineDto.class)
    
    1434 1223
                                   .addProperty(String.class, SetSeineDto.PROPERTY_COMMENT));
    
    ... ... @@ -1456,10 +1245,7 @@ class ObserveDtoInitializer {
    1456 1245
     
    
    1457 1246
             @Override
    
    1458 1247
             public void initTargetCatchDto() {
    
    1459
    -
    
    1460
    -
    
    1461 1248
                 n("observe.type.targetCatch");
    
    1462
    -
    
    1463 1249
                 n("observe.type.targetCatches");
    
    1464 1250
                 flushData(dataDefinitionBuilder(TargetCatchDto.class)
    
    1465 1251
                                   .addProperty(String.class, TargetCatchDto.PROPERTY_SPECIES));
    
    ... ... @@ -1467,10 +1253,7 @@ class ObserveDtoInitializer {
    1467 1253
     
    
    1468 1254
             @Override
    
    1469 1255
             public void initTargetLengthDto() {
    
    1470
    -
    
    1471
    -
    
    1472 1256
                 n("observe.type.targetLength");
    
    1473
    -
    
    1474 1257
                 n("observe.type.targetLengths");
    
    1475 1258
                 flushData(dataDefinitionBuilder(TargetLengthDto.class)
    
    1476 1259
                                   .addProperty(String.class, TargetLengthDto.PROPERTY_SPECIES)
    
    ... ... @@ -1480,18 +1263,13 @@ class ObserveDtoInitializer {
    1480 1263
     
    
    1481 1264
             @Override
    
    1482 1265
             public void initTargetSampleDto() {
    
    1483
    -
    
    1484
    -
    
    1485 1266
                 n("observe.type.targetSample");
    
    1486
    -
    
    1487 1267
                 n("observe.type.targetSamples");
    
    1488 1268
                 flushData(dataDefinitionBuilder(TargetSampleDto.class));
    
    1489 1269
             }
    
    1490 1270
     
    
    1491 1271
             @Override
    
    1492 1272
             public void initTransmittingBuoyDto() {
    
    1493
    -
    
    1494
    -
    
    1495 1273
                 n("observe.type.transmittingBuoy");
    
    1496 1274
                 n("observe.type.transmittingBuoys");
    
    1497 1275
                 flushData(dataDefinitionBuilder(TransmittingBuoyDto.class)
    
    ... ... @@ -1503,10 +1281,7 @@ class ObserveDtoInitializer {
    1503 1281
     
    
    1504 1282
             @Override
    
    1505 1283
             public void initTripSeineDto() {
    
    1506
    -
    
    1507
    -
    
    1508 1284
                 n("observe.type.tripSeine");
    
    1509
    -
    
    1510 1285
                 n("observe.type.tripSeines");
    
    1511 1286
                 flushData(dataDefinitionBuilder(TripSeineDto.class)
    
    1512 1287
                                   .addProperty(Date.class, TripSeineDto.PROPERTY_START_DATE)
    
    ... ... @@ -1519,10 +1294,7 @@ class ObserveDtoInitializer {
    1519 1294
     
    
    1520 1295
             @Override
    
    1521 1296
             public void initTripSeineGearUseDto() {
    
    1522
    -
    
    1523
    -
    
    1524 1297
                 n("observe.type.tripSeineGearUse");
    
    1525
    -
    
    1526 1298
                 n("observe.type.tripSeineGearUses");
    
    1527 1299
                 flushData(dataDefinitionBuilder(TripSeineGearUseDto.class));
    
    1528 1300
             }