This is an automated email from the git hooks/post-receive script. New commit to branch feature/8383_importer_une_sauvegarde_apres_fermeture_connexion in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 4a9fc8dd7d64ab6c423db096305fb6a200dac1d3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 16 18:15:25 2016 +0200 fix merge --- .../ird/observe/ui/storage/StorageUIHandler.java | 70 ++++++++++------------ .../observe-application-swing_en_GB.properties | 1 + .../observe-application-swing_es_ES.properties | 1 + .../observe-application-swing_fr_FR.properties | 1 + 4 files changed, 36 insertions(+), 37 deletions(-) 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 b8e8f52..4c4b19d 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 @@ -52,7 +52,6 @@ import fr.ird.observe.ui.storage.tabs.DataSelectionModel; import fr.ird.observe.ui.storage.tabs.RolesTableModel; import fr.ird.observe.ui.storage.tabs.SecurityModel; import fr.ird.observe.ui.storage.tabs.StorageTabUI; -import jaxx.runtime.JAXXContext; import jaxx.runtime.context.DefaultApplicationContext.AutoLoad; import jaxx.runtime.swing.wizard.WizardUILancher; import org.apache.commons.io.FileUtils; @@ -91,7 +90,7 @@ public class StorageUIHandler { * * Le service ne sera pas ouvert. * - * @param model le modèle de la source de données + * @param model le modèle de la source de données * @return le service de persistance initialisé mais non ouvert. */ public ObserveSwingDataSource newDataSourceFromModel( @@ -104,7 +103,7 @@ public class StorageUIHandler { case USE_LOCAL: configuration = model.toH2StorageConfig(t("observe.storage.label.local")); - dataSource = ObserveSwingApplicationContext.get().newDataSource(configuration); + dataSource = ObserveSwingApplicationContext.get().getDataSourcesManager().newDataSource(configuration); dataSource.addObserveSwingDataSourceListener( new ObserveSwingDataSourceListenerAdapter() { @@ -253,7 +252,7 @@ public class StorageUIHandler { if (StorageStep.SELECT_DATA == newStep && mustRecompute) { if (ObstunaAdminAction.CREATE == ui.getModel().getAdminAction() - && (model.getSelectDataModel() == null || model.getSelectDataModel().isEmpty())) { + && (model.getSelectDataModel() == null || model.getSelectDataModel().isEmpty())) { // récupération des données possibles à importer initSelectData(ui); @@ -296,7 +295,7 @@ public class StorageUIHandler { } }; } - ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getObserveMainUI(); + ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getMainUI(); if (mainUI == null) { if (log.isWarnEnabled()) { log.warn("Launch standalone apply action " + action); @@ -332,8 +331,7 @@ public class StorageUIHandler { /** * Utiliser le storage defini dans le modèle donné. * - * @param context le context applicatif - * @param model le model++ du storage a creer ou utiliser + * @param model le model++ du storage a creer ou utiliser */ public void doChangeStorage(StorageUIModel model) { ObserveSwingApplicationContext observeContext = ObserveSwingApplicationContext.get(); @@ -343,7 +341,7 @@ public class StorageUIHandler { // faut-il detruire la base locale ? boolean destroyLocalBase = config.isLocalStorageExist() && - model.getDbMode() == DbMode.CREATE_LOCAL; + model.getDbMode() == DbMode.CREATE_LOCAL; if (log.isDebugEnabled()) { log.debug(">>> should destroy local db ? " + destroyLocalBase); @@ -453,7 +451,7 @@ public class StorageUIHandler { } // suppression du storage local - if (localDataSource != null && localDataSource != localDataSource) { + if (localDataSource != null && localDataSource != currentDataSource) { // ce cas peut arriver lorsque l'on fait juste une backup // sans vouloir supprimer la base locale if (log.isDebugEnabled()) { @@ -484,8 +482,8 @@ public class StorageUIHandler { } - observeContext.setDataSource(currentDataSource); - observeContext.prepareMainStorage(currentDataSource); + observeContext.getDataSourcesManager().setMainDataSource(currentDataSource); + observeContext.prepareMainStorage(currentDataSource, true); if (model.getDbMode() == DbMode.CREATE_LOCAL) { @@ -510,10 +508,9 @@ public class StorageUIHandler { } config.setLocalStorageExist(false); - observeContext.setDataSource(null); - + observeContext.getDataSourcesManager().setMainDataSource(null); - throw e; + throw e; } } else { // ouverture du nouveau storage @@ -521,7 +518,7 @@ public class StorageUIHandler { } if (DbMode.CREATE_LOCAL.equals(model.getDbMode()) - && (CreationMode.IMPORT_REMOTE_STORAGE.equals(model.getCreationMode()) || CreationMode.IMPORT_SERVER_STORAGE.equals(model.getCreationMode())) + && (CreationMode.IMPORT_REMOTE_STORAGE.equals(model.getCreationMode()) || CreationMode.IMPORT_SERVER_STORAGE.equals(model.getCreationMode())) && config.isLocalStorageExist()) { // si on a creer la base locale a partir d'un import d'une base // distante, on sauvegarde la base locale comme dump initial @@ -530,16 +527,14 @@ public class StorageUIHandler { if (f.exists()) { // on supprime le dump sql de la base embarquée if (!f.delete()) { - throw new IllegalStateException("could not delete " + - f); + throw new IllegalStateException("could not delete " + f); } } if (log.isInfoEnabled()) { - log.info(">>> create initial dump with " + localDataSource + - " in " + f); + log.info(">>> create initial dump with " + localDataSource + " in " + f); } try { - SqlScriptProducerService dumpProducerService = observeContext.newService(SqlScriptProducerService.class); + SqlScriptProducerService dumpProducerService = observeContext.getMainDataSourceServicesProvider().newSqlScriptProducerService(); backupLocalDatabase(dumpProducerService, f); config.setInitialDumpExist(true); } catch (Exception e) { @@ -552,7 +547,7 @@ public class StorageUIHandler { } if (model.isStoreRemoteConfig()) { - storeRemoteConfig(context, model); + storeRemoteConfig(model); } } catch (Exception ex) { @@ -565,11 +560,10 @@ public class StorageUIHandler { * Sauvegarder dans la configuration de l'application le paramétrage de la * source de données distante donnée. * - * @param context le context applicatif - * @param model le model de la source de données + * @param model le model de la source de données */ - public void storeRemoteConfig(JAXXContext context, StorageUIModel model) { - ObserveSwingApplicationConfig config = context.getContextValue(ObserveSwingApplicationConfig.class); + public void storeRemoteConfig(StorageUIModel model) { + ObserveSwingApplicationConfig config = ObserveSwingApplicationContext.get().getConfig(); // on sauvegarde dans le parametrage dans la configuration de // l'application @@ -597,8 +591,9 @@ public class StorageUIHandler { /** * Effectue une sauvegarde de la base locale vers le fichier choisi. + * * @param dumpProducerService le service de dump - * @param dst le fichier de sauvegarde + * @param dst le fichier de sauvegarde */ public void backupLocalDatabase(SqlScriptProducerService dumpProducerService, File dst) { if (dst == null) { @@ -609,13 +604,13 @@ public class StorageUIHandler { log.debug(dst); } - SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addSchema().addReferential().addAllData(); - byte[] dataDump = dumpProducerService.produceSqlScript(request); + AddSqlScriptProducerRequest request = AddSqlScriptProducerRequest.forH2().addSchema().addReferential().addAllData(); + byte[] dataDump = dumpProducerService.produceAddSqlScript(request); try (FileOutputStream outputStream = new FileOutputStream(dst)) { outputStream.write(dataDump); - } catch (Exception e) { + } catch (Exception e) { UIHelper.handlingError(e); } } @@ -628,15 +623,16 @@ public class StorageUIHandler { * marees}. * * <b>Note:</b> Si ce paramètre vaut {@code null}, on export tout. - * @param dataSource la source de donnée qui encapsule la base locale - * @param dst le fichier de sauvegarde - * @param trips les marees a exporter (si {@code null} on exporte tout) + * + * @param dataSource la source de donnée qui encapsule la base locale + * @param dst le fichier de sauvegarde + * @param trips les marees a exporter (si {@code null} on exporte tout) */ public void backupLocalDatabase(ObserveSwingDataSource dataSource, File dst, Set<DataReference> trips) { - SqlScriptProducerService dumpService = dataSource.newService(SqlScriptProducerService.class); + SqlScriptProducerService dumpService = dataSource.newSqlScriptProducerService(); if (trips == null) { @@ -662,8 +658,8 @@ public class StorageUIHandler { ImmutableSet<String> tripIds = ImmutableSet.copyOf(Iterables.transform(trips, DataReference.getIdFunction())); - SqlScriptProducerRequest request = SqlScriptProducerRequest.forH2().addSchema().addReferential().addDataIds(tripIds); - byte[] dump = dumpService.produceSqlScript(request); + AddSqlScriptProducerRequest request = AddSqlScriptProducerRequest.forH2().addSchema().addReferential().dataIdsToAdd(tripIds); + byte[] dump = dumpService.produceAddSqlScript(request); try (FileOutputStream fileOutputStream = new FileOutputStream(dst)) { @@ -783,11 +779,11 @@ public class StorageUIHandler { case USE_REMOTE: ObserveDataSourceConfigurationTopiaPG pgConfig = model.getPgConfig(); - dataSource = ObserveSwingApplicationContext.get().newDataSource(pgConfig); + dataSource = ObserveSwingApplicationContext.get().getDataSourcesManager().newDataSource(pgConfig); break; case USE_SERVER: ObserveDataSourceConfigurationRest restConfig = model.getRestConfig(); - dataSource = ObserveSwingApplicationContext.get().newDataSource(restConfig); + dataSource = ObserveSwingApplicationContext.get().getDataSourcesManager().newDataSource(restConfig); } diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index 3622106..75b2e23 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -142,6 +142,7 @@ observe.action.stop.h2.web.server= observe.action.stop.h2.web.server.tip= observe.action.stop.server.mode= observe.action.stop.server.mode.tip= +observe.action.storage.applyAction= observe.action.test.remote=Test connexion observe.action.test.remote.tip=Click here to validate remote connexion observe.actions.config.step= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index 956e92f..1afbe82 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -142,6 +142,7 @@ observe.action.stop.h2.web.server=Terminar modo servidor Web (H2) observe.action.stop.h2.web.server.tip=Parar el servidor web H2 observe.action.stop.server.mode=Terminar modo servidor observe.action.stop.server.mode.tip=Parar el modo servidor de la base local +observe.action.storage.applyAction= observe.action.test.remote=Comprobar la conexión observe.action.test.remote.tip=Pulsar para comprobar la conexión con el servidor remoto observe.actions.config.step= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index d30fb18..e32dfff 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -142,6 +142,7 @@ observe.action.stop.h2.web.server=Arrêter le serveur web observe.action.stop.h2.web.server.tip=Arrêter le serveur web H2 observe.action.stop.server.mode=Arrêter le mode serveur observe.action.stop.server.mode.tip=Arrêter le mode serveur de la base locale +observe.action.storage.applyAction=Appliquer observe.action.test.remote=Valider la connexion observe.action.test.remote.tip=Cliquer pour valider la connexion au serveur distant observe.actions.config.step=Configuration -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.