- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop-7.x] Ergonomie assistant sauvegarde - Closes #1229
by Tony CHEMIT 14 Feb '19

14 Feb '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 1ec2311f by tchemit at 2019-02-14T16:41:33Z Ergonomie assistant sauvegarde - Closes #1229 - - - - - 6 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/admin/save/SaveLocalModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/save/SaveLocalUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/admin/save/SaveLocalUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUIHandler.java 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; import fr.ird.observe.client.ui.admin.AdminActionModel; import fr.ird.observe.client.ui.admin.AdminStep; import fr.ird.observe.client.ui.admin.AdminUIModel; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; @@ -35,6 +36,8 @@ import java.io.File; import java.util.HashSet; import java.util.Set; +import static fr.ird.observe.client.ui.storage.StorageUIModel.SQL_GZ_EXTENSION; + /** * Le modèle d'une opération d'export de données observers. * @@ -45,6 +48,8 @@ public class SaveLocalModel extends AdminActionModel { public static final String BACKUP_FILE_PROPERTY_NAME = "backupFile"; + public static final String BACKUP_FILE_NAME_PROPERTY_NAME = "backupFileName"; + public static final String DO_BACKUP_PROPERTY_NAME = "doBackup"; public static final String CAN_SAVE_LOCAL_PROPERTY_NAME = "canSaveLocal"; @@ -99,11 +104,17 @@ public class SaveLocalModel extends AdminActionModel { return backupFile; } + public String getBackupFileName() { + return StringUtils.removeEnd(backupFile.getName(), SQL_GZ_EXTENSION); + } + public void setBackupFile(File backupFile) { boolean canSave = isCanSaveLocal(); File oldValue = this.backupFile; + String oldBackupFileName = getBackupFileName(); this.backupFile = backupFile; firePropertyChange(BACKUP_FILE_PROPERTY_NAME, oldValue, backupFile); + firePropertyChange(BACKUP_FILE_NAME_PROPERTY_NAME, oldBackupFileName, getBackupFileName()); firePropertyChange(CAN_SAVE_LOCAL_PROPERTY_NAME, canSave, isCanSaveLocal()); } @@ -125,9 +136,11 @@ public class SaveLocalModel extends AdminActionModel { public boolean isCanSaveLocal() { boolean validate = !doBackup || backupFile != null && - !backupFile.exists() && - backupFile.getName().endsWith(".sql.gz") && - backupFile.getParentFile().exists(); + !backupFile.exists() && backupFile.getParentFile().exists() && backupFile.getName().endsWith(SQL_GZ_EXTENSION); + if (validate) { + String filename = getBackupFileName(); + validate = !filename.isEmpty() && !filename.contains("."); + }; if (log.isDebugEnabled()) { log.debug("can save ? " + validate); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/save/SaveLocalUI.jcss ===================================== @@ -75,7 +75,7 @@ #filenameText { enabled:{stepModel.isDoBackup()}; - text:{stepModel.getBackupFile().getName()}; + text:{stepModel.getBackupFileName()}; } #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; import fr.ird.observe.client.ui.admin.AdminStep; import fr.ird.observe.client.ui.admin.AdminTabUIHandler; import fr.ird.observe.client.ui.admin.synchronize.referential.legacy.SynchronizeModel; +import fr.ird.observe.client.ui.storage.StorageUIModel; import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeContext; import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; @@ -106,7 +107,7 @@ public class SaveLocalUIHandler extends AdminTabUIHandler<SaveLocalUI> implement } public void changeFilename(String filename) { - getUi().getStepModel().setBackupFile(new File(getUi().directoryText.getText(), filename)); + getUi().getStepModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename + StorageUIModel.SQL_GZ_EXTENSION)); } 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> { public static final String CREATION_MODE_PROPERTY_NAME = "creationMode"; public static final String DO_BACKUP_PROPERTY_NAME = "doBackup"; public static final String BACKUP_FILE_PROPERTY_NAME = "backupFile"; + public static final String BACKUP_FILE_NAME_PROPERTY_NAME = "backupFileName"; public static final String DUMP_FILE_PROPERTY_NAME = "dumpFile"; public static final String LOCAL_STORAGE_EXIST_PROPERTY_NAME = "localStorageExist"; public static final String USE_SSL_PROPERTY_NAME = "useSsl"; @@ -117,6 +118,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { private static final String CAN_USE_REMOTE_SERVICE_PROPERTY_NAME = "canUseRemoteService"; private static final String CAN_USE_SERVER_SERVICE_PROPERTY_NAME = "canUseServerService"; private static final char[] EMPTY_PASSWORD = new char[0]; + public static final String SQL_GZ_EXTENSION = ".sql.gz"; // private static final String LOGIN_REFERENTIEL = "referentiel"; private final ProgressModel progressModel = new ProgressModel(); @@ -991,7 +993,11 @@ 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_EXTENSION); + if (validate) { + String filename = getBackupFileName(); + validate = !filename.isEmpty() && !filename.contains("."); + } break; case SELECT_DATA: // chemit 20100525 : aucune contrainte dans ce cas @@ -1149,10 +1155,15 @@ public class StorageUIModel extends WizardModel<StorageStep> { return backupFile; } + public String getBackupFileName() { + return StringUtils.removeEnd(backupFile.getName(),SQL_GZ_EXTENSION); + } public void setBackupFile(File backupFile) { File oldValue = this.backupFile; + String oldBackupFileName = getBackupFileName(); this.backupFile = backupFile; firePropertyChange(BACKUP_FILE_PROPERTY_NAME, oldValue, backupFile); + firePropertyChange(BACKUP_FILE_NAME_PROPERTY_NAME, oldBackupFileName, getBackupFileName()); validate(); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUI.jcss ===================================== @@ -50,5 +50,5 @@ #filenameText { enabled:{model.isDoBackup()}; - text:{model.getBackupFile().getName()}; + text:{model.getBackupFileName()}; } ===================================== 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; import fr.ird.observe.client.ui.ObserveKeyStrokes; import fr.ird.observe.client.ui.storage.StorageStep; +import fr.ird.observe.client.ui.storage.StorageUIModel; import fr.ird.observe.client.ui.util.UIHelper; import org.apache.commons.lang3.StringUtils; import org.nuiton.jaxx.runtime.spi.UIHandler; @@ -91,9 +92,7 @@ public class BackupUIHandler extends StorageTabUIHandler<BackupUI> implements UI } public void changeFilename(String filename) { - if (StringUtils.isNoneEmpty(filename)) { - ui.getModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename)); - } + ui.getModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename + StorageUIModel.SQL_GZ_EXTENSION)); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1ec2311fdd4b78e7e0190b83093… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1ec2311fdd4b78e7e0190b83093… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ergonomie assistant sauvegarde - Closes #1229
by Tony CHEMIT 14 Feb '19

14 Feb '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6662dcf9 by tchemit at 2019-02-14T16:14:58Z Ergonomie assistant sauvegarde - Closes #1229 - - - - - 3 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUIHandler.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java ===================================== @@ -92,6 +92,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { public static final String CREATION_MODE_PROPERTY_NAME = "creationMode"; public static final String DO_BACKUP_PROPERTY_NAME = "doBackup"; public static final String BACKUP_FILE_PROPERTY_NAME = "backupFile"; + public static final String BACKUP_FILE_NAME_PROPERTY_NAME = "backupFileName"; public static final String DUMP_FILE_PROPERTY_NAME = "dumpFile"; public static final String LOCAL_STORAGE_EXIST_PROPERTY_NAME = "localStorageExist"; public static final String USE_SSL_PROPERTY_NAME = "useSsl"; @@ -117,6 +118,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { private static final String CAN_USE_REMOTE_SERVICE_PROPERTY_NAME = "canUseRemoteService"; private static final String CAN_USE_SERVER_SERVICE_PROPERTY_NAME = "canUseServerService"; private static final char[] EMPTY_PASSWORD = new char[0]; + public static final String SQL_GZ_EXTENSION = ".sql.gz"; // private static final String LOGIN_REFERENTIEL = "referentiel"; private final ProgressModel progressModel = new ProgressModel(); @@ -991,7 +993,11 @@ 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_EXTENSION); + if (validate) { + String filename = getBackupFileName(); + validate = !filename.isEmpty() && !filename.contains("."); + } break; case SELECT_DATA: // chemit 20100525 : aucune contrainte dans ce cas @@ -1149,10 +1155,14 @@ public class StorageUIModel extends WizardModel<StorageStep> { return backupFile; } + public String getBackupFileName() { + return StringUtils.removeEnd(backupFile.getName(),SQL_GZ_EXTENSION); + } public void setBackupFile(File backupFile) { File oldValue = this.backupFile; this.backupFile = backupFile; firePropertyChange(BACKUP_FILE_PROPERTY_NAME, oldValue, backupFile); + firePropertyChange(BACKUP_FILE_NAME_PROPERTY_NAME, oldValue, getBackupFileName()); validate(); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUI.jcss ===================================== @@ -50,5 +50,5 @@ #filenameText { enabled:{model.isDoBackup()}; - text:{model.getBackupFile().getName()}; + text:{model.getBackupFileName()}; } ===================================== 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; import fr.ird.observe.client.ui.ObserveKeyStrokes; import fr.ird.observe.client.ui.storage.StorageStep; +import fr.ird.observe.client.ui.storage.StorageUIModel; import fr.ird.observe.client.ui.util.UIHelper; import org.apache.commons.lang3.StringUtils; import org.nuiton.jaxx.runtime.spi.UIHandler; @@ -91,9 +92,7 @@ public class BackupUIHandler extends StorageTabUIHandler<BackupUI> implements UI } public void changeFilename(String filename) { - if (StringUtils.isNoneEmpty(filename)) { - ui.getModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename)); - } + ui.getModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename + StorageUIModel.SQL_GZ_EXTENSION)); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6662dcf9fab5375c981fe139183… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6662dcf9fab5375c981fe139183… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Ergonomie assistant sauvegarde - Closes #1229
by Tony CHEMIT 14 Feb '19

14 Feb '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 97b53d5e by tchemit at 2019-02-14T16:14:29Z Ergonomie assistant sauvegarde - Closes #1229 - - - - - 3 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUIHandler.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java ===================================== @@ -92,6 +92,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { public static final String CREATION_MODE_PROPERTY_NAME = "creationMode"; public static final String DO_BACKUP_PROPERTY_NAME = "doBackup"; public static final String BACKUP_FILE_PROPERTY_NAME = "backupFile"; + public static final String BACKUP_FILE_NAME_PROPERTY_NAME = "backupFileName"; public static final String DUMP_FILE_PROPERTY_NAME = "dumpFile"; public static final String LOCAL_STORAGE_EXIST_PROPERTY_NAME = "localStorageExist"; public static final String USE_SSL_PROPERTY_NAME = "useSsl"; @@ -117,6 +118,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { private static final String CAN_USE_REMOTE_SERVICE_PROPERTY_NAME = "canUseRemoteService"; private static final String CAN_USE_SERVER_SERVICE_PROPERTY_NAME = "canUseServerService"; private static final char[] EMPTY_PASSWORD = new char[0]; + public static final String SQL_GZ_EXTENSION = ".sql.gz"; // private static final String LOGIN_REFERENTIEL = "referentiel"; private final ProgressModel progressModel = new ProgressModel(); @@ -991,7 +993,11 @@ 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_EXTENSION); + if (validate) { + String filename = getBackupFileName(); + validate = !filename.isEmpty() && !filename.contains("."); + } break; case SELECT_DATA: // chemit 20100525 : aucune contrainte dans ce cas @@ -1149,10 +1155,14 @@ public class StorageUIModel extends WizardModel<StorageStep> { return backupFile; } + public String getBackupFileName() { + return StringUtils.removeEnd(backupFile.getName(),SQL_GZ_EXTENSION); + } public void setBackupFile(File backupFile) { File oldValue = this.backupFile; this.backupFile = backupFile; firePropertyChange(BACKUP_FILE_PROPERTY_NAME, oldValue, backupFile); + firePropertyChange(BACKUP_FILE_NAME_PROPERTY_NAME, oldValue, getBackupFileName()); validate(); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUI.jcss ===================================== @@ -50,5 +50,5 @@ #filenameText { enabled:{model.isDoBackup()}; - text:{model.getBackupFile().getName()}; + text:{model.getBackupFileName()}; } ===================================== 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; import fr.ird.observe.client.ui.ObserveKeyStrokes; import fr.ird.observe.client.ui.storage.StorageStep; +import fr.ird.observe.client.ui.storage.StorageUIModel; import fr.ird.observe.client.ui.util.UIHelper; import org.apache.commons.lang3.StringUtils; import org.nuiton.jaxx.runtime.spi.UIHandler; @@ -91,9 +92,7 @@ public class BackupUIHandler extends StorageTabUIHandler<BackupUI> implements UI } public void changeFilename(String filename) { - if (StringUtils.isNoneEmpty(filename)) { - ui.getModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename)); - } + ui.getModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename + StorageUIModel.SQL_GZ_EXTENSION)); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/97b53d5ed89020260ea2524ba3a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/97b53d5ed89020260ea2524ba3a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] L'asssitant sauvegarde a un comportement étonnant - Closes #1228
by Tony CHEMIT 14 Feb '19

14 Feb '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: d701372e by tchemit at 2019-02-14T14:47:01Z L'asssitant sauvegarde a un comportement étonnant - Closes #1228 - - - - - 1 changed file: - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUIHandler.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUIHandler.java ===================================== @@ -25,6 +25,7 @@ package fr.ird.observe.client.ui.storage.tabs; import fr.ird.observe.client.ui.ObserveKeyStrokes; import fr.ird.observe.client.ui.storage.StorageStep; import fr.ird.observe.client.ui.util.UIHelper; +import org.apache.commons.lang3.StringUtils; import org.nuiton.jaxx.runtime.spi.UIHandler; import javax.swing.AbstractAction; @@ -90,7 +91,9 @@ public class BackupUIHandler extends StorageTabUIHandler<BackupUI> implements UI } public void changeFilename(String filename) { - ui.getModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename)); + if (StringUtils.isNoneEmpty(filename)) { + ui.getModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename)); + } } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d701372ee6dfed4d1a1958bfa72… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d701372ee6dfed4d1a1958bfa72… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: L'asssitant sauvegarde a un comportement étonnant - Closes #1228
by Tony CHEMIT 14 Feb '19

14 Feb '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 264f6b5f by tchemit at 2019-02-14T14:46:39Z L'asssitant sauvegarde a un comportement étonnant - Closes #1228 - - - - - 4bd72e53 by tchemit at 2019-02-14T14:46:39Z A la ré ouverture de l'UI, l'affichage est partiel - See #1224 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeCellRenderer.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUIHandler.java ===================================== @@ -25,6 +25,7 @@ package fr.ird.observe.client.ui.storage.tabs; import fr.ird.observe.client.ui.ObserveKeyStrokes; import fr.ird.observe.client.ui.storage.StorageStep; import fr.ird.observe.client.ui.util.UIHelper; +import org.apache.commons.lang3.StringUtils; import org.nuiton.jaxx.runtime.spi.UIHandler; import javax.swing.AbstractAction; @@ -90,7 +91,9 @@ public class BackupUIHandler extends StorageTabUIHandler<BackupUI> implements UI } public void changeFilename(String filename) { - ui.getModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename)); + if (StringUtils.isNoneEmpty(filename)) { + ui.getModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename)); + } } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeCellRenderer.java ===================================== @@ -33,6 +33,7 @@ import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; import java.awt.Color; import java.awt.Component; +import java.awt.Dimension; /** * Created on 14/11/16. @@ -86,6 +87,14 @@ public class NavigationTreeCellRenderer extends DefaultTreeCellRenderer implemen JLabel comp = (JLabel) super.getTreeCellRendererComponent(tree, text, sel, expanded, leaf, row, hasFocus); comp.setToolTipText(text); comp.setIcon(icon); + Dimension size = comp.getPreferredSize(); + double height = size.getHeight(); + if (height > 50) { + log.error(String.format("Size is amazing: %s for node: %s", size, text)); + Dimension newSize = new Dimension((int) size.getWidth(), 32); + comp.setSize(newSize); + comp.setPreferredSize(newSize); + } return comp; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/910ad8213b54f377666db2ec5d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/910ad8213b54f377666db2ec5d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: remove dependency version
by Tony CHEMIT 14 Feb '19

14 Feb '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a2abc8f2 by tchemit at 2019-02-08T13:57:20Z remove dependency version - - - - - c8789253 by tchemit at 2019-02-12T15:16:15Z Improve usage guis - Closes #1066 Use improved Spi API - - - - - a0546cd5 by tchemit at 2019-02-13T11:54:13Z Introduce services-validation module + generate ServicesProvider - - - - - 4c2d6d35 by tchemit at 2019-02-13T13:42:07Z update pom - - - - - 875eac6b by tchemit at 2019-02-14T14:45:05Z L'asssitant sauvegarde a un comportement étonnant - Closes #1128 - - - - - 910ad821 by tchemit at 2019-02-14T14:45:30Z A la ré ouverture de l'UI, l'affichage est partiel - See #1224 - - - - - 30 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/db/ObserveDataSourceServicesProvider.java - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/edit/SaveEditDataUIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/SaveOpenDataUIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/DeleteReferentialUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/SaveReferentialUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/ShowReferentialUsageUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/FloatingObjectUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDeleteUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDeleteUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDesactivateUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDesactivateUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDisplayUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDisplayUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsagePanel.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageUIHandlerSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeCellRenderer.java - client-core/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java - client-runner/pom.xml - persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContext.java - persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContext.java - persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContextConstructorParameter.java - pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/d3be1e9da4e3ac75f3d5e8e473… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/d3be1e9da4e3ac75f3d5e8e473… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] L'asssitant sauvegarde a un comportement étonnant - Closes #1128
by Tony CHEMIT 14 Feb '19

14 Feb '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: d87af0b1 by tchemit at 2019-02-14T14:44:27Z L'asssitant sauvegarde a un comportement étonnant - Closes #1128 - - - - - 1 changed file: - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUIHandler.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUIHandler.java ===================================== @@ -25,6 +25,7 @@ package fr.ird.observe.client.ui.storage.tabs; import fr.ird.observe.client.ui.ObserveKeyStrokes; import fr.ird.observe.client.ui.storage.StorageStep; import fr.ird.observe.client.ui.util.UIHelper; +import org.apache.commons.lang3.StringUtils; import org.nuiton.jaxx.runtime.spi.UIHandler; import javax.swing.AbstractAction; @@ -90,7 +91,9 @@ public class BackupUIHandler extends StorageTabUIHandler<BackupUI> implements UI } public void changeFilename(String filename) { - ui.getModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename)); + if (StringUtils.isNoneEmpty(filename)) { + ui.getModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename)); + } } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d87af0b1bf51a7139c622c72eb3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d87af0b1bf51a7139c622c72eb3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] A la ré ouverture de l'UI, l'affichage est partiel - See #1224
by Tony CHEMIT 14 Feb '19

14 Feb '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f580ae71 by tchemit at 2019-02-14T13:38:09Z A la ré ouverture de l'UI, l'affichage est partiel - See #1224 - - - - - 1 changed file: - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeCellRenderer.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeCellRenderer.java ===================================== @@ -33,6 +33,7 @@ import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; import java.awt.Color; import java.awt.Component; +import java.awt.Dimension; /** * Created on 14/11/16. @@ -86,6 +87,14 @@ public class NavigationTreeCellRenderer extends DefaultTreeCellRenderer implemen JLabel comp = (JLabel) super.getTreeCellRendererComponent(tree, text, sel, expanded, leaf, row, hasFocus); comp.setToolTipText(text); comp.setIcon(icon); + Dimension size = comp.getPreferredSize(); + double height = size.getHeight(); + if (height > 50) { + log.error(String.format("Size is amazing: %s for node: %s", size, text)); + Dimension newSize = new Dimension((int) size.getWidth(), 32); + comp.setSize(newSize); + comp.setPreferredSize(newSize); + } return comp; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f580ae71ab53c48d5c98f3e8652… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f580ae71ab53c48d5c98f3e8652… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: add missing i18n key
by Tony CHEMIT 14 Feb '19

14 Feb '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 3ae3e01e by tchemit at 2019-02-14T13:11:19Z add missing i18n key - - - - - de8269ea by tchemit at 2019-02-14T13:11:36Z [PS] La suppression d'éléments dans Calée/Estimation du banc ne fonctionne pas - closes #1222 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java - validation/src/main/i18n/getters/validation-messages.getter Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java ===================================== @@ -331,7 +331,7 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto, U U ui = getUi(); - if (getModel().isModified() || getModel().isCanSaveRow()) { + if (!getTableModel().isEmpty() && (getModel().isModified() || getModel().isCanSaveRow())) { // flush modified line to model getTableModel().updateRowFromEditBean(); ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -5,7 +5,6 @@ observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped observe.validation.catchLongline.required.position observe.validation.field.mandatory observe.validation.floatingObject.invalid.parts -observe.validation.floatingObject.required.comment.for.balise1 observe.validation.floatingObject.required.comment.for.balise2 observe.validation.floatingObject.size.supportVesselName observe.validation.lengthFormula.endDate.before.startDate View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/eb1a6dd5da45cd6d579773125e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/eb1a6dd5da45cd6d579773125e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] update pom
by Tony CHEMIT 13 Feb '19

13 Feb '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: eb1a6dd5 by tchemit at 2019-02-13T15:38:37Z update pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.8</version> + <version>2019.8.11</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/eb1a6dd5da45cd6d579773125e2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/eb1a6dd5da45cd6d579773125e2… You're receiving this email because of your account on gitlab.com.

1 0