Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

3 changed files:

Changes:

  • client-core/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java
    ... ... @@ -92,6 +92,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
    92 92 
         public static final String CREATION_MODE_PROPERTY_NAME = "creationMode";
    93 93 
         public static final String DO_BACKUP_PROPERTY_NAME = "doBackup";
    94 94 
         public static final String BACKUP_FILE_PROPERTY_NAME = "backupFile";
    95 
    +    public static final String BACKUP_FILE_NAME_PROPERTY_NAME = "backupFileName";
    95 96 
         public static final String DUMP_FILE_PROPERTY_NAME = "dumpFile";
    96 97 
         public static final String LOCAL_STORAGE_EXIST_PROPERTY_NAME = "localStorageExist";
    97 98 
         public static final String USE_SSL_PROPERTY_NAME = "useSsl";
    ... ... @@ -117,6 +118,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
    117 118 
         private static final String CAN_USE_REMOTE_SERVICE_PROPERTY_NAME = "canUseRemoteService";
    118 119 
         private static final String CAN_USE_SERVER_SERVICE_PROPERTY_NAME = "canUseServerService";
    119 120 
         private static final char[] EMPTY_PASSWORD = new char[0];
    121 
    +    public static final String SQL_GZ_EXTENSION = ".sql.gz";
    120 122
    121 123 
         //    private static final String LOGIN_REFERENTIEL = "referentiel";
    122 124 
         private final ProgressModel progressModel = new ProgressModel();
    ... ... @@ -991,7 +993,11 @@ public class StorageUIModel extends WizardModel<StorageStep> {
    991 993
    992 994 
                         break;
    993 995 
                     case BACKUP:
    994 
    -                    validate = !doBackup || backupFile != null && !backupFile.exists() && backupFile.getName().endsWith(".sql.gz");
    996 
    +                    validate = !doBackup || backupFile != null && !backupFile.exists() && backupFile.getName().endsWith(SQL_GZ_EXTENSION);
    997 
    +                    if (validate) {
    998 
    +                        String filename = getBackupFileName();
    999 
    +                        validate = !filename.isEmpty() && !filename.contains(".");
    1000 
    +                    }
    995 1001 
                         break;
    996 1002 
                     case SELECT_DATA:
    997 1003 
                         // chemit 20100525 : aucune contrainte dans ce cas
    ... ... @@ -1149,10 +1155,14 @@ public class StorageUIModel extends WizardModel<StorageStep> {
    1149 1155 
             return backupFile;
    1150 1156 
         }
    1151 1157
    1158 
    +    public String getBackupFileName() {
    1159 
    +        return StringUtils.removeEnd(backupFile.getName(),SQL_GZ_EXTENSION);
    1160 
    +    }
    1152 1161 
         public void setBackupFile(File backupFile) {
    1153 1162 
             File oldValue = this.backupFile;
    1154 1163 
             this.backupFile = backupFile;
    1155 1164 
             firePropertyChange(BACKUP_FILE_PROPERTY_NAME, oldValue, backupFile);
    1165 
    +        firePropertyChange(BACKUP_FILE_NAME_PROPERTY_NAME, oldValue, getBackupFileName());
    1156 1166 
             validate();
    1157 1167 
         }
    1158 1168

  • client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUI.jcss
    ... ... @@ -50,5 +50,5 @@
    50 50
    51 51 
     #filenameText {
    52 52 
        enabled:{model.isDoBackup()};
    53 
    -   text:{model.getBackupFile().getName()};
    53 
    +   text:{model.getBackupFileName()};
    54 54 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUIHandler.java
    ... ... @@ -24,6 +24,7 @@ package fr.ird.observe.client.ui.storage.tabs;
    24 24
    25 25 
     import fr.ird.observe.client.ui.ObserveKeyStrokes;
    26 26 
     import fr.ird.observe.client.ui.storage.StorageStep;
    27 
    +import fr.ird.observe.client.ui.storage.StorageUIModel;
    27 28 
     import fr.ird.observe.client.ui.util.UIHelper;
    28 29 
     import org.apache.commons.lang3.StringUtils;
    29 30 
     import org.nuiton.jaxx.runtime.spi.UIHandler;
    ... ... @@ -91,9 +92,7 @@ public class BackupUIHandler extends StorageTabUIHandler<BackupUI> implements UI
    91 92 
         }
    92 93
    93 94 
         public void changeFilename(String filename) {
    94 
    -        if (StringUtils.isNoneEmpty(filename)) {
    95 
    -            ui.getModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename));
    96 
    -        }
    95 
    +        ui.getModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename + StorageUIModel.SQL_GZ_EXTENSION));
    97 96 
         }
    98 97
    99 98 
     }

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.