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 2582a8d8dfd778198e1f08209916ff31eef32fc7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 16:06:27 2015 +0200 Suppression de ObserveServiceHelper et ObserveApplicationContext --- .../main/java/fr/ird/observe/ObserveRunner.java | 22 +- .../java/fr/ird/observe/ObserveServiceHelper.java | 344 --------------------- .../observe/ObserveSwingApplicationContext.java | 126 +++++++- .../business/ObserveApplicationContext.java | 231 -------------- .../observe/ui/actions/ShowStorageInfoAction.java | 10 +- .../ui/admin/validate/ValidateUIHandler.java | 21 +- .../ird/observe/ui/content/ContentUIHandler.java | 24 +- .../ui/content/open/ContentOpenableUIHandler.java | 7 +- .../ui/content/ref/ContentReferenceUIHandler.java | 10 +- .../ird/observe/ui/storage/StorageUIHandler.java | 4 +- .../ui/storage/tabs/StorageTabUIHandler.java | 8 +- .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 7 +- .../observe/validation/ObserveSwingValidator.java | 5 +- .../validation/ValidationMessageDetector.java | 5 +- ...glineDetailCompositionValidatorServiceTest.java | 12 +- 15 files changed, 192 insertions(+), 644 deletions(-) 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 1158503..920f3eb 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 @@ -362,7 +362,7 @@ public abstract class ObserveRunner extends ApplicationRunner { @Override protected void onClose(boolean reload) throws Exception { - if (ObserveServiceHelper.isInit()) { + if (ObserveSwingApplicationContext.isInit()) { if (log.isDebugEnabled()) { log.debug("Will close context..."); @@ -514,7 +514,7 @@ public abstract class ObserveRunner extends ApplicationRunner { } } - boolean hasInitialDb = ObserveServiceHelper.isInitialDbExists(config); + boolean hasInitialDb = config.getInitialDbDump().exists(); config.setInitialDumpExist(hasInitialDb); if (!hasInitialDb) { @@ -628,26 +628,24 @@ public abstract class ObserveRunner extends ApplicationRunner { * @throws IllegalStateException si un contexte applicatif a déja été positionné. */ public ObserveSwingApplicationContext initContext(ObserveSwingApplicationConfig config) throws Exception { - if (ObserveServiceHelper.isInit()) { - throw new IllegalStateException( - "there is an already application context registred."); - } - ObserveSwingApplicationContext instance = new ObserveSwingApplicationContext(); + ObserveSwingApplicationContext.checkIsNotInit(); + + ObserveSwingApplicationContext applicationContext = new ObserveSwingApplicationContext(); // add config - ObserveSwingApplicationContext.CONFIG_ENTRY_DEF.setContextValue(instance, config); + ObserveSwingApplicationContext.CONFIG_ENTRY_DEF.setContextValue(applicationContext, config); // add actions - ObserveSwingApplicationContext.ACTIONS_ENTRY_DEF.setContextValue(instance, new ObserveCLAction()); + ObserveSwingApplicationContext.ACTIONS_ENTRY_DEF.setContextValue(applicationContext, new ObserveCLAction()); // referencement du context applicatif sur le helper de service - ObserveServiceHelper.set(instance); + ObserveSwingApplicationContext.set(applicationContext); // init decorator service - ObserveServiceHelper.getDecoratorService(); + applicationContext.getDecoratorService(); - return instance; + return applicationContext; } protected ObserveMainUI startUI(ObserveSwingApplicationContext context, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveServiceHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveServiceHelper.java deleted file mode 100644 index fdee002..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveServiceHelper.java +++ /dev/null @@ -1,344 +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; - -import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.gps.GPSService; -import fr.ird.observe.validation.ValidationContext; -import fr.ird.observe.validation.ValidationService; -import fr.ird.observe.configuration.ObserveSwingApplicationConfig; -import fr.ird.observe.db.ObserveSwingDataSource; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; -import fr.ird.observe.ui.DecoratorService; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.io.IOException; - -import static org.nuiton.i18n.I18n.t; - -public class ObserveServiceHelper { - - /** Logger. */ - private static Log log = LogFactory.getLog(ObserveServiceHelper.class); - - /** Le context applicatif. */ - public static ObserveSwingApplicationContext context; - - /** Un drapeau pour savoir quand l'application est en cours de fermeture. */ - protected static boolean closed; - - /** - * Un drapeau pour activer sur les connections le support JMX. - * - * @since 2.2 - */ - private static boolean useJMX; - - /** - * Récupération du contexte applicatif. - * - * @return l'instance partagé du contexte. - * @throws IllegalStateException si le contexte n'a pas été initialisé - */ - public static ObserveSwingApplicationContext get() throws IllegalStateException { - checkInit(); - return context; - } - - /** - * @return {@code true} si le context applicatif a été fermé (et est donc - * passé dans la méthode {@link #close()}, {@code false} autrement. - */ - public static boolean isClosed() { - return closed; - } - - /** @return {@code true} si le context a été initialisé */ - public static boolean isInit() { - return context != null; - } - - public static void set(ObserveSwingApplicationContext context) { - if (isInit()) { - throw new IllegalStateException( - "application context already registred."); - } - ObserveServiceHelper.context = context; - - //FIXME -// AbstractDataSourceMigration.setApplicationConfigSupplier(new Supplier<ApplicationConfig>() { -// @Override -// public ApplicationConfig get() { -// return ObserveServiceHelper.context.getContextValue(ApplicationConfig.class); -// } -// }); - - // application non fermée - closed = false; - } - - public static void close() { - if (log.isDebugEnabled()) { - log.debug("Closing service helper..."); - } - context = null; - - // application fermée - closed = true; - } - - /** - * Pour instancier un nouveau service de réplication. - * - * @return le nouveau service de réplication - */ - //FIXME -// public static ReplicationService newReplicationService() { -// return new ReplicationService(); -// } - - /** - * Pour instancier un nouveau service de validation. - * - * @return le nouveau service de validation - */ - public static ValidationService newValidationService() { - return new ValidationService(); - } - - public static DataContext getDataContext() { - checkInit(); - ObserveSwingApplicationContext context = get(); - DataContext dataContext = context.getDataContext(); - return dataContext; - } - - public static ValidationContext getValidationContext() { - checkInit(); - ObserveSwingApplicationContext context = get(); - ValidationContext dataContext = context.getValidationContext(); - return dataContext; - } - - /** - * Pour instancier un nouveau service GPS. - * - * @return le service GPS partagé - */ - public static GPSService getGPSService() { - checkInit(); - ObserveSwingApplicationContext context = get(); - GPSService service = context.getGPSService(); - return service; - } - - /** - * Pour récupérer le service de consolidation des données. - * - * @return le service de consolidation des données partagé - */ - //FIXME -// public static ConsolidateDataService getConsolidateDataService() { -// checkInit(); -// ObserveApplicationContext context = get(); -// ConsolidateDataService service = context.getConsolidateDataService(); -// return service; -// -// } - - /** - * Pour obtenir l'unique service haut niveau de manipulation des données. - * - * @return le service haut niveau de manipulation des donées. - */ - //FIXME -// public static DataService getDataService() { -// checkInit(); -// ObserveApplicationContext context = get(); -// DataService service = context.getDataService(); -// return service; -// } - - /** - * Pour obtenir l'unique service de décoration. - * - * @return l'instance partagé du service de décoration - */ - public static DecoratorService getDecoratorService() { - checkInit(); - ObserveSwingApplicationContext context = get(); - DecoratorService service = context.getDecoratorService(); - return service; - } - - /** - * Pour obtenir le generateur de text. - * - * @return l'instance partagé du generateur de text - */ - public static ObserveTextGenerator getTextGenerator() { - checkInit(); - ObserveSwingApplicationContext context = get(); - ObserveTextGenerator textGenerator = context.getTextGenerator(); - return textGenerator; - } - - - /** - * Creates a new local temp storage. - * - * @param config the configuration containing the tmp directory to use - * @param label label of storage - * @param prefixName prefix to add directory of local db - * @return the new service NOT opened - * @throws IOException if any pb while configuring the service - */ - //FIXME -// public static DataSource newEmptyTempStorage( -// ObserveSwingApplicationConfig config, -// String label, -// String prefixName) throws IOException { -// String dbfileName = (prefixName == null ? "tmp_" : prefixName + "_") -// + System.nanoTime(); -// -// File dir = new File(config.getTmpDirectory(), dbfileName); -// -// H2DataSourceConfig conf = DataSourceFactory.newH2ConfigEmpty( -// label, -// dir, -// config.getH2Login(), -// config.getH2Password() -// ); -// -// H2DataSource service = DataSourceFactory.newService(conf); -// return service; -// } - - /** - * Creates a new local temp storage. - * - * @param dir the directory to use to store database - * @param label label of storage - * @return the new service NOT opened - * @throws IOException if any pb while configuring the service - */ - //FIXME -// public static DataSource newEmptyTempStorage(File dir, -// String label) throws IOException { -// -// H2DataSourceConfig conf = DataSourceFactory.newH2ConfigEmpty( -// label, -// dir, -// "sa", -// "sa".toCharArray() -// ); -// -// H2DataSource service = DataSourceFactory.newService(conf); -// return service; -// } - - /** - * Construit une source de données sur la base locale de l'application. - * <p/> - * <b>Note:</b> La base locale doit exister, sinon on soulève une - * exeception - * - * @param config la configuration à utiliser - * @return la service de persistance initialisé (mais non ouvert) - * @throws IOException si une erreur d'IO - * @throws IllegalStateException si la base locale n'existe pas - * @see ObserveSwingDataSource - */ - public static ObserveSwingDataSource newLocalStorageService(ObserveSwingApplicationConfig config) throws IllegalStateException { - - ObserveDataSourceConfigurationTopiaH2 dataSourceConfigurationH2 = config.getDataSourceConfigurationH2(t("observe.storage.label.local")); - - if (! dataSourceConfigurationH2.getDatabaseFile().exists()) { - throw new IllegalStateException( - "local base must exist, when using this method (" + - dataSourceConfigurationH2.getDirectory() + ')'); - } - - ObserveSwingDataSource dataSource = new ObserveSwingDataSource(dataSourceConfigurationH2); - - return dataSource; - } - - - - /** - * Teste si la base locale existe. - * - * @param config la configuration à tester - * @return {@code true} si la base locale existe, {@code false} sinon. - * @throws IOException si pb d'IO - */ - //FIXME -// public static boolean isLocalStorageExists(ObserveSwingApplicationConfig config) throws IOException { -// -// // build a local storage service config -// H2DataSourceConfig storageConfig = config.toH2StorageConfig( -// n("observe.storage.label.local")); -// storageConfig.init(); -// boolean dbExists = storageConfig.isStorageExists(); -// return dbExists; -// } - - /** - * Teste si le dump depuis la base obstuna a ete cree. - * <p/> - * Ce dump est cree lors de la premiere creation de base locale a partir - * d'une base distante. - * <p/> - * Une fois ce dump crée, on autorise la création de base locale à partir de - * la base embarquée. Ainsi, on force toujours un premier import de - * référentiel depuis une base distante. - * - * @param config la configuration à utiliser - * @return {@code true} si le dump existe, {@code false} sinon. - */ - public static boolean isInitialDbExists(ObserveSwingApplicationConfig config) { - - boolean dbExists = config.getInitialDbDump().exists(); - return dbExists; - } - - /** - * Teste si le context applicatif a bien été initialisé. - * - * @throws IllegalStateException si le context n'a pas été initialisé. - */ - protected static void checkInit() throws IllegalStateException { - if (!isInit()) { - throw new IllegalStateException("no application context initialized."); - } - } - - public static boolean isUseJMX() { - return useJMX; - } - - public static void setUseJMX(boolean useJMX) { - ObserveServiceHelper.useJMX = useJMX; - } -} 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 d16b7b0..415fd96 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 @@ -75,6 +75,7 @@ import javax.swing.ActionMap; import javax.swing.JOptionPane; import javax.swing.JPanel; import java.awt.Component; +import java.io.Closeable; import java.io.File; import java.util.Arrays; import java.util.List; @@ -95,11 +96,24 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class ObserveSwingApplicationContext extends DefaultApplicationContext { +public class ObserveSwingApplicationContext extends DefaultApplicationContext implements Closeable { /** Logger */ static private Log log = LogFactory.getLog(ObserveSwingApplicationContext.class); + /** Un drapeau pour savoir quand l'application est en cours de fermeture. */ + protected static boolean closed; + + /** + * //FIXME Rendre cela configurable + * Un drapeau pour activer sur les connections le support JMX. + * + * @since 2.2 + */ + private static boolean useJMX; + + public static ObserveSwingApplicationContext applicationContext; + /** the jaxx context entry to store the config */ public static final JAXXContextEntryDef<ObserveSwingApplicationConfig> CONFIG_ENTRY_DEF = JAXXUtil.newContextEntryDef(ObserveSwingApplicationConfig.class); @@ -197,7 +211,6 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { if (decoratorService == null) { // initialisation du service de décoration - // initialisation ObserveSwingApplicationConfig config = getConfig(); ReferentialLocale loc = ReferentialLocale.FR; if (config != null) { @@ -337,19 +350,19 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { return result; } - /** - * close the application's context. - * - * @throws Exception if any pb while closing - */ - public void close() throws Exception { - if (log.isDebugEnabled()) { - log.debug("closing context " + this); + @Override + public void close() { + if (log.isInfoEnabled()) { + log.info("Closing swing application context " + this); } // fermeture du context de données ObserveSwingDataSource dataSource = getDataSource(); if (getDataSource() != null && dataSource.isOpen()) { + + if (log.isInfoEnabled()) { + log.info("Closing dataSource : "+dataSource.getConnection()); + } dataSource.close(); setDataSource(null); } @@ -357,7 +370,10 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { // fermeture du context principal clear(); - ObserveServiceHelper.close(); + applicationContext = null; + + closed = true; + } @@ -365,6 +381,22 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { // UI instances //------------------------------------------- + public static void set(ObserveSwingApplicationContext context) { + checkIsNotInit(); + applicationContext = context; + + //FIXME +// AbstractDataSourceMigration.setApplicationConfigSupplier(new Supplier<ApplicationConfig>() { +// @Override +// public ApplicationConfig get() { +// return ObserveServiceHelper.context.getContextValue(ApplicationConfig.class); +// } +// }); + + // application non fermée + closed = false; + } + /** * Récupération du contexte applicatif. * @@ -372,11 +404,51 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { * @throws IllegalStateException si le contexte n'a pas été initialisé */ public static ObserveSwingApplicationContext get() throws IllegalStateException { - return ObserveServiceHelper.get(); + checkInit(); + return applicationContext; + } + + /** @return {@code true} si le context a été initialisé */ + public static boolean isInit() { + return applicationContext != null; + } + + /** + * Teste si le context applicatif a bien été initialisé. + * + * @throws IllegalStateException si le context n'a pas été initialisé. + */ + public static void checkIsNotInit() throws IllegalStateException { + if (isInit()) { + throw new IllegalStateException("application context already registred."); + } } + /** + * Teste si le context applicatif a bien été initialisé. + * + * @throws IllegalStateException si le context n'a pas été initialisé. + */ + protected static void checkInit() throws IllegalStateException { + if (!isInit()) { + throw new IllegalStateException("no application context initialized."); + } + } + + public static boolean isUseJMX() { + return useJMX; + } + + public static void setUseJMX(boolean useJMX) { + useJMX = useJMX; + } + + /** + * @return {@code true} si le context applicatif a été fermé (et est donc + * passé dans la méthode {@link #close()}, {@code false} autrement. + */ public static boolean isClosed() { - return ObserveServiceHelper.isClosed(); + return closed; } public ObserveMainUI getObserveMainUI() { @@ -565,7 +637,7 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { // chargement de la base locale // création de la source de données sur la base locale - ObserveSwingDataSource dataSource = ObserveServiceHelper.newLocalStorageService(getConfig()); + ObserveSwingDataSource dataSource = newLocalStorageService(getConfig()); try { @@ -767,4 +839,30 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { // return on; // } + /** + * Construit une source de données sur la base locale de l'application. + * <p/> + * <b>Note:</b> La base locale doit exister, sinon on soulève une + * exeception + * + * @param config la configuration à utiliser + * @return la service de persistance initialisé (mais non ouvert) + * @throws IllegalStateException si la base locale n'existe pas + * @see ObserveSwingDataSource + */ + public static ObserveSwingDataSource newLocalStorageService(ObserveSwingApplicationConfig config) throws IllegalStateException { + + ObserveDataSourceConfigurationTopiaH2 dataSourceConfigurationH2 = config.getDataSourceConfigurationH2(t("observe.storage.label.local")); + + if (!dataSourceConfigurationH2.getDatabaseFile().exists()) { + throw new IllegalStateException( + "local base must exist, when using this method (" + + dataSourceConfigurationH2.getDirectory() + ')'); + } + + ObserveSwingDataSource dataSource = new ObserveSwingDataSource(dataSourceConfigurationH2); + + return dataSource; + } + } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/ObserveApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/business/ObserveApplicationContext.java deleted file mode 100644 index aa94cdd..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/ObserveApplicationContext.java +++ /dev/null @@ -1,231 +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.validation.ObserveSwingValidator; -import fr.ird.observe.configuration.ObserveSwingApplicationConfig; -import fr.ird.observe.business.db.DataContext; - -import fr.ird.observe.business.gps.GPSService; -import fr.ird.observe.validation.ValidationContext; -import fr.ird.observe.db.ObserveSwingDataSource; -import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.ui.DecoratorService; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.context.DefaultApplicationContext; -import jaxx.runtime.context.JAXXContextEntryDef; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.decorator.Decorator; - -import java.util.Locale; - -/** - * Le contexte de l'application. - * <p/> - * On définit ici toutes les entrées du contexte applicatif. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.0 - */ -public class ObserveApplicationContext extends DefaultApplicationContext { - - /** Logger */ - static private Log log = LogFactory.getLog(ObserveApplicationContext.class); - - /** the jaxx context entry to store the config */ - public static final JAXXContextEntryDef<ObserveSwingApplicationConfig> CONFIG_ENTRY_DEF = - JAXXUtil.newContextEntryDef(ObserveSwingApplicationConfig.class); - - /** the jaxx context entry to store the decorator service */ - public static final JAXXContextEntryDef<DecoratorService> DECORATOR_SERVICE_ENTRY_DEF = - JAXXUtil.newContextEntryDef(DecoratorService.class); - - /** the jaxx context entry to store the decorator service */ - public static final JAXXContextEntryDef<BinderService> BINDER_SERVICE_ENTRY_DEF = - JAXXUtil.newContextEntryDef(BinderService.class); - - /** the jaxx context entry to store the gps service */ - public static final JAXXContextEntryDef<GPSService> GPS_SERVICE_ENTRY_DEF = - JAXXUtil.newContextEntryDef(GPSService.class); - - //FIXME -// /** the jaxx context entry to store the consolidate data service */ -// public static final JAXXContextEntryDef<ConsolidateDataService> CONSOLIDATE_DATA_SERVICE_ENTRY_DEF = -// JAXXUtil.newContextEntryDef(ConsolidateDataService.class); - //FIXME -// /** the jaxx context entry to store the data service */ -// public static final JAXXContextEntryDef<DataService> DATA_SERVICE_ENTRY_DEF = -// JAXXUtil.newContextEntryDef(DataService.class); - - /** the jaxx context entry to store the data service */ - public static final JAXXContextEntryDef<DataContext> DATA_CONTEXT_ENTRY_DEF = - JAXXUtil.newContextEntryDef(DataContext.class); - - /** the jaxx context entry to store the data source (says the ui data source) */ - public static final JAXXContextEntryDef<ObserveSwingDataSource> DATA_SOURCE_ENTRY_DEF = - JAXXUtil.newContextEntryDef(ObserveSwingDataSource.class); - - public static final JAXXContextEntryDef<ValidationContext> VALIDATION_CONTEXT_ENTRY_DEF = - JAXXUtil.newContextEntryDef(ValidationContext.class); - - public <O> Decorator<O> getDecorator(Class<O> clazz) { - DecoratorService provider = getDecoratorService(); - Decorator<O> value = provider.getDecoratorByType(clazz); - return value; - } - - public <O> Decorator<O> getDecorator(Class<O> clazz, String name) { - DecoratorService provider = getDecoratorService(); - Decorator<O> value = provider.getDecoratorByType(clazz, name); - return value; - } - - public ObserveSwingApplicationConfig getConfig() { - return CONFIG_ENTRY_DEF.getContextValue(this); - } - - public final ObserveSwingDataSource getDataSource() { - ObserveSwingDataSource dataSource = DATA_SOURCE_ENTRY_DEF.getContextValue(this); - return dataSource; - } - - public final void setDataSource(ObserveSwingDataSource source) { - if (source == null) { - DATA_SOURCE_ENTRY_DEF.removeContextValue(this); - } else { - DATA_SOURCE_ENTRY_DEF.setContextValue(this, source); - } - } - - public final DecoratorService getDecoratorService() { - DecoratorService decoratorService = - DECORATOR_SERVICE_ENTRY_DEF.getContextValue(this); - if (decoratorService == null) { - - // initialisation du service de décoration - // initialisation - ObserveSwingApplicationConfig config = getConfig(); - ReferentialLocale loc = ReferentialLocale.FR; - if (config != null) { - Locale dbLocale = config.getDbLocale(); - if (dbLocale != null) { - loc = ReferentialLocale.valueOf(dbLocale); - } - } - decoratorService = new DecoratorService(loc); - DECORATOR_SERVICE_ENTRY_DEF.setContextValue(this, decoratorService); - } - return decoratorService; - } - - //FIXME -// public final DataService getDataService() { -// DataService dataService = -// DATA_SERVICE_ENTRY_DEF.getContextValue(this); -// if (dataService == null) { -// dataService = new DataService(); -// DATA_SERVICE_ENTRY_DEF.setContextValue(this, dataService); -// } -// return dataService; -// } - - public final BinderService getBinderService() { - BinderService service = BINDER_SERVICE_ENTRY_DEF.getContextValue(this); - if (service == null) { - service = new BinderService(); - BINDER_SERVICE_ENTRY_DEF.setContextValue(this, service); - } - return service; - } - - public final GPSService getGPSService() { - GPSService service = - GPS_SERVICE_ENTRY_DEF.getContextValue(this); - if (service == null) { - service = new GPSService(); - GPS_SERVICE_ENTRY_DEF.setContextValue(this, service); - } - return service; - } - - //FIXME -// public ConsolidateDataService getConsolidateDataService() { -// -// ConsolidateDataService service = -// CONSOLIDATE_DATA_SERVICE_ENTRY_DEF.getContextValue(this); -// if (service == null) { -// service = new ConsolidateDataService(); -// CONSOLIDATE_DATA_SERVICE_ENTRY_DEF.setContextValue(this, service); -// } -// return service; -// } - - public final DataContext getDataContext() { - DataContext result = DATA_CONTEXT_ENTRY_DEF.getContextValue(this); - if (result == null) { - result = new DataContext(); - DATA_CONTEXT_ENTRY_DEF.setContextValue(this, result); - } - return result; - } - - public final ValidationContext getValidationContext() { - ValidationContext result = - VALIDATION_CONTEXT_ENTRY_DEF.getContextValue(this); - if (result == null) { - result = new ValidationContext(); - ObserveSwingValidator.setValidationContext(result); - result.setDataContext(getDataContext()); - VALIDATION_CONTEXT_ENTRY_DEF.setContextValue(this, result); - } - return result; - } - - /** - * close the application's context. - * - * @throws Exception if any pb while closing - */ - public void close() throws Exception { - if (log.isDebugEnabled()) { - log.debug("closing context " + this); - } - - // fermeture du context de données - if (getDataSource() != null) { - setDataSource(null); - } - // FIXME -// getValidationContext().closeDataSource(); - - // fermeture des services de persistances ouverts - //FIXME -// DataSourceFactory.dispose(); - - // fermeture du context principal - clear(); - - //FIXME -// ObserveServiceHelper.close(); - } -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowStorageInfoAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowStorageInfoAction.java index 6b1a5bc..e6fc98a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowStorageInfoAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowStorageInfoAction.java @@ -22,12 +22,12 @@ package fr.ird.observe.ui.actions; * #L% */ -import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.ObserveTextGenerator; import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.ui.ObserveMainUI; import jaxx.runtime.SwingUtil; -import fr.ird.observe.ui.*; + import javax.swing.AbstractAction; import javax.swing.JLabel; import javax.swing.JOptionPane; @@ -59,14 +59,16 @@ public class ShowStorageInfoAction extends AbstractAction { @Override public void actionPerformed(ActionEvent e) { + ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); + ObserveSwingDataSource source; if (ui.getConfig().isMainStorageOpened()) { - source = ObserveSwingApplicationContext.get().getDataSource(); + source = applicationContext.getDataSource(); } else { source = null; } - ObserveTextGenerator textGenerator = ObserveServiceHelper.getTextGenerator(); + ObserveTextGenerator textGenerator = applicationContext.getTextGenerator(); String text = textGenerator.getDataSourceInfo(source); JOptionPane.showMessageDialog( ui, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java index 1b9657b..f9ca188 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java @@ -22,15 +22,11 @@ package fr.ird.observe.ui.admin.validate; import com.google.common.base.Charsets; -import fr.ird.observe.ObserveServiceHelper; -import fr.ird.observe.ui.DecoratorService; -import fr.ird.observe.validation.ValidationContext; -import fr.ird.observe.validation.ValidationMessageDetector; -import fr.ird.observe.validation.ValidationModelMode; -import fr.ird.observe.validation.ValidatorsMap; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.admin.AdminStep; import fr.ird.observe.ui.admin.AdminTabUI; @@ -40,6 +36,10 @@ import fr.ird.observe.ui.admin.AdminUIModel; import fr.ird.observe.ui.admin.config.ConfigUI; import fr.ird.observe.ui.admin.config.SelectDataUI; import fr.ird.observe.ui.util.ObserveSimpleValidatorMessageTableRenderer; +import fr.ird.observe.validation.ValidationContext; +import fr.ird.observe.validation.ValidationMessageDetector; +import fr.ird.observe.validation.ValidationModelMode; +import fr.ird.observe.validation.ValidatorsMap; import jaxx.runtime.context.JAXXInitialContext; import jaxx.runtime.swing.wizard.ext.WizardState; import jaxx.runtime.validator.swing.SwingValidatorUtil; @@ -51,7 +51,10 @@ import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.simple.SimpleBeanValidator; import org.nuiton.validator.bean.simple.SimpleBeanValidatorMessage; -import javax.swing.*; +import javax.swing.ComboBoxModel; +import javax.swing.DefaultComboBoxModel; +import javax.swing.DefaultListModel; +import javax.swing.JCheckBox; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; @@ -393,8 +396,8 @@ public class ValidateUIHandler extends AdminTabUIHandler { //FIXME // DataSelectionModel dataModel = model.getSelectionDataModel(); - - ValidationContext context = ObserveServiceHelper.getValidationContext(); + ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); + ValidationContext context = applicationContext.getValidationContext(); //FIXME // context.setDataSource(model.getLocalSource()); // context.setDataContext(model.getDataService().getDataContext()); 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 f5139eb..9d88f06 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 @@ -22,7 +22,6 @@ package fr.ird.observe.ui.content; import fr.ird.observe.ObserveOpenDataManager; -import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.BinderService; import fr.ird.observe.business.ObserveTechnicalException; @@ -39,6 +38,7 @@ import fr.ird.observe.ui.content.ref.ContentReferenceUIHandler; import fr.ird.observe.ui.tree.AbstractObserveTreeCellRenderer; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; +import fr.ird.observe.validation.ValidationContext; import jaxx.runtime.JAXXContext; import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.swing.JAXXButtonGroup; @@ -54,8 +54,14 @@ import org.nuiton.decorator.JXPathDecorator; import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor; import org.nuiton.validator.NuitonValidatorScope; -import javax.swing.*; -import java.awt.*; +import javax.swing.AbstractButton; +import javax.swing.ActionMap; +import javax.swing.Icon; +import javax.swing.JComponent; +import javax.swing.JOptionPane; +import javax.swing.JToolBar; +import javax.swing.UIManager; +import java.awt.Component; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.ArrayList; @@ -330,7 +336,9 @@ public abstract class ContentUIHandler<E extends IdDto> { //FIXME chemit 20100913 : il vaudrait le faire uniquement lors de l'édition // chaque arrive sur un ecran invalide le cache de validation - ObserveServiceHelper.getValidationContext().cleanCache(); + ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); + ValidationContext context = applicationContext.getValidationContext(); + context.cleanCache(); if (log.isDebugEnabled()) { log.debug("ui " + ui.getClass()); @@ -391,7 +399,9 @@ public abstract class ContentUIHandler<E extends IdDto> { } public void stopEditUI() { - ObserveServiceHelper.getValidationContext().cleanCache(); + ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); + ValidationContext context = applicationContext.getValidationContext(); + context.cleanCache(); ContentUIModel<E> model = getModel(); @@ -644,7 +654,9 @@ public abstract class ContentUIHandler<E extends IdDto> { protected void prepareValidationContext() { // reset validation cache - ObserveServiceHelper.get().getValidationContext().cleanCache(); + ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); + ValidationContext context = applicationContext.getValidationContext(); + context.cleanCache(); } protected final ContentMode computeContentMode() { 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 f1f4ad3..ab16916 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 @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.content.open; -import fr.ird.observe.ObserveServiceHelper; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdDto; @@ -31,6 +31,7 @@ import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; +import fr.ird.observe.validation.ValidationContext; import jaxx.runtime.swing.ErrorDialogUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -287,7 +288,9 @@ public abstract class ContentOpenableUIHandler<E extends IdDto> extends ContentU if (!create) { - TripSeineDto currentTripSeine = ObserveServiceHelper.getValidationContext().getCurrentTripSeine(); + ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); + ValidationContext context = applicationContext.getValidationContext(); + TripSeineDto currentTripSeine = context.getCurrentTripSeine(); if (currentTripSeine != null && currentTripSeine.isHistoricalData()) { 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 7820f1b..9380259 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 @@ -21,7 +21,6 @@ */ package fr.ird.observe.ui.content.ref; -import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.db.ObserveSwingDataSource; @@ -571,7 +570,10 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content // pass in editing mode (without any modification possible) model.setEditing(true); - ObserveServiceHelper.get().getValidationContext().cleanCache(); + + ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); + ValidationContext validationContext = applicationContext.getValidationContext(); + validationContext.cleanCache(); } } @@ -580,8 +582,8 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content super.prepareValidationContext(); BeanListHeader<ReferenceDto> jList = getUi().getListHeader(); List<ReferenceDto> data = jList.getData(); - ValidationContext validationContext = - ObserveServiceHelper.get().getValidationContext(); + ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); + ValidationContext validationContext = applicationContext.getValidationContext(); if (log.isDebugEnabled()) { log.debug("Set referentiel list [" + getBeanType().getSimpleName() + "] in validation context : " + data.size()); } 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 01e5cbc..60fbf74 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 @@ -26,7 +26,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import fr.ird.observe.ObserveActionExecutor; import fr.ird.observe.ObserveRunner; -import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.ObserveTextGenerator; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; @@ -681,7 +680,8 @@ public class StorageUIHandler { log.debug("Build report from step " + step); } StorageUIModel model = ui.getModel(); - ObserveTextGenerator textGenerator = ObserveServiceHelper.getTextGenerator(); + ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); + ObserveTextGenerator textGenerator = applicationContext.getTextGenerator(); String report = textGenerator.getDataSourceConnectionReport(model); return report; } 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 3332fbe..c7de3e6 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 @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.storage.tabs; -import fr.ird.observe.ObserveServiceHelper; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.ObserveTextGenerator; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.ObserveSwingDataSource; @@ -101,7 +101,8 @@ public class StorageTabUIHandler { public void propertyChange(PropertyChangeEvent evt) { StorageUIModel model = (StorageUIModel) evt.getSource(); - ObserveTextGenerator textGenerator = ObserveServiceHelper.getTextGenerator(); + ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); + ObserveTextGenerator textGenerator = applicationContext.getTextGenerator(); String txt = textGenerator.getLoadDataSourceResume(model); ui.getResume().setText(txt); } @@ -326,7 +327,8 @@ public class StorageTabUIHandler { } public String updateConnexionStatutText(ConfigUI ui, ConnexionStatus status) { - ObserveTextGenerator textGenerator = ObserveServiceHelper.getTextGenerator(); + ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); + ObserveTextGenerator textGenerator = applicationContext.getTextGenerator(); String text = textGenerator.getConnexionTestResultMessage(ui.getModel()); return text; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java index a67ab87..e5de607 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java @@ -22,7 +22,8 @@ package fr.ird.observe.ui.tree; * #L% */ -import fr.ird.observe.ObserveServiceHelper; +import fr.ird.observe.ObserveOpenDataManager; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.OpenableDto; import fr.ird.observe.services.dto.ReferenceDto; @@ -93,7 +94,9 @@ public abstract class DtoNodeSupport<E extends IdDto> extends ObserveNode { } if (OpenableDto.class.isAssignableFrom(entity.getType())) { - open = ObserveServiceHelper.get().getOpenDataManager().isOpen(entity.getId()); + ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); + ObserveOpenDataManager openDataManager = applicationContext.getOpenDataManager(); + open = openDataManager.isOpen(entity.getId()); if (log.isDebugEnabled()) { log.debug("Set open: " + open + " for entity: " + id); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/ObserveSwingValidator.java b/observe-application-swing/src/main/java/fr/ird/observe/validation/ObserveSwingValidator.java index c1fee69..564cddb 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/validation/ObserveSwingValidator.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/validation/ObserveSwingValidator.java @@ -23,9 +23,7 @@ package fr.ird.observe.validation; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.util.ValueStack; -import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.ObserveSwingApplicationContext; - import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -111,8 +109,7 @@ public class ObserveSwingValidator<B> extends SwingValidator<B> { if (log.isDebugEnabled()) { log.debug("No validation context registred, try in application context..."); } - ObserveSwingApplicationContext rootContext; - rootContext = ObserveServiceHelper.get(); + ObserveSwingApplicationContext rootContext = ObserveSwingApplicationContext.get(); if (rootContext == null) { throw new IllegalStateException( "pas de context d'application enregistré... utiliser la " + 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 1f57065..292e673 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 @@ -21,7 +21,7 @@ */ package fr.ird.observe.validation; -import fr.ird.observe.ObserveServiceHelper; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.services.dto.IdDto; import org.apache.commons.logging.Log; @@ -72,7 +72,8 @@ public class ValidationMessageDetector implements SimpleBeanValidatorListener { public ValidationContext getContext() { if (context == null) { - context = ObserveServiceHelper.getValidationContext(); + ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); + context = applicationContext.getValidationContext(); } return context; } diff --git a/observe-application-swing/src/test/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java b/observe-application-swing/src/test/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java index 818e5f3..36b709d 100644 --- a/observe-application-swing/src/test/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java +++ b/observe-application-swing/src/test/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java @@ -22,15 +22,13 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ -import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.ui.DecoratorService; -import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.services.dto.constants.ReferentialLocale; 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 fr.ird.observe.services.service.actions.validate.ObserveValidator; +import fr.ird.observe.ui.DecoratorService; import jaxx.runtime.validator.swing.SwingValidatorMessage; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -63,9 +61,13 @@ public class LonglineDetailCompositionValidatorServiceTest { @Before public void setUp() throws Exception { - ObserveServiceHelper.close(); + if (ObserveSwingApplicationContext.isInit()) { + + ObserveSwingApplicationContext.get().close(); + } + ObserveSwingApplicationContext applicationContext = new ObserveSwingApplicationContext(); - ObserveServiceHelper.set(applicationContext); + ObserveSwingApplicationContext.set(applicationContext); DecoratorService decoratorService = new DecoratorService(ReferentialLocale.FR); ObserveValidator<SectionDto> sectionValidator = new ObserveValidator<SectionDto>(SectionDto.class, "n1-update-table", NuitonValidatorScope.values()); -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit 6d2c40bb349fdf7a81e23684c3da5c5c68691325 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 16:08:30 2015 +0200 Deplacement et renommage de l'exception technique de l'application swing --- .../src/main/java/fr/ird/observe/ObserveRunner.java | 7 +++---- ...calException.java => ObserveSwingTechnicalException.java} | 12 ++++++------ .../java/fr/ird/observe/ui/content/ContentUIHandler.java | 4 ++-- .../main/java/fr/ird/observe/ui/content/ContentUIModel.java | 4 ++-- .../fr/ird/observe/ui/content/table/ContentTableUIModel.java | 4 ++-- .../ui/content/table/impl/longline/SensorUsedUIHandler.java | 10 +++++----- .../observe/ui/content/table/impl/longline/TdrUIHandler.java | 10 +++++----- .../ird/observe/ui/util/tripMap/TripMapContentBuilder.java | 4 ++-- .../fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java | 6 +++--- 9 files changed, 30 insertions(+), 31 deletions(-) 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 920f3eb..d4ca764 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,7 +22,6 @@ package fr.ird.observe; import com.google.common.base.Preconditions; -import fr.ird.observe.business.ObserveTechnicalException; import fr.ird.observe.business.converter.FloatConverter; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.ui.ObserveMainUI; @@ -249,7 +248,7 @@ public abstract class ObserveRunner extends ApplicationRunner { try { resource = logFile.toURI().toURL(); } catch (MalformedURLException mue) { - throw new ObserveTechnicalException("Unable to load log configuration", mue); + throw new ObserveSwingTechnicalException("Unable to load log configuration", mue); } if (log.isInfoEnabled()) { @@ -599,7 +598,7 @@ public abstract class ObserveRunner extends ApplicationRunner { try { resourceManager.copyResource(Resource.ui, file, message); } catch (IOException e) { - throw new ObserveTechnicalException("could not copy ui configuration: " + file, e); + throw new ObserveSwingTechnicalException("could not copy ui configuration: " + file, e); } } @@ -611,7 +610,7 @@ public abstract class ObserveRunner extends ApplicationRunner { UIHelper.loadUIConfig(p); } catch (IOException e) { - throw new ObserveTechnicalException("could not load ui configuration: " + file, e); + throw new ObserveSwingTechnicalException("could not load ui configuration: " + file, e); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/ObserveTechnicalException.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingTechnicalException.java similarity index 75% rename from observe-application-swing/src/main/java/fr/ird/observe/business/ObserveTechnicalException.java rename to observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingTechnicalException.java index f362557..ca73a1e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/ObserveTechnicalException.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingTechnicalException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.business; +package fr.ird.observe; /* * #%L @@ -28,22 +28,22 @@ package fr.ird.observe.business; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class ObserveTechnicalException extends RuntimeException { +public class ObserveSwingTechnicalException extends RuntimeException { private static final long serialVersionUID = 1L; - public ObserveTechnicalException() { + public ObserveSwingTechnicalException() { } - public ObserveTechnicalException(String message) { + public ObserveSwingTechnicalException(String message) { super(message); } - public ObserveTechnicalException(String message, Throwable cause) { + public ObserveSwingTechnicalException(String message, Throwable cause) { super(message, cause); } - public ObserveTechnicalException(Throwable cause) { + public ObserveSwingTechnicalException(Throwable cause) { super(cause); } 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 9d88f06..47288ca 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 @@ -24,7 +24,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.business.ObserveTechnicalException; +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.ObserveSwingDataSource; @@ -114,7 +114,7 @@ public abstract class ContentUIHandler<E extends IdDto> { return handler; } catch (Exception e) { - throw new ObserveTechnicalException("Could not create handler for ui: " + ui, e); + throw new ObserveSwingTechnicalException("Could not create handler for ui: " + ui, e); } } 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 c78578c..962f0ce 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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content; import fr.ird.observe.business.BinderService; -import fr.ird.observe.business.ObserveTechnicalException; +import fr.ird.observe.ObserveSwingTechnicalException; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDto; import org.apache.commons.logging.Log; @@ -115,7 +115,7 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab return model; } catch (Exception e) { - throw new ObserveTechnicalException("Could not create model for ui: " + ui, e); + throw new ObserveSwingTechnicalException("Could not create model for ui: " + ui, e); } } 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 ec1742a..a2aa0fe 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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.table; import fr.ird.observe.business.BinderService; -import fr.ird.observe.business.ObserveTechnicalException; +import fr.ird.observe.ObserveSwingTechnicalException; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.content.ContentUIModel; import org.apache.commons.lang3.reflect.ConstructorUtils; @@ -107,7 +107,7 @@ public abstract class ContentTableUIModel<E extends IdDto, D extends IdDto> exte return model; } catch (Exception e) { - throw new ObserveTechnicalException("Could not create model for ui: " + ui, e); + throw new ObserveSwingTechnicalException("Could not create model for ui: " + ui, e); } } 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 c4e32fe..71e7cfd 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 @@ -26,7 +26,7 @@ import com.google.common.base.Predicate; import com.google.common.io.FileWriteMode; import com.google.common.io.Files; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.ObserveTechnicalException; +import fr.ird.observe.ObserveSwingTechnicalException; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; @@ -148,9 +148,9 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineD mainUI.getStatus().setStatus(t("observe.sensorUsed.message.data.imported", file)); } catch (IOException e) { - throw new ObserveTechnicalException("Could not read file: " + file, e); + throw new ObserveSwingTechnicalException("Could not read file: " + file, e); } catch (SQLException e) { - throw new ObserveTechnicalException("Could not create binary data from file: " + file, e); + throw new ObserveSwingTechnicalException("Could not create binary data from file: " + file, e); } } @@ -212,7 +212,7 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineD try { binaryStream = getTableEditBean().getData().getBinaryStream(); } catch (SQLException e) { - throw new ObserveTechnicalException("Could not read binary data", e); + throw new ObserveSwingTechnicalException("Could not read binary data", e); } OutputStream outputstream = null; @@ -225,7 +225,7 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineD ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getObserveMainUI(); mainUI.getStatus().setStatus(t("observe.sensorUsed.message.data.exported", file)); } catch (IOException e) { - throw new ObserveTechnicalException("Could not save binary data to " + file, e); + throw new ObserveSwingTechnicalException("Could not save binary data to " + file, e); } finally { IOUtils.closeQuietly(outputstream); } 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 c0f7776..1cc9251 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 @@ -26,7 +26,7 @@ import com.google.common.base.Predicate; import com.google.common.io.FileWriteMode; import com.google.common.io.Files; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.ObserveTechnicalException; +import fr.ird.observe.ObserveSwingTechnicalException; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; @@ -327,9 +327,9 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineDto, TdrDto> mainUI.getStatus().setStatus(t("observe.tdr.message.data.imported", file)); } catch (IOException e) { - throw new ObserveTechnicalException("Could not read file: " + file, e); + throw new ObserveSwingTechnicalException("Could not read file: " + file, e); } catch (SQLException e) { - throw new ObserveTechnicalException("Could not create binary data from file: " + file, e); + throw new ObserveSwingTechnicalException("Could not create binary data from file: " + file, e); } } @@ -391,7 +391,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineDto, TdrDto> try { binaryStream = getTableEditBean().getData().getBinaryStream(); } catch (SQLException e) { - throw new ObserveTechnicalException("Could not read binary data", e); + throw new ObserveSwingTechnicalException("Could not read binary data", e); } OutputStream outputstream = null; @@ -404,7 +404,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineDto, TdrDto> ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getObserveMainUI(); mainUI.getStatus().setStatus(t("observe.sensorUsed.message.data.exported", file)); } catch (IOException e) { - throw new ObserveTechnicalException("Could not save binary data to " + file, e); + throw new ObserveSwingTechnicalException("Could not save binary data to " + file, e); } finally { IOUtils.closeQuietly(outputstream); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapContentBuilder.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapContentBuilder.java index 7b77a75..d9b3c1c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapContentBuilder.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapContentBuilder.java @@ -33,7 +33,7 @@ import com.vividsolutions.jts.geom.GeometryFactory; import com.vividsolutions.jts.geom.LineString; import com.vividsolutions.jts.geom.Point; import com.vividsolutions.jts.geom.Polygon; -import fr.ird.observe.business.ObserveTechnicalException; +import fr.ird.observe.ObserveSwingTechnicalException; import fr.ird.observe.services.dto.TripMapPointDto; import fr.ird.observe.services.dto.constants.TripMapPointType; import org.apache.commons.lang3.StringUtils; @@ -465,7 +465,7 @@ public class TripMapContentBuilder { Style style = findStyle(styledLayerDescriptor, layerName, styleName, null); if (style == null) { - throw new ObserveTechnicalException(String.format("No style found for layer name '%s' and style name '%s'", layerName, styleName)); + throw new ObserveSwingTechnicalException(String.format("No style found for layer name '%s' and style name '%s'", layerName, styleName)); } return style; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java index 06870bc..7c1ec8f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java @@ -24,7 +24,7 @@ package fr.ird.observe.ui.util.tripMap; import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.ObserveTechnicalException; +import fr.ird.observe.ObserveSwingTechnicalException; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.services.dto.IdDtos; import fr.ird.observe.services.dto.TripMapDto; @@ -154,7 +154,7 @@ public class TripMapUIHandler { mapPane.setLegendItems(mapContentBuilder.getLegendItems()); } catch (Exception e) { - throw new ObserveTechnicalException("Unable to load trip map activity points", e); + throw new ObserveSwingTechnicalException("Unable to load trip map activity points", e); } finally { ObserveSwingApplicationContext.get().getObserveMainUI().setBusy(false); } @@ -199,7 +199,7 @@ public class TripMapUIHandler { try { ImageIO.write(im, "PNG", file); } catch (IOException e) { - throw new ObserveTechnicalException("unable to export map ", e); + throw new ObserveSwingTechnicalException("unable to export map ", e); } UIHelper.displayInfo(t("observe.map.export.success", file)); -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit dbc9837fdd28940619f5d5dfb509102e2033992b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 16:36:32 2015 +0200 Suppression de la méthode createOpeningBinder dans les modèles d'ui --- .../fr/ird/observe/ui/content/ContentUIModel.java | 4 -- .../content/impl/longline/BranchlineUIModel.java | 37 ------------ .../longline/LonglineDetailCompositionUIModel.java | 27 --------- .../longline/LonglineGlobalCompositionUIModel.java | 17 ------ .../content/impl/longline/SetLonglineUIModel.java | 68 ---------------------- .../seine/ActivitySeineObservedSystemUIModel.java | 14 ----- ...tingObjectTransmittingBuoyOperationUIModel.java | 15 ----- .../content/impl/seine/FloatingObjectUIModel.java | 18 ------ .../ui/content/impl/seine/SetSeineUIModel.java | 30 ---------- .../impl/longline/ActivityLonglinesUIModel.java | 25 -------- .../list/impl/longline/TripLonglinesUIModel.java | 19 ------ .../list/impl/seine/ActivitySeinesUIModel.java | 32 ---------- .../ui/content/list/impl/seine/RoutesUIModel.java | 19 ------ .../content/list/impl/seine/TripSeinesUIModel.java | 19 ------ .../impl/longline/ActivityLonglineUIModel.java | 31 ---------- .../open/impl/longline/TripLonglineUIModel.java | 31 ---------- .../open/impl/seine/ActivitySeineUIModel.java | 35 ----------- .../ui/content/open/impl/seine/RouteUIModel.java | 21 ------- .../content/open/impl/seine/TripSeineUIModel.java | 31 ---------- .../ui/content/ref/ContentReferenceUIModel.java | 18 ------ .../ui/content/ref/ReferenceHomeUIModel.java | 7 --- .../ui/content/table/ContentTableUIModel.java | 17 +----- 22 files changed, 2 insertions(+), 533 deletions(-) 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 bcb218f..5259b99 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,14 +21,12 @@ */ package fr.ird.observe.ui.content; -import fr.ird.observe.ObserveSwingBinderService; import fr.ird.observe.ObserveSwingTechnicalException; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractSerializableBean; -import org.nuiton.util.beans.BinderModelBuilder; /** * Le modèle d'un écran d'édition @@ -120,8 +118,6 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab } - 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 9f8cdb6..438e68f 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,11 +23,9 @@ package fr.ird.observe.ui.content.impl.longline; */ import com.google.common.collect.ImmutableSet; -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; -import org.nuiton.util.beans.BinderModelBuilder; import java.util.Date; import java.util.Set; @@ -84,41 +82,6 @@ public class BranchlineUIModel extends ContentUIModel<BranchlineDto> { super(BranchlineDto.class); } - @Override - protected BinderModelBuilder<BranchlineDto, BranchlineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<BranchlineDto, BranchlineDto> builder = binderService.newBinderBuilder( - BranchlineDto.class, - BranchlineDto.PROPERTY_COMMENT, - - // general tab - BranchlineDto.PROPERTY_TOP_TYPE, - BranchlineDto.PROPERTY_TRACELINE_TYPE, - BranchlineDto.PROPERTY_DEPTH_RECORDER, - BranchlineDto.PROPERTY_HOOK_LOST, - BranchlineDto.PROPERTY_TRACE_CUT_OFF, - BranchlineDto.PROPERTY_WEIGHTED_SWIVEL, - BranchlineDto.PROPERTY_SWIVEL_WEIGHT, - BranchlineDto.PROPERTY_WEIGHTED_SNAP, - BranchlineDto.PROPERTY_SNAP_WEIGHT, - BranchlineDto.PROPERTY_BAIT_TYPE, - BranchlineDto.PROPERTY_TIMER, - BranchlineDto.PROPERTY_TIME_SINCE_CONTACT, - BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD, - - // hook and bait tab - BranchlineDto.PROPERTY_HOOK_TYPE, - BranchlineDto.PROPERTY_HOOK_SIZE, - BranchlineDto.PROPERTY_HOOK_OFFSET, - BranchlineDto.PROPERTY_BAIT_SETTING_STATUS, - BranchlineDto.PROPERTY_BAIT_HAULING_STATUS - - ); - - return builder; - - } - public BranchlineDto getBranchline() { return branchlineDto; } 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 cd247f4..26e71d7 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,10 +22,8 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ -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; /** * Created on 12/5/14. @@ -230,29 +228,4 @@ public class LonglineDetailCompositionUIModel extends ContentUIModel<SetLongline // return sectionBinder; // } - @Override - protected BinderModelBuilder<SetLonglineDto, SetLonglineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - // SetLongline binder - - BinderModelBuilder<SetLonglineDto, SetLonglineDto> builderSetLongline = binderService.newBinderBuilder( - SetLonglineDto.class, - //FIXME -// SetLonglineDto.PROPERTY_SECTION, - SetLonglineDto.PROPERTY_SETTING_START_TIME_STAMP, - SetLonglineDto.PROPERTY_SETTING_END_TIME_STAMP, - SetLonglineDto.PROPERTY_HAULING_START_TIME_STAMP, - SetLonglineDto.PROPERTY_HAULING_END_TIME_STAMP, - SetLonglineDto.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING, - SetLonglineDto.PROPERTY_HAULING_BREAKS, - SetLonglineDto.PROPERTY_MONITORED, - SetLonglineDto.PROPERTY_TOTAL_SECTIONS_COUNT, - SetLonglineDto.PROPERTY_BASKETS_PER_SECTION_COUNT, - SetLonglineDto.PROPERTY_BRANCHLINES_PER_BASKET_COUNT - ); - //FIXME -// builderSetLongline.addCollectionBinder(getSectionBinder(), SetLongline.PROPERTY_SECTION); - return builderSetLongline; - - } } \ No newline at end of file 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 2a61224..83418a5 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,10 +22,8 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ -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; /** * Created on 12/5/14. @@ -41,19 +39,4 @@ public class LonglineGlobalCompositionUIModel extends ContentUIModel<SetLongline super(SetLonglineDto.class); } - @Override - protected BinderModelBuilder<SetLonglineDto, SetLonglineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<SetLonglineDto, SetLonglineDto> builder = binderService.newBinderBuilder( - SetLonglineDto.class, - //FIXME -// SetLonglineDto.PROPERTY_MITIGATION_TYPE, - SetLonglineDto.PROPERTY_COMMENT); - - //FIXME -// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, SetLonglineDto.PROPERTY_MITIGATION_TYPE); - - return builder; - - } } \ No newline at end of file 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 5e56f09..9a9bc26 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,11 +23,9 @@ package fr.ird.observe.ui.content.impl.longline; */ import com.google.common.collect.ImmutableSet; -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; -import org.nuiton.util.beans.BinderModelBuilder; import java.util.Date; import java.util.Set; @@ -135,72 +133,6 @@ public class SetLonglineUIModel extends ContentUIModel<SetLonglineDto> { super(SetLonglineDto.class); } - @Override - protected BinderModelBuilder<SetLonglineDto, SetLonglineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<SetLonglineDto, SetLonglineDto> builder = binderService.newBinderBuilder( - SetLonglineDto.class, - SetLonglineDto.PROPERTY_COMMENT, - - // setting tab - SetLonglineDto.PROPERTY_HOME_ID, - SetLonglineDto.PROPERTY_NUMBER, - - SetLonglineDto.PROPERTY_SETTING_START_TIME_STAMP, - //FIXME -// SetLonglineDto.PROPERTY_SETTING_START_QUADRANT, - SetLonglineDto.PROPERTY_SETTING_START_LATITUDE, - SetLonglineDto.PROPERTY_SETTING_START_LONGITUDE, - - SetLonglineDto.PROPERTY_SETTING_END_TIME_STAMP, - //FIXME -// SetLonglineDto.PROPERTY_SETTING_END_QUADRANT, - SetLonglineDto.PROPERTY_SETTING_END_LATITUDE, - SetLonglineDto.PROPERTY_SETTING_END_LONGITUDE, - - // setting caracteristics tab - SetLonglineDto.PROPERTY_SETTING_SHAPE, - SetLonglineDto.PROPERTY_LINE_TYPE, - SetLonglineDto.PROPERTY_LIGHTSTICKS_TYPE, - SetLonglineDto.PROPERTY_LIGHTSTICKS_COLOR, - SetLonglineDto.PROPERTY_SETTING_VESSEL_SPEED, - SetLonglineDto.PROPERTY_MAX_DEPTH_TARGETED, - SetLonglineDto.PROPERTY_SHOOTER_USED, - SetLonglineDto.PROPERTY_SHOOTER_SPEED, - SetLonglineDto.PROPERTY_WEIGHTED_SWIVEL, - SetLonglineDto.PROPERTY_SWIVEL_WEIGHT, - SetLonglineDto.PROPERTY_WEIGHTED_SNAP, - SetLonglineDto.PROPERTY_SNAP_WEIGHT, - SetLonglineDto.PROPERTY_MONITORED, - SetLonglineDto.PROPERTY_TIME_BETWEEN_HOOKS, - SetLonglineDto.PROPERTY_BASKETS_PER_SECTION_COUNT, - SetLonglineDto.PROPERTY_BRANCHLINES_PER_BASKET_COUNT, - SetLonglineDto.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT, - SetLonglineDto.PROPERTY_TOTAL_SECTIONS_COUNT, - SetLonglineDto.PROPERTY_TOTAL_BASKETS_COUNT, - SetLonglineDto.PROPERTY_TOTAL_HOOKS_COUNT, - - // hauling tab - SetLonglineDto.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING, - - //FIXME -// SetLonglineDto.PROPERTY_HAULING_START_QUADRANT, - SetLonglineDto.PROPERTY_HAULING_START_LATITUDE, - SetLonglineDto.PROPERTY_HAULING_START_LONGITUDE, - SetLonglineDto.PROPERTY_HAULING_START_TIME_STAMP, - - //FIXME -// SetLonglineDto.PROPERTY_HAULING_END_QUADRANT, - SetLonglineDto.PROPERTY_HAULING_END_LATITUDE, - SetLonglineDto.PROPERTY_HAULING_END_LONGITUDE, - SetLonglineDto.PROPERTY_HAULING_END_TIME_STAMP, - - SetLonglineDto.PROPERTY_HAULING_BREAKS); - - return builder; - - } - public boolean isHaulingTabValid() { return haulingTabValid; } 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 4d14298..1cf900c 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 @@ -41,18 +41,4 @@ public class ActivitySeineObservedSystemUIModel extends ContentUIModel<ActivityS super(ActivitySeineObservedSystemDto.class); } - @Override - protected BinderModelBuilder<ActivitySeineObservedSystemDto, ActivitySeineObservedSystemDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<ActivitySeineObservedSystemDto, ActivitySeineObservedSystemDto> builder = binderService.newBinderBuilder( - ActivitySeineObservedSystemDto.class, - ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM, - ActivitySeineObservedSystemDto.PROPERTY_COMMENT, - ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM_DISTANCE - ); - - return builder; - - } - } 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 c9c2817..7c3fc2a 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,10 +22,8 @@ package fr.ird.observe.ui.content.impl.seine; * #L% */ -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; /** * Created on 9/28/14. @@ -41,17 +39,4 @@ public class FloatingObjectTransmittingBuoyOperationUIModel extends ContentUIMod super(FloatingObjectTransmittingBuoyDto.class); } - @Override - protected BinderModelBuilder<FloatingObjectTransmittingBuoyDto, FloatingObjectTransmittingBuoyDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<FloatingObjectTransmittingBuoyDto, FloatingObjectTransmittingBuoyDto> builder = binderService.newBinderBuilder( - FloatingObjectTransmittingBuoyDto.class, - FloatingObjectTransmittingBuoyDto.PROPERTY_COMMENT, - FloatingObjectTransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY - ); - - return builder; - - } - } 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 41cb271..594a484 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,10 +22,8 @@ package fr.ird.observe.ui.content.impl.seine; * #L% */ -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; /** * Created on 9/28/14. @@ -41,20 +39,4 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> { super(FloatingObjectDto.class); } - @Override - protected BinderModelBuilder<FloatingObjectDto, FloatingObjectDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<FloatingObjectDto, FloatingObjectDto> builder = binderService.newBinderBuilder( - FloatingObjectDto.class, - FloatingObjectDto.PROPERTY_OBJECT_TYPE, - FloatingObjectDto.PROPERTY_OBJECT_FATE, - FloatingObjectDto.PROPERTY_OBJECT_OPERATION, - FloatingObjectDto.PROPERTY_COMMENT, - FloatingObjectDto.PROPERTY_SUPPORT_VESSEL_NAME, - FloatingObjectDto.PROPERTY_DAYS_AT_SEA_COUNT); - - return builder; - - } - } 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 8686d19..efa026a 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,10 +23,8 @@ package fr.ird.observe.ui.content.impl.seine; */ import com.google.common.collect.ImmutableSet; -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; import java.util.Set; @@ -93,32 +91,4 @@ public class SetSeineUIModel extends ContentUIModel<SetSeineDto> { firePropertyChange(PROPERTY_GENERAL_TAB_VALID, oldValue, generalTabValid); } - @Override - protected BinderModelBuilder<SetSeineDto, SetSeineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<SetSeineDto, SetSeineDto> builder = binderService.newBinderBuilder( - SetSeineDto.class, - SetSeineDto.PROPERTY_COMMENT, - SetSeineDto.PROPERTY_SUPPORT_VESSEL_NAME, - SetSeineDto.PROPERTY_START_TIME, - SetSeineDto.PROPERTY_END_SET_TIME_STAMP, - SetSeineDto.PROPERTY_END_PURSING_TIME_STAMP, - SetSeineDto.PROPERTY_CURRENT_DIRECTION, - SetSeineDto.PROPERTY_CURRENT_SPEED, - SetSeineDto.PROPERTY_REASON_FOR_NULL_SET, - SetSeineDto.PROPERTY_SCHOOL_THICKNESS, - SetSeineDto.PROPERTY_MAX_GEAR_DEPTH, - SetSeineDto.PROPERTY_SCHOOL_MEAN_DEPTH, - SetSeineDto.PROPERTY_SCHOOL_TOP_DEPTH, - SetSeineDto.PROPERTY_CURRENT_MEASURE_DEPTH, - SetSeineDto.PROPERTY_TARGET_DISCARDED, - SetSeineDto.PROPERTY_NON_TARGET_DISCARDED, - SetSeineDto.PROPERTY_SCHOOL_TYPE, - SetSeineDto.PROPERTY_SONAR_USED - ); - - return builder; - - } - } 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 be6ec15..bc0966d 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 @@ -42,29 +42,4 @@ public class ActivityLonglinesUIModel extends ContentListUIModel<TripLonglineDto super(TripLonglineDto.class, ActivityLonglineDto.class); } - @Override - protected BinderModelBuilder<TripLonglineDto, TripLonglineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<TripLonglineDto, TripLonglineDto> builder = binderService.newBinderBuilder( - TripLonglineDto.class, - TripLonglineDto.PROPERTY_OPEN - //FIXME -// TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE - ); - - BinderModelBuilder<ActivityLonglineDto, ActivityLonglineDto> builder2 = binderService.newBinderBuilder( - ActivityLonglineDto.class, - ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, - ActivityLonglineDto.PROPERTY_TIME_STAMP, - ActivityLonglineDto.PROPERTY_OPEN); - - //FIXME -// TopiaEntityBinder<ActivityLongline> binder = -// binderService.registerTopiaBinder(ActivityLongline.class, builder2, binderName); -// -// builder.addCollectionBinder(binder, TripLongline.PROPERTY_ACTIVITY_LONGLINE); - - return builder; - - } } 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 eca55c5..c704361 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,11 +22,9 @@ package fr.ird.observe.ui.content.list.impl.longline; * #L% */ -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; -import org.nuiton.util.beans.BinderModelBuilder; /** * Created on 9/26/14. @@ -42,21 +40,4 @@ public class TripLonglinesUIModel extends ContentListUIModel<ProgramDto, TripLon super(ProgramDto.class, TripLonglineDto.class); } - @Override - protected BinderModelBuilder<ProgramDto, ProgramDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<ProgramDto, ProgramDto> builder = binderService.newBinderBuilder( - ProgramDto.class, - ProgramDto.PROPERTY_LABEL1, - ProgramDto.PROPERTY_LABEL2, - ProgramDto.PROPERTY_LABEL3, - ProgramDto.PROPERTY_LABEL4, - ProgramDto.PROPERTY_LABEL5, - ProgramDto.PROPERTY_LABEL6, - ProgramDto.PROPERTY_LABEL7, - ProgramDto.PROPERTY_LABEL8); - - return builder; - - } } 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 0dab03d..5ed9d2e 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,11 +22,9 @@ package fr.ird.observe.ui.content.list.impl.seine; * #L% */ -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; -import org.nuiton.util.beans.BinderModelBuilder; /** * Created on 9/26/14. @@ -42,34 +40,4 @@ public class ActivitySeinesUIModel extends ContentListUIModel<RouteDto, Activity super(RouteDto.class, ActivitySeineDto.class); } - @Override - protected BinderModelBuilder<RouteDto, RouteDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<RouteDto, RouteDto> builder = binderService.newBinderBuilder( - RouteDto.class, - RouteDto.PROPERTY_OPEN - //FIXME -// RouteDto.PROPERTY_ACTIVITY_SEINE - ); - -// // on ajoute la recopie de l'association route -// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, -// Route.PROPERTY_ACTIVITY_SEINE -// ); - - BinderModelBuilder<ActivitySeineDto, ActivitySeineDto> builder2 = binderService.newBinderBuilder( - ActivitySeineDto.class, - ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, - ActivitySeineDto.PROPERTY_TIME, - ActivitySeineDto.PROPERTY_OPEN); - - //FIXME -// TopiaEntityBinder<ActivitySeineDto> binder = -// binderService.registerTopiaBinder(ActivitySeineDto.class, builder2, binderName); -// -// builder.addCollectionBinder(binder, RouteDto.PROPERTY_ACTIVITY_SEINE); - - return builder; - - } } 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 dfb515e..c56922e 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,11 +22,9 @@ package fr.ird.observe.ui.content.list.impl.seine; * #L% */ -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; -import org.nuiton.util.beans.BinderModelBuilder; /** * Created on 9/26/14. @@ -42,21 +40,4 @@ public class RoutesUIModel extends ContentListUIModel<TripSeineDto, RouteDto> { super(TripSeineDto.class, RouteDto.class); } - @Override - protected BinderModelBuilder<TripSeineDto, TripSeineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<TripSeineDto, TripSeineDto> builder = binderService.newBinderBuilder( - TripSeineDto.class, - TripSeineDto.PROPERTY_OPEN - //FIXME -// TripSeineDto.PROPERTY_ROUTE - ); - - // on ajoute la recopie de l'association route - //FIXME -// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripSeineDto.PROPERTY_ROUTE); - - return builder; - - } } 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 2a5502b..f28ed51 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,11 +22,9 @@ package fr.ird.observe.ui.content.list.impl.seine; * #L% */ -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; -import org.nuiton.util.beans.BinderModelBuilder; /** * Created on 9/26/14. @@ -42,21 +40,4 @@ public class TripSeinesUIModel extends ContentListUIModel<ProgramDto, TripSeineD super(ProgramDto.class, TripSeineDto.class); } - @Override - protected BinderModelBuilder<ProgramDto, ProgramDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<ProgramDto, ProgramDto> builder = binderService.newBinderBuilder( - ProgramDto.class, - ProgramDto.PROPERTY_LABEL1, - ProgramDto.PROPERTY_LABEL2, - ProgramDto.PROPERTY_LABEL3, - ProgramDto.PROPERTY_LABEL4, - ProgramDto.PROPERTY_LABEL5, - ProgramDto.PROPERTY_LABEL6, - ProgramDto.PROPERTY_LABEL7, - ProgramDto.PROPERTY_LABEL8); - - return builder; - - } } 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 4fad78a..b32227c 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 @@ -53,37 +53,6 @@ public class ActivityLonglineUIModel extends ContentOpenableUIModel<ActivityLong super(ActivityLonglineDto.class); } - @Override - protected BinderModelBuilder<ActivityLonglineDto, ActivityLonglineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<ActivityLonglineDto, ActivityLonglineDto> builder = binderService.newBinderBuilder( - ActivityLonglineDto.class, - //FIXME -// ActivityLonglineDto.PROPERTY_QUADRANT, - ActivityLonglineDto.PROPERTY_LATITUDE, - ActivityLonglineDto.PROPERTY_LONGITUDE, - ActivityLonglineDto.PROPERTY_TIME_STAMP, - ActivityLonglineDto.PROPERTY_SEA_SURFACE_TEMPERATURE, - ActivityLonglineDto.PROPERTY_COMMENT, - //FIXME -// ActivityLonglineDto.PROPERTY_SET_LONGLINE, - ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, - ActivityLonglineDto.PROPERTY_FPA_ZONE, - ActivityLonglineDto.PROPERTY_OPEN - //FIXME -// ActivityLonglineDto.PROPERTY_ENCOUNTER, -// ActivityLonglineDto.PROPERTY_SENSOR_USED - ); - - //FIXME -// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, ActivityLonglineDto.PROPERTY_ENCOUNTER); - //FIXME -// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, ActivityLonglineDto.PROPERTY_SENSOR_USED); - - return builder; - - } - public boolean isSetOperation() { ReferentialReferenceDto<VesselActivityLonglineDto> vesselActivityLongline = bean.getVesselActivityLongline(); return vesselActivityLongline != null 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 58f2eaf..aaceab0 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,11 +22,8 @@ package fr.ird.observe.ui.content.open.impl.longline; * #L% */ -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; -import org.nuiton.util.beans.BinderModelBuilder; /** * Created on 9/26/14. @@ -42,32 +39,4 @@ public class TripLonglineUIModel extends ContentOpenableUIModel<TripLonglineDto> super(TripLonglineDto.class); } - @Override - protected BinderModelBuilder<TripLonglineDto, TripLonglineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<TripLonglineDto, TripLonglineDto> builder = binderService.newBinderBuilder( - TripLonglineDto.class, - TripLonglineDto.PROPERTY_START_DATE, - TripLonglineDto.PROPERTY_END_DATE, - TripLonglineDto.PROPERTY_TRIP_TYPE, - TripLonglineDto.PROPERTY_HOME_ID, - TripLonglineDto.PROPERTY_COMMENT, - TripLonglineDto.PROPERTY_VESSEL, - TripLonglineDto.PROPERTY_OBSERVER, - TripLonglineDto.PROPERTY_CAPTAIN, - TripLonglineDto.PROPERTY_DATA_ENTRY_OPERATOR, - TripLonglineDto.PROPERTY_TOTAL_FISHING_OPERATIONS_NUMBER, - TripLonglineDto.PROPERTY_OCEAN, - TripLonglineDto.PROPERTY_DEPARTURE_HARBOUR, - TripLonglineDto.PROPERTY_LANDING_HARBOUR, - TripLonglineDto.PROPERTY_PROGRAM, - TripLonglineDto.PROPERTY_OPEN, - TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE); - - // on ajoute la recopie de l'association route - builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE); - - return builder; - - } } 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 da79d96..d006be5 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 @@ -101,39 +101,4 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeineDt return false; } - @Override - protected BinderModelBuilder<ActivitySeineDto, ActivitySeineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<ActivitySeineDto, ActivitySeineDto> builder = binderService.newBinderBuilder( - ActivitySeineDto.class, - ActivitySeineDto.PROPERTY_LATITUDE, - ActivitySeineDto.PROPERTY_LONGITUDE, - ActivitySeineDto.PROPERTY_ERS_ID, - ActivitySeineDto.PROPERTY_TIME, - ActivitySeineDto.PROPERTY_SEA_SURFACE_TEMPERATURE, - ActivitySeineDto.PROPERTY_REASON_FOR_NO_FISHING, - ActivitySeineDto.PROPERTY_COMMENT, - ActivitySeineDto.PROPERTY_VESSEL_SPEED, - //FIXME -// ActivitySeineDto.PROPERTY_OBSERVED_SYSTEM, -// ActivitySeineDto.PROPERTY_OBSERVED_SYSTEM_DISTANCE, - ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, - ActivitySeineDto.PROPERTY_SURROUNDING_ACTIVITY, - ActivitySeineDto.PROPERTY_WIND, - ActivitySeineDto.PROPERTY_DETECTION_MODE, - //FIXME -// ActivitySeineDto.PROPERTY_SET_SEINE, -// ActivitySeineDto.PROPERTY_FLOATING_OBJECT, - ActivitySeineDto.PROPERTY_OPEN, - ActivitySeineDto.PROPERTY_CURRENT_FPA_ZONE, - ActivitySeineDto.PROPERTY_PREVIOUS_FPA_ZONE, - ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE); - - //FIXME -// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, ActivitySeineDto.PROPERTY_OBSERVED_SYSTEM); - //FIXME -// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, ActivitySeineDto.PROPERTY_FLOATING_OBJECT); - - return builder; - } } 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 a172e58..750f249 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,11 +22,8 @@ package fr.ird.observe.ui.content.open.impl.seine; * #L% */ -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; -import org.nuiton.util.beans.BinderModelBuilder; /** * Created on 9/26/14. @@ -42,22 +39,4 @@ public class RouteUIModel extends ContentOpenableUIModel<RouteDto> { super(RouteDto.class); } - @Override - protected BinderModelBuilder<RouteDto, RouteDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<RouteDto, RouteDto> builder = binderService.newBinderBuilder( - RouteDto.class, - RouteDto.PROPERTY_DATE, - RouteDto.PROPERTY_START_LOG_VALUE, - RouteDto.PROPERTY_END_LOG_VALUE, - RouteDto.PROPERTY_CHECK_LEVEL, - RouteDto.PROPERTY_ACTIVITY_SEINE, - RouteDto.PROPERTY_OPEN, - RouteDto.PROPERTY_COMMENT); - - builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, RouteDto.PROPERTY_ACTIVITY_SEINE); - - return builder; - - } } 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 57bd360..1636b6c 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,11 +22,8 @@ package fr.ird.observe.ui.content.open.impl.seine; * #L% */ -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; -import org.nuiton.util.beans.BinderModelBuilder; /** * Created on 9/26/14. @@ -42,32 +39,4 @@ public class TripSeineUIModel extends ContentOpenableUIModel<TripSeineDto> { super(TripSeineDto.class); } - @Override - protected BinderModelBuilder<TripSeineDto, TripSeineDto> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<TripSeineDto, TripSeineDto> builder = binderService.newBinderBuilder( - TripSeineDto.class, - TripSeineDto.PROPERTY_START_DATE, - TripSeineDto.PROPERTY_END_DATE, - TripSeineDto.PROPERTY_FORMS_URL, - TripSeineDto.PROPERTY_REPORTS_URL, - TripSeineDto.PROPERTY_COMMENT, - TripSeineDto.PROPERTY_VESSEL, - TripSeineDto.PROPERTY_OBSERVER, - TripSeineDto.PROPERTY_CAPTAIN, - TripSeineDto.PROPERTY_DATA_ENTRY_OPERATOR, - TripSeineDto.PROPERTY_OCEAN, - TripSeineDto.PROPERTY_DEPARTURE_HARBOUR, - TripSeineDto.PROPERTY_LANDING_HARBOUR, - TripSeineDto.PROPERTY_ERS_ID, - TripSeineDto.PROPERTY_OPEN, - TripSeineDto.PROPERTY_ROUTE); - - // on ajoute la recopie de l'association route - builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripSeineDto.PROPERTY_ROUTE); - - return builder; - - } - } 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 bee21bf..2a585b8 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,14 +21,12 @@ */ package fr.ird.observe.ui.content.ref; -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; import fr.ird.observe.ui.content.ContentUIModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.beans.BinderModelBuilder; import java.util.ArrayList; import java.util.Arrays; @@ -194,22 +192,6 @@ public abstract class ContentReferenceUIModel<E extends ReferentialDto> extends firePropertyChange(PROPERTY_SELECTED_BEAN, oldvalue, selectedBean); } - @Override - protected BinderModelBuilder<E, E> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - BinderModelBuilder<E, E> builder = binderService.newBinderBuilder(beanType, properties); - - if (log.isDebugEnabled()) { - log.debug("new binder [" + getClass().getName() + "#" + - beanType.getName() + "] : " + - Arrays.toString(properties) - ); - } - - return builder; - } - - /** * construction de la liste des propriétés a binder pour une entite. * 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 defa89d..1233147 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,10 +22,8 @@ package fr.ird.observe.ui.content.ref; * #L% */ -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; /** * Created on 9/28/14. @@ -41,9 +39,4 @@ public class ReferenceHomeUIModel extends ContentUIModel<ProgramDto> { super(ProgramDto.class); } - @Override - 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 f2c5d44..c49fa26 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 @@ -28,10 +28,10 @@ import fr.ird.observe.ui.content.ContentUIModel; import org.apache.commons.lang3.reflect.ConstructorUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderModelBuilder; -import javax.swing.*; +import javax.swing.DefaultListSelectionModel; +import javax.swing.ListSelectionModel; import java.util.List; /** @@ -112,19 +112,6 @@ public abstract class ContentTableUIModel<E extends IdDto, D extends IdDto> exte } - @Override - protected BinderModelBuilder<E, E> createOpeningBinder(ObserveSwingBinderService binderService, String binderName) { - - String[] properties = getParentProperties(); - - BinderModelBuilder<E, E> builder = binderService.newBinderBuilder(getBeanType(), properties); - - // la première propriete est l'association - builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, properties[0]); - - return builder; - } - public void initModel(ObserveContentTableUI<E, D> ui, List<ContentTableMeta<D>> metas) { this.tableModel = createTableModel(ui, metas); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.