[Observe-commits] 03/14: [iso] nettoyage de code

4 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 e17eac292e2758564a116ef08969cd8fedb79005
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Sun Nov 27 14:54:55 2016 +0100

    [iso] nettoyage de code
---
 .../swing/ui/storage/StorageUIModel.java           | 64 +++++++---------------
 1 file changed, 20 insertions(+), 44 deletions(-)

diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java
index 391efa4..484c446 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java
@@ -255,24 +255,25 @@ public class StorageUIModel extends WizardModel<StorageStep> {
      * @since 3.6
      */
     protected CreationMode dataImportMode;
+    /**
+     * Pour sélectionner toutes les marées.
+     *
+     * @since 6.0
+     */
     private boolean selectAll;
 
     public StorageUIModel() {
-        super(StorageStep.class,
-              StorageStep.CHOOSE_DB_MODE,
-              StorageStep.BACKUP,
-              StorageStep.CONFIRM
-        );
+        super(StorageStep.class, StorageStep.CHOOSE_DB_MODE, StorageStep.BACKUP, StorageStep.CONFIRM);
         securityModel = new SecurityModel();
 
         connexionStatus = ConnexionStatus.UNTESTED;
 
         ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get();
-        ObserveDataSourceConfigurationMainFactory configurationMainFactory = applicationContext.getObserveDataSourceConfigurationMainFactory();
+        ObserveDataSourceConfigurationMainFactory factory = applicationContext.getObserveDataSourceConfigurationMainFactory();
 
         Version modelVersion = applicationContext.getConfig().getModelVersion();
 
-        h2Config = configurationMainFactory.createObserveDataSourceConfigurationTopiaH2(
+        h2Config = factory.createObserveDataSourceConfigurationTopiaH2(
                 t("observe.storage.label.local"),
                 null,
                 ObserveSwingApplicationConfig.DB_NAME,
@@ -283,7 +284,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
                 modelVersion
         );
 
-        pgConfig = configurationMainFactory.createObserveDataSourceConfigurationTopiaPG(
+        pgConfig = factory.createObserveDataSourceConfigurationTopiaPG(
                 t("observe.storage.label.remote"),
                 "",
                 "",
@@ -294,7 +295,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
                 modelVersion
         );
 
-        restConfig = configurationMainFactory.createObserveDataSourceConfigurationRest(
+        restConfig = factory.createObserveDataSourceConfigurationRest(
                 t("observe.storage.label.server"),
                 null,
                 "",
@@ -443,8 +444,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
      * @param previousConfig la configuration de service existant
      * @since 2.0
      */
-    public void initFromPreviousConfig(ObserveDataSourceConfiguration previousConfig,
-                                       ObserveDataSourceInformation previousInfo) {
+    public void initFromPreviousConfig(ObserveDataSourceConfiguration previousConfig, ObserveDataSourceInformation previousInfo) {
 
         Objects.requireNonNull(previousConfig, "previousConfig parameter can not be null in method initFromPreviousConfig");
 
@@ -912,25 +912,9 @@ public class StorageUIModel extends WizardModel<StorageStep> {
                     }
                     break;
                 case CONFIG:
-                    if (DbMode.USE_REMOTE.equals(dbMode)
-                            || DbMode.USE_SERVER.equals(dbMode)
-                            || DbMode.CREATE_LOCAL.equals(dbMode)
-                            && (CreationMode.IMPORT_SERVER_STORAGE.equals(creationMode)
-                            || CreationMode.IMPORT_REMOTE_STORAGE.equals(creationMode))) {
+                    if (DbMode.USE_REMOTE.equals(dbMode) || DbMode.USE_SERVER.equals(dbMode) || DbMode.CREATE_LOCAL.equals(dbMode)
+                            && (CreationMode.IMPORT_SERVER_STORAGE.equals(creationMode) || CreationMode.IMPORT_REMOTE_STORAGE.equals(creationMode))) {
                         validate = ConnexionStatus.SUCCESS.equals(getConnexionStatus());
-                        //FIXME Il faut savoir si l'utilisateur est le
-                        //FIXME propriétaire de la base
-//                        if (validate) {
-//                            if (getAdminAction() != null) {
-//
-//                                // il faut des droits rw sur la base distante
-//                                validate = dataSourceInformation != null &&
-//                                        dataSourceInformation.canReadReferential() &&
-//                                        dataSourceInformation.canWriteReferential() &&
-//                                        dataSourceInformation.canWriteData() &&
-//                                        dataSourceInformation.canReadData();
-//                            }
-//                        }
                     } else if (DbMode.CREATE_LOCAL.equals(dbMode) && CreationMode.IMPORT_EXTERNAL_DUMP.equals(creationMode)) {
                         validate = isValidDumpFile(dumpFile);
                     }
@@ -958,8 +942,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
                             if (validate) {
 
                                 // check remote db != remote import db
-                                validate = !centralSourceModel.getRemoteUrl().equals(
-                                        getRemoteUrl());
+                                validate = !centralSourceModel.getRemoteUrl().equals(getRemoteUrl());
                             }
                             if (validate) {
 
@@ -1007,10 +990,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
 
                     break;
                 case BACKUP:
-                    validate = !doBackup ||
-                            backupFile != null &&
-                                    !backupFile.exists() &&
-                                    backupFile.getName().endsWith(".sql.gz");
+                    validate = !doBackup || backupFile != null && !backupFile.exists() && backupFile.getName().endsWith(".sql.gz");
                     break;
                 case SELECT_DATA:
                     // chemit 20100525 : aucune contrainte dans ce cas
@@ -1045,15 +1025,13 @@ public class StorageUIModel extends WizardModel<StorageStep> {
             switch (dbMode) {
 
                 case CREATE_LOCAL:
-                    result = getCreationMode() != null &&
-                            validate(StorageStep.CONFIG);
+                    result = getCreationMode() != null && validate(StorageStep.CONFIG);
                     break;
                 case USE_REMOTE:
                 case USE_SERVER:
                     result = validate(StorageStep.CONFIG);
                     break;
                 case USE_LOCAL:
-                    //TODO  A tester...
                     result = h2Config.getDatabaseFile().exists();
                     break;
             }
@@ -1279,10 +1257,12 @@ public class StorageUIModel extends WizardModel<StorageStep> {
         validate();
     }
 
+    @Override
     public void setExcludeSteps(List<StorageStep> excludeSteps) {
         this.excludeSteps = excludeSteps;
     }
 
+    @Override
     public void destroy() {
         super.destroy();
     }
@@ -1423,8 +1403,6 @@ public class StorageUIModel extends WizardModel<StorageStep> {
 
     public void setRemoteLogin(String remoteLogin) {
 
-//        String oldValue = getRemoteLogin();
-
         if (isEditRemoteConfig()) {
 
             pgConfig.setUsername(remoteLogin);
@@ -1439,7 +1417,6 @@ public class StorageUIModel extends WizardModel<StorageStep> {
     }
 
     public void setRemotePassword(char... remotePassword) {
-//        char[] oldValue = getRemotePassword();
 
         if (isEditRemoteConfig()) {
 
@@ -1643,6 +1620,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
         dst.setSelectDataModel(getSelectDataModel());
         dst.setSecurityModel(getSecurityModel());
         dst.setAdminAction(getAdminAction());
+        dst.setSelectAll(isSelectAll());
 
         dst.updateEditConfig();
 
@@ -1657,9 +1635,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
 
     }
 
-    public void firePgConfigChanged(String propertyName,
-                                    Object oldValue,
-                                    Object newValue) {
+    public void firePgConfigChanged(String propertyName, Object oldValue, Object newValue) {
         firePropertyChange(propertyName, oldValue, newValue);
         validate();
     }

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

    

[Observe-commits] 03/14: [iso] nettoyage de code

codelutin.com scm