[Observe-commits] 16/16: fix cherry-pick

15 Dec 2016

This is an automated email from the git hooks/post-receive script.

New commit to branch develop in repository observe.

See https://gitlab.nuiton.org/codelutin/observe.git

commit 40649a15584c08dd41c1375c48f1f3f3bbc56b77
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Thu Dec 15 20:32:16 2016 +0100

    fix cherry-pick
---
 .../application/swing/db/ObserveSwingDataSource.java      |  3 ---
 .../application/swing/ui/ObserveMainUIInitializer.java    | 15 +++++++++------
 .../swing/ui/actions/menu/storage/CloseStorageAction.java |  3 ++-
 .../swing/ui/admin/synchronize/data/DataSynchroModel.java |  5 ++---
 .../referential/ng/ReferentialSynchroModel.java           |  1 -
 .../application/swing/ui/content/ContentUIManager.java    |  4 ----
 .../application/swing/ui/storage/StorageUILauncher.java   |  5 +----
 7 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java b/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java
index 4bb8f63..a185587 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java
@@ -60,10 +60,7 @@ import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException;
 import fr.ird.observe.services.service.DatabaseDestroyNotAuthorizedException;
 import fr.ird.observe.services.service.DatabaseNotFoundException;
 import fr.ird.observe.services.service.LastUpdateDateService;
-import fr.ird.observe.services.service.ObserveReferentialCache;
 import fr.ird.observe.services.service.PingService;
-import fr.ird.observe.services.service.ReferentialService;
-import fr.ird.observe.services.service.SqlScriptProducerService;
 import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService;
 import fr.ird.observe.services.service.actions.report.ReportService;
 import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java
index 29c8057..daac71c 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java
@@ -21,6 +21,7 @@
  */
 package fr.ird.observe.application.swing.ui;
 
+import fr.ird.observe.application.swing.ObserveRunner;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig;
 import fr.ird.observe.application.swing.db.DataContext;
@@ -221,17 +222,19 @@ public class ObserveMainUIInitializer {
             }
         }
 
-        // on recherche l'ui (voir si elle existe déjà)
-        ContentUI<?, ?> content = manager.getContent(uiClass);
-
-        if (content == null) {
-
-            content = manager.createContent(uiClass);
+        ContentUI<?, ?> previousSelectedContent = manager.getSelectedContentUI();
+        if (previousSelectedContent != null) {
+            manager.removeSelectedContentUI();
         }
 
+        // on recherche l'ui (voir si elle existe déjà)
+        ContentUI<?, ?> content = manager.createContent(uiClass);
+
         // on ouvre l'écran
         manager.openContent(content);
 
+        ObserveRunner.cleanMemory();
+
         if (focusOnNavigation) SwingUtilities.invokeLater(focusOwner::requestFocusInWindow);
     }
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/CloseStorageAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/CloseStorageAction.java
index 9d5384a..772d4c4 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/CloseStorageAction.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/CloseStorageAction.java
@@ -1,4 +1,4 @@
-package fr.ird.observe.application.swing.ui.actions;
+package fr.ird.observe.application.swing.ui.actions.menu.storage;
 
 /*
  * #%L
@@ -25,6 +25,7 @@ package fr.ird.observe.application.swing.ui.actions;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.db.ObserveSwingDataSource;
 import fr.ird.observe.application.swing.ui.ObserveMainUI;
+import fr.ird.observe.application.swing.ui.actions.AbstractUIAction;
 import jaxx.runtime.SwingUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java
index fd607f2..d509b70 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java
@@ -48,7 +48,6 @@ public class DataSynchroModel extends AdminActionModel {
 
     public static final String LEFT_SOURCE_PROPERTY_NAME = "leftSource";
     public static final String RIGHT_SOURCE_PROPERTY_NAME = "rightSource";
-//    public static final String TASKS_PROPERTY_NAME = "tasks";
 
     public static final String LEFT_SELECTION_MODEL_CHANGED_PROPERTY_NAME = "leftSelectionModelChanged";
     public static final String RIGHT_SELECTION_MODEL_CHANGED_PROPERTY_NAME = "rightSelectionModelChanged";
@@ -88,8 +87,8 @@ public class DataSynchroModel extends AdminActionModel {
     @Override
     public void destroy() {
         super.destroy();
-        leftSelectionDataModel.destroy();
-        rightSelectionDataModel.destroy();
+        leftSelectionDataModel = null;
+        rightSelectionDataModel = null;
         tasks.clear();
         leftSource = null;
         rightSource = null;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java
index 102f62d..b4f2126 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java
@@ -61,7 +61,6 @@ public class ReferentialSynchroModel extends AdminActionModel {
 
     public static final String LEFT_SOURCE_PROPERTY_NAME = "leftSource";
     public static final String RIGHT_SOURCE_PROPERTY_NAME = "rightSource";
-    public static final String TASKS_PROPERTY_NAME = "tasks";
     public static final String SYNCHRONIZE_MODE_PROPERTY_NAME = "synchronizeMode";
     public static final String RIGHT_TREE_MODEL_PROPERTY_NAME = "rightTreeModel";
     public static final String LEFT_TREE_MODEL_PROPERTY_NAME = "lefttTreeModel";
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java
index 1c18476..c1b6692 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java
@@ -79,9 +79,6 @@ public class ContentUIManager {
 
         String constraints = uiClass.getName();
 
-        if (getLayout().contains(constraints)) {
-            throw new IllegalStateException("Already existing constrainst [" + constraints + "]");
-        }
         U result;
         try {
             Constructor<U> constructor = uiClass.getConstructor(JAXXContext.class);
@@ -102,7 +99,6 @@ public class ContentUIManager {
             }
 
             // initialisation du content
-//            result.init();
             result.addMouseListener(new MouseAdapter() {
                 @Override
                 public void mouseEntered(MouseEvent e) {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUILauncher.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUILauncher.java
index 64174cf..f039245 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUILauncher.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUILauncher.java
@@ -25,7 +25,6 @@ import fr.ird.observe.application.swing.ObserveRunner;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig;
 import fr.ird.observe.application.swing.configuration.constants.DbMode;
-import fr.ird.observe.application.swing.ui.ObserveMainUIHandler;
 import fr.ird.observe.application.swing.ui.UIHelper;
 import jaxx.runtime.JAXXContext;
 import jaxx.runtime.JAXXObject;
@@ -304,8 +303,6 @@ public class StorageUILauncher extends WizardUILancher<StorageStep, StorageUIMod
             mainUI = ObserveSwingApplicationContext.get().getMainUI();
         }
 
-        addStorageUIHandler(context);
-
         StorageUILauncher launcher = new StorageUILauncher(
                 context,
                 mainUI,
@@ -353,7 +350,7 @@ public class StorageUILauncher extends WizardUILancher<StorageStep, StorageUIMod
 
                     if (log.isDebugEnabled()) {
                         log.debug("Only one mode available [" + mode +
-                                  "], set it in model");
+                                          "], set it in model");
                     }
 
                     // un seul mode possible, on le sélectionne

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Observe-commits] 16/16: fix cherry-pick

codelutin.com scm