branch feature/7017 updated (2bbe067 -> a8e1073)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7017 in repository observe. See http://git.codelutin.com/observe.git from 2bbe067 demander l'enregistrement du detail de l'avançon modifié avant l'enregistrement de la composition de la palangre new a8e1073 - suppression commons.collections - ajout Sylvain en tant que développeur - observe-validation est en dépendances sur observe-service-api - optimisation des dépendances - deplacement model The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a8e10732dc363f0117073bfe056d926740cc0c40 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon May 4 17:56:03 2015 +0200 - suppression commons.collections - ajout Sylvain en tant que développeur - observe-validation est en dépendances sur observe-service-api - optimisation des dépendances - deplacement model Summary of changes: observe-business/pom.xml | 4 -- .../fr/ird/observe/db/impl/PGDataSourceConfig.java | 2 +- .../java/fr/ird/observe/db/util/PGInstall.java | 2 +- observe-services-api/pom.xml | 79 ++-------------------- .../fr/ird/observe/services/ObserveService.java | 3 +- .../ird/observe/services/ObserveServicesCache.java | 4 +- .../{model => data}/DataSelectionModel.java | 5 +- .../fr/ird/observe/services/data/TripService.java | 1 - .../services/operation/ValidationService.java | 2 +- observe-services/pom.xml | 25 ++----- .../observe/services/AbstractObserveService.java | 5 -- .../ird/observe/services/data/TripServiceImpl.java | 1 - .../services/operation/ComputeDataServiceImpl.java | 2 +- .../services/operation/SynchronizeServiceImpl.java | 4 +- .../services/operation/ValidationServiceImpl.java | 2 +- .../referential/ReferentialServiceImpl.java | 2 +- observe-swing/pom.xml | 16 ----- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 2 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 2 +- .../ird/observe/ui/admin/config/SelectDataUI.jaxx | 2 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 16 ++--- .../ird/observe/ui/admin/export/ExportModel.java | 2 +- .../observe/ui/admin/export/ExportUIHandler.java | 2 +- .../observe/ui/admin/report/ReportUIHandler.java | 2 +- .../ui/admin/synchronize/SynchronizeUIHandler.java | 2 +- .../ui/admin/validate/ValidateUIHandler.java | 3 +- .../impl/longline/CatchLonglineUIHandler.java | 6 +- .../ird/observe/ui/storage/ObstunaAdminAction.java | 2 +- .../ui/storage/StorageBackupUILauncher.java | 2 +- .../ird/observe/ui/storage/StorageUIHandler.java | 2 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 2 +- .../ui/storage/tabs/StorageTabUIHandler.java | 2 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 2 +- .../ird/observe/ui/tree/ObserveDataProvider.java | 2 +- .../fr/ird/observe/ui/tree/ObserveTreeBridge.java | 2 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 4 +- .../ui/tree/loadors/AbstractNodeChildLoador.java | 2 +- .../loadors/ProgramLonglineNodeChildLoador.java | 4 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 4 +- .../ui/tree/loadors/RootNodeChildLoador.java | 2 +- pom.xml | 15 +++- 41 files changed, 70 insertions(+), 175 deletions(-) rename observe-services-api/src/main/java/fr/ird/observe/services/{model => data}/DataSelectionModel.java (98%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7017 in repository observe. See http://git.codelutin.com/observe.git commit a8e10732dc363f0117073bfe056d926740cc0c40 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon May 4 17:56:03 2015 +0200 - suppression commons.collections - ajout Sylvain en tant que développeur - observe-validation est en dépendances sur observe-service-api - optimisation des dépendances - deplacement model --- observe-business/pom.xml | 4 -- .../fr/ird/observe/db/impl/PGDataSourceConfig.java | 2 +- .../java/fr/ird/observe/db/util/PGInstall.java | 2 +- observe-services-api/pom.xml | 79 ++-------------------- .../fr/ird/observe/services/ObserveService.java | 3 +- .../ird/observe/services/ObserveServicesCache.java | 4 +- .../{model => data}/DataSelectionModel.java | 5 +- .../fr/ird/observe/services/data/TripService.java | 1 - .../services/operation/ValidationService.java | 2 +- observe-services/pom.xml | 25 ++----- .../observe/services/AbstractObserveService.java | 5 -- .../ird/observe/services/data/TripServiceImpl.java | 1 - .../services/operation/ComputeDataServiceImpl.java | 2 +- .../services/operation/SynchronizeServiceImpl.java | 4 +- .../services/operation/ValidationServiceImpl.java | 2 +- .../referential/ReferentialServiceImpl.java | 2 +- observe-swing/pom.xml | 16 ----- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 2 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 2 +- .../ird/observe/ui/admin/config/SelectDataUI.jaxx | 2 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 16 ++--- .../ird/observe/ui/admin/export/ExportModel.java | 2 +- .../observe/ui/admin/export/ExportUIHandler.java | 2 +- .../observe/ui/admin/report/ReportUIHandler.java | 2 +- .../ui/admin/synchronize/SynchronizeUIHandler.java | 2 +- .../ui/admin/validate/ValidateUIHandler.java | 3 +- .../impl/longline/CatchLonglineUIHandler.java | 6 +- .../ird/observe/ui/storage/ObstunaAdminAction.java | 2 +- .../ui/storage/StorageBackupUILauncher.java | 2 +- .../ird/observe/ui/storage/StorageUIHandler.java | 2 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 2 +- .../ui/storage/tabs/StorageTabUIHandler.java | 2 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 2 +- .../ird/observe/ui/tree/ObserveDataProvider.java | 2 +- .../fr/ird/observe/ui/tree/ObserveTreeBridge.java | 2 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 4 +- .../ui/tree/loadors/AbstractNodeChildLoador.java | 2 +- .../loadors/ProgramLonglineNodeChildLoador.java | 4 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 4 +- .../ui/tree/loadors/RootNodeChildLoador.java | 2 +- pom.xml | 15 +++- 41 files changed, 70 insertions(+), 175 deletions(-) diff --git a/observe-business/pom.xml b/observe-business/pom.xml index 4366577..9c20720 100644 --- a/observe-business/pom.xml +++ b/observe-business/pom.xml @@ -89,10 +89,6 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> diff --git a/observe-business/src/main/java/fr/ird/observe/db/impl/PGDataSourceConfig.java b/observe-business/src/main/java/fr/ird/observe/db/impl/PGDataSourceConfig.java index 134f57d..354d53d 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/impl/PGDataSourceConfig.java +++ b/observe-business/src/main/java/fr/ird/observe/db/impl/PGDataSourceConfig.java @@ -28,7 +28,7 @@ import fr.ird.observe.db.constants.CommonDataSourceConfigParam; import fr.ird.observe.db.constants.ConnexionStatus; import fr.ird.observe.db.constants.CreationMode; import fr.ird.observe.db.constants.DataPolicy; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.version.Version; diff --git a/observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java b/observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java index d57a514..a60b91c 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java +++ b/observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java @@ -25,7 +25,7 @@ import com.google.common.collect.Sets; import fr.ird.observe.db.impl.PGDataSourceConfig; import fr.ird.observe.entities.Entities; import fr.ird.observe.util.Scripts; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/observe-services-api/pom.xml b/observe-services-api/pom.xml index 7d7da42..87c1025 100644 --- a/observe-services-api/pom.xml +++ b/observe-services-api/pom.xml @@ -28,7 +28,12 @@ <artifactId>observe-business</artifactId> <version>${project.version}</version> </dependency> - + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-validation</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> <!-- commons dependencies --> @@ -36,87 +41,17 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> - <groupId>commons-primitives</groupId> - <artifactId>commons-primitives</artifactId> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - <dependency> - <groupId>commons-jxpath</groupId> - <artifactId>commons-jxpath</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> - <!-- Nuiton --> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> - <!-- persistence --> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> - <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <scope>runtime</scope> - </dependency> - - <!-- Logging --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>runtime</scope> - </dependency> - - <!-- test dependencies --> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> </dependencies> diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveService.java b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveService.java index a214822..335c670 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveService.java @@ -5,7 +5,6 @@ import com.google.common.base.Predicate; import fr.ird.observe.entities.EntityMap; import org.nuiton.topia.persistence.TopiaEntity; -import java.io.Closeable; import java.util.List; /** @@ -14,7 +13,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 4.0 */ -public interface ObserveService extends Closeable { +public interface ObserveService { <E extends TopiaEntity> EntityMap findAllUsages(E entity); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServicesCache.java b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServicesCache.java index 788589f..e642827 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServicesCache.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServicesCache.java @@ -11,7 +11,6 @@ import fr.ird.observe.db.DataSource; import fr.ird.observe.db.event.DataSourceEvent; import fr.ird.observe.db.event.DataSourceListener; import fr.ird.observe.db.event.DataSourceListenerAdapter; -import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -140,9 +139,8 @@ public class ObserveServicesCache implements Closeable { for (ServiceKey<? extends ObserveService> serviceKey : keysToRemove) { ObserveService service = map.get(serviceKey); if (log.isInfoEnabled()) { - log.info("Close service: " + service); + log.info("Remove service : " + service); } - IOUtils.closeQuietly(service); } cache.invalidateAll(keysToRemove); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/model/DataSelectionModel.java b/observe-services-api/src/main/java/fr/ird/observe/services/data/DataSelectionModel.java similarity index 98% rename from observe-services-api/src/main/java/fr/ird/observe/services/model/DataSelectionModel.java rename to observe-services-api/src/main/java/fr/ird/observe/services/data/DataSelectionModel.java index f03fc98..f4d5bd7 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/model/DataSelectionModel.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/data/DataSelectionModel.java @@ -19,12 +19,11 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.model; +package fr.ird.observe.services.data; import fr.ird.observe.entities.Entities; import fr.ird.observe.entities.Trips; import fr.ird.observe.entities.referentiel.Program; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntity; @@ -220,7 +219,7 @@ public class DataSelectionModel implements Serializable { if (id.startsWith(Program.class.getName())) { // on doit verifier que toutes les marees du program sont sélectionnées List<String> tripIds = datas.get(id); - if (CollectionUtils.isEmpty(tripIds)) { + if (tripIds != null || tripIds.isEmpty()) { // pas de marées return false; diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/data/TripService.java b/observe-services-api/src/main/java/fr/ird/observe/services/data/TripService.java index db47799..dee420c 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/data/TripService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/data/TripService.java @@ -5,7 +5,6 @@ import fr.ird.observe.entities.referentiel.Ocean; import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.services.Commit; import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.model.DataSelectionModel; import fr.ird.observe.tripMap.TripMapPoint; import java.util.List; diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/operation/ValidationService.java b/observe-services-api/src/main/java/fr/ird/observe/services/operation/ValidationService.java index 76f84b5..ff3a0ce 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/operation/ValidationService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/operation/ValidationService.java @@ -2,7 +2,7 @@ package fr.ird.observe.services.operation; import fr.ird.observe.SendMessageAble; import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.model.DataSelectionModel; +import fr.ird.observe.services.data.DataSelectionModel; import fr.ird.observe.validation.ValidationMessageDetector; /** diff --git a/observe-services/pom.xml b/observe-services/pom.xml index 821a17d..a8ac043 100644 --- a/observe-services/pom.xml +++ b/observe-services/pom.xml @@ -42,26 +42,14 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> <groupId>commons-primitives</groupId> <artifactId>commons-primitives</artifactId> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> </dependency> <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - <dependency> <groupId>commons-jxpath</groupId> <artifactId>commons-jxpath</artifactId> </dependency> @@ -80,6 +68,10 @@ <artifactId>nuiton-utils</artifactId> </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> + </dependency> + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> @@ -94,13 +86,8 @@ <artifactId>topia-persistence</artifactId> </dependency> <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <scope>runtime</scope> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-replication</artifactId> </dependency> <!-- Logging --> diff --git a/observe-services/src/main/java/fr/ird/observe/services/AbstractObserveService.java b/observe-services/src/main/java/fr/ird/observe/services/AbstractObserveService.java index b14e6fa..2fd2fe1 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/AbstractObserveService.java +++ b/observe-services/src/main/java/fr/ird/observe/services/AbstractObserveService.java @@ -107,11 +107,6 @@ public abstract class AbstractObserveService implements ObserveService { } - @Override - public void close() { - //TODO - } - public TopiaContext getTransaction() { return serviceContext.getTransaction(); } diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/TripServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/TripServiceImpl.java index d7ed97b..d820490 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/TripServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/TripServiceImpl.java @@ -15,7 +15,6 @@ import fr.ird.observe.entities.seine.TripSeineDAO; import fr.ird.observe.services.AbstractObserveService; import fr.ird.observe.services.data.longline.TripLonglineService; import fr.ird.observe.services.data.seine.TripSeineService; -import fr.ird.observe.services.model.DataSelectionModel; import fr.ird.observe.services.referential.ReferentialService; import fr.ird.observe.tripMap.TripMapPoint; import org.apache.commons.logging.Log; diff --git a/observe-services/src/main/java/fr/ird/observe/services/operation/ComputeDataServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/operation/ComputeDataServiceImpl.java index 8dab84f..511b351 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/operation/ComputeDataServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/operation/ComputeDataServiceImpl.java @@ -27,7 +27,7 @@ import fr.ird.observe.entities.seine.TargetSample; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.AbstractObserveService; import fr.ird.observe.services.referential.ReferentialService; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaDAO; diff --git a/observe-services/src/main/java/fr/ird/observe/services/operation/SynchronizeServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/operation/SynchronizeServiceImpl.java index 0079de3..379c0a4 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/operation/SynchronizeServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/operation/SynchronizeServiceImpl.java @@ -12,8 +12,8 @@ import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.AbstractObserveService; import fr.ird.observe.services.ReplicationService; import fr.ird.observe.services.referential.ReferentialService; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.MapUtils; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.jdbc.Work; diff --git a/observe-services/src/main/java/fr/ird/observe/services/operation/ValidationServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/operation/ValidationServiceImpl.java index 6fe70a6..381336d 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/operation/ValidationServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/operation/ValidationServiceImpl.java @@ -6,7 +6,7 @@ import fr.ird.observe.entities.Trip; import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.services.AbstractObserveService; import fr.ird.observe.services.data.TripService; -import fr.ird.observe.services.model.DataSelectionModel; +import fr.ird.observe.services.data.DataSelectionModel; import fr.ird.observe.validation.ValidationMessageDetector; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; diff --git a/observe-services/src/main/java/fr/ird/observe/services/referential/ReferentialServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/referential/ReferentialServiceImpl.java index 232fada..0cf87f6 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/referential/ReferentialServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/referential/ReferentialServiceImpl.java @@ -22,7 +22,7 @@ import fr.ird.observe.entities.referentiel.SpeciesList; import fr.ird.observe.entities.referentiel.seine.WeightCategory; import fr.ird.observe.services.AbstractObserveService; import fr.ird.observe.services.operation.ObsoleteReferenceToReplace; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 7745ab5..be7fb50 100644 --- a/observe-swing/pom.xml +++ b/observe-swing/pom.xml @@ -154,14 +154,6 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>commons-primitives</groupId> - <artifactId>commons-primitives</artifactId> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> </dependency> @@ -170,10 +162,6 @@ <artifactId>commons-beanutils</artifactId> </dependency> <dependency> - <groupId>commons-jxpath</groupId> - <artifactId>commons-jxpath</artifactId> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> @@ -232,10 +220,6 @@ <!-- persistence --> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> - <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency> diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java index 5195f51..4d59113 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java @@ -31,7 +31,7 @@ import fr.ird.observe.db.event.DataSourceEvent; import fr.ird.observe.db.event.DataSourceListener; import fr.ird.observe.db.event.DataSourceListenerAdapter; import fr.ird.observe.gps.GPSService; -import fr.ird.observe.services.model.DataSelectionModel; +import fr.ird.observe.services.data.DataSelectionModel; import fr.ird.observe.ui.admin.config.SelectDataUI; import fr.ird.observe.ui.admin.resume.ShowResumeUI; import fr.ird.observe.ui.tree.DataSelectionTreeSelectionModel; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java index 79238c5..bf5b478 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java @@ -35,7 +35,7 @@ import fr.ird.observe.entities.Trip; import fr.ird.observe.entities.Trips; import fr.ird.observe.report.model.Report; import fr.ird.observe.services.data.TripService; -import fr.ird.observe.services.model.DataSelectionModel; +import fr.ird.observe.services.data.DataSelectionModel; import fr.ird.observe.ui.admin.consolidate.ConsolidateModel; import fr.ird.observe.ui.admin.export.ExportModel; import fr.ird.observe.ui.admin.gps.ImportGPSModel; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx b/observe-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx index f55f2c7..88947f2 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx @@ -27,7 +27,7 @@ <fr.ird.observe.ui.admin.AdminTabUI> <import> - fr.ird.observe.services.model.DataSelectionModel + fr.ird.observe.services.data.DataSelectionModel fr.ird.observe.ui.UIHelper fr.ird.observe.ui.admin.AdminUI fr.ird.observe.ui.admin.AdminStep diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java index 77aaa3d..05e81ae 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java @@ -23,7 +23,7 @@ package fr.ird.observe.ui.admin.consolidate; import fr.ird.observe.ObserveContext; import fr.ird.observe.db.DataSource; -import fr.ird.observe.services.model.DataSelectionModel; +import fr.ird.observe.services.data.DataSelectionModel; import fr.ird.observe.services.operation.ComputeDataService; import fr.ird.observe.ui.admin.AdminStep; import fr.ird.observe.ui.admin.AdminTabUI; @@ -115,6 +115,7 @@ public class ConsolidateUIHandler extends AdminTabUIHandler { } public WizardState doAction() throws Exception { + if (log.isDebugEnabled()) { log.debug(this); } @@ -130,16 +131,7 @@ public class ConsolidateUIHandler extends AdminTabUIHandler { Set<String> tripIds = model.getSelectionDataModel().getSelectedData(); ComputeDataService service = ObserveContext.getService(getStepModel().getSource(), ComputeDataService.class); - - try { - - service.consolidateTrips(this, tripIds); - - } finally { - - service.close(); - - } + service.consolidateTrips(this, tripIds); sendMessage(t("observe.message.consolidate.operation.done", new Date())); @@ -147,7 +139,6 @@ public class ConsolidateUIHandler extends AdminTabUIHandler { } - protected WizardState initDB() throws Exception { // on recupere la source de données @@ -157,6 +148,7 @@ public class ConsolidateUIHandler extends AdminTabUIHandler { openSource(source); return null; + } } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java index 959dd3f..1de7455 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java @@ -27,7 +27,7 @@ import fr.ird.observe.entities.Trip; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.services.model.DataSelectionModel; +import fr.ird.observe.services.data.DataSelectionModel; import fr.ird.observe.ui.admin.AdminActionModel; import fr.ird.observe.ui.admin.AdminStep; import fr.ird.observe.ui.admin.AdminUIModel; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java index 6d5d320..debdcb4 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java @@ -30,7 +30,7 @@ import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ReplicationService; import fr.ird.observe.services.data.TripService; -import fr.ird.observe.services.model.DataSelectionModel; +import fr.ird.observe.services.data.DataSelectionModel; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.admin.AdminStep; import fr.ird.observe.ui.admin.AdminTabUI; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java index 1f62ecb..1136c41 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java @@ -23,7 +23,7 @@ package fr.ird.observe.ui.admin.report; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; -import fr.ird.observe.services.model.DataSelectionModel; +import fr.ird.observe.services.data.DataSelectionModel; import fr.ird.observe.report.model.DataMatrix; import fr.ird.observe.report.model.Report; import fr.ird.observe.report.model.ReportExecute; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java index 0f5f8f8..030b302 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java @@ -39,7 +39,7 @@ import jaxx.runtime.swing.CardLayout2; import jaxx.runtime.swing.editor.MyDefaultCellEditor; import jaxx.runtime.swing.editor.bean.BeanComboBox; import jaxx.runtime.swing.wizard.ext.WizardState; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java index 7255057..591ba54 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java @@ -28,9 +28,8 @@ import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.db.DataSource; import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.services.ObserveServiceFactory; import fr.ird.observe.services.operation.ValidationService; -import fr.ird.observe.services.model.DataSelectionModel; +import fr.ird.observe.services.data.DataSelectionModel; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.admin.AdminStep; import fr.ird.observe.ui.admin.AdminTabUI; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java index b98435a..024908d 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -740,7 +740,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C CatchLonglineUI ui = getUi(); - Branchline branchline = ui.getBranchlineBean(); + Branchline branchlineBean = ui.getBranchlineBean(); SwingValidator<Branchline> branchlineValidator = ui.getBranchlineValidator(); if (newValue == null) { @@ -757,11 +757,11 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLongline, C log.info("Use branchline: " + newValue); } - branchlineValidator.setBean(branchline); + branchlineValidator.setBean(branchlineBean); CatchLonglineService service = getService(CatchLonglineService.class); Branchline loadedBranchline = service.loadBranchlineForEdit(newValue.getTopiaId()); - copy(Branchline.class, BinderService.EDIT_CATCH_LONGLINE, loadedBranchline, getUi().getBranchlineBean()); + copy(Branchline.class, BinderService.EDIT_CATCH_LONGLINE, loadedBranchline, branchlineBean); } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java b/observe-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java index c46692a..dde779f 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java @@ -28,7 +28,7 @@ import fr.ird.observe.db.DataSourceFactory; import fr.ird.observe.db.constants.CreationMode; import fr.ird.observe.db.impl.PGDataSource; import fr.ird.observe.db.impl.PGDataSourceConfig; -import fr.ird.observe.services.model.DataSelectionModel; +import fr.ird.observe.services.data.DataSelectionModel; import fr.ird.observe.db.util.PGInstall; import jaxx.runtime.JAXXContext; import org.apache.commons.logging.Log; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java b/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java index ec33e90..6204932 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java @@ -25,7 +25,7 @@ import fr.ird.observe.ObserveContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.constants.DbMode; import fr.ird.observe.db.impl.H2DataSource; -import fr.ird.observe.services.model.DataSelectionModel; +import fr.ird.observe.services.data.DataSelectionModel; import jaxx.runtime.JAXXContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java index 9f98482..25cfce6 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java @@ -46,7 +46,7 @@ import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ReplicationService; import fr.ird.observe.services.data.TripService; -import fr.ird.observe.services.model.DataSelectionModel; +import fr.ird.observe.services.data.DataSelectionModel; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.storage.tabs.RolesTableModel; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java index e2ba79f..21fbb9a 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java @@ -32,7 +32,7 @@ import fr.ird.observe.db.constants.CreationMode; import fr.ird.observe.db.constants.DbMode; import fr.ird.observe.db.impl.H2DataSourceConfig; import fr.ird.observe.db.impl.PGDataSourceConfig; -import fr.ird.observe.services.model.DataSelectionModel; +import fr.ird.observe.services.data.DataSelectionModel; import fr.ird.observe.db.util.PGInstall; import fr.ird.observe.db.util.SecurityModel; import jaxx.runtime.JAXXContext; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java index 7883989..89df7d8 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java @@ -29,7 +29,7 @@ import fr.ird.observe.db.constants.ConnexionStatus; import fr.ird.observe.db.constants.CreationMode; import fr.ird.observe.db.constants.DbMode; import fr.ird.observe.db.impl.PGDataSourceConfig; -import fr.ird.observe.services.model.DataSelectionModel; +import fr.ird.observe.services.data.DataSelectionModel; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.storage.StorageStep; import fr.ird.observe.ui.storage.StorageUIHandler; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/DataSelectionTreeSelectionModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/DataSelectionTreeSelectionModel.java index 003fcdc..26a91ad 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/DataSelectionTreeSelectionModel.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/DataSelectionTreeSelectionModel.java @@ -23,7 +23,7 @@ package fr.ird.observe.ui.tree; import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.services.model.DataSelectionModel; +import fr.ird.observe.services.data.DataSelectionModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveDataProvider.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveDataProvider.java index 958be96..877fd62 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveDataProvider.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveDataProvider.java @@ -24,7 +24,7 @@ package fr.ird.observe.ui.tree; import fr.ird.observe.ObserveContext; import fr.ird.observe.db.DataSource; import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.model.DataSelectionModel; +import fr.ird.observe.services.data.DataSelectionModel; import jaxx.runtime.swing.nav.NavDataProvider; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeBridge.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeBridge.java index 36257a6..ab4aabb 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeBridge.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeBridge.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.tree; import jaxx.runtime.swing.nav.tree.NavTreeBridge; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java index f9f1baf..11a32ce 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java @@ -36,7 +36,7 @@ import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.entities.seine.Route; import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.services.model.DataSelectionModel; +import fr.ird.observe.services.data.DataSelectionModel; import fr.ird.observe.services.referential.ReferentialService; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.tree.loadors.AbstractNodeChildLoador; @@ -51,7 +51,7 @@ import fr.ird.observe.ui.tree.loadors.RoutesNodeChildLoador; import jaxx.runtime.JAXXContext; import jaxx.runtime.swing.nav.tree.NavTreeHelper; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractNodeChildLoador.java index 42409b3..7a1b531 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractNodeChildLoador.java @@ -23,7 +23,7 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.DecoratorService; import fr.ird.observe.ObserveContext; -import fr.ird.observe.services.model.DataSelectionModel; +import fr.ird.observe.services.data.DataSelectionModel; import fr.ird.observe.ui.tree.ObserveDataProvider; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java index 41a85e7..479aed3 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java @@ -24,14 +24,14 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.services.data.longline.TripLonglineService; -import fr.ird.observe.services.model.DataSelectionModel; +import fr.ird.observe.services.data.DataSelectionModel; import fr.ird.observe.ui.tree.ObserveDataProvider; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.TripLonglineNode; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeBridge; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import java.util.ArrayList; import java.util.List; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java index edd8dae..acafac2 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java @@ -23,14 +23,14 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.data.seine.TripSeineService; -import fr.ird.observe.services.model.DataSelectionModel; +import fr.ird.observe.services.data.DataSelectionModel; import fr.ird.observe.ui.tree.ObserveDataProvider; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.TripSeineNode; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeBridge; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import java.util.ArrayList; import java.util.List; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java index 6b19743..1b5d6f1 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java @@ -23,7 +23,7 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.entities.constants.GearType; import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.services.model.DataSelectionModel; +import fr.ird.observe.services.data.DataSelectionModel; import fr.ird.observe.services.referential.ReferentialService; import fr.ird.observe.ui.tree.ObserveDataProvider; import fr.ird.observe.ui.tree.ObserveNode; diff --git a/pom.xml b/pom.xml index f3e32b7..f460a4f 100644 --- a/pom.xml +++ b/pom.xml @@ -67,6 +67,19 @@ </developer> <developer> + <id>bavencoff</id> + <name>Sylvain Bavencoff</name> + <email>bavencoff@codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://codelutin.com</organizationUrl> + <roles> + <role>lead</role> + <role>developer</role> + </roles> + <timezone>Europe/Paris</timezone> + </developer> + + <developer> <id>couteau</id> <name>Jean Couteau</name> <email>couteau@codelutin.com</email> @@ -82,9 +95,9 @@ <modules> <module>observe-entities</module> <module>observe-business</module> + <module>observe-validation</module> <module>observe-services-api</module> <module>observe-services</module> - <module>observe-validation</module> <module>observe-swing</module> </modules> <!--scm> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm