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

Commits:

15 changed files:

Changes:

  • client/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java
    ... ... @@ -28,10 +28,10 @@ import fr.ird.observe.client.ui.ObserveKeyStrokes;
    28 28
     import fr.ird.observe.client.ui.admin.AdminTabUIHandler;
    
    29 29
     import fr.ird.observe.client.ui.util.ProgressModel;
    
    30 30
     import fr.ird.observe.services.dto.reference.DataReference;
    
    31
    -import fr.ird.observe.services.service.actions.consolidate.set.ConsolidateActivitySeineDataResult;
    
    32 31
     import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService;
    
    33 32
     import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataRequest;
    
    34 33
     import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataResult;
    
    34
    +import fr.ird.observe.services.service.actions.consolidate.set.ConsolidateActivitySeineDataResult;
    
    35 35
     import java.util.Date;
    
    36 36
     import java.util.Set;
    
    37 37
     import java.util.stream.Collectors;
    

  • client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java
    ... ... @@ -78,7 +78,6 @@ import org.nuiton.jaxx.runtime.spi.UIHandler;
    78 78
     import org.nuiton.jaxx.runtime.swing.SwingUtil;
    
    79 79
     import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
    
    80 80
     import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
    
    81
    -import org.nuiton.jaxx.validator.swing.SwingValidatorUtil;
    
    82 81
     import org.nuiton.validator.NuitonValidatorScope;
    
    83 82
     
    
    84 83
     
    

  • client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIBlockingLayerUI.java
    ... ... @@ -25,7 +25,6 @@ package fr.ird.observe.client.ui.storage;
    25 25
     import com.google.common.collect.ImmutableSet;
    
    26 26
     import fr.ird.observe.client.ObserveSwingApplicationContext;
    
    27 27
     import fr.ird.observe.client.ui.actions.AbstractUIAction;
    
    28
    -import fr.ird.observe.client.ui.content.ContentUI;
    
    29 28
     import java.awt.event.ActionEvent;
    
    30 29
     import java.awt.event.KeyEvent;
    
    31 30
     import java.awt.event.MouseEvent;
    

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/CatchLonglineNavigationTreeNode.java
    ... ... @@ -38,7 +38,7 @@ import static org.nuiton.i18n.I18n.t;
    38 38
     public class CatchLonglineNavigationTreeNode extends ClassNavigationTreeNode<CatchLonglineDto> {
    
    39 39
     
    
    40 40
         CatchLonglineNavigationTreeNode() {
    
    41
    -        super(CatchLonglineDto.class,t("observe.ui.tree.longline.catch"));
    
    41
    +        super(CatchLonglineDto.class, t("observe.ui.tree.longline.catch"));
    
    42 42
         }
    
    43 43
     
    
    44 44
         @Override
    

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/SetGlobalCompositionLonglineNavigationTreeNode.java
    ... ... @@ -38,7 +38,7 @@ import static org.nuiton.i18n.I18n.t;
    38 38
     public class SetGlobalCompositionLonglineNavigationTreeNode extends ClassNavigationTreeNode<SetLonglineGlobalCompositionDto> {
    
    39 39
     
    
    40 40
         SetGlobalCompositionLonglineNavigationTreeNode() {
    
    41
    -        super(SetLonglineGlobalCompositionDto.class,t("observe.ui.tree.longline.setGlobalComposition"));
    
    41
    +        super(SetLonglineGlobalCompositionDto.class, t("observe.ui.tree.longline.setGlobalComposition"));
    
    42 42
         }
    
    43 43
     
    
    44 44
         @Override
    

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ActivitiesSeineNavigationTreeNode.java
    ... ... @@ -41,7 +41,7 @@ import static org.nuiton.i18n.I18n.t;
    41 41
     public class ActivitiesSeineNavigationTreeNode extends ClassNavigationTreeNode<ActivitySeineDto> implements WithChildsToReload {
    
    42 42
     
    
    43 43
         ActivitiesSeineNavigationTreeNode() {
    
    44
    -        super(ActivitySeineDto.class, true,t("observe.ui.tree.activities"));
    
    44
    +        super(ActivitySeineDto.class, true, t("observe.ui.tree.activities"));
    
    45 45
         }
    
    46 46
     
    
    47 47
         @Override
    

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/DiscardedTargetCatchSeineNavigationTreeNode.java
    ... ... @@ -38,7 +38,7 @@ import static org.nuiton.i18n.I18n.t;
    38 38
     public class DiscardedTargetCatchSeineNavigationTreeNode extends ClassNavigationTreeNode<DiscardedTargetCatchDto> {
    
    39 39
     
    
    40 40
         DiscardedTargetCatchSeineNavigationTreeNode() {
    
    41
    -        super(DiscardedTargetCatchDto.class,t("observe.ui.tree.seine.discardedTargetCatch"));
    
    41
    +        super(DiscardedTargetCatchDto.class, t("observe.ui.tree.seine.discardedTargetCatch"));
    
    42 42
         }
    
    43 43
     
    
    44 44
         @Override
    

  • client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/GearUseFeaturesSeineNavigationTreeNode.java
    ... ... @@ -39,7 +39,7 @@ import static org.nuiton.i18n.I18n.t;
    39 39
     public class GearUseFeaturesSeineNavigationTreeNode extends ClassNavigationTreeNode<GearUseFeaturesSeineDto> {
    
    40 40
     
    
    41 41
         GearUseFeaturesSeineNavigationTreeNode() {
    
    42
    -        super(GearUseFeaturesSeineDto.class,t("observe.ui.tree.gearUseFeatures"));
    
    42
    +        super(GearUseFeaturesSeineDto.class, t("observe.ui.tree.gearUseFeatures"));
    
    43 43
         }
    
    44 44
     
    
    45 45
         @Override
    

  • services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java
    ... ... @@ -55,8 +55,8 @@ public abstract class ReferentialBinderSupport<E extends ObserveReferentialEntit
    55 55
     
    
    56 56
         protected ReferentialReference<D> toReferentialReference(E entity, Serializable... values) {
    
    57 57
     
    
    58
    -        ReferentialReference<D> reference=null;
    
    59
    -        if (entity!=null) {
    
    58
    +        ReferentialReference<D> reference = null;
    
    59
    +        if (entity != null) {
    
    60 60
                 reference = new ReferentialReference<>();
    
    61 61
     
    
    62 62
                 reference.setId(entity.getTopiaId());
    

  • services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopiaClassMapping.java
    ... ... @@ -25,7 +25,6 @@ package fr.ird.observe.services.topia;
    25 25
     import fr.ird.observe.services.service.DataSourceService;
    
    26 26
     import fr.ird.observe.services.service.LastUpdateDateService;
    
    27 27
     import fr.ird.observe.services.service.ObserveService;
    
    28
    -import fr.ird.observe.services.service.PingService;
    
    29 28
     import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService;
    
    30 29
     import fr.ird.observe.services.service.actions.report.ReportService;
    
    31 30
     import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService;
    

  • services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java
    ... ... @@ -313,7 +313,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements
    313 313
             ConsolidateFloatingObjectRequest request = new ConsolidateFloatingObjectRequest(floatingObjectDto, floatingObjectPartDtos);
    
    314 314
             Optional<ConsolidateFloatingObjectResult> result = floatingObjectConsolidateEngine.consolidate(request);
    
    315 315
     
    
    316
    -        result.ifPresent(r->activityContext.flushDcp(dcp, r));
    
    316
    +        result.ifPresent(r -> activityContext.flushDcp(dcp, r));
    
    317 317
     
    
    318 318
         }
    
    319 319
     
    

  • services/src/main/java/fr/ird/observe/services/dto/AbstractObserveDto.java
    ... ... @@ -32,7 +32,7 @@ import org.nuiton.util.CollectionUtil;
    32 32
      * @author Tony Chemit - dev@tchemit.fr
    
    33 33
      * @since 7.0
    
    34 34
      */
    
    35
    -public abstract class AbstractObserveDto extends AbstractSerializableBean implements ObserveDto{
    
    35
    +public abstract class AbstractObserveDto extends AbstractSerializableBean implements ObserveDto {
    
    36 36
     
    
    37 37
         private static final long serialVersionUID = 1L;
    
    38 38
     
    

  • services/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryHelper.java
    ... ... @@ -25,7 +25,6 @@ package fr.ird.observe.services.dto.referential.seine;
    25 25
     import fr.ird.observe.services.dto.reference.ReferentialReference;
    
    26 26
     import java.util.Collection;
    
    27 27
     import java.util.List;
    
    28
    -import java.util.Set;
    
    29 28
     import java.util.function.Predicate;
    
    30 29
     import java.util.stream.Collectors;
    
    31 30
     import org.apache.commons.logging.Log;
    

  • services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java
    ... ... @@ -47,8 +47,8 @@ import fr.ird.observe.services.gson.reference.DataReferenceSetAdapter;
    47 47
     import fr.ird.observe.services.gson.reference.ReferentialReferenceAdapter;
    
    48 48
     import fr.ird.observe.services.gson.reference.ReferentialReferenceSetAdapter;
    
    49 49
     import fr.ird.observe.services.gson.reference.UnknownReferenceAdapter;
    
    50
    -import io.ultreia.java4all.http.HResponseError;
    
    51 50
     import fr.ird.observe.services.service.actions.report.ReportVariable;
    
    51
    +import io.ultreia.java4all.http.HResponseError;
    
    52 52
     import io.ultreia.java4all.http.HResponseErrorAdapter;
    
    53 53
     import java.sql.Blob;
    
    54 54
     import java.util.Collection;
    

  • services/src/main/java/fr/ird/observe/services/service/actions/consolidate/dcp/ConsolidateFloatingObjectRequest.java
    ... ... @@ -39,7 +39,6 @@ public class ConsolidateFloatingObjectRequest implements ObserveDto {
    39 39
         private final ImmutableSet<FloatingObjectPartDto> whenArriving;
    
    40 40
         private final ImmutableSet<FloatingObjectPartDto> whenLeaving;
    
    41 41
     
    
    42
    -
    
    43 42
         public ConsolidateFloatingObjectRequest(FloatingObjectDto dcp, ImmutableSet<FloatingObjectPartDto> floatingObjectParts) {
    
    44 43
             this.dcp = dcp;
    
    45 44
             whenArriving = ImmutableSet.copyOf(floatingObjectParts.stream().filter(p -> p.getWhenArriving() != null).collect(Collectors.toSet()));