This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 2faaf5451d62d95fa85e7b7830323646ad392f04 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 16:15:59 2015 +0200 Deplacement de BinderService et renommage en ObserveSwingBinder + suppression IObserveConfig + ajout de deux FIXME --- .../observe/ObserveSwingApplicationContext.java | 11 +- ...Service.java => ObserveSwingBinderService.java} | 4 +- .../fr/ird/observe/business/IObserveConfig.java | 411 --------------------- .../fr/ird/observe/business/SendMessageAble.java | 1 + .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 6 +- .../ird/observe/ui/content/ContentUIHandler.java | 4 +- .../fr/ird/observe/ui/content/ContentUIModel.java | 4 +- .../content/impl/longline/BranchlineUIModel.java | 4 +- .../longline/LonglineDetailCompositionUIModel.java | 4 +- .../longline/LonglineGlobalCompositionUIModel.java | 4 +- .../content/impl/longline/SetLonglineUIModel.java | 4 +- .../seine/ActivitySeineObservedSystemUIModel.java | 4 +- ...tingObjectTransmittingBuoyOperationUIModel.java | 4 +- .../content/impl/seine/FloatingObjectUIModel.java | 4 +- .../ui/content/impl/seine/SetSeineUIModel.java | 4 +- .../impl/longline/ActivityLonglinesUIModel.java | 4 +- .../list/impl/longline/TripLonglinesUIModel.java | 4 +- .../list/impl/seine/ActivitySeinesUIModel.java | 4 +- .../ui/content/list/impl/seine/RoutesUIModel.java | 4 +- .../content/list/impl/seine/TripSeinesUIModel.java | 4 +- .../impl/longline/ActivityLonglineUIModel.java | 4 +- .../open/impl/longline/TripLonglineUIModel.java | 4 +- .../open/impl/seine/ActivitySeineUIModel.java | 4 +- .../ui/content/open/impl/seine/RouteUIModel.java | 4 +- .../content/open/impl/seine/TripSeineUIModel.java | 4 +- .../ui/content/ref/ContentReferenceUIModel.java | 4 +- .../ui/content/ref/ReferenceHomeUIModel.java | 4 +- .../ui/content/table/ContentTableUIModel.java | 6 +- .../table/impl/longline/CatchLonglineUIModel.java | 4 +- .../ui/content/table/impl/longline/TdrUIModel.java | 4 +- 30 files changed, 62 insertions(+), 473 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 415fd96..258f488 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 @@ -22,7 +22,6 @@ package fr.ird.observe; import com.google.common.base.Preconditions; -import fr.ird.observe.business.BinderService; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.gps.GPSService; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; @@ -141,8 +140,8 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im /** the jaxx context entry to store the decorator service */ - public static final JAXXContextEntryDef<BinderService> BINDER_SERVICE_ENTRY_DEF = - JAXXUtil.newContextEntryDef(BinderService.class); + public static final JAXXContextEntryDef<ObserveSwingBinderService> BINDER_SERVICE_ENTRY_DEF = + JAXXUtil.newContextEntryDef(ObserveSwingBinderService.class); /** the jaxx context entry to store the gps service */ public static final JAXXContextEntryDef<GPSService> GPS_SERVICE_ENTRY_DEF = @@ -298,10 +297,10 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im return service; } - public final BinderService getBinderService() { - BinderService service = BINDER_SERVICE_ENTRY_DEF.getContextValue(this); + public final ObserveSwingBinderService getBinderService() { + ObserveSwingBinderService service = BINDER_SERVICE_ENTRY_DEF.getContextValue(this); if (service == null) { - service = new BinderService(); + service = new ObserveSwingBinderService(); BINDER_SERVICE_ENTRY_DEF.setContextValue(this, service); } return service; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/BinderService.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingBinderService.java similarity index 97% rename from observe-application-swing/src/main/java/fr/ird/observe/business/BinderService.java rename to observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingBinderService.java index 93c3be2..2ff97fa 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/BinderService.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingBinderService.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.business; +package fr.ird.observe; import fr.ird.observe.services.dto.AbstractObserveDto; import org.nuiton.util.beans.BinderModelBuilder; @@ -30,7 +30,7 @@ import org.nuiton.util.beans.BinderModelBuilder; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class BinderService { +public class ObserveSwingBinderService { public <E extends AbstractObserveDto> BinderModelBuilder<E, E> newBinderBuilder(Class<E> type, String... properties) { BinderModelBuilder<E, E> builder = BinderModelBuilder.newEmptyBuilder(type); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/IObserveConfig.java b/observe-application-swing/src/main/java/fr/ird/observe/business/IObserveConfig.java deleted file mode 100644 index 3d0322a..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/IObserveConfig.java +++ /dev/null @@ -1,411 +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; - -import fr.ird.observe.db.constantes.CreationMode; -import fr.ird.observe.db.constantes.DbMode; -import org.nuiton.util.version.Version; - -import java.beans.PropertyChangeListener; -import java.io.File; -import java.util.Locale; - -/** - * Contrat de la configuration d'Observe. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.2 - */ -public interface IObserveConfig { - /** - * le fichier de configuration de l'application avec les informations sur le - * projet (version, license,...) et la configuration des ui (icons, ...) - */ - String APPLICATION_PROPERTIES = "/observe.properties"; - - /** le lastName du repertoire ou sont les donnees de l'application */ - String USER_DIRECTORY_FILENAME = ".observe"; - - /** le pattern du fichier de sauvegarde d'une base locale */ - String BACKUP_DB_PATTERN = "obstuna-local-%1$tF--%1$tk-%1$tM-%1$tS.sql.gz"; - - /** le pattern du fichier de sauvegarde d'une base access importée */ - String ACCESS_DB_PATTERN = "import-access-%1$tF--%1$tk-%1$tM-%1$tS.sql.gz"; - - /** le pattern du fichier de rapport après validation */ - String REPORT_PATTERN = "report-%1$tF--%1$tk-%1$tM-%1$tS.sql.gz"; - - /** - * La version de l'application. - */ - String APPLICATION_VERSION = "application.version"; - - /** - * La version du modèle de la persistence - */ - //FIXME -// String DB_VERSION = AbstractDataSourceMigration.DB_VERSION; - - String VERSION = "version"; - - String PROPERTY_DEFAULT_DB_MODE = "defaultDbMode"; - - String PROPERTY_DEFAULT_CREATION_MODE = "defaultCreationMode"; - - String PROPERTY_SPECIES_LIST_SEINE_TARGET_CATCH_ID = "speciesListSeineTargetCatchId"; - - String PROPERTY_SPECIES_LIST_SEINE_SCHOOL_ESTIMATE_ID = "speciesListSeineSchoolEstimateId"; - - String PROPERTY_SPECIES_LIST_SEINE_OBJECT_SCHOOL_ESTIMATE_ID = "speciesListSeineObjectSchoolEstimateId"; - - String PROPERTY_SPECIES_LIST_SEINE_NON_TARGET_CATCH_ID = "speciesListSeineNonTargetCatchId"; - - String PROPERTY_SPECIES_LIST_SEINE_OBJECT_OBSERVED_SPECIES_ID = "speciesListSeineObjectObservedSpeciesId"; - - String PROPERTY_SPECIES_LIST_LONGLINE_CATCH_ID = "speciesListLonglineCatchId"; - - String PROPERTY_SPECIES_LIST_LONGLINE_ENCOUNTER_ID = "speciesListLonglineEncounterId"; - - String PROPERTY_SPECIES_LIST_LONGLINE_DEPREDATOR_ID = "speciesListLonglineDepredatorId"; - - String PROPERTY_VERSION = "version"; - - String PROPERTY_DB_VERSION = "dbVersion"; - - String PROPERTY_AUTO_POPUP_NUMBER_EDITOR = "autoPopupNumberEditor"; - - String PROPERTY_SHOW_NUMBER_EDITOR_BUTTON = "showNumberEditorButton"; - - String PROPERTY_SHOW_DATE_TIME_EDITOR_SLIDER= "showTimeEditorSlider"; - - String PROPERTY_LOCAL_STORAGE_EXIST = "localStorageExist"; - - String PROPERTY_INITIAL_DUMP_EXIST = "initialDumpExist"; - - String PROPERTY_MAIN_STORAGE_OPENED = "mainStorageOpened"; - - String PROPERTY_STORE_REMOTE_STORAGE = "storeRemoteStorage"; - - String PROPERTY_DEFAULT_GPS_MAX_DELAY = "defaultGpsMaxDelay"; - - String PROPERTY_DEFAULT_GPS_MAX_SPEED = "defaultGpsMaxSpeed"; - - String PROPERTY_CHANGE_SYNCHRO_SRC = "changeSynchroSrc"; - - String PROPERTY_NON_TARGET_OBSERVATION = "nonTargetObservation"; - - String PROPERTY_TARGET_DISCARDS_OBSERVATION = "targetDiscardsObservation"; - - String PROPERTY_SAMPLES_OBSERVATION = "samplesObservation"; - - String PROPERTY_OBJECTS_OBSERVATION = "objectsObservation"; - - String PROPERTY_DETAILLED_ACTIVITIES_OBSERVATION = "detailledActivitiesObservation"; - - String PROPERTY_MAMMALS_OBSERVATION = "mammalsObservation"; - - String PROPERTY_BIRDS_OBSERVATION = "birdsObservation"; - - String PROPERTY_BAIT_OBSERVATION = "baitObservation"; - - String PROPERTY_RESOURCES_DIRECTORY = "resourcesDirectory"; - - String PROPERTY_LOCALE = "locale"; - - String PROPERTY_DB_LOCALE = "dbLocale"; - - String PROPERTY_CAN_MIGRATE_OBSTUNA = "canMigrateObstuna"; - - String PROPERTY_CAN_MIGRATE_H2 = "canMigrateH2"; - - String PROPERTY_MAIN_STORAGE_OPENED_LOCAL = "mainStorageOpenedLocal"; - - String PROPERTY_COPYRIGHT_TEXT = "copyrightText"; - - String PROPERTY_FULL_SCREEN = "fullScreen"; - - String PROPERTY_LOCAL_DBDIRECTORY = "localDBDirectory"; - - String PROPERTY_I18N_DIRECTORY = "i18nDirectory"; - - String PROPERTY_INITIAL_DB_DUMP = "initialDbDump"; - - String PROPERTY_BACKUP_DIRECTORY = "backupDirectory"; - - String PROPERTY_REPORT_DIRECTORY = "reportDirectory"; - - String PROPERTY_MAP_DIRECTORY = "mapDirectory"; - - String PROPERTY_TMP_DIRECTORY = "tmpDirectory"; - - String PROPERTY_DISPLAY_MAIN_UI = "displayMainUI"; - - String PROPERTY_CAN_USE_UI = "canUseUI"; - - String PROPERTY_ADJUSTING = "adjusting"; - - String PROPERTY_H2_LOGIN = "h2Login"; - - String PROPERTY_H2_PASSWORD = "h2Password"; - - String PROPERTY_OBSTUNA_URL = "obstunaUrl"; - - String PROPERTY_OBSTUNA_LOGIN = "obstunaLogin"; - - String PROPERTY_OBSTUNA_PASSWORD = "obstunaPassword"; - - String PROPERTY_OBSTUNA_USE_SSL = "obstunaUseSsl"; - - String PROPERTY_LOAD_LOCAL_STORAGE = "loadLocalStorage"; - - String PROPERTY_SHOW_MIGRATION_PROGRESSION = "showMigrationProgression"; - - String PROPERTY_SHOW_MIGRATION_SQL = "showMigrationSql"; - - String PROPERTY_VALIDATION_REPORT_DIRECTORY = "validationReportDirectory"; - - String PROPERTY_SHOW_SQL = "showSql"; - - String PROPERTY_H2_SERVER_PORT = "h2ServerPort"; - - String PROPERTY_DEV_MODE = "devMode"; - - boolean isDevMode(); - - Version getVersion(); - - Version getDbVersion(); - - boolean isAutoPopupNumberEditor(); - - boolean isShowNumberEditorButton(); - - boolean isShowTimeEditorSlider(); - - boolean isLocalStorageExist(); - - boolean isInitialDumpExist(); - - boolean isMainStorageOpened(); - - boolean isStoreRemoteStorage(); - - int getDefaultGpsMaxDelay(); - - float getDefaultGpsMaxSpeed(); - - boolean isChangeSynchroSrc(); - - int getNonTargetObservation(); - - int getTargetDiscardsObservation(); - - int getSamplesObservation(); - - int getObjectsObservation(); - - int getDetailledActivitiesObservation(); - - int getMammalsObservation(); - - int getBirdsObservation(); - - int getBaitObservation(); - - File getResourcesDirectory(); - - Locale getLocale(); - - Locale getDbLocale(); - - boolean isCanMigrateObstuna(); - - boolean isCanMigrateH2(); - - Boolean getMainStorageOpenedLocal(); - - String getCopyrightText(); - - boolean isFullScreen(); - - File getLocalDBDirectory(); - - File getI18nDirectory(); - - File getInitialDbDump(); - - File getBackupDirectory(); - - File getReportDirectory(); - - File getTmpDirectory(); - - File getLogConfigurationFile(); - - boolean isDisplayMainUI(); - - boolean isCanUseUI(); - - boolean isAdjusting(); - - String getH2Login(); - - char[] getH2Password(); - - String getObstunaUrl(); - - String getObstunaLogin(); - - char[] getObstunaPassword(); - - boolean isObstunaUseSsl(); - - boolean isLoadLocalStorage(); - - boolean isShowMigrationProgression(); - - boolean isShowMigrationSql(); - - File getValidationReportDirectory(); - - boolean isShowSql(); - - int getH2ServerPort(); - - void setResourcesDirectory(File newValue); - - DbMode getDefaultDbMode(); - - CreationMode getDefaultCreationMode(); - - void saveForUser(String... excludeKeys); - - //FIXME -// void fromStorageConfig(H2DataSourceConfig config); - -// void fromStorageConfig(PGDataSourceConfig config); - -// H2DataSourceConfig toH2StorageConfig(String label); - -// PGDataSourceConfig toPostgresStorageConfig(String label); - - void setAutoPopupNumberEditor(boolean newValue); - - void setShowNumberEditorButton(boolean newValue); - - void setShowTimeEditorSlider(boolean newValue); - - void setFullScreen(boolean newValue); - - void setChangeSynchroSrc(boolean newValue); - - void setStoreRemoteStorage(boolean newValue); - - void setLoadLocalStorage(boolean newValue); - - void setDefaultDbMode(DbMode newValue); - - void setDefaultCreationMode(CreationMode newValue); - - void setDefaultGpsMaxDelay(int newValue); - - void setDefaultGpsMaxSpeed(float newValue); - - void setLocale(Locale newValue); - - void setDbLocale(Locale newValue); - - void setCanMigrateObstuna(Boolean newValue); - - void setCanMigrateH2(Boolean newValue); - - void setNonTargetObservation(int newValue); - - void setTargetDiscardsObservation(int newValue); - - void setSamplesObservation(int newValue); - - void setObjectsObservation(int newValue); - - void setDetailledActivitiesObservation(int newValue); - - void setMammalsObservation(int newValue); - - void setBirdsObservation(int newValue); - - void setBaitObservation(int newValue); - - void addPropertyChangeListener(PropertyChangeListener listener); - - void addPropertyChangeListener(String propertyName, - PropertyChangeListener listener); - - void removePropertyChangeListener(PropertyChangeListener listener); - - void removePropertyChangeListener(String propertyName, - PropertyChangeListener listener); - - void setShowMigrationSql(boolean showMigrationSql); - - void setShowMigrationProgression(boolean showMigrationProgression); - - void setShowSql(boolean showSql); - - boolean hasListeners(String propertyName); - - PropertyChangeListener[] getPropertyChangeListeners(String propertyName); - - PropertyChangeListener[] getPropertyChangeListeners(); - - String getSpeciesListSeineNonTargetCatchId(); - - String getSpeciesListSeineTargetCatchId(); - - String getSpeciesListSeineSchoolEstimateId(); - - String getSpeciesListSeineObjectObservedSpeciesId(); - - String getSpeciesListSeineObjectSchoolEstimateId(); - - String getSpeciesListLonglineCatchId(); - - String getSpeciesListLonglineEncounterId(); - - String getSpeciesListLonglineDepredatorId(); - - void setSpeciesListSeineNonTargetCatchId(String speciesListSeineNonTargetCatchId); - - void setSpeciesListSeineTargetCatchId(String speciesListSeineTargetCatchId); - - void setSpeciesListSeineSchoolEstimateId(String speciesListSeineSchoolEstimateId); - - void setSpeciesListSeineObjectObservedSpeciesId(String speciesListSeineObjectObservedSpeciesId); - - void setSpeciesListSeineObjectSchoolEstimateId(String speciesListseineObjectSchoolEstimateId); - - void setSpeciesListLonglineCatchId(String speciesListLonglineCatchId); - - void setSpeciesListLonglineEncounterId(String speciesListLonglineEncounterId); - - void setSpeciesListLonglineDepredatorId(String speciesListLonglineDepredatorId); - -} 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 index d8bae0e..9ed2b05 100644 --- 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 @@ -27,6 +27,7 @@ package fr.ird.observe.business; * @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 994bfe4..46319cc 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 @@ -23,7 +23,7 @@ package fr.ird.observe.ui.admin; import fr.ird.observe.ObserveRunner; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.business.SendMessageAble; @@ -108,7 +108,7 @@ public class AdminTabUIHandler implements SendMessageAble { private DecoratorService decoratorService; /** Service de binders. */ - private BinderService binderService; + private ObserveSwingBinderService binderService; public AdminTabUIHandler(AdminTabUI ui) { this.ui = ui; @@ -146,7 +146,7 @@ public class AdminTabUIHandler implements SendMessageAble { return decoratorService; } - public final BinderService getBinderService() { + public final ObserveSwingBinderService getBinderService() { if (binderService == null) { binderService = ObserveSwingApplicationContext.get().getBinderService(); } 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 47288ca..1080e32 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 @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content; import fr.ird.observe.ObserveOpenDataManager; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.BinderService; +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; @@ -301,7 +301,7 @@ public abstract class ContentUIHandler<E extends IdDto> { return result; } - public BinderService getBinderService() { + public ObserveSwingBinderService getBinderService() { return ObserveSwingApplicationContext.get().getBinderService(); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java index 962f0ce..bcb218f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.content; -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.ObserveSwingTechnicalException; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDto; @@ -120,7 +120,7 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab } - protected abstract BinderModelBuilder<E, E> createOpeningBinder(BinderService binderService, String binderName); + protected abstract BinderModelBuilder<E, E> createOpeningBinder(ObserveSwingBinderService binderService, String binderName); public E getBean() { return bean; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIModel.java index aca4e59..9f8cdb6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/BranchlineUIModel.java @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.impl.longline; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.ui.content.ContentUIModel; import org.nuiton.util.DateUtil; @@ -85,7 +85,7 @@ public class BranchlineUIModel extends ContentUIModel<BranchlineDto> { } @Override - protected BinderModelBuilder<BranchlineDto, BranchlineDto> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<BranchlineDto, BranchlineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { BinderModelBuilder<BranchlineDto, BranchlineDto> builder = binderService.newBinderBuilder( BranchlineDto.class, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIModel.java index fea3f23..cd247f4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIModel.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.ContentUIModel; import org.nuiton.util.beans.BinderModelBuilder; @@ -231,7 +231,7 @@ public class LonglineDetailCompositionUIModel extends ContentUIModel<SetLongline // } @Override - protected BinderModelBuilder<SetLonglineDto, SetLonglineDto> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<SetLonglineDto, SetLonglineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { // SetLongline binder diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIModel.java index 367acde..2a61224 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIModel.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.ContentUIModel; import org.nuiton.util.beans.BinderModelBuilder; @@ -42,7 +42,7 @@ public class LonglineGlobalCompositionUIModel extends ContentUIModel<SetLongline } @Override - protected BinderModelBuilder<SetLonglineDto, SetLonglineDto> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<SetLonglineDto, SetLonglineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { BinderModelBuilder<SetLonglineDto, SetLonglineDto> builder = binderService.newBinderBuilder( SetLonglineDto.class, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIModel.java index 2f19f3a..5e56f09 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIModel.java @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.impl.longline; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.ContentUIModel; import org.nuiton.util.DateUtil; @@ -136,7 +136,7 @@ public class SetLonglineUIModel extends ContentUIModel<SetLonglineDto> { } @Override - protected BinderModelBuilder<SetLonglineDto, SetLonglineDto> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<SetLonglineDto, SetLonglineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { BinderModelBuilder<SetLonglineDto, SetLonglineDto> builder = binderService.newBinderBuilder( SetLonglineDto.class, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java index 9306166..4d14298 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.impl.seine; * #L% */ -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.ui.content.ContentUIModel; import org.nuiton.util.beans.BinderModelBuilder; @@ -42,7 +42,7 @@ public class ActivitySeineObservedSystemUIModel extends ContentUIModel<ActivityS } @Override - protected BinderModelBuilder<ActivitySeineObservedSystemDto, ActivitySeineObservedSystemDto> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<ActivitySeineObservedSystemDto, ActivitySeineObservedSystemDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { BinderModelBuilder<ActivitySeineObservedSystemDto, ActivitySeineObservedSystemDto> builder = binderService.newBinderBuilder( ActivitySeineObservedSystemDto.class, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java index 0a36c46..c9c2817 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIModel.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.impl.seine; * #L% */ -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; import fr.ird.observe.ui.content.ContentUIModel; import org.nuiton.util.beans.BinderModelBuilder; @@ -42,7 +42,7 @@ public class FloatingObjectTransmittingBuoyOperationUIModel extends ContentUIMod } @Override - protected BinderModelBuilder<FloatingObjectTransmittingBuoyDto, FloatingObjectTransmittingBuoyDto> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<FloatingObjectTransmittingBuoyDto, FloatingObjectTransmittingBuoyDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { BinderModelBuilder<FloatingObjectTransmittingBuoyDto, FloatingObjectTransmittingBuoyDto> builder = binderService.newBinderBuilder( FloatingObjectTransmittingBuoyDto.class, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIModel.java index fa3589a..41cb271 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIModel.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.impl.seine; * #L% */ -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.ui.content.ContentUIModel; import org.nuiton.util.beans.BinderModelBuilder; @@ -42,7 +42,7 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> { } @Override - protected BinderModelBuilder<FloatingObjectDto, FloatingObjectDto> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<FloatingObjectDto, FloatingObjectDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { BinderModelBuilder<FloatingObjectDto, FloatingObjectDto> builder = binderService.newBinderBuilder( FloatingObjectDto.class, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIModel.java index cef7b9b..8686d19 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIModel.java @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.impl.seine; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.ui.content.ContentUIModel; import org.nuiton.util.beans.BinderModelBuilder; @@ -94,7 +94,7 @@ public class SetSeineUIModel extends ContentUIModel<SetSeineDto> { } @Override - protected BinderModelBuilder<SetSeineDto, SetSeineDto> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<SetSeineDto, SetSeineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { BinderModelBuilder<SetSeineDto, SetSeineDto> builder = binderService.newBinderBuilder( SetSeineDto.class, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIModel.java index 1218f27..be6ec15 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIModel.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.list.impl.longline; * #L% */ -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.ui.content.list.ContentListUIModel; @@ -43,7 +43,7 @@ public class ActivityLonglinesUIModel extends ContentListUIModel<TripLonglineDto } @Override - protected BinderModelBuilder<TripLonglineDto, TripLonglineDto> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<TripLonglineDto, TripLonglineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { BinderModelBuilder<TripLonglineDto, TripLonglineDto> builder = binderService.newBinderBuilder( TripLonglineDto.class, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIModel.java index ac1a57c..eca55c5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIModel.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.list.impl.longline; * #L% */ -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.ui.content.list.ContentListUIModel; @@ -43,7 +43,7 @@ public class TripLonglinesUIModel extends ContentListUIModel<ProgramDto, TripLon } @Override - protected BinderModelBuilder<ProgramDto, ProgramDto> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<ProgramDto, ProgramDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { BinderModelBuilder<ProgramDto, ProgramDto> builder = binderService.newBinderBuilder( ProgramDto.class, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIModel.java index 156690f..0dab03d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIModel.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.list.impl.seine; * #L% */ -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.ui.content.list.ContentListUIModel; @@ -43,7 +43,7 @@ public class ActivitySeinesUIModel extends ContentListUIModel<RouteDto, Activity } @Override - protected BinderModelBuilder<RouteDto, RouteDto> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<RouteDto, RouteDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { BinderModelBuilder<RouteDto, RouteDto> builder = binderService.newBinderBuilder( RouteDto.class, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIModel.java index e6bd247..dfb515e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIModel.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.list.impl.seine; * #L% */ -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.content.list.ContentListUIModel; @@ -43,7 +43,7 @@ public class RoutesUIModel extends ContentListUIModel<TripSeineDto, RouteDto> { } @Override - protected BinderModelBuilder<TripSeineDto, TripSeineDto> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<TripSeineDto, TripSeineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { BinderModelBuilder<TripSeineDto, TripSeineDto> builder = binderService.newBinderBuilder( TripSeineDto.class, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIModel.java index 1e71743..2a5502b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIModel.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.list.impl.seine; * #L% */ -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.content.list.ContentListUIModel; @@ -43,7 +43,7 @@ public class TripSeinesUIModel extends ContentListUIModel<ProgramDto, TripSeineD } @Override - protected BinderModelBuilder<ProgramDto, ProgramDto> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<ProgramDto, ProgramDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { BinderModelBuilder<ProgramDto, ProgramDto> builder = binderService.newBinderBuilder( ProgramDto.class, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java index 8e8fab3..4fad78a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIModel.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.open.impl.longline; * #L% */ -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; @@ -54,7 +54,7 @@ public class ActivityLonglineUIModel extends ContentOpenableUIModel<ActivityLong } @Override - protected BinderModelBuilder<ActivityLonglineDto, ActivityLonglineDto> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<ActivityLonglineDto, ActivityLonglineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { BinderModelBuilder<ActivityLonglineDto, ActivityLonglineDto> builder = binderService.newBinderBuilder( ActivityLonglineDto.class, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIModel.java index f06d2c5..58f2eaf 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIModel.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.open.impl.longline; * #L% */ -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; import org.nuiton.util.beans.Binder; @@ -43,7 +43,7 @@ public class TripLonglineUIModel extends ContentOpenableUIModel<TripLonglineDto> } @Override - protected BinderModelBuilder<TripLonglineDto, TripLonglineDto> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<TripLonglineDto, TripLonglineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { BinderModelBuilder<TripLonglineDto, TripLonglineDto> builder = binderService.newBinderBuilder( TripLonglineDto.class, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java index 58c5792..da79d96 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.open.impl.seine; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; import org.nuiton.util.beans.BinderModelBuilder; @@ -102,7 +102,7 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeineDt } @Override - protected BinderModelBuilder<ActivitySeineDto, ActivitySeineDto> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<ActivitySeineDto, ActivitySeineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { BinderModelBuilder<ActivitySeineDto, ActivitySeineDto> builder = binderService.newBinderBuilder( ActivitySeineDto.class, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIModel.java index 970b755..a172e58 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIModel.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.open.impl.seine; * #L% */ -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; import org.nuiton.util.beans.Binder; @@ -43,7 +43,7 @@ public class RouteUIModel extends ContentOpenableUIModel<RouteDto> { } @Override - protected BinderModelBuilder<RouteDto, RouteDto> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<RouteDto, RouteDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { BinderModelBuilder<RouteDto, RouteDto> builder = binderService.newBinderBuilder( RouteDto.class, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java index bdbf73f..57bd360 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.open.impl.seine; * #L% */ -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; import org.nuiton.util.beans.Binder; @@ -43,7 +43,7 @@ public class TripSeineUIModel extends ContentOpenableUIModel<TripSeineDto> { } @Override - protected BinderModelBuilder<TripSeineDto, TripSeineDto> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<TripSeineDto, TripSeineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { BinderModelBuilder<TripSeineDto, TripSeineDto> builder = binderService.newBinderBuilder( TripSeineDto.class, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIModel.java index d80fc31..bee21bf 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIModel.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.content.ref; -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.referential.I18nReferentialDto; import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; import fr.ird.observe.services.dto.referential.ReferentialDto; @@ -195,7 +195,7 @@ public abstract class ContentReferenceUIModel<E extends ReferentialDto> extends } @Override - protected BinderModelBuilder<E, E> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<E, E> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { BinderModelBuilder<E, E> builder = binderService.newBinderBuilder(beanType, properties); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIModel.java index 047580c..defa89d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferenceHomeUIModel.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.ref; * #L% */ -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.ui.content.ContentUIModel; import org.nuiton.util.beans.BinderModelBuilder; @@ -42,7 +42,7 @@ public class ReferenceHomeUIModel extends ContentUIModel<ProgramDto> { } @Override - protected BinderModelBuilder<ProgramDto, ProgramDto> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<ProgramDto, ProgramDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { return null; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIModel.java index a2aa0fe..f2c5d44 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIModel.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.content.table; -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.ObserveSwingTechnicalException; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.content.ContentUIModel; @@ -113,7 +113,7 @@ public abstract class ContentTableUIModel<E extends IdDto, D extends IdDto> exte } @Override - protected BinderModelBuilder<E, E> createOpeningBinder(BinderService binderService, String binderName) { + protected BinderModelBuilder<E, E> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { String[] properties = getParentProperties(); @@ -222,7 +222,7 @@ public abstract class ContentTableUIModel<E extends IdDto, D extends IdDto> exte firePropertyChange(PROPERTY_SHOW_DATA, oldValue, showData); } - protected BinderModelBuilder<D, D> prepareChildLoador(BinderService binderService, String binderName) { + protected BinderModelBuilder<D, D> prepareChildLoador(ObserveSwingBinderService binderService, String binderName) { String[] properties = getChildProperties(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIModel.java index 5bcf8e8..0af30cc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIModel.java @@ -24,7 +24,7 @@ package fr.ird.observe.ui.content.table.impl.longline; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; @@ -224,7 +224,7 @@ public class CatchLonglineUIModel extends ContentTableUIModel<SetLonglineDto, Ca } @Override - protected BinderModelBuilder<CatchLonglineDto, CatchLonglineDto> prepareChildLoador(BinderService binderService, String binderName) { + protected BinderModelBuilder<CatchLonglineDto, CatchLonglineDto> prepareChildLoador(ObserveSwingBinderService binderService, String binderName) { BinderModelBuilder<CatchLonglineDto, CatchLonglineDto> builder = super.prepareChildLoador(binderService, binderName); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIModel.java index 3b02b11..16fd09b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIModel.java @@ -24,7 +24,7 @@ package fr.ird.observe.ui.content.table.impl.longline; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import fr.ird.observe.business.BinderService; +import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.TdrDto; import fr.ird.observe.ui.content.table.ContentTableMeta; @@ -212,7 +212,7 @@ public class TdrUIModel extends ContentTableUIModel<SetLonglineDto, TdrDto> { } @Override - protected BinderModelBuilder<TdrDto, TdrDto> prepareChildLoador(BinderService binderService, String binderName) { + protected BinderModelBuilder<TdrDto, TdrDto> prepareChildLoador(ObserveSwingBinderService binderService, String binderName) { BinderModelBuilder<TdrDto, TdrDto> builder = super.prepareChildLoador(binderService, binderName); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.