This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit c74fc00c34a9f9da9ad89cd79ffeff148e6f7bf0 Author: Kevin Morin <morin@codelutin.com> Date: Fri Nov 13 16:26:03 2015 +0100 déplacement du package de gps --- .../main/java/fr/ird/observe/ObserveSwingApplicationContext.java | 2 +- .../src/main/java/fr/ird/observe/ui/DecoratorService.java | 4 ++-- .../main/java/fr/ird/observe/ui/admin/gps/GPSAbleTableModel.java | 2 +- .../java/fr/ird/observe/ui/admin/gps/GPSActivityTableModel.java | 2 +- .../main/java/fr/ird/observe/ui/admin/gps/ImportGPSUIHandler.java | 6 +++--- .../validation/validator/dto/ActivitySimpleSpeedDtoValidator.java | 4 ++-- .../observe/validation/validator/dto/ActivitySpeedDtoValidator.java | 4 ++-- .../src/main/java/fr/ird/observe/util}/gps/CoordinateHelper.java | 2 +- .../src/main/java/fr/ird/observe/util}/gps/GPSAble.java | 2 +- .../src/main/java/fr/ird/observe/util}/gps/GPSFileReader.java | 2 +- .../src/main/java/fr/ird/observe/util}/gps/GPSPoint.java | 2 +- .../src/main/java/fr/ird/observe/util}/gps/GPSPointImpl.java | 2 +- .../src/main/java/fr/ird/observe/util}/gps/GPSPointInterval.java | 2 +- .../main/java/fr/ird/observe/util}/gps/GPSPointIntervalImpl.java | 2 +- .../src/main/java/fr/ird/observe/util}/gps/GPSRoute.java | 2 +- .../src/main/java/fr/ird/observe/util}/gps/GPSRouteImpl.java | 2 +- .../src/main/java/fr/ird/observe/util}/gps/GPSService.java | 2 +- .../src/main/java/fr/ird/observe/util}/gps/GpsPoints.java | 2 +- 18 files changed, 23 insertions(+), 23 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java index 954693f..5efda8f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java @@ -25,7 +25,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import fr.ird.observe.db.DataContext; -import fr.ird.observe.business.gps.GPSService; +import fr.ird.observe.util.gps.GPSService; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.db.constants.DbMode; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java index 5d60408..8d1b2f7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java @@ -22,8 +22,8 @@ package fr.ird.observe.ui; import com.google.common.collect.Lists; -import fr.ird.observe.business.gps.GPSPoint; -import fr.ird.observe.business.gps.GPSPointInterval; +import fr.ird.observe.util.gps.GPSPoint; +import fr.ird.observe.util.gps.GPSPointInterval; import fr.ird.observe.entities.longline.SectionTemplate; import fr.ird.observe.services.dto.AbstractObserveDto; import fr.ird.observe.services.dto.IdDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/GPSAbleTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/GPSAbleTableModel.java index ad88677..e09bdce 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/GPSAbleTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/GPSAbleTableModel.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.admin.gps; -import fr.ird.observe.business.gps.GPSAble; +import fr.ird.observe.util.gps.GPSAble; import org.nuiton.i18n.I18n; import javax.swing.table.AbstractTableModel; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/GPSActivityTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/GPSActivityTableModel.java index e53268f..95010ae 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/GPSActivityTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/GPSActivityTableModel.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.admin.gps; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.gps.GPSPoint; +import fr.ird.observe.util.gps.GPSPoint; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import org.nuiton.decorator.Decorator; import org.nuiton.i18n.I18n; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUIHandler.java index d1ac289..0b1741c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/gps/ImportGPSUIHandler.java @@ -21,9 +21,9 @@ */ package fr.ird.observe.ui.admin.gps; -import fr.ird.observe.business.gps.GPSPoint; -import fr.ird.observe.business.gps.GPSPointInterval; -import fr.ird.observe.business.gps.GPSRoute; +import fr.ird.observe.util.gps.GPSPoint; +import fr.ird.observe.util.gps.GPSPointInterval; +import fr.ird.observe.util.gps.GPSRoute; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.TripSeineDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySimpleSpeedDtoValidator.java b/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySimpleSpeedDtoValidator.java index b8e0e9e..389e461 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySimpleSpeedDtoValidator.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySimpleSpeedDtoValidator.java @@ -26,8 +26,8 @@ import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.gps.GPSPoint; -import fr.ird.observe.business.gps.GpsPoints; +import fr.ird.observe.util.gps.GPSPoint; +import fr.ird.observe.util.gps.GpsPoints; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.RouteDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySpeedDtoValidator.java b/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySpeedDtoValidator.java index 7347e57..530b548 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySpeedDtoValidator.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySpeedDtoValidator.java @@ -26,8 +26,8 @@ import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.gps.GPSPoint; -import fr.ird.observe.business.gps.GpsPoints; +import fr.ird.observe.util.gps.GPSPoint; +import fr.ird.observe.util.gps.GpsPoints; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.RouteDto; import org.apache.commons.logging.Log; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/gps/CoordinateHelper.java b/observe-services-model/src/main/java/fr/ird/observe/util/gps/CoordinateHelper.java similarity index 97% rename from observe-application-swing/src/main/java/fr/ird/observe/business/gps/CoordinateHelper.java rename to observe-services-model/src/main/java/fr/ird/observe/util/gps/CoordinateHelper.java index a01f6e2..10be892 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/gps/CoordinateHelper.java +++ b/observe-services-model/src/main/java/fr/ird/observe/util/gps/CoordinateHelper.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.business.gps; +package fr.ird.observe.util.gps; /** * Helper to deal with coordinates. diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSAble.java b/observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSAble.java similarity index 97% rename from observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSAble.java rename to observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSAble.java index e9f126f..8428f28 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSAble.java +++ b/observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSAble.java @@ -1,4 +1,4 @@ -package fr.ird.observe.business.gps; +package fr.ird.observe.util.gps; /* * #%L diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSFileReader.java b/observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSFileReader.java similarity index 99% rename from observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSFileReader.java rename to observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSFileReader.java index 525791a..f8608b7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSFileReader.java +++ b/observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSFileReader.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.business.gps; +package fr.ird.observe.util.gps; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.logging.Log; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSPoint.java b/observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSPoint.java similarity index 98% rename from observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSPoint.java rename to observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSPoint.java index 7b9cfe8..7891366 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSPoint.java +++ b/observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSPoint.java @@ -1,4 +1,4 @@ -package fr.ird.observe.business.gps; +package fr.ird.observe.util.gps; /* * #%L diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSPointImpl.java b/observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSPointImpl.java similarity index 98% rename from observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSPointImpl.java rename to observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSPointImpl.java index 8425091..a9714c6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSPointImpl.java +++ b/observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSPointImpl.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.business.gps; +package fr.ird.observe.util.gps; /** * @author Tony Chemit - chemit@codelutin.com diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSPointInterval.java b/observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSPointInterval.java similarity index 99% rename from observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSPointInterval.java rename to observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSPointInterval.java index f1f92d2..40ff7f1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSPointInterval.java +++ b/observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSPointInterval.java @@ -1,4 +1,4 @@ -package fr.ird.observe.business.gps; +package fr.ird.observe.util.gps; /* * #%L diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSPointIntervalImpl.java b/observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSPointIntervalImpl.java similarity index 98% rename from observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSPointIntervalImpl.java rename to observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSPointIntervalImpl.java index a1c22c7..363af69 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSPointIntervalImpl.java +++ b/observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSPointIntervalImpl.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.business.gps; +package fr.ird.observe.util.gps; import java.util.Date; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSRoute.java b/observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSRoute.java similarity index 99% rename from observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSRoute.java rename to observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSRoute.java index 166ebd4..4590179 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSRoute.java +++ b/observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSRoute.java @@ -1,4 +1,4 @@ -package fr.ird.observe.business.gps; +package fr.ird.observe.util.gps; /* * #%L diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSRouteImpl.java b/observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSRouteImpl.java similarity index 99% rename from observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSRouteImpl.java rename to observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSRouteImpl.java index 485c4e1..f8d772f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSRouteImpl.java +++ b/observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSRouteImpl.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.business.gps; +package fr.ird.observe.util.gps; import java.util.Date; import java.util.List; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSService.java b/observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSService.java similarity index 98% rename from observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSService.java rename to observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSService.java index b33ae29..d927f80 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/gps/GPSService.java +++ b/observe-services-model/src/main/java/fr/ird/observe/util/gps/GPSService.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.business.gps; +package fr.ird.observe.util.gps; import java.io.File; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/gps/GpsPoints.java b/observe-services-model/src/main/java/fr/ird/observe/util/gps/GpsPoints.java similarity index 99% rename from observe-application-swing/src/main/java/fr/ird/observe/business/gps/GpsPoints.java rename to observe-services-model/src/main/java/fr/ird/observe/util/gps/GpsPoints.java index 1aaa45a..0383c27 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/gps/GpsPoints.java +++ b/observe-services-model/src/main/java/fr/ird/observe/util/gps/GpsPoints.java @@ -1,4 +1,4 @@ -package fr.ird.observe.business.gps; +package fr.ird.observe.util.gps; /* * #%L -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.