Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d9a44894 by Tony CHEMIT at 2017-08-04T23:59:27+02:00 reformat code - - - - - 15 changed files: - client/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIBlockingLayerUI.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/CatchLonglineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/SetGlobalCompositionLonglineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ActivitiesSeineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/DiscardedTargetCatchSeineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/GearUseFeaturesSeineNavigationTreeNode.java - services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java - services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopiaClassMapping.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java - services/src/main/java/fr/ird/observe/services/dto/AbstractObserveDto.java - services/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryHelper.java - services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java - services/src/main/java/fr/ird/observe/services/service/actions/consolidate/dcp/ConsolidateFloatingObjectRequest.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java @@ -28,10 +28,10 @@ import fr.ird.observe.client.ui.ObserveKeyStrokes; import fr.ird.observe.client.ui.admin.AdminTabUIHandler; import fr.ird.observe.client.ui.util.ProgressModel; import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.service.actions.consolidate.set.ConsolidateActivitySeineDataResult; import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService; import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataRequest; import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataResult; +import fr.ird.observe.services.service.actions.consolidate.set.ConsolidateActivitySeineDataResult; import java.util.Date; import java.util.Set; import java.util.stream.Collectors; ===================================== client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/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; import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel; -import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; import org.nuiton.validator.NuitonValidatorScope; ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIBlockingLayerUI.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIBlockingLayerUI.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIBlockingLayerUI.java @@ -25,7 +25,6 @@ package fr.ird.observe.client.ui.storage; import com.google.common.collect.ImmutableSet; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ui.actions.AbstractUIAction; -import fr.ird.observe.client.ui.content.ContentUI; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/CatchLonglineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/CatchLonglineNavigationTreeNode.java +++ b/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; public class CatchLonglineNavigationTreeNode extends ClassNavigationTreeNode<CatchLonglineDto> { CatchLonglineNavigationTreeNode() { - super(CatchLonglineDto.class,t("observe.ui.tree.longline.catch")); + super(CatchLonglineDto.class, t("observe.ui.tree.longline.catch")); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/SetGlobalCompositionLonglineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/SetGlobalCompositionLonglineNavigationTreeNode.java +++ b/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; public class SetGlobalCompositionLonglineNavigationTreeNode extends ClassNavigationTreeNode<SetLonglineGlobalCompositionDto> { SetGlobalCompositionLonglineNavigationTreeNode() { - super(SetLonglineGlobalCompositionDto.class,t("observe.ui.tree.longline.setGlobalComposition")); + super(SetLonglineGlobalCompositionDto.class, t("observe.ui.tree.longline.setGlobalComposition")); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ActivitiesSeineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ActivitiesSeineNavigationTreeNode.java +++ b/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; public class ActivitiesSeineNavigationTreeNode extends ClassNavigationTreeNode<ActivitySeineDto> implements WithChildsToReload { ActivitiesSeineNavigationTreeNode() { - super(ActivitySeineDto.class, true,t("observe.ui.tree.activities")); + super(ActivitySeineDto.class, true, t("observe.ui.tree.activities")); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/DiscardedTargetCatchSeineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/DiscardedTargetCatchSeineNavigationTreeNode.java +++ b/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; public class DiscardedTargetCatchSeineNavigationTreeNode extends ClassNavigationTreeNode<DiscardedTargetCatchDto> { DiscardedTargetCatchSeineNavigationTreeNode() { - super(DiscardedTargetCatchDto.class,t("observe.ui.tree.seine.discardedTargetCatch")); + super(DiscardedTargetCatchDto.class, t("observe.ui.tree.seine.discardedTargetCatch")); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/GearUseFeaturesSeineNavigationTreeNode.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/GearUseFeaturesSeineNavigationTreeNode.java +++ b/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; public class GearUseFeaturesSeineNavigationTreeNode extends ClassNavigationTreeNode<GearUseFeaturesSeineDto> { GearUseFeaturesSeineNavigationTreeNode() { - super(GearUseFeaturesSeineDto.class,t("observe.ui.tree.gearUseFeatures")); + super(GearUseFeaturesSeineDto.class, t("observe.ui.tree.gearUseFeatures")); } @Override ===================================== services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java +++ b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java @@ -55,8 +55,8 @@ public abstract class ReferentialBinderSupport<E extends ObserveReferentialEntit protected ReferentialReference<D> toReferentialReference(E entity, Serializable... values) { - ReferentialReference<D> reference=null; - if (entity!=null) { + ReferentialReference<D> reference = null; + if (entity != null) { reference = new ReferentialReference<>(); reference.setId(entity.getTopiaId()); ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopiaClassMapping.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopiaClassMapping.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopiaClassMapping.java @@ -25,7 +25,6 @@ package fr.ird.observe.services.topia; import fr.ird.observe.services.service.DataSourceService; import fr.ird.observe.services.service.LastUpdateDateService; import fr.ird.observe.services.service.ObserveService; -import fr.ird.observe.services.service.PingService; import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService; import fr.ird.observe.services.service.actions.report.ReportService; 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 ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java +++ b/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 ConsolidateFloatingObjectRequest request = new ConsolidateFloatingObjectRequest(floatingObjectDto, floatingObjectPartDtos); Optional<ConsolidateFloatingObjectResult> result = floatingObjectConsolidateEngine.consolidate(request); - result.ifPresent(r->activityContext.flushDcp(dcp, r)); + result.ifPresent(r -> activityContext.flushDcp(dcp, r)); } ===================================== services/src/main/java/fr/ird/observe/services/dto/AbstractObserveDto.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/dto/AbstractObserveDto.java +++ b/services/src/main/java/fr/ird/observe/services/dto/AbstractObserveDto.java @@ -32,7 +32,7 @@ import org.nuiton.util.CollectionUtil; * @author Tony Chemit - dev@tchemit.fr * @since 7.0 */ -public abstract class AbstractObserveDto extends AbstractSerializableBean implements ObserveDto{ +public abstract class AbstractObserveDto extends AbstractSerializableBean implements ObserveDto { private static final long serialVersionUID = 1L; ===================================== services/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryHelper.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryHelper.java +++ b/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; import fr.ird.observe.services.dto.reference.ReferentialReference; import java.util.Collection; import java.util.List; -import java.util.Set; import java.util.function.Predicate; import java.util.stream.Collectors; import org.apache.commons.logging.Log; ===================================== services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java @@ -47,8 +47,8 @@ import fr.ird.observe.services.gson.reference.DataReferenceSetAdapter; import fr.ird.observe.services.gson.reference.ReferentialReferenceAdapter; import fr.ird.observe.services.gson.reference.ReferentialReferenceSetAdapter; import fr.ird.observe.services.gson.reference.UnknownReferenceAdapter; -import io.ultreia.java4all.http.HResponseError; import fr.ird.observe.services.service.actions.report.ReportVariable; +import io.ultreia.java4all.http.HResponseError; import io.ultreia.java4all.http.HResponseErrorAdapter; import java.sql.Blob; import java.util.Collection; ===================================== services/src/main/java/fr/ird/observe/services/service/actions/consolidate/dcp/ConsolidateFloatingObjectRequest.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/actions/consolidate/dcp/ConsolidateFloatingObjectRequest.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/consolidate/dcp/ConsolidateFloatingObjectRequest.java @@ -39,7 +39,6 @@ public class ConsolidateFloatingObjectRequest implements ObserveDto { private final ImmutableSet<FloatingObjectPartDto> whenArriving; private final ImmutableSet<FloatingObjectPartDto> whenLeaving; - public ConsolidateFloatingObjectRequest(FloatingObjectDto dcp, ImmutableSet<FloatingObjectPartDto> floatingObjectParts) { this.dcp = dcp; whenArriving = ImmutableSet.copyOf(floatingObjectParts.stream().filter(p -> p.getWhenArriving() != null).collect(Collectors.toSet())); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d9a448941ed45d4ab7d267b7e59d... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d9a448941ed45d4ab7d267b7e59d... You're receiving this email because of your account on gitlab.com.