[Observe-commits] 03/09: remplacement des anciens datasources par les nouveaux

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553 in repository observe. See http://git.codelutin.com/observe.git commit 2335488512509a946abebd783ab462fbda0729ce Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 30 16:37:41 2015 +0200 remplacement des anciens datasources par les nouveaux --- .../business/ObserveApplicationContext.java | 13 +- .../fr/ird/observe/business/db/DataSource.java | 225 ---------- .../ird/observe/business/db/DataSourceConfig.java | 219 ---------- .../observe/business/db/DataSourceConfigParam.java | 43 -- .../observe/business/db/DataSourceException.java | 55 --- .../ird/observe/business/db/DataSourceFactory.java | 457 --------------------- .../observe/business/db/DataSourceProvider.java | 72 ---- .../db/constants/CommonDataSourceConfigParam.java | 128 ------ .../business/report/model/ReportExecute.java | 9 +- .../business/validation/ObserveValidator.java | 5 +- .../business/validation/ValidationContext.java | 13 +- .../ird/observe/ui/actions/ShowConfigAction.java | 20 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 28 +- .../ui/admin/validate/ValidateUIHandler.java | 2 +- .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 6 +- .../ird/observe/ui/content/ObserveContentUI.java | 5 +- .../impl/longline/ActivityLonglinesUIHandler.java | 2 +- .../ui/content/open/ContentOpenableUIHandler.java | 2 +- .../CatchLonglineContentTableUIInitializer.java | 2 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 2 +- .../impl/longline/HooksCompositionUIHandler.java | 1 + .../content/table/impl/longline/TdrUIHandler.java | 10 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 2 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 2 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 8 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 2 +- .../table/impl/seine/TargetCatchUIHandler.java | 5 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 5 +- .../table/impl/seine/TargetSampleUIHandler.java | 10 +- .../ird/observe/ui/storage/StorageUIHandler.java | 26 +- .../ird/observe/ui/tree/ActivityLonglineNode.java | 2 +- .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 2 +- .../observe/ui/tree/FloatingObjectSeineNode.java | 2 +- .../fr/ird/observe/ui/tree/RouteSeineNode.java | 2 +- .../fr/ird/observe/ui/tree/SetLonglineNode.java | 2 +- .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 2 +- .../fr/ird/observe/ui/tree/TripLonglineNode.java | 2 +- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 2 +- .../actions/ChangeTripProgramActionListener.java | 7 +- .../loadors/ActivityLonglineNodeChildLoador.java | 3 +- .../loadors/FloatingObjectNodeChildLoador.java | 4 +- .../loadors/ReferenceCommonNodeChildLoador.java | 4 +- .../loadors/ReferenceLonglineNodeChildLoador.java | 4 +- .../loadors/ReferenceSeineNodeChildLoador.java | 4 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 4 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 4 +- 46 files changed, 114 insertions(+), 1315 deletions(-) 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 index 66b1965..846e44a 100644 --- 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 @@ -23,10 +23,11 @@ package fr.ird.observe.business; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; + import fr.ird.observe.business.gps.GPSService; import fr.ird.observe.business.validation.ObserveValidator; import fr.ird.observe.business.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; @@ -81,8 +82,8 @@ public class ObserveApplicationContext extends DefaultApplicationContext { JAXXUtil.newContextEntryDef(DataContext.class); /** the jaxx context entry to store the data source (says the ui data source) */ - public static final JAXXContextEntryDef<DataSource> DATA_SOURCE_ENTRY_DEF = - JAXXUtil.newContextEntryDef(DataSource.class); + 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); @@ -103,12 +104,12 @@ public class ObserveApplicationContext extends DefaultApplicationContext { return CONFIG_ENTRY_DEF.getContextValue(this); } - public final DataSource getDataSource() { - DataSource dataSource = DATA_SOURCE_ENTRY_DEF.getContextValue(this); + public final ObserveSwingDataSource getDataSource() { + ObserveSwingDataSource dataSource = DATA_SOURCE_ENTRY_DEF.getContextValue(this); return dataSource; } - public final void setDataSource(DataSource source) { + public final void setDataSource(ObserveSwingDataSource source) { if (source == null) { DATA_SOURCE_ENTRY_DEF.removeContextValue(this); } else { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSource.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSource.java deleted file mode 100644 index 98aa6b8..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSource.java +++ /dev/null @@ -1,225 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.business.db; - -import fr.ird.observe.business.db.constants.DataSourceState; -import org.nuiton.util.version.Version; - -import java.io.File; -import java.util.Properties; - -/** - * Le contrat d'une source de données. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public interface DataSource { - - String OPEN_PROPERTY_KEY = "open"; - - String REFERENTIEL_PROPERTY_KEY = "referentiel"; - - String DATA_PROPERTY_KEY = "data"; - - // ------------------------------------------------------------------------- - // Methodes de démarrage et fermeture de la source de données - // ------------------------------------------------------------------------- - - /** - * Pour initialiser le service sans l'ouvrir. - * <p/> - * Note: cette opération est délégué à la configuration. - * <p/> - * A la fin de cette méthode, l'état doit être {@link - * DataSourceState#INIT} si - * tout s'est bien déroulé. - * - * @see DataSourceConfig#init() - */ - void init(); - - /** - * Ouvre le service. - * <p/> - * Après cette opération, le service doit être en état {@link - * DataSourceState#OPEN} si - * tout s'est bien déroulé. - * - * @throws DataSourceException si pb - */ - void doOpen() throws DataSourceException; - - /** - * Ferme le service. - * <p/> - * Après cette opération, le service doit être en état {@link - * DataSourceState#CLOSED} - * - * @param destroy drapeau pour savoir si on doit détruire la base après - * fermeture. - * @throws DataSourceException if pb - */ - void doClose(boolean destroy) throws DataSourceException; - - // ------------------------------------------------------------------------- - // Methodes d'accès aux état internes de la source de données - // ------------------------------------------------------------------------- - - /** - * Recupère la version de la base. (ne peut pas être utilisé avant que la - * base soit ouverte). - * <p/> - * Note: si la base n'est pas versionnée, la version est nulle. - * - * @return la version de la base, ou <code>null</code> si la base n'est pas - * versionnee - * @throws DataSourceException if pb - */ - Version getDbVersion() throws DataSourceException; - - /** @return le libellé court du service */ - String getShortLabel(); - - /** @return le libellé complet du service */ - String getLabel(); - - /** - * @return {@code true} si le service est ouvert (i.e qu'il y a une - * connection ouverte vers la base). - */ - boolean isOpen(); - - boolean wasClosed(); - - /** @return la configuration du service */ - DataSourceConfig getConfig(); - - /** @return {@code true} si on peut lire le référentiel */ - boolean canReadReferentiel(); - - /** @return {@code true} si on peut écrire sur le référentiel */ - boolean canWriteReferentiel(); - - /** @return {@code true} si on peut lire les donées observer */ - boolean canReadData(); - - /** @return {@code true} si on peut écrire des données observer */ - boolean canWriteData(); - - Properties getConfigForTopia(); - - // ------------------------------------------------------------------------- - // Methodes de manipulation des transactions, DAO et TopiaService - // ------------------------------------------------------------------------- - - //FIXME -// /** @return le parent de tous les context topia. */ -// TopiaContext getRootCtxt(); -// -// TopiaContext beginTransaction(String methodName) throws DataSourceException; -// -// void rollbackTransaction(TopiaContext context, -// String methodName) throws DataSourceException; -// -// void commitTransaction(TopiaContext context, -// String methodName) throws DataSourceException; -// -// void closeTransaction(TopiaContext context, -// String methodName) throws DataSourceException; - -// ReplicationService getReplicationService(); -// -// <S extends TopiaService> S getTopiaService(Class<S> serviceType); -// -// <P extends TopiaEntity> TopiaDAO<P> getDAO(TopiaContext context, -// Class<P> entityType) throws TopiaException; -// -// <P extends TopiaEntity> TopiaDAO<P> getDAO(TopiaContext context, -// P entity) throws TopiaException; -// -// <E extends OpenableEntity & TopiaEntity> E getOpen(TopiaContext tx, -// Class<E> klass) throws DataSourceException; -// -// String[] getOpenIds(TopiaContext tx) throws DataSourceException; - - /** - * Exporte la base de données dans un script gzip-compresse. - * <p/> - * Note : Actuellement, seul esl bases de type H2 peuvent utiliser cette - * fonctionnalitee. - * - * @param gzipFile le fichier ou ecrire le script gzippe - * @throws DataSourceException si un pb pendant l'objectOperation - */ - void storeDB(File gzipFile) throws DataSourceException; - - //FIXME -// /** -// * Décore un obet persistant. -// * -// * @param tx la transaction à utiliser (si elle est nulle on en crée une que l'on ferme avant la fin de l'appel). -// * @param id l'id de l'obet à décorer -// * @param decorator le décorateur -// * @return la décoration -// * @throws DataSourceException si pas possible de récupérer l'objet en base -// */ -// String decorateEntity(TopiaContext tx, -// String id, -// Decorator<?> decorator) throws DataSourceException; -// -// <E extends TopiaEntity> List<E> loadDecoratedEntities(TopiaContext tx, -// Class<E> entityClass, -// Decorator<E> decorator) throws DataSourceException; - - // ------------------------------------------------------------------------- - // Methodes de vérification d'état - // ------------------------------------------------------------------------- - - /** - * Verifie que l'etat du service est l'un de ceux donnes en parametre. - * - * @param state les etats acceptes - * @throws IllegalStateException si l'etat du service n'est pas l'un de ceux - * donnes en parametre - */ - void checkState(DataSourceState... state) throws IllegalStateException; - - // ------------------------------------------------------------------------- - // Methodes de l'api des écouteurs sur évènement sur source de données - // ------------------------------------------------------------------------- - - //FIXME -// void addDataSourceListener(DataSourceListener listener); -// -// boolean containsDataSourceListener(DataSourceListener listener); -// -// void removeDataSourceListener(DataSourceListener listener); -// -// DataSourceListener[] getDataSourceListeners(); -// -// void fireNewMessage(String message); -// -// void fireNewMessage(String message, DataSourceEvent.MessageLevel level); -// -// <E> E findByTopiaId(TopiaContext tx, String entityId) throws TopiaException; -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfig.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfig.java deleted file mode 100644 index ead8e9a..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfig.java +++ /dev/null @@ -1,219 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.business.db; - -import fr.ird.observe.db.constantes.CreationMode; -import fr.ird.observe.business.db.constants.DataPolicy; -import fr.ird.observe.business.db.constants.DataSourceState; - -import java.util.EnumSet; -import java.util.Properties; -import java.util.Set; - -/** - * Le contrat de la configuration d'une source de données. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public interface DataSourceConfig extends Cloneable { - - /** - * Récupère la valeur d'un paramètre. - * - * @param <T> le type de la valeur d'un paramètre - * @param param la définition du paramètre - * @param type le type du paramètre - * @return la valeur du paramètre - */ - <T> T get(DataSourceConfigParam param, Class<T> type); - - /** - * Positionne une nouvelle valeur pour unparamètre donné. - * <p/> - * Note: si on passe la valeur <code>null</code> alors le paramètre ne sera - * plus utilisé (jusqu'à ré-affectation d'un valeur non nulle). - * - * @param param la définition du paramètre - * @param value la nouvelle valeur à positionner - */ - void set(DataSourceConfigParam param, Object value); - - /** - * Prépare l'utilisation de la configuration sans ouvrir aucun connexion - * vers la base de données associée. - * <p/> - * A la fin de cette méthode, l'état doit être {@link - * DataSourceState#INIT} si - * tout s'est bien déroulé. - */ - void init(); - - /** @return la configuration sous forme l'un fichier de properties. */ - Properties getDbConfig(); - - /** - * Méthode pour valider la configuration. - * <p/> - * Cette méthode doit être appelée par le service avant toute ouverture de - * service pour assurer que l'on obtiendra un service valide. - * - * @return {@code true} si la configuration est valide. - */ - boolean isValid(); - - /** - * @return {@code true} si le service de persistance utilise un cache - * sur les entités du référentiel. - */ - boolean isUseCache(); - - /** @return le label court de la source de donnees. */ - String getShortLabel(); - - /** @return le label long de la source de donnees. */ - String getLabel(); - - /** @return le login pour se connecter a la base */ - String getLogin(); - - /** @return le mot de passe pour se connecter a la base */ - char[] getPassword(); - - /** - * @return {@code true} si on doit effectuer une tentative de mise a - * jour de la base a l'ouverture du service. - */ - boolean isCanMigrate(); - - boolean isShowMigrationSql(); - - boolean isShowMigrationProgression(); - - void setShowMigrationSql(boolean showSql); - - void setShowMigrationProgression(boolean showProgression); - - /** - * Positionne le login de connexion. - * - * @param login le nouveau login de connexion - */ - void setLogin(String login); - - /** - * Positionne le mot de passe de connexion. - * - * @param password le nouveau mot de passe de connexion - */ - void setPassword(char[] password); - - /** - * Positionne le label court de la source de donnees. - * - * @param shortLabel le nouvel label court de la source de donnes. - */ - void setShortLabel(String shortLabel); - - /** - * Positionne le drapeau d'utilisation du cache des entites. - * <p/> - * Il s'agit d'un cache sur le referentiel, mise a jour a chaque - * modification sur une entite du referentiel. - * <p/> - * Sera util lorsque l'on editera le referentiel dans l'application. - * - * @param useCache la nouvelle valeur du drapeau - */ - void setUseCache(boolean useCache); - - /** @return une instance clonee de la configuration */ - DataSourceConfig clone(); - - /** - * Recopie cette configuration vers la configuratyion donnee en parametre. - * - * @param config la configuration destination - */ - void copyTo(DataSourceConfig config); - - /** @return les droits sur la source de donnees */ - EnumSet<DataPolicy> getPolicy(); - - /** - * Recupère les droits utilisables sur ce service de persistance. - * <p/> - * La liste des droits sera positionné dans le champ {@link #getPolicy()}. - * <p/> - * Cette méthode est appellé à l'ouverture du service si la connexion a bien - * été établie. - */ - void detectPolicy(); - - /** @return les droits sur la source de donnees formates. */ - String getPolicyLabel(); - - void fillWrights(StringBuilder buffer, boolean read, - boolean write, String label); - - /** - * @param canMigrate pour indiquer si on doit effecuter une tentative de - * mise a jour a l'ouverture du service. - */ - void setCanMigrate(boolean canMigrate); - - boolean isCanReadData(); - - boolean isCanReadReferentiel(); - - boolean isCanWriteData(); - - boolean isCanWriteReferentiel(); - - CreationMode getCreationMode(); - - void setCreationMode(CreationMode creationMode); - - DataSourceConfig getImportConfig(); - - void setImportConfig(DataSourceConfig importConfig); - - DataSourceConfig getImportDataConfig(); - - void setImportDataConfig(DataSourceConfig importDataConfig); - - Set<String> getImportDataIds(); - - void setImportDataIds(Set<String> importDataIds); - -// boolean hasH2ImportConfig(); -// -// boolean hasPGImportConfig(); - - boolean hasImportReferentielConfig(); - - boolean hasImportDataConfig(); - -// H2DataSourceConfig getH2ImportConfig(); -// -// PGDataSourceConfig getPGImportConfig(); -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfigParam.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfigParam.java deleted file mode 100644 index 8002ce2..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfigParam.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.business.db; - -/** - * Le contrat d'un paramètre de la configuration d'une source de données. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public interface DataSourceConfigParam { - - /** - * @return le lastName de la clef utilisée pour stocker la valeur de la - * propriété. - */ - String getMapName(); - - /** @return le lastName de la propriété. */ - String getPropertyName(); - - /** @return le type de la propriété. */ - Class<?> getType(); -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceException.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceException.java deleted file mode 100644 index 4a970c0..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceException.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.business.db; - -/** - * L'exception déclanché lors de l'accès aux méthodes de la source de données. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public class DataSourceException extends Exception { - - private final static long serialVersionUID = 1L; - - protected final String methodName; - - public DataSourceException(String message, String methodName) { - super(message); - this.methodName = methodName; - } - - public DataSourceException(Throwable cause, String methodName) { - super(cause); - this.methodName = methodName; - } - - public DataSourceException(String message, Throwable cause, String methodName) { - super(message, cause); - this.methodName = methodName; - } - - public String getMethodName() { - return methodName; - } - -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceFactory.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceFactory.java deleted file mode 100644 index 6846264..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceFactory.java +++ /dev/null @@ -1,457 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.business.db; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.util.Collections; -import java.util.HashSet; -import java.util.ServiceLoader; -import java.util.Set; - -import static org.nuiton.i18n.I18n.t; - -/** - * L'usine de source de données. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public class DataSourceFactory { - - /** Logger */ - private static final Log log = - LogFactory.getLog(DataSourceFactory.class); - - /** l'ensemble des proversId découverts */ - protected static Set<DataSourceProvider<?, ?>> proversId; - - /** l'ensemble des services actuellement ouverts */ - protected static final Set<DataSource> services = - new HashSet<DataSource>(); - - /** - * un ecouteur sur les services pour mettre à jour la liste des services - * actifs - */ - //FIXME -// protected static final DataSourceListener l = -// new DataSourceListenerAdapter() { -// -// @Override -// public void onClosed(DataSourceEvent event) { -// DataSource s = event.getSource(); -// if (log.isDebugEnabled()) { -// log.debug("remove active service " + s.getLabel()); -// } -// services.remove(s); -// } -// -// @Override -// public void onOpened(DataSourceEvent event) { -// DataSource s = event.getSource(); -// if (log.isDebugEnabled()) { -// log.debug("add active service " + s.getLabel()); -// } -// services.add(s); -// } -// -// @Override -// public void onNewMessage(DataSourceEvent event) { -// if (log.isInfoEnabled()) { -// log.info(event.getMessage()); -// } -// } -// }; - - //FIXME -// public static Version getModelVersion() { -// if (ObserveServiceHelper.context != null) { -// ApplicationConfig config; -// config = ObserveServiceHelper.context.getContextValue(ApplicationConfig.class); -// if (config != null) { -// return config.getOption(Version.class, -// AbstractDataSourceMigration.DB_VERSION); -// } -// } -// return null; -// } - - /** - * @param label le label du service de persistance - * @param params les paramètres de la configuration - * @return la configuration instanciée - */ -//FIXME -// public static H2DataSourceConfig newH2Config(String label, Object... params) { -// -// H2DataSourceConfig config = newConfig(label, -// H2DataSourceConfig.class, -// H2DataSource.class, -// params -// ); -// -// return config; -// } - - /** - * @param label le label du service de persistance - * @param params les paramètres de la configuration - * @return la configuration instanciée - */ -//FIXME -// public static PGDataSourceConfig newPGConfig(String label, Object... params) { -// -// PGDataSourceConfig config = newConfig(label, -// PGDataSourceConfig.class, -// PGDataSource.class, -// params -// ); -// -// return config; -// } - -//FIXME -// public static PGDataSource newService(PGDataSourceConfig config) { -// -// PGDataSource service = newService(config, PGDataSource.class); -// -// return service; -// } - -//FIXME -// public static H2DataSource newService(H2DataSourceConfig config) { -// -// H2DataSource service = newService(config, H2DataSource.class); -// -// return service; -// } - -//FIXME -// public static DataSource newService(DataSourceConfig config) { -// -// DataSource service = null; -// -// if (config instanceof H2DataSourceConfig) { -// service = newService((H2DataSourceConfig) config); -// } else if (config instanceof PGDataSourceConfig) { -// service = newService((PGDataSourceConfig) config); -// } -// -// return service; -// } - - /** - * @param <C> le type de la configuration - * @param label le label du service de persistance - * @param configClass le type de configuration - * @param serviceClass le type de service - * @param params les paramètres de la configuration - * @return la configuration instanciée - */ - private static <C extends DataSourceConfig, S extends DataSource> C newConfig(String label, - Class<C> configClass, - Class<S> serviceClass, - Object... params) { - - DataSourceProvider<C, S> provider = - getProvider(configClass, serviceClass); - - C config = provider.newConfig(label, params); - - return config; - } -// -//FIXME -// public static <C extends DataSourceConfig, S extends DataSource> S -// newService(C config, Class<S> serviceClass) { -// -// DataSourceProvider<C, S> provider = getProvider(config, serviceClass); -// -// S service = provider.newService(config); -// -// service.addDataSourceListener(l); -// -// service.init(); -// -// return service; -// } - - public static Set<DataSourceProvider<?, ?>> getProversId() { - if (proversId == null) { - proversId = discover(); - } - return proversId; - } -//FIXME -// public static void dispose() throws DataSourceException { -// if (log.isInfoEnabled()) { -// log.info("close all services (" + services.size() + ')'); -// } -// -// for (DataSource service : services) { -// // on supprime le listener qui met a jour la liste de services -// // sinon on entre en concurrence de modification -// service.removeDataSourceListener(l); -// if (service.isOpen()) { -// service.doClose(false); -// } -// } -// services.clear(); -// } - - @SuppressWarnings("unchecked") - protected static <C extends DataSourceConfig, S extends DataSource> - DataSourceProvider<C, S> getProvider(Class<C> configClass, - Class<S> serviceClass) { - - if (configClass == null) { - throw new NullPointerException("configClass can not be null"); - } - - if (serviceClass == null) { - throw new NullPointerException("serviceClass can not be null"); - } - - for (DataSourceProvider<?, ?> p : getProversId()) { - if (configClass.equals(p.getConfigClass()) && - serviceClass.equals(p.getServiceClass())) { - return (DataSourceProvider<C, S>) p; - } - } - return null; - } - - @SuppressWarnings("unchecked") - protected static <C extends DataSourceConfig, S extends DataSource> - DataSourceProvider<C, S> getProvider(C config, - Class<S> serviceClass) { - - if (config == null) { - throw new NullPointerException("config can not be null"); - } - - if (serviceClass == null) { - throw new NullPointerException("serviceClass can not be null"); - } - - Class<C> configClass = (Class<C>) config.getClass(); - return getProvider(configClass, serviceClass); - } - - protected static Set<DataSourceProvider<?, ?>> discover() { - Set<DataSourceProvider<?, ?>> detected; - detected = new HashSet<DataSourceProvider<?, ?>>(); - if (log.isDebugEnabled()) { - log.debug("init " + DataSourceFactory.class); - } - for (DataSourceProvider<?, ?> p : ServiceLoader.load(DataSourceProvider.class)) { - detected.add(p); - if (log.isDebugEnabled()) { - log.debug(t("observe.storage.message.provider.detected", p.getServiceClass().getName())); - } - } - - return Collections.unmodifiableSet(detected); - } - - /** - * Creates the config for an empty local storage. - * - * @param label label of storage - * @param dir directory of the database - * @param login login to connect ot the storage - * @param password password to connect ot the storage - * @return the instanciate config - */ -//FIXME -// public static H2DataSourceConfig newH2ConfigEmpty( -// String label, -// File dir, -// String login, -// char[] password) { -// H2DataSourceConfig config = newH2Config( -// label, -// CommonDataSourceConfigParam.LOGIN, login, -// CommonDataSourceConfigParam.PASSWORD, password, -// CommonDataSourceConfigParam.CREATION_MODE, CreationMode.EMPTY, -// H2DataSourceConfigParam.DIRECTORY, dir -// ); -// return config; -// } - - /** - * Creates the config for a new local storage loaded from the given {@code - * dump}. - * - * @param label label of storage - * @param dir directory of the database - * @param dump url of the dump to load - * @param login login to connect ot the storage - * @param password password to connect ot the storage - * @param canMigrate flag to migrate db if required - * @return the instanciate config - */ -//FIXME -// public static H2DataSourceConfig newH2ConfigFromDump( -// String label, -// File dir, -// URL dump, -// String login, -// char[] password, -// boolean canMigrate) { -// H2DataSourceConfig config = newH2Config( -// label, -// CommonDataSourceConfigParam.LOGIN, login, -// CommonDataSourceConfigParam.PASSWORD, password, -// CommonDataSourceConfigParam.CREATION_MODE, CreationMode.IMPORT_EXTERNAL_DUMP, -// H2DataSourceConfigParam.DUMP, dump, -// H2DataSourceConfigParam.DIRECTORY, dir, -// CommonDataSourceConfigParam.CAN_MIGRATE, canMigrate -// ); -// return config; -// } - - /** - * Creates the config for an existing local storage with migration if - * required. - * - * @param label label of storage - * @param dir directory of the database - * @param login login to connect ot the storage - * @param password password to connect ot the storage - * @param canMigrate flag to update database - * @return the instanciate config - */ -//FIXME -// public static H2DataSourceConfig newH2ConfigUseLocalStorage( -// String label, -// File dir, -// String login, -// char[] password, -// boolean canMigrate) { -// H2DataSourceConfig config = newH2Config( -// label, -// CommonDataSourceConfigParam.LOGIN, login, -// CommonDataSourceConfigParam.PASSWORD, password, -// H2DataSourceConfigParam.DIRECTORY, dir, -// CommonDataSourceConfigParam.CAN_MIGRATE, canMigrate -// ); -// return config; -// } - - /** - * Creates the config for an new local storage with a copy of the - * referentiel of local storage given his {@code importConfig} with - * migration if required. - * - * @param label label of storage - * @param dir directory of the database - * @param importConfig import service configuration - * @param login login to connect ot the storage - * @param password password to connect ot the storage - * @param canMigrate flag to allow migration - * @return the instanciate config - */ -//FIXME -// public static H2DataSourceConfig newH2ConfigImportLocalStorage( -// String label, -// File dir, -// H2DataSourceConfig importConfig, -// String login, -// char[] password, -// boolean canMigrate) { -// H2DataSourceConfig config = newH2Config( -// label, -// CommonDataSourceConfigParam.LOGIN, login, -// CommonDataSourceConfigParam.PASSWORD, password, -// CommonDataSourceConfigParam.CREATION_MODE, CreationMode.IMPORT_LOCAL_STORAGE, -// H2DataSourceConfigParam.DIRECTORY, dir, -// CommonDataSourceConfigParam.IMPORT_CONFIG, importConfig, -// CommonDataSourceConfigParam.CAN_MIGRATE, canMigrate -// ); -// return config; -// } - - /** - * Creates the config for an new local storage with a copy of the - * referentiel of remote storage given his {@code importConfig} with - * migration if required. - * - * @param label label of storage - * @param dir directory of the database - * @param importConfig import service configuration - * @param login login to connect ot the storage - * @param password password to connect ot the storage - * @param canMigrate flag to allow migration - * @return the instanciate config - */ -//FIXME -// public static H2DataSourceConfig newH2ConfigImportRemoteStorage( -// String label, -// File dir, -// PGDataSourceConfig importConfig, -// String login, -// char[] password, -// boolean canMigrate) { -// H2DataSourceConfig config = newH2Config( -// label, -// CommonDataSourceConfigParam.LOGIN, login, -// CommonDataSourceConfigParam.PASSWORD, password, -// CommonDataSourceConfigParam.CREATION_MODE, CreationMode.IMPORT_REMOTE_STORAGE, -// H2DataSourceConfigParam.DIRECTORY, dir, -// CommonDataSourceConfigParam.IMPORT_CONFIG, importConfig, -// CommonDataSourceConfigParam.CAN_MIGRATE, canMigrate -// ); -// return config; -// } - - /** - * Creates a configuration to connect to a remote dn. - * - * @param dbName storage label - * @param login login to connect remote db - * @param password password to connect remote db - * @param url url of remote db - * @param canMigrate flag to allow migration - * @return the new instanciated configuration - */ -//FIXME -// public static PGDataSourceConfig newPGConfig( -// String dbName, -// String login, -// char[] password, -// String url, -// boolean canMigrate) { -// -// PGDataSourceConfig config = newPGConfig( -// dbName, -// CommonDataSourceConfigParam.LOGIN, login, -// CommonDataSourceConfigParam.PASSWORD, password, -// PGDataSourceConfigParam.URL, url, -// CommonDataSourceConfigParam.CAN_MIGRATE, canMigrate -// ); -// -// return config; -// } -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceProvider.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceProvider.java deleted file mode 100644 index 405c6ab..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceProvider.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.business.db; - -import org.hibernate.dialect.Dialect; - -import java.sql.Driver; - -/** - * Le contrat d'un provider de source de données. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public interface DataSourceProvider<C extends DataSourceConfig, S extends DataSource> { - - /** @return le type de configuration que le provider peut fournir. */ - Class<C> getConfigClass(); - - /** @return le type de service que le provider peut fournir. */ - Class<S> getServiceClass(); - - /** @return le dialect hibernate utilisé */ - Class<? extends Dialect> getDialectClass(); - - /** @return le driver sql du service */ - Class<? extends Driver> getDriverClass(); - - /** @return la classe de migration */ -// Class<? extends AbstractDataSourceMigration> getMigrationClass(); - - /** @return les paramètres utilisables sur la configuration */ - DataSourceConfigParam[] getParams(); - - /** - * Pour créer une nouvelle configuration. - * - * @param label le libellé du service - * @param params les paramètres de la configuration - * @return la nouvelle configuration instanciée mais non initialisée. - */ - C newConfig(String label, Object... params); - - /** - * Pour créer un nouveau service à partir de sa configuration. - * <p/> - * Note: le service n'est pas ouvert. - * - * @param config la configuration du service - * @return le service instancié non ouvert. - */ - S newService(C config); -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/CommonDataSourceConfigParam.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/CommonDataSourceConfigParam.java deleted file mode 100644 index 3aa71f6..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/CommonDataSourceConfigParam.java +++ /dev/null @@ -1,128 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.business.db.constants; - -import fr.ird.observe.business.db.DataSourceConfig; -import fr.ird.observe.business.db.DataSourceConfigParam; -import fr.ird.observe.db.constantes.CreationMode; -import org.hibernate.cfg.Environment; -import org.nuiton.topia.migration.TopiaMigrationEngine; - -import java.util.Set; - -/** - * Les différents parametres communs a tout type de configuration. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.0 - */ -public enum CommonDataSourceConfigParam implements DataSourceConfigParam { - - /** le lastName d'utilisateur pour se connecter à la base */ - LOGIN( - "login", - Environment.USER, - String.class - ), - /** le mot de passe de l'utilisateur pour se connecter à la base */ - PASSWORD( - "password", - Environment.PASS, - char[].class - ), - /** un drapeau pour voir les requetes sql lors de la migration. */ - SHOW_MIGRATION_SQL( - TopiaMigrationEngine.MIGRATION_SHOW_SQL, - Boolean.class - ), - /** un drapeau pour voir la progression des requetes sql lors de la migration. */ - SHOW_MIGRATION_PROGRESSION( - TopiaMigrationEngine.MIGRATION_SHOW_PROGRESSION, - Boolean.class - ), - /** un drapeau pour autoriser les migrations. */ - CAN_MIGRATE( - "migrate", - Boolean.class - ), - /** - * le type de création de la base. - * <p/> - * Si on veut juste utiliser une base sans opération de création, on - * n'utilise pas ce paramètre. - */ - CREATION_MODE("creationMode", CreationMode.class), - - /** - * le service de persistance à utiliser en mode création pour importer un - * référentiel. - * <p/> - * Cette donnée sera utilisée uniquement si le mode de création est : - * <p/> - * {@link CreationMode#IMPORT_LOCAL_STORAGE} - * ou {@link CreationMode#IMPORT_REMOTE_STORAGE}. - */ - IMPORT_CONFIG("importConfig", DataSourceConfig.class), - /** - * le service de persistance à utiliser en mode création pour importer - * des données. - */ - IMPORT_DATA_CONFIG("importDataConfig", DataSourceConfig.class), - - /** - * Les ids à importer (si {@code null} alors on import tout). - */ - IMPORT_DATA_IDS("importDataIds", Set.class); - - private final String mapName; - - private final String propertyName; - - private final Class<?> type; - - CommonDataSourceConfigParam(String name, Class<?> type) { - this(name, name, type); - } - - CommonDataSourceConfigParam(String propertyName, - String mapName, - Class<?> type) { - this.mapName = mapName; - this.propertyName = propertyName; - this.type = type; - } - - @Override - public String getMapName() { - return mapName; - } - - @Override - public String getPropertyName() { - return propertyName; - } - - @Override - public Class<?> getType() { - return type; - } -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/ReportExecute.java b/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/ReportExecute.java index 2451881..8538cbe 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/ReportExecute.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/ReportExecute.java @@ -21,7 +21,6 @@ */ package fr.ird.observe.business.report.model; -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.db.ObserveSwingDataSource; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -82,7 +81,7 @@ public class ReportExecute { } public void populate(Report report, - String tripId) throws DataSourceException { + String tripId) { if (!checkDataSource(source)) { // source de donnee fermée @@ -94,7 +93,7 @@ public class ReportExecute { doPopulateVariables(tripId); } - public DataMatrix execute(Map<String, Object> variables) throws DataSourceException { + public DataMatrix execute(Map<String, Object> variables) { if (report == null) { @@ -208,7 +207,7 @@ public class ReportExecute { return true; } - protected void doPopulateVariables(String tripId) throws DataSourceException { + protected void doPopulateVariables(String tripId) { // on nettoye les univers de variables avant tout variablesUniverse.clear(); @@ -248,7 +247,7 @@ public class ReportExecute { // } } - protected void doPopulateRepeatVariables(Map<String, Object> variables) throws DataSourceException { + protected void doPopulateRepeatVariables(Map<String, Object> variables) { // on nettoye les univers de variables de répétition avant tout repeatVariablesUniverse.clear(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ObserveValidator.java b/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ObserveValidator.java index 621740d..91f5bde 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ObserveValidator.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ObserveValidator.java @@ -25,7 +25,7 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.util.ValueStack; import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataSourceFactory; + import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -117,7 +117,8 @@ public class ObserveValidator<B> extends SwingValidator<B> { throw new IllegalStateException( "pas de context d'application enregistré... utiliser la " + "methode " + - DataSourceFactory.class.getName() + + //FIXME +// DataSourceFactory.class.getName() + "#setApplicationContext(context)"); } dataContext = rootContext.getValidationContext(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationContext.java index 8bd8c2e..8c5f73d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationContext.java @@ -22,7 +22,8 @@ package fr.ird.observe.business.validation; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; + +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.AbstractObserveDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; @@ -52,7 +53,7 @@ public class ValidationContext { public static final String VALIDATION_TRANSACTION_NAME = "validation"; - protected DataSource dataSource; + protected ObserveSwingDataSource dataSource; //FIXME // protected TopiaContext tx; @@ -76,7 +77,7 @@ public class ValidationContext { cleanTransaction(); } - public DataSource getDataSource() { + public ObserveSwingDataSource getDataSource() { return dataSource; } @@ -134,12 +135,12 @@ public class ValidationContext { return dataContext; } - public void setDataSource(DataSource dataSource) { + public void setDataSource(ObserveSwingDataSource dataSource) { if (this.dataSource != null) { closeDataSource(); } if (log.isDebugEnabled()) { - log.debug("Attach data source " + (dataSource == null ? "null" : dataSource.getShortLabel())); + log.debug("Attach data source " + (dataSource == null ? "null" : dataSource.getLabel())); } this.dataSource = dataSource; } @@ -255,7 +256,7 @@ public class ValidationContext { } //FIXME -// public TopiaContext getTx() throws DataSourceException { +// public TopiaContext getTx() { // if (tx == null) { // if (dataSource != null) { // if (log.isInfoEnabled()) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java index a176494..3f26531 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java @@ -23,8 +23,6 @@ package fr.ird.observe.ui.actions; */ import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.ObserveTechnicalException; -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.configuration.ObserveSwingApplicationConfigOption; import fr.ird.observe.db.ObserveSwingDataSource; @@ -43,14 +41,8 @@ import org.nuiton.config.ConfigOptionDef; import org.nuiton.decorator.Decorator; import org.nuiton.decorator.JXPathDecorator; -import javax.swing.AbstractAction; -import javax.swing.DefaultCellEditor; -import javax.swing.DefaultListCellRenderer; -import javax.swing.Icon; -import javax.swing.JComboBox; -import javax.swing.JList; -import javax.swing.JTable; -import java.awt.Component; +import javax.swing.*; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.MouseEvent; import java.util.EventObject; @@ -100,11 +92,7 @@ public class ShowConfigAction extends AbstractAction { ObserveConfigUIBuilder helper; - try { - helper = buildUI(config, dataSource); - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not load some data", e); - } + helper = buildUI(config, dataSource); helper.buildUI(ui, "observe.config.category.directories"); @@ -114,7 +102,7 @@ public class ShowConfigAction extends AbstractAction { } - protected ObserveConfigUIBuilder buildUI(ObserveSwingApplicationConfig config, ObserveSwingDataSource dataSource) throws DataSourceException { + protected ObserveConfigUIBuilder buildUI(ObserveSwingApplicationConfig config, ObserveSwingDataSource dataSource) { //FIXME // SpeciesListTableCellEditor editor; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java index e67bd3a..586f716 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java @@ -25,8 +25,8 @@ import fr.ird.observe.ObserveRunner; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.BinderService; import fr.ird.observe.business.SendMessageAble; -import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; + + import fr.ird.observe.business.gps.GPSService; import fr.ird.observe.business.validation.ValidationService; import fr.ird.observe.db.ObserveSwingDataSource; @@ -186,9 +186,9 @@ public class AdminTabUIHandler implements SendMessageAble { return WizardState.FAILED; } - protected void replicateData(DataSource source, - DataSource target, - String... tripIds) throws DataSourceException { + protected void replicateData(ObserveSwingDataSource source, + ObserveSwingDataSource target, + String... tripIds) { //FIXME // ReplicationService service = getReplicationService(); // if (tripIds == null || tripIds.length == 0) { @@ -202,31 +202,31 @@ public class AdminTabUIHandler implements SendMessageAble { // } } - protected void replicateReferentiel(DataSource source, - DataSource target) throws DataSourceException { + protected void replicateReferentiel(ObserveSwingDataSource source, + ObserveSwingDataSource target) { //FIXME // getReplicationService().replicateReferentiel(source, target); } //FIXME -// protected TopiaContext beginTransaction(DataSource source, String methodName) throws DataSourceException { +// protected TopiaContext beginTransaction(DataSource source, String methodName) { // TopiaContext ctxt = source.beginTransaction(methodName); // return ctxt; // } //FIXME -// protected void commitTransaction(DataSource source, TopiaContext tx, String methodName) throws DataSourceException { +// protected void commitTransaction(DataSource source, TopiaContext tx, String methodName) { // source.commitTransaction(tx, methodName); // } //FIXME -// protected void closeTransaction(DataSource source, TopiaContext tx, String methodName) throws DataSourceException { +// protected void closeTransaction(DataSource source, TopiaContext tx, String methodName) { // source.closeTransaction(tx, methodName); // } //FIXME -// protected void rollbackTransaction(DataSource source, TopiaContext tx, String methodName) throws DataSourceException { +// protected void rollbackTransaction(DataSource source, TopiaContext tx, String methodName) { // source.rollbackTransaction(tx, methodName); // } @@ -371,9 +371,9 @@ public class AdminTabUIHandler implements SendMessageAble { // } } - protected void removeStorageServiceLogger(DataSource service) { -// if (service.containsObserveSwingDataSourceListener(serviceLogger)) { -// service.removeObserveSwingDataSourceListener(serviceLogger); + protected void removeStorageServiceLogger(ObserveSwingDataSource service) { +// if (service.containsDataSourceListener(serviceLogger)) { +// service.removeDataSourceListener(serviceLogger); // } } 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 f22fc0c..e5cbec6 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 @@ -444,7 +444,7 @@ public class ValidateUIHandler extends AdminTabUIHandler { //FIXME // protected void validateReferentiel(ValidationMessageDetector detector, // TopiaContext ctxt, -// DataSelectionModel dataModel) throws DataSourceException, TopiaException { +// DataSelectionModel dataModel), TopiaException { // // DataService dataService = getDataService(); // Set<Class<?>> classes = dataModel.getSelectedReferentiel(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx index c7106cc..6156c05 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx @@ -35,7 +35,7 @@ <import> fr.ird.observe.business.db.DataContext - fr.ird.observe.business.db.DataSource + fr.ird.observe.db.ObserveSwingDataSource fr.ird.observe.configuration.ObserveSwingApplicationConfig fr.ird.observe.ObserveSwingApplicationContext fr.ird.observe.ui.actions.shared.GoUpUIAction @@ -61,8 +61,8 @@ initializer='getContextValue(SwingValidatorMessageTableModel.class)'/> <!--FIXME a supprimer a la fin de la migration de service --> - <DataSource id='dataSource' - initializer='null'/> + <ObserveSwingDataSource id='dataSource' + initializer='ObserveSwingApplicationContext.get().getDataSource()'/> <DataContext id='dataContext' javaBean='getContextValue(DataContext.class)'/> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java index c33bf06..5a40d9e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java @@ -23,7 +23,8 @@ package fr.ird.observe.ui.content; */ import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; + +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdDto; import jaxx.runtime.JAXXObject; import jaxx.runtime.swing.BlockingLayerUI; @@ -49,7 +50,7 @@ public interface ObserveContentUI<E extends IdDto> extends JAXXObject { DataContext getDataContext(); - DataSource getDataSource(); + ObserveSwingDataSource getDataSource(); SwingValidatorMessageTableModel getErrorTableModel(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java index 06e68bb..cc1e8ac 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java @@ -24,9 +24,9 @@ package fr.ird.observe.ui.content.list.impl.longline; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; + import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; 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 13e2828..8fd2fc8 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 @@ -265,7 +265,7 @@ public abstract class ContentOpenableUIHandler<E extends OpenableDto> extends Co //FIXME // protected final void obtainChildPosition(E bean, // DataService dataService, -// DataSource dataSource) throws DataSourceException { +// DataSource dataSource) { // // String containerId = getSelectedParentId(); // diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java index 1209507..c753cc2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.business.db.DataSourceException; + import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.table.ContentTableUIInitializer; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index 585c342..9a6abe7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -297,7 +297,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip //FIXME // @Override -// protected TripLongline loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { +// protected TripLongline loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) { // // TripLongline tripLongline = super.loadEditBean(mode, dataContext, dataService, dataSource); // diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java index aba9b82..91fd1c6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java @@ -23,6 +23,7 @@ package fr.ird.observe.ui.content.table.impl.longline; */ import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.HooksCompositionDto; 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 33f070a..c0f7776 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,10 +26,10 @@ 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.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.business.ObserveTechnicalException; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDtos; import fr.ird.observe.services.dto.longline.TdrDto; @@ -50,13 +50,11 @@ import org.nuiton.jaxx.runtime.JaxxFileChooser; import org.nuiton.validator.NuitonValidatorScope; import javax.sql.rowset.serial.SerialBlob; -import javax.swing.JComponent; -import javax.swing.JOptionPane; -import javax.swing.JTable; +import javax.swing.*; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; -import java.awt.Component; +import java.awt.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; @@ -261,7 +259,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineDto, TdrDto> //FIXME // @Override -// protected SetLongline loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { +// protected SetLongline loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) { // // SetLongline setLongline = super.loadEditBean(mode, dataContext, dataService, dataSource); // diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index 93ad580..78ba65a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -295,7 +295,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei //FIXME // @Override -// protected TripSeine loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { +// protected TripSeine loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) { // // TripSeine tripSeine = super.loadEditBean(mode, dataContext, dataService, dataSource); // diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java index 4c3821f..477693c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -208,7 +208,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineDto, // protected SetSeine loadEditBean(ContentMode mode, // DataContext dataContext, // DataService dataService, -// DataSource dataSource) throws DataSourceException { +// DataSource dataSource) { // // List<Species> speciesList; // diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java index 47cc1c1..698f71e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.table.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSourceException; + import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.referential.SexDto; @@ -127,7 +127,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam // protected NonTargetSample loadEditBean(ContentMode mode, // DataContext dataContext, // DataService dataService, -// DataSource dataSource) throws DataSourceException { +// DataSource dataSource) { // // List<Species> speciess; // @@ -176,7 +176,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam // } @Override - protected boolean prepareSave(NonTargetSampleDto bean, List<NonTargetLengthDto> objets) throws DataSourceException { + protected boolean prepareSave(NonTargetSampleDto bean, List<NonTargetLengthDto> objets) { boolean withLengths = !objets.isEmpty(); @@ -205,7 +205,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam //FIXME // @Override -// protected void doPersist(NonTargetSample bean, DataService dataService, DataSource dataSource) throws DataSourceException { +// protected void doPersist(NonTargetSample bean, DataService dataService, DataSource dataSource) { // // if (bean.getTopiaId() != null && bean.isNonTargetLengthEmpty()) { // diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java index a429375..1a4d8f2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java @@ -71,7 +71,7 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineDto, //FIXME // @Override -// protected SetSeine loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { +// protected SetSeine loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) { // // List<Species> speciesList; // diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java index 354e09b..f8b90e8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.content.table.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; @@ -137,7 +136,7 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineDto, Tar // protected SetSeine loadEditBean(ContentMode mode, // DataContext dataContext, // DataService dataService, -// DataSource dataSource) throws DataSourceException { +// DataSource dataSource) { // // List<Species> speciesList; // List<WeightCategory> categorieList; @@ -231,7 +230,7 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineDto, Tar // } @Override - protected boolean prepareSave(SetSeineDto bean, List<TargetCatchDto> objets) throws DataSourceException { + protected boolean prepareSave(SetSeineDto bean, List<TargetCatchDto> objets) { // on recupere les speciess acceptables pour des echantillonnages // i.e une species d'un targetCatch diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java index 441ffec..dd5146a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.content.table.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; @@ -191,7 +190,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineD // protected SetSeine loadEditBean(ContentMode mode, // DataContext dataContext, // DataService dataService, -// DataSource dataSource) throws DataSourceException { +// DataSource dataSource) { // // List<WeightCategory> categorieList; // List<ReasonForDiscard> reasonForDiscardList; @@ -296,7 +295,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineD } @Override - protected boolean prepareSave(SetSeineDto bean, List<TargetCatchDto> objets) throws DataSourceException { + protected boolean prepareSave(SetSeineDto bean, List<TargetCatchDto> objets) { // on recupere les speciess acceptables pour des echantillonnages // i.e une species d'un targetDiscarded montee sur le pont diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java index 66da3e7..0c94b6e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -23,8 +23,8 @@ package fr.ird.observe.ui.content.table.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; + + import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.referential.SpeciesDto; @@ -137,7 +137,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto // protected TargetSample loadEditBean(ContentMode mode, // DataContext dataContext, // DataService dataService, -// DataSource dataSource) throws DataSourceException { +// DataSource dataSource) { // // String setId = dataContext.getSelectedSetId(); // @@ -182,7 +182,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto // } @Override - protected boolean prepareSave(TargetSampleDto bean, List<TargetLengthDto> objets) throws DataSourceException { + protected boolean prepareSave(TargetSampleDto bean, List<TargetLengthDto> objets) { boolean withLengths = !objets.isEmpty(); @@ -218,7 +218,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto //FIXME // @Override -// protected void doPersist(TargetSample bean, DataService dataService, DataSource dataSource) throws DataSourceException { +// protected void doPersist(TargetSample bean, DataService dataService, DataSource dataSource) { // // if (bean.getTopiaId() != null && bean.isTargetLengthEmpty()) { // 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 7a47fa6..a83ae3d 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 @@ -29,8 +29,10 @@ import fr.ird.observe.ObserveRunner; import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.ObserveTextGenerator; -import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; +import fr.ird.observe.services.service.DatabaseNotFoundException; +import fr.ird.observe.ui.DecoratorService; +import fr.ird.observe.business.util.SecurityModel; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.db.constantes.ConnexionStatus; @@ -708,7 +710,6 @@ public class StorageUIHandler { ObserveSwingApplicationContext.get().getDecoratorService(); return decoratorService; } - protected void computeBackupReport(SelectDataUI stepUI, StorageUIModel model, StringBuilder sb) { @@ -802,7 +803,7 @@ public class StorageUIHandler { addCloseTag("ul", sb); } - protected void computeImportDataReport(StorageUIModel model, StringBuilder sb) throws DataSourceException { + protected void computeImportDataReport(StorageUIModel model, StringBuilder sb) { //FIXME // DataSelectionModel dataModel = model.getSelectDataModel(); @@ -948,17 +949,26 @@ public class StorageUIHandler { } - protected void checkImportDbVersion(StorageUIModel model, DataSource dataSource) throws DataSourceException { + protected void checkImportDbVersion(StorageUIModel model, ObserveSwingDataSource dataSource) { + //FIXME try { - dataSource.doOpen(); + dataSource.open(); - Version importServiceDbVersion = dataSource.getDbVersion(); + Version importServiceDbVersion = dataSource.getVersion(); Version currentDbVersion = model.getModelVersion(); if (importServiceDbVersion.before(currentDbVersion)) { throw new IllegalStateException("Import db version (" + importServiceDbVersion + ") is not compatible with the current database version (" + currentDbVersion + ")"); } + } catch (DatabaseConnexionNotAuthorizedException e) { + if (log.isErrorEnabled()) { + log.error("", e); + } + } catch (DatabaseNotFoundException e) { + if (log.isErrorEnabled()) { + log.error("", e); + } } finally { - dataSource.doClose(false); + dataSource.close(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java index fa83798..17d982d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java @@ -42,7 +42,7 @@ public class ActivityLonglineNode extends DtoNodeSupport<ActivityLonglineDto> { //FIXME // @Override -// protected ActivityLonglineDto getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected ActivityLonglineDto getEntity(DataService dataService, DataSource source) { // return dataService.getActivityLonglineStub(source, id); // } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java index c8332da..e4abe09 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java @@ -41,7 +41,7 @@ public class ActivitySeineNode extends DtoNodeSupport<ActivitySeineDto> { } // @Override -// protected ActivitySeine getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected ActivitySeine getEntity(DataService dataService, DataSource source) { // return dataService.getActivitySeineStub(source, id); // } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java index 1067ca8..bf25cce 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java @@ -42,7 +42,7 @@ public class FloatingObjectSeineNode extends DtoNodeSupport<FloatingObjectDto> { //FIXME // @Override -// protected FloatingObjectDto getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected FloatingObjectDto getEntity(DataService dataService, DataSource source) { // return dataService.getFloatinObjectStub(source, id); // } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java index ecc7df7..83e8a5b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java @@ -40,7 +40,7 @@ public class RouteSeineNode extends DtoNodeSupport<RouteDto> { } // @Override -// protected Route getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected Route getEntity(DataService dataService, DataSource source) { // return dataService.getRouteStub(source, id); // } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java index a881387..5827a9d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java @@ -42,7 +42,7 @@ public class SetLonglineNode extends DtoNodeSupport<SetLonglineDto> { //FIXME // @Override -// protected SetLongline getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected SetLongline getEntity(DataService dataService, DataSource source) { // return (SetLongline) dataService.loadEntity(source, id, true); // } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java index 7c97b8e..3e6e259 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java @@ -42,7 +42,7 @@ public class SetSeineNode extends DtoNodeSupport<SetSeineDto> { //FIXME // @Override -// protected SetSeine getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected SetSeine getEntity(DataService dataService, DataSource source) { // return (SetSeine) dataService.loadEntity(source, id, true); // } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java index 2297ba1..2d4fbc6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java @@ -41,7 +41,7 @@ public class TripLonglineNode extends DtoNodeSupport<TripLonglineDto> { //FIXME // @Override -// protected TripLongline getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected TripLongline getEntity(DataService dataService, DataSource source) { // return dataService.getTripLonglineStub(source, id); // } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java index ff3e2f7..b18213c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java @@ -45,7 +45,7 @@ public class TripSeineNode extends DtoNodeSupport<TripSeineDto> { } // @Override -// protected TripSeine getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected TripSeine getEntity(DataService dataService, DataSource source) { // return dataService.getTripSeineStub(source, id); // } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java index 7ac148c..8e8754a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java @@ -22,7 +22,8 @@ package fr.ird.observe.ui.tree.actions; * #L% */ -import fr.ird.observe.business.db.DataSource; + +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import org.apache.commons.logging.Log; @@ -51,13 +52,13 @@ public class ChangeTripProgramActionListener implements ActionListener { //FIXME // private final DataService dataService; - private final DataSource dataSource; + private final ObserveSwingDataSource dataSource; public ChangeTripProgramActionListener(ObserveTreeHelper treeHelper, //FIXME // DataService dataService, Object dataService, - DataSource dataSource, + ObserveSwingDataSource dataSource, String tripId, String programId) { this.tripId = tripId; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java index c3e45f0..07f9e3d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.tree.loadors; * #L% */ -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; @@ -91,7 +90,7 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<IdD @Override public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, - NavDataProvider dataService) throws DataSourceException { + NavDataProvider dataService) { //FIXME // List<String> result = new ArrayList<String>(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java index e90bab7..d299ecc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.business.db.DataSourceException; + import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.tree.ObserveNode; @@ -54,7 +54,7 @@ public class FloatingObjectNodeChildLoador extends AbstractNodeChildLoador<IdDto @Override public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, - NavDataProvider dataService) throws DataSourceException { + NavDataProvider dataService) { //FIXME // List<String> result = new ArrayList<String>(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java index d4395cc..8517b48 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.business.db.DataSourceException; + import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.tree.ObserveNode; @@ -71,7 +71,7 @@ public class ReferenceCommonNodeChildLoador extends AbstractNodeChildLoador<IdDt @Override public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, - NavDataProvider dataProvider) throws DataSourceException { + NavDataProvider dataProvider) { //FIXME // List<Class> result = new ArrayList<Class>(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java index 244aa7e..e9f15ba 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.business.db.DataSourceException; + import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.UIHelper; @@ -79,7 +79,7 @@ public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<Id @Override public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, - NavDataProvider dataProvider) throws DataSourceException { + NavDataProvider dataProvider) { List<Class> result = new ArrayList<Class>(); //FIXME diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java index 09c1e67..c6a8377 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.business.db.DataSourceException; + import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.UIHelper; @@ -71,7 +71,7 @@ public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto @Override public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, - NavDataProvider dataProvider) throws DataSourceException { + NavDataProvider dataProvider) { List<Class> result = new ArrayList<Class>(); //FIXME diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java index b418489..310874e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.tree.loadors; * #L% */ -import fr.ird.observe.business.db.DataSourceException; + import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.tree.ObserveNode; @@ -57,7 +57,7 @@ public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<IdDto> { @Override public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, - NavDataProvider dataProvider) throws DataSourceException { + NavDataProvider dataProvider) { // FIXME // List<String> result = new ArrayList<String>(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java index 5a3a559..43f4c03 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.business.db.DataSourceException; + import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.seine.SetSeineDto; @@ -63,7 +63,7 @@ public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//F @Override public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, - NavDataProvider dataProvider) throws DataSourceException { + NavDataProvider dataProvider) { List<String> result = new ArrayList<String>(); result.add(SetSeineSchoolEstimateDto.PROPERTY_SCHOOL_ESTIMATE); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.