branch feature/remove_dead_code created (now 93de948)
This is an automated email from the git hooks/post-receive script. New change to branch feature/remove_dead_code in repository observe. See http://git.codelutin.com/observe.git at 93de948 suppression du code mort This branch includes the following new commits: new 40c0036 déplacement des classes encore utilisées hors du package business new 5cc123b suppression du code mort new c74fc00 déplacement du package de gps new 7183b3f fix dependencies new 93de948 suppression du code mort The 5 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 93de948caf2a858ecc232a5d0722aead08364f8c Author: Kevin Morin <morin@codelutin.com> Date: Fri Nov 13 16:43:26 2015 +0100 suppression du code mort commit 7183b3fd5b6da37f71cc19f8b13319e5b81ae1f1 Author: Kevin Morin <morin@codelutin.com> Date: Fri Nov 13 16:43:08 2015 +0100 fix dependencies commit c74fc00c34a9f9da9ad89cd79ffeff148e6f7bf0 Author: Kevin Morin <morin@codelutin.com> Date: Fri Nov 13 16:26:03 2015 +0100 déplacement du package de gps commit 5cc123bae7c09d8e4b99f6686b6b4dfeeda5c06b Author: Kevin Morin <morin@codelutin.com> Date: Fri Nov 13 16:23:49 2015 +0100 suppression du code mort commit 40c00366054139690f33fab57a92d640b3fb3e7f Author: Kevin Morin <morin@codelutin.com> Date: Fri Nov 13 11:36:04 2015 +0100 déplacement des classes encore utilisées hors du package business -- 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/remove_dead_code in repository observe. See http://git.codelutin.com/observe.git commit 40c00366054139690f33fab57a92d640b3fb3e7f Author: Kevin Morin <morin@codelutin.com> Date: Fri Nov 13 11:36:04 2015 +0100 déplacement des classes encore utilisées hors du package business --- .../fr/ird/observe/ObserveOpenDataManager.java | 2 +- .../main/java/fr/ird/observe/ObserveRunner.java | 12 +--- .../observe/ObserveSwingApplicationContext.java | 4 +- .../observe/business/db/constants/DataPolicy.java | 72 ---------------------- .../business/db/constants/DataSourceState.java | 40 ------------ .../ObserveSwingApplicationConfig.java | 4 +- .../ObserveSwingApplicationConfigOption.java | 4 +- .../ird/observe/{business => }/db/DataContext.java | 4 +- .../{constantes => constants}/ConnexionStatus.java | 2 +- .../{constantes => constants}/ConstantsI18n.java | 2 +- .../db/{constantes => constants}/CreationMode.java | 2 +- .../db/constants/DataContextType.java | 4 +- .../db/{constantes => constants}/DbMode.java | 2 +- .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 2 +- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 2 +- .../observe/ui/actions/ChangeStorageAction.java | 2 +- .../ui/actions/ImportStorageFromFileAction.java | 4 +- .../ui/actions/shared/AbstractUIAction.java | 3 +- .../java/fr/ird/observe/ui/admin/AdminStep.java | 2 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 2 +- .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 2 +- .../ird/observe/ui/content/ContentUIHandler.java | 4 +- .../ird/observe/ui/content/ObserveContentUI.java | 2 +- .../content/impl/longline/BranchlineUIHandler.java | 4 +- .../LonglineDetailCompositionUIHandler.java | 4 +- .../LonglineGlobalCompositionUIHandler.java | 4 +- .../impl/longline/SetLonglineUIHandler.java | 4 +- .../ActivitySeineObservedSystemUIHandler.java | 4 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 4 +- .../impl/seine/FloatingObjectUIHandler.java | 4 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 6 +- .../ui/content/list/ContentListUIHandler.java | 2 +- .../impl/longline/ActivityLonglinesUIHandler.java | 4 +- .../list/impl/longline/TripLonglinesUIHandler.java | 4 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 4 +- .../content/list/impl/seine/RoutesUIHandler.java | 4 +- .../list/impl/seine/TripSeinesUIHandler.java | 4 +- .../ui/content/open/ContentOpenableUIHandler.java | 2 +- .../impl/longline/ActivityLonglineUIHandler.java | 4 +- .../open/impl/longline/TripLonglineUIHandler.java | 4 +- .../open/impl/seine/ActivitySeineUIHandler.java | 4 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 4 +- .../open/impl/seine/TripSeineUIHandler.java | 4 +- .../ui/content/ref/ContentReferenceUIHandler.java | 2 +- .../ui/content/ref/ReferenceHomeUIHandler.java | 2 +- .../ui/content/table/ContentTableUIHandler.java | 4 +- .../impl/longline/BaitsCompositionUIHandler.java | 2 +- .../longline/BranchlinesCompositionUIHandler.java | 2 +- .../impl/longline/CatchLonglineUIHandler.java | 2 +- .../table/impl/longline/EncounterUIHandler.java | 2 +- .../longline/FloatlinesCompositionUIHandler.java | 2 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 4 +- .../impl/longline/HooksCompositionUIHandler.java | 2 +- .../table/impl/longline/SensorUsedUIHandler.java | 2 +- .../content/table/impl/longline/TdrUIHandler.java | 2 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 4 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 2 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 4 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 2 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 2 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 2 +- .../table/impl/seine/TargetCatchUIHandler.java | 2 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 2 +- .../table/impl/seine/TargetSampleUIHandler.java | 4 +- .../ird/observe/ui/storage/ObstunaAdminAction.java | 2 +- .../ird/observe/ui/storage/RemoteUILauncher.java | 2 +- .../ui/storage/StorageBackupUILauncher.java | 3 +- .../ird/observe/ui/storage/StorageUIHandler.java | 6 +- .../ird/observe/ui/storage/StorageUILauncher.java | 2 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 6 +- .../observe/ui/storage/tabs/ChooseDbModeUI.jaxx | 4 +- .../ird/observe/ui/storage/tabs/ConfigDataUI.jaxx | 2 +- .../ui/storage/tabs/ConfigReferentielUI.jaxx | 2 +- .../fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx | 4 +- .../ui/storage/tabs/StorageTabUIHandler.java | 6 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 2 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 2 +- .../converter => ui/util}/FloatConverter.java | 2 +- .../ird/observe/validation/ValidationContext.java | 2 +- .../validation/ValidationMessageDetector.java | 2 +- 80 files changed, 118 insertions(+), 240 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveOpenDataManager.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveOpenDataManager.java index 4108439..5e16df8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveOpenDataManager.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveOpenDataManager.java @@ -1,7 +1,7 @@ package fr.ird.observe; import com.google.common.base.Preconditions; -import fr.ird.observe.business.db.DataContext; +import fr.ird.observe.db.DataContext; import java.io.Closeable; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java index e0664ab..be74bfe 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java @@ -22,12 +22,12 @@ package fr.ird.observe; import com.google.common.base.Preconditions; -import fr.ird.observe.business.converter.FloatConverter; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.ObserveMainUIHandler; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.actions.StartServerModeAction; +import fr.ird.observe.ui.util.FloatConverter; import jaxx.runtime.FileChooserUtil; import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.swing.application.ApplicationRunner; @@ -62,15 +62,7 @@ import java.util.Map; import java.util.Properties; import static fr.ird.observe.ObserveResourceManager.Resource; -import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.BACKUP_DIRECTORY; -import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.DATA_DIRECTORY; -import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.DB_DIRECTORY; -import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.INITIAL_DB_DUMP; -import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.MAP_DIRECTORY; -import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.REPORT_DIRECTORY; -import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.RESOURCES_DIRECTORY; -import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.TMP_DIRECTORY; -import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.VALIDATION_REPORT_DIRECTORY; +import static fr.ird.observe.configuration.ObserveSwingApplicationConfigOption.*; import static org.nuiton.i18n.I18n.t; /** 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 23ed676..954693f 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 @@ -24,11 +24,11 @@ package fr.ird.observe; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import fr.ird.observe.business.db.DataContext; +import fr.ird.observe.db.DataContext; import fr.ird.observe.business.gps.GPSService; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.ObserveSwingDataSource; -import fr.ird.observe.db.constantes.DbMode; +import fr.ird.observe.db.constants.DbMode; import fr.ird.observe.db.event.ObserveSwingDataSourceEvent; import fr.ird.observe.db.event.ObserveSwingDataSourceListenerAdapter; import fr.ird.observe.services.ObserveDataSourceConfigurationMainFactory; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataPolicy.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataPolicy.java deleted file mode 100644 index 6ebb3db..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataPolicy.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.business.db.constants; - -import static org.nuiton.i18n.I18n.n; - -/** - * Pour caractériser les droits de lecture, ecriture sur les données d'un - * service de persistance. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.0 - */ -public enum DataPolicy { - - /** pour lire le référentiel */ - READ_REFERENTIEL( - n("observe.storage.dataPolicy.readReferentiel"), - n("observe.storage.dataPolicy.readReferentiel.description") - ), - /** pour lire les données observer */ - READ_DATA( - n("observe.storage.dataPolicy.readData"), - n("observe.storage.dataPolicy.readData.description") - ), - /** pour modifier le référentiel */ - WRITE_REFERENTIEL( - n("observe.storage.dataPolicy.writeReferentiel"), - n("observe.storage.dataPolicy.writeReferentiel.description") - ), - /** pour modifier les données observer */ - WRITE_DATA( - n("observe.storage.dataPolicy.writeData"), - n("observe.storage.dataPolicy.writeData.description") - ); - - private final String label; - - private final String description; - - DataPolicy(String label, String description) { - this.label = label; - this.description = description; - } - - public String getLabel() { - return label; - } - - public String getDescription() { - return description; - } -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataSourceState.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataSourceState.java deleted file mode 100644 index 0ec4987..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataSourceState.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.business.db.constants; - -/** - * Pour qualifier l'état d'un storageService. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.0 - */ -public enum DataSourceState { - - /** avant l'intialisation */ - NULL, - /** apres l'initialisation */ - INIT, - /** apres l'ouverture */ - OPEN, - /** apres la fermeture */ - CLOSED -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfig.java b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfig.java index 4a3f17d..5d7d6c5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfig.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfig.java @@ -28,8 +28,8 @@ import com.google.common.collect.Sets; import fr.ird.observe.ObserveCLAction; import fr.ird.observe.ObserveResourceManager; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.db.constantes.CreationMode; -import fr.ird.observe.db.constantes.DbMode; +import fr.ird.observe.db.constants.CreationMode; +import fr.ird.observe.db.constants.DbMode; import fr.ird.observe.services.ObserveDataSourceConfigurationMainFactory; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java index 26e5ed0..b2f5ae0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java @@ -23,8 +23,8 @@ package fr.ird.observe.configuration; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import fr.ird.observe.db.constantes.CreationMode; -import fr.ird.observe.db.constantes.DbMode; +import fr.ird.observe.db.constants.CreationMode; +import fr.ird.observe.db.constants.DbMode; import fr.ird.observe.services.ObserveSpeciesListConfiguration; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ConfigOptionDef; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataContext.java b/observe-application-swing/src/main/java/fr/ird/observe/db/DataContext.java similarity index 99% rename from observe-application-swing/src/main/java/fr/ird/observe/business/db/DataContext.java rename to observe-application-swing/src/main/java/fr/ird/observe/db/DataContext.java index dc81a55..47436bf 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/DataContext.java @@ -1,4 +1,4 @@ -package fr.ird.observe.business.db; +package fr.ird.observe.db; /* * #%L @@ -22,7 +22,7 @@ package fr.ird.observe.business.db; * #L% */ -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.IdDtos; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/constantes/ConnexionStatus.java b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/ConnexionStatus.java similarity index 98% rename from observe-application-swing/src/main/java/fr/ird/observe/db/constantes/ConnexionStatus.java rename to observe-application-swing/src/main/java/fr/ird/observe/db/constants/ConnexionStatus.java index ef25fcf..f87c840 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/db/constantes/ConnexionStatus.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/ConnexionStatus.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.db.constantes; +package fr.ird.observe.db.constants; import static org.nuiton.i18n.I18n.n; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/constantes/ConstantsI18n.java b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/ConstantsI18n.java similarity index 93% rename from observe-application-swing/src/main/java/fr/ird/observe/db/constantes/ConstantsI18n.java rename to observe-application-swing/src/main/java/fr/ird/observe/db/constants/ConstantsI18n.java index 34e8663..529f6ce 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/db/constantes/ConstantsI18n.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/ConstantsI18n.java @@ -1,4 +1,4 @@ -package fr.ird.observe.db.constantes; +package fr.ird.observe.db.constants; import fr.ird.observe.services.dto.constants.seine.SchoolType; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/constantes/CreationMode.java b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/CreationMode.java similarity index 98% rename from observe-application-swing/src/main/java/fr/ird/observe/db/constantes/CreationMode.java rename to observe-application-swing/src/main/java/fr/ird/observe/db/constants/CreationMode.java index 51471f8..d895f88 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/db/constantes/CreationMode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/CreationMode.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.db.constantes; +package fr.ird.observe.db.constants; import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataContextType.java b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/DataContextType.java similarity index 99% rename from observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataContextType.java rename to observe-application-swing/src/main/java/fr/ird/observe/db/constants/DataContextType.java index 9bee852..51bd8fe 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/DataContextType.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/DataContextType.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.business.db.constants; +package fr.ird.observe.db.constants; -import fr.ird.observe.business.db.DataContext; +import fr.ird.observe.db.DataContext; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/constantes/DbMode.java b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/DbMode.java similarity index 98% rename from observe-application-swing/src/main/java/fr/ird/observe/db/constantes/DbMode.java rename to observe-application-swing/src/main/java/fr/ird/observe/db/constants/DbMode.java index 8755192..d484d0c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/db/constantes/DbMode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/DbMode.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.db.constantes; +package fr.ird.observe.db.constants; import static org.nuiton.i18n.I18n.n; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx index d7b7870..2c446ef 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx @@ -25,7 +25,7 @@ <import> fr.ird.observe.configuration.ObserveSwingApplicationConfig - fr.ird.observe.business.db.DataContext + fr.ird.observe.db.DataContext fr.ird.observe.services.dto.referential.ProgramDto fr.ird.observe.services.dto.seine.ActivitySeineDto diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java index 25cc31b..422d46a 100755 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; +import fr.ird.observe.db.DataContext; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.AbstractObserveDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ChangeStorageAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ChangeStorageAction.java index ff7de1e..7e9a1d7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ChangeStorageAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ChangeStorageAction.java @@ -23,7 +23,7 @@ package fr.ird.observe.ui.actions; */ import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.db.constantes.DbMode; +import fr.ird.observe.db.constants.DbMode; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.storage.StorageUILauncher; import jaxx.runtime.SwingUtil; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ImportStorageFromFileAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ImportStorageFromFileAction.java index e466ab7..1a60b17 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ImportStorageFromFileAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ImportStorageFromFileAction.java @@ -23,8 +23,8 @@ package fr.ird.observe.ui.actions; */ import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.db.constantes.CreationMode; -import fr.ird.observe.db.constantes.DbMode; +import fr.ird.observe.db.constants.CreationMode; +import fr.ird.observe.db.constants.DbMode; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.storage.StorageStep; import fr.ird.observe.ui.storage.StorageUI; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/AbstractUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/AbstractUIAction.java index 598b035..4f4fde1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/AbstractUIAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/AbstractUIAction.java @@ -21,9 +21,8 @@ */ package fr.ird.observe.ui.actions.shared; -import fr.ird.observe.business.db.DataContext; +import fr.ird.observe.db.DataContext; import fr.ird.observe.ui.ObserveMainUI; -import fr.ird.observe.ui.content.ContentUI; import fr.ird.observe.ui.content.ObserveContentUI; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminStep.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminStep.java index 6317db5..c41b137 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminStep.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminStep.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.admin; -import fr.ird.observe.db.constantes.DbMode; +import fr.ird.observe.db.constants.DbMode; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.admin.config.ConfigUI; import fr.ird.observe.ui.admin.config.SelectDataUI; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java index a27cb15..dbbcef8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java @@ -26,7 +26,7 @@ import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.ObserveSwingDataSource; -import fr.ird.observe.db.constantes.DbMode; +import fr.ird.observe.db.constants.DbMode; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.dto.IdDtos; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx index 6156c05..c2ff287 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx @@ -34,7 +34,7 @@ _UPDATETip='t("observe.content.mode.update.tip")'> <import> - fr.ird.observe.business.db.DataContext + fr.ird.observe.db.DataContext fr.ird.observe.db.ObserveSwingDataSource fr.ird.observe.configuration.ObserveSwingApplicationConfig fr.ird.observe.ObserveSwingApplicationContext diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java index 1080e32..8b12298 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java @@ -25,8 +25,8 @@ import fr.ird.observe.ObserveOpenDataManager; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.ObserveSwingTechnicalException; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.ObserveSwingDataSource; 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/content/ObserveContentUI.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java index 9f5586e..5c8799b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content; * #L% */ -import fr.ird.observe.business.db.DataContext; +import fr.ird.observe.db.DataContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java index 1ba8e19..bb8d908 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIHandler.java @@ -22,8 +22,8 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.BranchlineDtos; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java index 04b5730..eba8d37 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java @@ -25,8 +25,8 @@ package fr.ird.observe.ui.content.impl.longline; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.entities.longline.SectionTemplate; import fr.ird.observe.entities.longline.SectionWithTemplate; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java index 96833e2..9e8ce1e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.impl.longline; */ import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java index da73f47..d5d88bd 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java @@ -24,8 +24,8 @@ package fr.ird.observe.ui.content.impl.longline; import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java index ad26ba9..2463da4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java @@ -22,8 +22,8 @@ package fr.ird.observe.ui.content.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.result.SaveResultDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java index ca5dc47..1b5a244 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.impl.seine; import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.constants.seine.Ownership; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java index d0178c9..e9d4fcc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -22,8 +22,8 @@ package fr.ird.observe.ui.content.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java index 91a9cd4..8d8c1ea 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java @@ -23,9 +23,9 @@ package fr.ird.observe.ui.content.impl.seine; import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; -import fr.ird.observe.db.constantes.ConstantsI18n; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; +import fr.ird.observe.db.constants.ConstantsI18n; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java index 0732497..68f7e19 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.content.list; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java index 5d1c6e8..ff6699f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.list.impl.longline; */ import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java index 937e623..e05c7c1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.list.impl.longline; */ import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java index cb32499..494df6b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java @@ -22,8 +22,8 @@ package fr.ird.observe.ui.content.list.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java index 07833df..aeb31c8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java @@ -22,8 +22,8 @@ package fr.ird.observe.ui.content.list.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java index 062b87e..0333cc2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java @@ -22,8 +22,8 @@ package fr.ird.observe.ui.content.list.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java index ab16916..ce4ca00 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.open; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java index 8665a95..7da80d5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.open.impl.longline; */ import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDtos; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java index 5c23f87..69c4c2c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.open.impl.longline; */ import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.TripMapDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java index 877db42..50b65c2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -22,8 +22,8 @@ package fr.ird.observe.ui.content.open.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java index 4da84fc..441f15f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java @@ -22,8 +22,8 @@ package fr.ird.observe.ui.content.open.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java index b60d8d1..7bfff7f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -22,8 +22,8 @@ package fr.ird.observe.ui.content.open.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.TripMapDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java index 9380259..2ef95d4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; +import fr.ird.observe.db.DataContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.DtoMap; import fr.ird.observe.services.dto.FormDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIHandler.java index 372a8b8..e8b2e85 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIHandler.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref; * #L% */ -import fr.ird.observe.business.db.DataContext; +import fr.ird.observe.db.DataContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.ui.content.ContentMode; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java index e5e1b94..9598fd3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.table; import com.google.common.collect.Collections2; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java index 5819a58..077d1cd 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.BaitsCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java index 2011d06..8e63600 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java index 2da0324..0169cd4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -24,7 +24,7 @@ package fr.ird.observe.ui.content.table.impl.longline; import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java index 6285af6..c873ad5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.table.impl.longline; */ import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java index 4820794..ec431e7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.FloatlinesCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index 8633a78..41d6668 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -26,8 +26,8 @@ import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java index b24a929..6faa103 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.HooksCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java index 3f4b5ab..97224d2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java @@ -27,7 +27,7 @@ import com.google.common.io.FileWriteMode; import com.google.common.io.Files; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.ObserveSwingTechnicalException; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java index 0471452..34df2b7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java @@ -27,7 +27,7 @@ import com.google.common.io.FileWriteMode; import com.google.common.io.Files; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.ObserveSwingTechnicalException; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.BasketDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index 41b65d4..14f209a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -26,8 +26,8 @@ import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java index 0d3e5f9..d039447 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -25,7 +25,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java index b162738..7e67baa 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.table.impl.seine; import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java index 2ba7e35..1e2daaf 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.table.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.referential.SpeciesDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java index 495b6c9..e0acd0b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.table.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.referential.SpeciesDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java index e77c910..f5a917f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java @@ -27,7 +27,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDtos; import fr.ird.observe.services.dto.ReferenceDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java index d633ed4..d1486ad 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java @@ -26,7 +26,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java index 2493a40..029018f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java @@ -25,7 +25,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java index 1f3d5ce..2f90d0b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -22,8 +22,8 @@ package fr.ird.observe.ui.content.table.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.referential.SpeciesDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java index 40394db..327476c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java @@ -26,7 +26,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.ObserveSwingDataSource; -import fr.ird.observe.db.constantes.DbMode; +import fr.ird.observe.db.constants.DbMode; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/RemoteUILauncher.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/RemoteUILauncher.java index efd349d..2daf3dc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/RemoteUILauncher.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/RemoteUILauncher.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.storage; -import fr.ird.observe.db.constantes.DbMode; +import fr.ird.observe.db.constants.DbMode; import fr.ird.observe.ui.storage.tabs.SecurityModel; import jaxx.runtime.JAXXContext; import jaxx.runtime.swing.ErrorDialogUI; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java index 6b7a30d..5221cef 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageBackupUILauncher.java @@ -23,8 +23,7 @@ package fr.ird.observe.ui.storage; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.ObserveSwingDataSource; -import fr.ird.observe.db.constantes.DbMode; -import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.db.constants.DbMode; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.storage.tabs.DataSelectionModel; import jaxx.runtime.JAXXContext; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java index 1a6fcb0..40583c7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java @@ -30,9 +30,9 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.ObserveTextGenerator; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.ObserveSwingDataSource; -import fr.ird.observe.db.constantes.ConnexionStatus; -import fr.ird.observe.db.constantes.CreationMode; -import fr.ird.observe.db.constantes.DbMode; +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.event.ObserveSwingDataSourceEvent; import fr.ird.observe.db.event.ObserveSwingDataSourceListenerAdapter; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUILauncher.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUILauncher.java index 1095c7f..6124755 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUILauncher.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUILauncher.java @@ -23,7 +23,7 @@ package fr.ird.observe.ui.storage; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; -import fr.ird.observe.db.constantes.DbMode; +import fr.ird.observe.db.constants.DbMode; import fr.ird.observe.ui.ObserveMainUIHandler; import fr.ird.observe.ui.UIHelper; import jaxx.runtime.JAXXContext; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java index edade25..b4cf219 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java @@ -25,9 +25,9 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.ObserveSwingTechnicalException; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.ObserveSwingDataSource; -import fr.ird.observe.db.constantes.ConnexionStatus; -import fr.ird.observe.db.constantes.CreationMode; -import fr.ird.observe.db.constantes.DbMode; +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.services.ObserveDataSourceConfigurationMainFactory; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ChooseDbModeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ChooseDbModeUI.jaxx index 7b93e02..5c75214 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ChooseDbModeUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ChooseDbModeUI.jaxx @@ -29,8 +29,8 @@ fr.ird.observe.configuration.ObserveSwingApplicationConfig fr.ird.observe.ui.UIHelper fr.ird.observe.ui.storage.StorageStep - fr.ird.observe.db.constantes.DbMode - fr.ird.observe.db.constantes.CreationMode + fr.ird.observe.db.constants.DbMode + fr.ird.observe.db.constants.CreationMode </import> <StorageStep id='step' initializer='StorageStep.CHOOSE_DB_MODE'/> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.jaxx index a84758a..c10cfae 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.jaxx @@ -26,7 +26,7 @@ <StorageTabUI> <import> - fr.ird.observe.db.constantes.CreationMode + fr.ird.observe.db.constants.CreationMode fr.ird.observe.ui.storage.StorageStep javax.swing.Icon diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigReferentielUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigReferentielUI.jaxx index fa263fe..15025e4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigReferentielUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigReferentielUI.jaxx @@ -26,7 +26,7 @@ <StorageTabUI> <import> - fr.ird.observe.db.constantes.CreationMode + fr.ird.observe.db.constants.CreationMode fr.ird.observe.ui.storage.StorageStep javax.swing.Icon diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx index 97ac53f..1366d30 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx @@ -28,8 +28,8 @@ <import> fr.ird.observe.ui.storage.StorageStep - fr.ird.observe.db.constantes.ConnexionStatus - fr.ird.observe.db.constantes.DbMode; + fr.ird.observe.db.constants.ConnexionStatus + fr.ird.observe.db.constants.DbMode; java.awt.Color java.awt.Dimension diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java index 4f76e7f..d6bd93e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java @@ -25,9 +25,9 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.ObserveTextGenerator; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.ObserveSwingDataSource; -import fr.ird.observe.db.constantes.ConnexionStatus; -import fr.ird.observe.db.constantes.CreationMode; -import fr.ird.observe.db.constantes.DbMode; +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.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.ui.UIHelper; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java index 1ce8320..54cc51a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java @@ -26,7 +26,7 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.DecoratorService; -import fr.ird.observe.business.db.DataContext; +import fr.ird.observe.db.DataContext; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.OpenableDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java index a8ed1e9..3d8197b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java @@ -24,7 +24,7 @@ package fr.ird.observe.ui.tree; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; +import fr.ird.observe.db.DataContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/converter/FloatConverter.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/FloatConverter.java similarity index 98% rename from observe-application-swing/src/main/java/fr/ird/observe/business/converter/FloatConverter.java rename to observe-application-swing/src/main/java/fr/ird/observe/ui/util/FloatConverter.java index 6893018..970eaf1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/converter/FloatConverter.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/FloatConverter.java @@ -22,7 +22,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.business.converter; +package fr.ird.observe.ui.util; import org.apache.commons.beanutils.ConversionException; import org.nuiton.converter.NuitonConverter; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationContext.java index 913c026..3bbd490 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationContext.java @@ -22,7 +22,7 @@ package fr.ird.observe.validation; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; +import fr.ird.observe.db.DataContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationMessageDetector.java b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationMessageDetector.java index 292e673..7f89288 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationMessageDetector.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationMessageDetector.java @@ -22,7 +22,7 @@ package fr.ird.observe.validation; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataContext; +import fr.ird.observe.db.DataContext; import fr.ird.observe.services.dto.IdDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -- 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/remove_dead_code in repository observe. See http://git.codelutin.com/observe.git commit 5cc123bae7c09d8e4b99f6686b6b4dfeeda5c06b Author: Kevin Morin <morin@codelutin.com> Date: Fri Nov 13 16:23:49 2015 +0100 suppression du code mort --- .../observe/business/LonglinePositionAware.java | 56 ---------------------- .../fr/ird/observe/business/SendMessageAble.java | 34 ------------- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 3 +- 3 files changed, 1 insertion(+), 92 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/LonglinePositionAware.java b/observe-application-swing/src/main/java/fr/ird/observe/business/LonglinePositionAware.java deleted file mode 100644 index a508bcb..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/LonglinePositionAware.java +++ /dev/null @@ -1,56 +0,0 @@ -package fr.ird.observe.business; - -/* - * #%L - * ObServe :: Entities - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.services.dto.longline.BasketDto; -import fr.ird.observe.services.dto.longline.BranchlineDto; -import fr.ird.observe.services.dto.longline.SectionDto; - -import java.beans.PropertyChangeListener; - -/** - * Created on 1/6/15. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 3.11 - */ -//FIXME -public interface LonglinePositionAware { - - void setSection(SectionDto section); - - SectionDto getSection(); - - void setBasket(BasketDto basket); - - BasketDto getBasket(); - - void setBranchline(BranchlineDto branchline); - - BranchlineDto getBranchline(); - - void addPropertyChangeListener(PropertyChangeListener listener); - - void addPropertyChangeListener(String property, PropertyChangeListener listener); - -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/SendMessageAble.java b/observe-application-swing/src/main/java/fr/ird/observe/business/SendMessageAble.java deleted file mode 100644 index 9ed2b05..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/SendMessageAble.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.business; - -/** - * Un contrat pour pouvoir propager les messages. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.5 - */ -//FIXME A supprimer -public interface SendMessageAble { - - void sendMessage(String message); -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java index 53dc106..ac8bd12 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java @@ -24,7 +24,6 @@ package fr.ird.observe.ui.admin; import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveRunner; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.SendMessageAble; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ImportDataDto; import fr.ird.observe.services.service.BabModelVersionException; @@ -57,7 +56,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class AdminTabUIHandler implements SendMessageAble { +public class AdminTabUIHandler { /** Logger */ private static final Log log = LogFactory.getLog(AdminTabUIHandler.class); -- 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/remove_dead_code 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>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/remove_dead_code in repository observe. See http://git.codelutin.com/observe.git commit 7183b3fd5b6da37f71cc19f8b13319e5b81ae1f1 Author: Kevin Morin <morin@codelutin.com> Date: Fri Nov 13 16:43:08 2015 +0100 fix dependencies --- observe-application-swing/pom.xml | 5 ----- observe-services-model/pom.xml | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/observe-application-swing/pom.xml b/observe-application-swing/pom.xml index 1ccef4e..46bb239 100644 --- a/observe-application-swing/pom.xml +++ b/observe-application-swing/pom.xml @@ -291,11 +291,6 @@ </dependency> <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - </dependency> - - <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> </dependency> diff --git a/observe-services-model/pom.xml b/observe-services-model/pom.xml index ac7c03b..5ccc0e5 100644 --- a/observe-services-model/pom.xml +++ b/observe-services-model/pom.xml @@ -87,6 +87,12 @@ <artifactId>gson</artifactId> </dependency> + <!-- for GPS --> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + </dependency> + </dependencies> <build> -- 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/remove_dead_code in repository observe. See http://git.codelutin.com/observe.git commit 93de948caf2a858ecc232a5d0722aead08364f8c Author: Kevin Morin <morin@codelutin.com> Date: Fri Nov 13 16:43:26 2015 +0100 suppression du code mort --- .../business/db/model/DataSelectionModel.java | 495 --------------------- 1 file changed, 495 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/model/DataSelectionModel.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/model/DataSelectionModel.java deleted file mode 100644 index 41e4382..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/model/DataSelectionModel.java +++ /dev/null @@ -1,495 +0,0 @@ -package fr.ird.observe.business.db.model; - -/** - * @author Kevin Morin (Code Lutin) - * @since x.x - */ - -import fr.ird.observe.services.dto.ReferenceDto; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; -import java.io.Serializable; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; - -/** - * Un modèle pour représenter la sélection de données. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public class DataSelectionModel implements Serializable { - -// public static void populate(DataSelectionModel model, -// ObserveSwingDataSource source) throws Exception { -// -// Preconditions.checkState(source.isOpen()); -// -// Map<String, List<String>> datas = new HashMap<String, List<String>>(); -// -// List<ProgramDto> programs = service.getAllProgramStub(source); -// for (Program program : programs) { -// -// if (Programs.isProgramSeine(program)) { -// List<TripSeine> trips = service.getTripSeineStubByProgram(source, program.getTopiaId()); -// populate(model, program, trips, datas); -// } -// -// if (Programs.isProgramLongline(program)) { -// List<TripLongline> trips = service.getTripLonglineStubByProgram(source, program.getTopiaId()); -// populate(model, program, trips, datas); -// } -// -// } -// model.setDatas(datas); -// -// } - -// protected static <T extends Trip> void populate(DataSelectionModel model, -// Program program, -// List<T> trips, -// Map<String, List<String>> datas) { -// -// model.cacheEntity(program); -// -// if (!trips.isEmpty()) { -// List<String> tripIds = new ArrayList<String>(); -// -// if (model.isUseOpenData()) { -// -// // ajout de toutes les marées ouvertes ou non -// for (T trip : trips) { -// trip.setProgram(program); -// model.cacheEntity(trip); -// tripIds.add(trip.getTopiaId()); -// } -// -// } else { -// -// // ajout de toutes les marées non ouvertes -// for (T trip : trips) { -// trip.setProgram(program); -// if (!trip.isOpen()) { -// model.cacheEntity(trip); -// tripIds.add(trip.getTopiaId()); -// } -// } -// -// } -// -// if (!tripIds.isEmpty()) { -// -// datas.put(program.getTopiaId(), tripIds); -// if (log.isDebugEnabled()) { -// log.debug("Add program " + program.getLabel1() + " with " + tripIds.size() + " trip(s)."); -// } -// -// } -// -// } -// -// } - - public static final String PROPERTY_USE_REFERENTIEL = "useReferentiel"; - - public static final String PROPERTY_USE_DATA = "useData"; - - public static final String PROPERTY_USE_OPEN_DATA = "useOpenData"; - - public static final String PROPERTY_SELECTED_DATA = "selectedData"; - - public static final String PROPERTY_SELECTED_REFERENTIEL = "selectedReferentiel"; - - public static final String PROPERTY_DATAS = "datas"; - - /** Logger */ - private static final Log log = LogFactory.getLog(DataSelectionModel.class); - - private static final long serialVersionUID = 2L; - - /** un drapeau pour selectionner ou non les donnees observers */ - protected boolean useData; - - /** un drapeau pour selectionner ou non des donnees observers ouvertes */ - protected boolean useOpenData; - - /** un drapeau pour selectionner ou non des donnees observer */ - protected boolean useReferentiel; - - /** la liste des programs utilisables (qui ont des marees) */ - protected transient Map<String, List<String>> datas; - - /** - * Le cache des entités chargées pour construire le modèle de sélection. - * - * Ces entités pourront ensuite être injectées dans les noeuds sans avoir à les recharger. - * - * @since 4.0 - */ - protected final Map<String, ReferenceDto> entityCache; - - /** la liste des marees selectionnee */ - protected transient Set<String> selectedData; - - /** la liste des referentiels possibles */ - protected final Set<Class<?>> referentiel; - - /** la liste des referentiels selectionnes */ - protected final Set<Class<?>> selectedReferentiel; - - /** nb marees */ - protected int nbTrips; - - /** nb referentiels */ - protected final int nbReferentiels; - - protected final PropertyChangeSupport pcs; - - public void populate() throws Exception { - throw new UnsupportedOperationException(); - } - - public DataSelectionModel() { - pcs = new PropertyChangeSupport(this); - //FIXME -// Class<?>[] classes = TopiaEntityHelper.getContracts(Entities.REFERENCE_ENTITIES); -// List<Class<?>> list = Arrays.asList(classes); -// referentiel = new HashSet<Class<?>>(list); - referentiel = new HashSet<Class<?>>(); - selectedReferentiel = new HashSet<Class<?>>(); - nbReferentiels = referentiel.size(); - entityCache = new TreeMap<String, ReferenceDto>(); - } - - public boolean isUseReferentiel() { - return useReferentiel; - } - - public boolean isUseData() { - return useData; - } - - public boolean isUseOpenData() { - return useOpenData; - } - - public boolean isEmpty() { - if (isUseReferentiel()) { - if (!isReferentielEmpty()) { - return false; - } - } - if (isUseData()) { - if (!isDataEmpty()) { - return false; - } - } - return true; - } - - protected void cacheEntity(ReferenceDto entity) { - entityCache.put(entity.getId(), entity); - } - - public ReferenceDto getEntityCache(String id) { - return entityCache.get(id); - } - - public boolean isReferentielEmpty() { - return selectedReferentiel.isEmpty(); - } - - public boolean isReferentielFull() { - return selectedReferentiel.size() == nbReferentiels; - } - - public boolean isDataEmpty() { - return selectedData == null || selectedData.isEmpty(); - } - - public boolean isDataFull() { - return selectedData != null && selectedData.size() == nbTrips; - } - - public Set<Class<?>> getSelectedReferentiel() { - return selectedReferentiel; - } - - public Map<String, List<String>> getDatas() { - if (datas == null) { - datas = new HashMap<String, List<String>>(); - } - return datas; - } - - public Set<String> getSelectedData() { - if (selectedData == null) { - selectedData = new HashSet<String>(); - } - return selectedData; - } - -// public Map<String, List<String>> getSelectedDataByProgram() { -// if (datas == null || selectedData == null || selectedData.isEmpty()) { -// return Collections.emptyMap(); -// } -// Map<String, List<String>> result = -// new HashMap<String, List<String>>(datas.size()); -// -// for (String m : selectedData) { -// -// // on recherche son program -// for (String p : datas.keySet()) { -// if (datas.get(p).contains(m)) { -// List<String> trips = result.get(p); -// if (trips == null) { -// trips = new ArrayList<String>(); -// result.put(p, trips); -// } -// trips.add(m); -// break; -// } -// } -// } -// return result; -// } - - public boolean isSelectedData(String id) { - - if (isTripId(id)) { - - // recherche directe sur les ids de marees - return getSelectedData().contains(id); - } - - if (isProgramId(id)) { - // on doit verifier que toutes les marees du program sont sélectionnées - List<String> tripIds = datas.get(id); - if (CollectionUtils.isEmpty(tripIds)) { - - // pas de marées - return false; - } - - for (String tripId : tripIds) { - if (!isSelectedData(tripId)) { - - // au moins une marée non sélectionnée - - return false; - } - } - - // toutes les marées sont sélectionnée - return true; - } - - // ne devrait pas arrivée - return false; - - } - - public boolean isSelectedReferentiel(Class<?> type) { - checkReferentielType(type); - return getSelectedReferentiel().contains(type); - } - -// public void setUseReferentiel(boolean useReferentiel) { -// this.useReferentiel = useReferentiel; -// firePropertyChange(PROPERTY_USE_REFERENTIEL, useReferentiel); -// } -// -// public void setUseData(boolean useData) { -// this.useData = useData; -// firePropertyChange(PROPERTY_USE_DATA, useData); -// } -// -// public void setUseOpenData(boolean useOpenData) { -// this.useOpenData = useOpenData; -// firePropertyChange(PROPERTY_USE_OPEN_DATA, useOpenData); -// } - - public void addSelectedReferentiel(Class<?> type) { - checkReferentielType(type); - if (log.isDebugEnabled()) { - log.debug("Add referentiel type " + type); - } - getSelectedReferentiel().add(type); - firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); - } - - public void addAllSelectedReferentiel() { - getSelectedReferentiel().addAll(referentiel); - firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); - } - - public void removeSelectedReferentiel(Class<?> type) { - checkReferentielType(type); - if (log.isDebugEnabled()) { - log.debug("remove referentiel type " + type); - } - getSelectedReferentiel().remove(type); - firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); - } - - public void removeAll() { - getSelectedReferentiel().clear(); - getSelectedData().clear(); - firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); - firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); - } - - public void removeAllSelectedReferentiel() { - getSelectedReferentiel().clear(); - firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); - } - - public void setDatas(Map<String, List<String>> datas) { - this.datas = datas; - - // on compte le count de marées totale - int nbTrips = 0; - if (datas != null) { - for (List<String> marees : datas.values()) { - nbTrips += marees.size(); - } - } - this.nbTrips = nbTrips; - - if (log.isDebugEnabled()) { - log.debug("Nb program registred : " + (datas == null ? 0 : datas.size())); - log.debug("Nb trip registred : " + this.nbTrips); - } - firePropertyChange(PROPERTY_DATAS, datas); - } - - public void addSelectedData(String id) { - - if (isTripId(id)) { - - // ajout d'une marée - if (log.isDebugEnabled()) { - log.debug("Add Trip " + id); - } - getSelectedData().add(id); - - } else if (isProgramId(id)) { - - // ajout de toutes les marées du program - - if (log.isDebugEnabled()) { - log.debug("Add all trips of program " + id); - } - getSelectedData().addAll(datas.get(id)); - } - - - firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); - } - - public void addAllSelectedData() { - if (log.isDebugEnabled()) { - log.debug("All all data."); - } - for (List<String> p : datas.values()) { - getSelectedData().addAll(p); - } - firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); - } - - public void removeSelectedData(String id) { - if (isTripId(id)) { - - // ajout d'une marée - if (log.isDebugEnabled()) { - log.debug("Remove maree " + id); - } - getSelectedData().remove(id); - } else if (isProgramId(id)) { - - // ajout de toutes les marées du program - - if (log.isDebugEnabled()) { - log.debug("Remove all marees of program " + id); - } - getSelectedData().removeAll(datas.get(id)); - } - firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); - } - - public void removeAllSelectedData() { - if (selectedData != null) { - selectedData.clear(); - } - firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); - } - - public void addPropertyChangeListener(PropertyChangeListener listener) { - pcs.addPropertyChangeListener(listener); - } - - public void addPropertyChangeListener(String propertyName, - PropertyChangeListener listener) { - pcs.addPropertyChangeListener(propertyName, listener); - } - - public void removePropertyChangeListener(PropertyChangeListener listener) { - pcs.removePropertyChangeListener(listener); - } - - public void removePropertyChangeListener(String propertyName, - PropertyChangeListener listener) { - pcs.removePropertyChangeListener(propertyName, listener); - } - - protected void firePropertyChange(String propertyName, Object newValue) { - pcs.firePropertyChange(propertyName, null, newValue); - } - - protected void firePropertyChange(String propertyName, - Object oldValue, - Object newValue) { - pcs.firePropertyChange(propertyName, oldValue, newValue); - } - - protected void checkReferentielType(Class<?> type) { - if (!referentiel.contains(type)) { - throw new IllegalArgumentException( - "given <" + type + "> is not in referentiel universe : " + - referentiel); - } - } - - protected boolean isTripId(String id) { - String[] entityFullClass = id.split("#")[0].split("\\."); - return entityFullClass[entityFullClass.length - 1].startsWith("Trip"); - } - - private boolean isProgramId(String id) { - String[] entityFullClass = id.split("#")[0].split("\\."); - return entityFullClass[entityFullClass.length - 1].equals("Program"); - } - - public void destroy() { - removeAll(); - // suppression de tous les listeners - PropertyChangeListener[] listeners = pcs.getPropertyChangeListeners(); - for (PropertyChangeListener l : listeners) { - removePropertyChangeListener(l); - } - } - - @Override - protected void finalize() throws Throwable { - super.finalize(); - destroy(); - } -} -- 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