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

[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

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: [PS] Libellé échantillon faune associée - Closes #1220
by Tony CHEMIT 13 Feb '19

13 Feb '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 7f028ae1 by tchemit at 2019-02-13T13:15:01Z [PS] Libellé échantillon faune associée - Closes #1220 - - - - - a4a2eb7f by tchemit at 2019-02-13T13:22:16Z [PS] Le formulaire bonnes pratiques de remise à l'eau ne s'ouvre pas - Closes #1221 - - - - - 4 changed files: - dto/src/main/java/fr/ird/observe/dto/referential/SpeciesGroupHelper.java - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== dto/src/main/java/fr/ird/observe/dto/referential/SpeciesGroupHelper.java ===================================== @@ -28,9 +28,9 @@ import java.util.List; public class SpeciesGroupHelper extends GeneratedSpeciesGroupHelper { //FIXME PROTECTED-ID public static final List<String> SPECIES_GROUP_IDS = Arrays.asList( - "fr.ird.referential.common.SpeciesGroup#1445863056144#0.9820877553253712", - "fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461", - "fr.ird.referential.common.SpeciesGroup#1446014286433#0.6480183366605247", - "fr.ird.referential.common.SpeciesGroup#1239832683689#0.7120116158620075" + "fr.ird.observe.entities.referentiel.SpeciesGroup#1445863056144#0.9820877553253712", + "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461", + "fr.ird.observe.entities.referentiel.SpeciesGroup#1446014286433#0.6480183366605247", + "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683689#0.7120116158620075" ); } ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -916,14 +916,14 @@ observe.common.NonTargetCatchReleasingTimeDto.type=Releasing time observe.common.NonTargetCatchReleasingTimeDto.types=Releasing time observe.common.NonTargetLengthDto.comment=Non target sample comment observe.common.NonTargetLengthDto.count=Count -observe.common.NonTargetLengthDto.length=Length +observe.common.NonTargetLengthDto.length=Length (cm) observe.common.NonTargetLengthDto.picturesReferences=Pictures references observe.common.NonTargetLengthDto.table.count=Count observe.common.NonTargetLengthDto.table.count.tip=Count observe.common.NonTargetLengthDto.table.gender=Sex observe.common.NonTargetLengthDto.table.gender.tip=Sex observe.common.NonTargetLengthDto.table.length=Length -observe.common.NonTargetLengthDto.table.length.tip=Length +observe.common.NonTargetLengthDto.table.length.tip=Length (cm) observe.common.NonTargetLengthDto.table.meanWeight=Indiv. Weight observe.common.NonTargetLengthDto.table.meanWeight.tip=Individual weight (en Kg) observe.common.NonTargetLengthDto.table.nonTargetSpecies=Species ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -916,14 +916,14 @@ observe.common.NonTargetCatchReleasingTimeDto.type=Hora de liberación de fauna observe.common.NonTargetCatchReleasingTimeDto.types=Horas de liberación de fauna accesoria observe.common.NonTargetLengthDto.comment=Comentarios sobre el muestreo de fauna accesoria observe.common.NonTargetLengthDto.count=Número -observe.common.NonTargetLengthDto.length=Talla +observe.common.NonTargetLengthDto.length=Talla (cm) observe.common.NonTargetLengthDto.picturesReferences=Referencia foto observe.common.NonTargetLengthDto.table.count=Número observe.common.NonTargetLengthDto.table.count.tip=Número de ejemplares medidos observe.common.NonTargetLengthDto.table.gender=Sexo observe.common.NonTargetLengthDto.table.gender.tip=Sexo observe.common.NonTargetLengthDto.table.length=Talla -observe.common.NonTargetLengthDto.table.length.tip=Talla +observe.common.NonTargetLengthDto.table.length.tip=Talla (cm) observe.common.NonTargetLengthDto.table.meanWeight=Peso indiv. observe.common.NonTargetLengthDto.table.meanWeight.tip=Peso del individuo (en Kg) observe.common.NonTargetLengthDto.table.nonTargetSpecies=Especie ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -916,14 +916,14 @@ observe.common.NonTargetCatchReleasingTimeDto.type=Moment de la libération observe.common.NonTargetCatchReleasingTimeDto.types=Moments de la libération observe.common.NonTargetLengthDto.comment=Commentaire de l’échantillonnage faune observe.common.NonTargetLengthDto.count=Nombre -observe.common.NonTargetLengthDto.length=Longueur hors tout +observe.common.NonTargetLengthDto.length=Taille (cm) observe.common.NonTargetLengthDto.picturesReferences=Référence photo observe.common.NonTargetLengthDto.table.count=Effectif observe.common.NonTargetLengthDto.table.count.tip=Effectif observe.common.NonTargetLengthDto.table.gender=Sexe observe.common.NonTargetLengthDto.table.gender.tip=Sexe -observe.common.NonTargetLengthDto.table.length=Longueur -observe.common.NonTargetLengthDto.table.length.tip=Longueur +observe.common.NonTargetLengthDto.table.length=Taille +observe.common.NonTargetLengthDto.table.length.tip=Taille (cm) observe.common.NonTargetLengthDto.table.meanWeight=Poids ind. observe.common.NonTargetLengthDto.table.meanWeight.tip=Poids individuel (en Kg) observe.common.NonTargetLengthDto.table.nonTargetSpecies=Espèce faune View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/151466957f6198fd50143568d0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/151466957f6198fd50143568d0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [PS] Inversion de libellé - Closes #1219
by Tony CHEMIT 13 Feb '19

13 Feb '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 15146695 by tchemit at 2019-02-13T11:09:37Z [PS] Inversion de libellé - Closes #1219 - - - - - 1 changed file: - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -590,7 +590,7 @@ observe.common.DataDto.captain=Capitaine observe.common.DataDto.dataQuality=Qualité de donnée observe.common.DataDto.departureHarbour=Port de départ observe.common.DataDto.depthRecorder=Enregistreur de profondeur -observe.common.DataDto.endDate=Date de début +observe.common.DataDto.endDate=Date de fin observe.common.DataDto.haulingIdentifier=Virage observe.common.DataDto.hookLost=Hameçon perdu observe.common.DataDto.landingHarbour=Port d'arrivée @@ -599,7 +599,7 @@ observe.common.DataDto.observer=Observateur observe.common.DataDto.program=Programme observe.common.DataDto.settingIdentifier=Filage observe.common.DataDto.speciesFate=Devenir espèce -observe.common.DataDto.startDate=Date de fin +observe.common.DataDto.startDate=Date de début observe.common.DataDto.timer=Horloge observe.common.DataDto.timerTimeOnBoard=Horodatage de montée à bord observe.common.DataDto.traceCutOff=Bas de ligne coupé View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/151466957f6198fd50143568d01… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/151466957f6198fd50143568d01… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 08 Feb '19

08 Feb '19

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 7bf1aa87 by 166231 at 2019-02-08T14:16:29Z Site checkin for project ObServe :: Pom - - - - - 13 changed files: - administration-web.html - − aggregate-third-party-report.html - architecture-logicielle.html - − changelog.html - − changes-report.html - − ci-management.html - config-report.html - − dependency-convergence.html - − dependency-info.html - − dependency-management.html - − dependency-updates-report.html - − dev-activity.html - − distribution-management.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7bf1aa87a583f5a8f97a97cfc1b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7bf1aa87a583f5a8f97a97cfc1b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/7.0.3
by Tony CHEMIT 08 Feb '19

08 Feb '19

Tony CHEMIT deleted branch release/7.0.3 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0