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

Commits:

8 changed files:

Changes:

  • client-core/src/main/java/fr/ird/observe/client/ui/admin/save/SaveLocalModel.java
    ... ... @@ -26,6 +26,7 @@ import fr.ird.observe.client.configuration.ClientConfig;
    26 26 
     import fr.ird.observe.client.ui.admin.AdminActionModel;
    27 27 
     import fr.ird.observe.client.ui.admin.AdminStep;
    28 28 
     import fr.ird.observe.client.ui.admin.AdminUIModel;
    29 
    +import org.apache.commons.lang3.StringUtils;
    29 30 
     import org.apache.logging.log4j.Logger;
    30 31 
     import org.apache.logging.log4j.LogManager;
    31 32 
     import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
    ... ... @@ -35,6 +36,8 @@ import java.io.File;
    35 36 
     import java.util.HashSet;
    36 37 
     import java.util.Set;
    37 38
    39 
    +import static fr.ird.observe.client.ui.storage.StorageUIModel.SQL_GZ_EXTENSION;
    40 
    +
    38 41 
     /**
    39 42 
      * Le modèle d'une opération d'export de données observers.
    40 43 
      *
    ... ... @@ -45,6 +48,8 @@ public class SaveLocalModel extends AdminActionModel {
    45 48
    46 49 
         public static final String BACKUP_FILE_PROPERTY_NAME = "backupFile";
    47 50
    51 
    +    public static final String BACKUP_FILE_NAME_PROPERTY_NAME = "backupFileName";
    52 
    +
    48 53 
         public static final String DO_BACKUP_PROPERTY_NAME = "doBackup";
    49 54
    50 55 
         public static final String CAN_SAVE_LOCAL_PROPERTY_NAME = "canSaveLocal";
    ... ... @@ -99,11 +104,17 @@ public class SaveLocalModel extends AdminActionModel {
    99 104 
             return backupFile;
    100 105 
         }
    101 106
    107 
    +    public String getBackupFileName() {
    108 
    +        return StringUtils.removeEnd(backupFile.getName(), SQL_GZ_EXTENSION);
    109 
    +    }
    110 
    +
    102 111 
         public void setBackupFile(File backupFile) {
    103 112 
             boolean canSave = isCanSaveLocal();
    104 113 
             File oldValue = this.backupFile;
    114 
    +        String oldBackupFileName = getBackupFileName();
    105 115 
             this.backupFile = backupFile;
    106 116 
             firePropertyChange(BACKUP_FILE_PROPERTY_NAME, oldValue, backupFile);
    117 
    +        firePropertyChange(BACKUP_FILE_NAME_PROPERTY_NAME, oldBackupFileName, getBackupFileName());
    107 118 
             firePropertyChange(CAN_SAVE_LOCAL_PROPERTY_NAME, canSave, isCanSaveLocal());
    108 119 
         }
    109 120
    ... ... @@ -125,9 +136,11 @@ public class SaveLocalModel extends AdminActionModel {
    125 136 
         public boolean isCanSaveLocal() {
    126 137 
             boolean validate = !doBackup ||
    127 138 
                     backupFile != null &&
    128 
    -                        !backupFile.exists() &&
    129 
    -                        backupFile.getName().endsWith(".sql.gz") &&
    130 
    -                        backupFile.getParentFile().exists();
    139 
    +                        !backupFile.exists() && backupFile.getParentFile().exists() && backupFile.getName().endsWith(SQL_GZ_EXTENSION);
    140 
    +        if (validate) {
    141 
    +            String filename = getBackupFileName();
    142 
    +            validate = !filename.isEmpty() && !filename.contains(".");
    143 
    +        };
    131 144
    132 145 
             if (log.isDebugEnabled()) {
    133 146 
                 log.debug("can save ? " + validate);

  • client-core/src/main/java/fr/ird/observe/client/ui/admin/save/SaveLocalUI.jcss
    ... ... @@ -75,7 +75,7 @@
    75 75
    76 76 
     #filenameText {
    77 77 
       enabled:{stepModel.isDoBackup()};
    78 
    -  text:{stepModel.getBackupFile().getName()};
    78 
    +  text:{stepModel.getBackupFileName()};
    79 79 
     }
    80 80
    81 81 
     #startAction {

  • client-core/src/main/java/fr/ird/observe/client/ui/admin/save/SaveLocalUIHandler.java
    ... ... @@ -26,6 +26,7 @@ import fr.ird.observe.client.ui.ObserveKeyStrokes;
    26 26 
     import fr.ird.observe.client.ui.admin.AdminStep;
    27 27 
     import fr.ird.observe.client.ui.admin.AdminTabUIHandler;
    28 28 
     import fr.ird.observe.client.ui.admin.synchronize.referential.legacy.SynchronizeModel;
    29 
    +import fr.ird.observe.client.ui.storage.StorageUIModel;
    29 30 
     import fr.ird.observe.client.ui.util.UIHelper;
    30 31 
     import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeContext;
    31 32 
     import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest;
    ... ... @@ -106,7 +107,7 @@ public class SaveLocalUIHandler extends AdminTabUIHandler<SaveLocalUI> implement
    106 107 
         }
    107 108
    108 109 
         public void changeFilename(String filename) {
    109 
    -        getUi().getStepModel().setBackupFile(new File(getUi().directoryText.getText(), filename));
    110 
    +        getUi().getStepModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename + StorageUIModel.SQL_GZ_EXTENSION));
    110 111 
         }
    111 112
    112 113 
         public void doStartAction() {

  • 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,15 @@ 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;
    1163 
    +        String oldBackupFileName = getBackupFileName();
    1154 1164 
             this.backupFile = backupFile;
    1155 1165 
             firePropertyChange(BACKUP_FILE_PROPERTY_NAME, oldValue, backupFile);
    1166 
    +        firePropertyChange(BACKUP_FILE_NAME_PROPERTY_NAME, oldBackupFileName, getBackupFileName());
    1156 1167 
             validate();
    1157 1168 
         }
    1158 1169

  • 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,7 +24,9 @@ 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;
    29 
    +import org.apache.commons.lang3.StringUtils;
    28 30 
     import org.nuiton.jaxx.runtime.spi.UIHandler;
    29 31
    30 32 
     import javax.swing.AbstractAction;
    ... ... @@ -90,7 +92,7 @@ public class BackupUIHandler extends StorageTabUIHandler<BackupUI> implements UI
    90 92 
         }
    91 93
    92 94 
         public void changeFilename(String filename) {
    93 
    -        ui.getModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename));
    95 
    +        ui.getModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename + StorageUIModel.SQL_GZ_EXTENSION));
    94 96 
         }
    95 97
    96 98 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeCellRenderer.java
    ... ... @@ -33,6 +33,7 @@ import javax.swing.JTree;
    33 33 
     import javax.swing.tree.DefaultTreeCellRenderer;
    34 34 
     import java.awt.Color;
    35 35 
     import java.awt.Component;
    36 
    +import java.awt.Dimension;
    36 37
    37 38 
     /**
    38 39 
      * Created on 14/11/16.
    ... ... @@ -86,6 +87,17 @@ public class NavigationTreeCellRenderer extends DefaultTreeCellRenderer implemen
    86 87 
             JLabel comp = (JLabel) super.getTreeCellRendererComponent(tree, text, sel, expanded, leaf, row, hasFocus);
    87 88 
             comp.setToolTipText(text);
    88 89 
             comp.setIcon(icon);
    90 
    +        Dimension size = comp.getPreferredSize();
    91 
    +        double height = size.getHeight();
    92 
    +        if (icon != null) {
    93 
    +            int iconHeight = icon.getIconHeight();
    94 
    +            if (height > 2 * iconHeight) {
    95 
    +                log.error(String.format("Size is amazing: %s for node: %s", size, text));
    96 
    +                Dimension newSize = new Dimension((int) size.getWidth(), iconHeight + 2);
    97 
    +                comp.setSize(newSize);
    98 
    +                comp.setPreferredSize(newSize);
    99 
    +            }
    100 
    +        }
    89 101 
             return comp;
    90 102 
         }
    91 103

  • validation/src/main/i18n/getters/validation-messages.getter
    ... ... @@ -5,6 +5,7 @@ observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped
    5 5 
     observe.validation.catchLongline.required.position
    6 6 
     observe.validation.field.mandatory
    7 7 
     observe.validation.floatingObject.invalid.parts
    8 
    +observe.validation.floatingObject.required.comment.for.balise1
    8 9 
     observe.validation.floatingObject.required.comment.for.balise2
    9 10 
     observe.validation.floatingObject.size.supportVesselName
    10 11 
     observe.validation.lengthFormula.endDate.before.startDate

    • —
    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.