mailman.cloud.codelutin.com
Sign In Sign Up
Manage this list Sign In Sign Up

Keyboard Shortcuts

Thread View

  • j: Next unread message
  • k: Previous unread message
  • j a: Jump to all threads
  • j l: Jump to MailingList overview

Observe-commits

Thread Start a new thread
Download
Threads by month
  • ----- 2026 -----
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2025 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2024 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2023 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2022 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2021 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2020 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2019 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2018 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2017 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2016 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2015 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2014 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2013 -----
  • December
  • November
  • October
  • September
observe-commits@list.forge.codelutin.com

July 2020

  • 1 participants
  • 91 discussions
[Git][ultreiaio/ird-observe][develop] 3 commits: [LL][LOGBOOKS] Activité : champ vitesse vent superflu - Closes #1531
by Tony CHEMIT 07 Jul '20

07 Jul '20
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4a5fc6f4 by Tony Chemit at 2020-07-07T07:17:58+02:00 [LL][LOGBOOKS] Activité : champ vitesse vent superflu - Closes #1531 - - - - - 48529e8f by Tony Chemit at 2020-07-07T07:18:09+02:00 Remove logger in plugin - - - - - 69869bd5 by Tony Chemit at 2020-07-07T10:19:45+02:00 [LL] Form marée / Coche des cases 'Données logbook' et 'Données d'observation' - Closes #1522 - - - - - 30 changed files: - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/list/actions/Create.java - client-datasource-editor-ll/src/main/i18n/getters/java.getter - + client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/ActionHelper.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUIHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/landing/LandingListUI.jcss - + client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/landing/actions/LandingListUICreate.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/ActivityListUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/ActivityUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/TripSampleListUI.jcss - + client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/actions/ActivityListUICreate.java - + client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/actions/TripSampleListUICreate.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/ActivityListUI.jcss - + client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/actions/ActivityListUICreate.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ll/common/ProgramLonglineNavigationTreeNode.java - dto/src/main/java/fr/ird/observe/dto/data/ll/common/TripDto.java - dto/src/main/java/fr/ird/observe/dto/data/ll/common/TripReference.java - dto/src/main/models/Observe-31-data-ll-logbook.model - dto/src/main/models/Observe-35-data-ll.model - 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 - persistence/src/main/java/fr/ird/observe/entities/data/ll/common/TripImpl.java - persistence/src/main/models/Observe-31-data-ll-logbook.model - persistence/src/main/models/Observe-35-data-ll-common.model - persistence/src/main/resources/db/migration/8.0/106_create_ll_logbook_schema-common.sql - test/src/main/resources/db/8.0/dataForTestLongline.sql.gz - test/src/main/resources/db/8.0/dataForTestSeine.sql.gz - test/src/main/resources/db/8.0/empty_h2.sql.gz - test/src/main/resources/db/8.0/empty_pg.sql.gz - test/src/main/resources/db/8.0/referentiel.sql.gz The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/080180d43e2d960a51391552… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/080180d43e2d960a51391552… You're receiving this email because of your account on gitlab.com.
1 0
0 0
[Git][ultreiaio/ird-observe][develop-7.x] Petite amélioration cosmétique (c kdo)
by Tony CHEMIT 06 Jul '20

06 Jul '20
Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 851b44ae by Tony Chemit at 2020-07-06T14:15:33+02:00 Petite amélioration cosmétique (c kdo) - - - - - 4 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/AbstractSampleUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIHandler.java - pom.xml Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/AbstractSampleUIHandler.java ===================================== @@ -102,8 +102,10 @@ public abstract class AbstractSampleUIHandler<E extends IdDto, D extends IdDto, protected abstract void onLengthChanged(Float newValue); void loadSizeMeasureTypes() { - List<SizeMeasureTypeReference> sizeMeasureTypeReferences = getModel().getReferentialReferences(NonTargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE); - sizeMeasureTypeReferenceMap = Maps.uniqueIndex(sizeMeasureTypeReferences, SizeMeasureTypeReference::getTopiaId); + if (sizeMeasureTypeReferenceMap == null) { + List<SizeMeasureTypeReference> sizeMeasureTypeReferences = getModel().getReferentialReferences(NonTargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE); + sizeMeasureTypeReferenceMap = Maps.uniqueIndex(sizeMeasureTypeReferences, SizeMeasureTypeReference::getId); + } } Optional<SizeMeasureTypeReference> getSpeciesDefaultSizeMeasureType(SpeciesReference species) { @@ -112,7 +114,7 @@ public abstract class AbstractSampleUIHandler<E extends IdDto, D extends IdDto, String sizeMeasureId = species.getSizeMeasureTypeId(); result = sizeMeasureTypeReferenceMap.get(sizeMeasureId); log.info("Use as default size measure type: " + result); - } else { + } else { log.info("No default size measure type defined (species is null, or no default size measure definied on it."); } return Optional.ofNullable(result); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java ===================================== @@ -72,6 +72,12 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS }); } + @Override + public void afterInit(NonTargetSampleUI ui) { + super.afterInit(ui); + ui.getSizeMeasureType().getToolbarRight().add(ui.getDefaultSizeMeasureType()); + } + @Override public void resetIsWeightComputed() { getTableEditBean().setIsWeightComputed(false); @@ -176,8 +182,9 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS // on passe le mode de saisie updateAcquisitionMode0(AcquisitionMode.valueOf(bean.getAcquisitionMode())); - species = null; sizeMeasureType = Optional.ofNullable(bean.getSizeMeasureType()); + onSpeciesChanged(species); + species = null; } ui.getSizeMeasureType().setSelectedItem(null); @@ -187,6 +194,8 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS log.info(String.format("Will set species : %s", species)); ui.getSpecies().setSelectedItem(null); ui.getSpecies().setSelectedItem(species); + onSpeciesChanged(species); + sizeMeasureType.ifPresent(ui.getSizeMeasureType()::setSelectedItem); } UIHelper.askFocus(requestFocus); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIHandler.java ===================================== @@ -142,7 +142,8 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar @Override public void afterInit(U ui) { super.afterInit(ui); - + TargetSampleUI ui1 = (TargetSampleUI) ui; + ui1.getSizeMeasureType().getToolbarRight().add(ui1.getDefaultSizeMeasureType()); } @Override @@ -242,12 +243,12 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar sizeMeasureType.ifPresent(sizeMeasureTypeDtoReferentialReference -> ui.getSizeMeasureType().setSelectedItem(sizeMeasureTypeDtoReferentialReference)); // on met a jour l'espece - ui.getSpecies().setSelectedItem(null); if (species != null) { - if (log.isDebugEnabled()) { - log.debug("species to use " + species); - } + log.debug(String.format("species to use %s", species)); + ui.getSpecies().setSelectedItem(null); ui.getSpecies().setSelectedItem(species); + onSpeciesChanged(species); + sizeMeasureType.ifPresent(ui.getSizeMeasureType()::setSelectedItem); } UIHelper.askFocus(requestFocus); @@ -260,10 +261,9 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar public void openUI() { super.openUI(); - List<SizeMeasureTypeReference> sizeMeasureTypes = getReferentialReferences(SizeMeasureTypeReference.class); - List<SizeMeasureTypeReference> data = SizeMeasureTypeHelper.filterForSeine(sizeMeasureTypes); - log.info("Using " + data.size() + " size measure type(s)."); loadSizeMeasureTypes(); + List<SizeMeasureTypeReference> data = SizeMeasureTypeHelper.filterForSeine(sizeMeasureTypeReferenceMap.values()); + log.info("Using " + data.size() + " size measure type(s)."); checkSizeMeasureTypes(data); ((TargetSampleUI) getUi()).getSizeMeasureType().setData(data); } @@ -360,6 +360,7 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar loadReferentialReferenceSetsInModel(form); getModel().setForm(form); TargetSampleHelper.copyTargetSampleDto(form.getObject(), getBean()); + loadSizeMeasureTypes(); } @Override ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2020.36</version> + <version>2020.39</version> </parent> <groupId>fr.ird.observe</groupId> @@ -170,7 +170,7 @@ <!--<lib.version.java4all.http>1.0.13</lib.version.java4all.http>--> <!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>--> - <lib.version.java4all.jaxx>3.0-alpha-74</lib.version.java4all.jaxx> + <!-- lib.version.java4all.jaxx>3.0-alpha-75</lib.version.java4all.jaxx>--> <!--<lib.version.java4all.i18n>4.0-beta-8-SNAPSHOT</lib.version.java4all.i18n>--> <!--<lib.version.nuiton.topia>3.6-SNAPSHOT</lib.version.nuiton.topia>--> <!--<lib.version.java4all.eugene>3.0-alpha-21</lib.version.java4all.eugene>--> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/851b44aeb69bb50e16b71a541… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/851b44aeb69bb50e16b71a541… You're receiving this email because of your account on gitlab.com.
1 0
0 0
[Git][ultreiaio/ird-observe][develop-7.x] Petite amélioration cosmétique (c kdo)
by Tony CHEMIT 06 Jul '20

06 Jul '20
Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 9f155e2e by Tony Chemit at 2020-07-06T13:21:54+02:00 Petite amélioration cosmétique (c kdo) - - - - - 3 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIHandler.java - pom.xml Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java ===================================== @@ -72,6 +72,12 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS }); } + @Override + public void afterInit(NonTargetSampleUI ui) { + super.afterInit(ui); + ui.getSizeMeasureType().getToolbarRight().add(ui.getDefaultSizeMeasureType()); + } + @Override public void resetIsWeightComputed() { getTableEditBean().setIsWeightComputed(false); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIHandler.java ===================================== @@ -142,7 +142,8 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar @Override public void afterInit(U ui) { super.afterInit(ui); - + TargetSampleUI ui1 = (TargetSampleUI) ui; + ui1.getSizeMeasureType().getToolbarRight().add(ui1.getDefaultSizeMeasureType()); } @Override ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2020.36</version> + <version>2020.39</version> </parent> <groupId>fr.ird.observe</groupId> @@ -170,7 +170,7 @@ <!--<lib.version.java4all.http>1.0.13</lib.version.java4all.http>--> <!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>--> - <lib.version.java4all.jaxx>3.0-alpha-74</lib.version.java4all.jaxx> + <!-- lib.version.java4all.jaxx>3.0-alpha-75</lib.version.java4all.jaxx>--> <!--<lib.version.java4all.i18n>4.0-beta-8-SNAPSHOT</lib.version.java4all.i18n>--> <!--<lib.version.nuiton.topia>3.6-SNAPSHOT</lib.version.nuiton.topia>--> <!--<lib.version.java4all.eugene>3.0-alpha-21</lib.version.java4all.eugene>--> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9f155e2e6206b0f684ae57e31… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9f155e2e6206b0f684ae57e31… You're receiving this email because of your account on gitlab.com.
1 0
0 0
[Git][ultreiaio/ird-observe][develop-7.x] Petite amélioration cosmétique (c kdo)
by Tony CHEMIT 06 Jul '20

06 Jul '20
Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: cf273ecb by Tony Chemit at 2020-07-06T12:41:12+02:00 Petite amélioration cosmétique (c kdo) - - - - - 3 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIHandler.java - pom.xml Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java ===================================== @@ -72,6 +72,12 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS }); } + @Override + public void afterInit(NonTargetSampleUI ui) { + super.afterInit(ui); + ui.getSizeMeasureType().getToolbarRight().add(ui.getDefaultSizeMeasureType()); + } + @Override public void resetIsWeightComputed() { getTableEditBean().setIsWeightComputed(false); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIHandler.java ===================================== @@ -142,7 +142,8 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar @Override public void afterInit(U ui) { super.afterInit(ui); - + TargetSampleUI ui1 = (TargetSampleUI) ui; + ui1.getSizeMeasureType().getToolbarRight().add(ui1.getDefaultSizeMeasureType()); } @Override ===================================== pom.xml ===================================== @@ -170,7 +170,7 @@ <!--<lib.version.java4all.http>1.0.13</lib.version.java4all.http>--> <!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>--> - <lib.version.java4all.jaxx>3.0-alpha-74</lib.version.java4all.jaxx> + <lib.version.java4all.jaxx>3.0-alpha-75</lib.version.java4all.jaxx> <!--<lib.version.java4all.i18n>4.0-beta-8-SNAPSHOT</lib.version.java4all.i18n>--> <!--<lib.version.nuiton.topia>3.6-SNAPSHOT</lib.version.nuiton.topia>--> <!--<lib.version.java4all.eugene>3.0-alpha-21</lib.version.java4all.eugene>--> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/cf273ecb11a292db0187db02f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/cf273ecb11a292db0187db02f… You're receiving this email because of your account on gitlab.com.
1 0
0 0
[Git][ultreiaio/ird-observe][develop] 3 commits: [LL] Appairement des activités : cosmétique - Closes #1537
by Tony CHEMIT 06 Jul '20

06 Jul '20
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f4094436 by Tony Chemit at 2020-07-06T13:00:01+02:00 [LL] Appairement des activités : cosmétique - Closes #1537 - - - - - cba65bba by Tony Chemit at 2020-07-06T13:00:02+02:00 amélioration log - - - - - 080180d4 by Tony Chemit at 2020-07-06T13:00:02+02:00 Les actions de changement d&#39;ordre sur les tableaux ordonné ne fonctionnent plus - Closes #1570 - - - - - 10 changed files: - client-core/src/main/java/fr/ird/observe/client/util/JMenuWithAccelerator.java - client-datasource-actions/src/main/i18n/getters/java.getter - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/tree/ActivityLonglinePairingTreeTableModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/actions/ContentTableUIEntryActionSupport.java - + client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/actions/MakeActionsEnabledOnlyIfMenuItemParentIsOpenedPopupMenuListener.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/popup/AutoSelectWithMoveUpAndDownShowPopupAction.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 - pom.xml Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/util/JMenuWithAccelerator.java ===================================== @@ -58,7 +58,7 @@ public class JMenuWithAccelerator extends JMenu { public void setSelected(boolean b) { super.setSelected(b); if (b) { - log.info(String.format("Yo selected: up to %s", getName())); + log.debug(String.format("%s is now selected", getName())); SwingUtilities.invokeLater(() -> ((JMenuItem) getMenuComponent(0)).setSelected(true)); } } ===================================== client-datasource-actions/src/main/i18n/getters/java.getter ===================================== @@ -48,6 +48,8 @@ observe.actions.exportData.title observe.actions.exportData.title.tip observe.actions.longline.pairing observe.actions.longline.pairing.description +observe.actions.longline.pairing.table.logbook.activity +observe.actions.longline.pairing.table.observation.activity observe.actions.longline.pairing.table.selected observe.actions.longline.pairing.tip observe.actions.longline.pairing.title @@ -173,9 +175,7 @@ observe.admin.report.title.tip observe.choice.cancel observe.choice.confirm.insert observe.choice.replace -observe.common.data observe.common.none -observe.data.ll.logbook.Activity.relatedObservedActivity observe.message.no.report.selected observe.message.select.report observe.message.show.usage.for.missingReferentials2 ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/tree/ActivityLonglinePairingTreeTableModel.java ===================================== @@ -48,8 +48,8 @@ public class ActivityLonglinePairingTreeTableModel extends DefaultTreeTableModel public ActivityLonglinePairingTreeTableModel(ActivityLonglinePairingModel uiModel, ActivityLonglinePairingRootNode rootNode) { super(Objects.requireNonNull(rootNode), Arrays.asList( - I18n.t("observe.common.data"), - I18n.t("observe.data.ll.logbook.Activity.relatedObservedActivity"), + I18n.t("observe.actions.longline.pairing.table.logbook.activity"), + I18n.t("observe.actions.longline.pairing.table.observation.activity"), I18n.t("observe.actions.longline.pairing.table.selected"))); this.uiModel = Objects.requireNonNull(uiModel); } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/actions/ContentTableUIEntryActionSupport.java ===================================== @@ -27,9 +27,13 @@ import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableMo import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUI; import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUIModel; import fr.ird.observe.client.main.MainUIModel; +import io.ultreia.java4all.lang.Objects2; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.nuiton.jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.swing.action.JAXXObjectActionSupport; +import javax.swing.AbstractButton; import javax.swing.KeyStroke; import java.awt.event.ActionEvent; import java.beans.PropertyChangeListener; @@ -45,6 +49,13 @@ public abstract class ContentTableUIEntryActionSupport extends ContentTableUIAct private final PropertyChangeListener propertyChangeListener; private boolean canExecuteFromRead; + public static <U extends JAXXObject, A extends JAXXObjectActionSupport<U>> A init(U ui, AbstractButton editor, Class<A> actionType) { + + A action = JAXXObjectActionSupport.init(ui, editor, actionType ); + editor.putClientProperty(ACTIVATE_FROM_POPUP, true); + return action; + } + protected ContentTableUIEntryActionSupport(String text, String tip, String icon, KeyStroke keyStroke) { super(text, tip, icon, keyStroke); propertyChangeListener = e -> { ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/actions/MakeActionsEnabledOnlyIfMenuItemParentIsOpenedPopupMenuListener.java ===================================== @@ -0,0 +1,93 @@ +package fr.ird.observe.client.datasource.editor.content.data.table.actions; + +/*- + * #%L + * ObServe :: Client DataSource Editor API + * %% + * Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.nuiton.jaxx.runtime.swing.action.JAXXObjectActionSupport; + +import javax.swing.JMenuItem; +import javax.swing.JPopupMenu; +import javax.swing.SwingUtilities; +import javax.swing.event.PopupMenuEvent; +import javax.swing.event.PopupMenuListener; +import java.awt.Component; +import java.util.Objects; + +/** + * Install this listener on menu to disable any accelerator in popup menu while menu is not displayed. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class MakeActionsEnabledOnlyIfMenuItemParentIsOpenedPopupMenuListener implements PopupMenuListener { + + private static final Logger log = LogManager.getLogger(MakeActionsEnabledOnlyIfMenuItemParentIsOpenedPopupMenuListener.class); + + private final JPopupMenu jMenu; + private boolean adjusting; + + public static void install(JPopupMenu menuBar) { + menuBar.addPopupMenuListener(new MakeActionsEnabledOnlyIfMenuItemParentIsOpenedPopupMenuListener(menuBar)); + } + + public MakeActionsEnabledOnlyIfMenuItemParentIsOpenedPopupMenuListener(JPopupMenu jMenu) { + this.jMenu = Objects.requireNonNull(jMenu); + } + + @Override + public void popupMenuWillBecomeVisible(PopupMenuEvent e) { + updateElements(true); + } + + @Override + public void popupMenuWillBecomeInvisible(PopupMenuEvent e) { + SwingUtilities.invokeLater(() -> updateElements(false)); + } + + @Override + public void popupMenuCanceled(PopupMenuEvent e) { + updateElements(false); + } + + public void updateElements(boolean activateFromPopup) { + if (adjusting) { + return; + } + adjusting = true; + + try { + String state = activateFromPopup ? "enabled" : "disabled"; + for (Component subElement : jMenu.getComponents()) { + if (subElement instanceof JMenuItem) { + JMenuItem component = (JMenuItem) subElement; + if (component.getAccelerator() != null && component.getAction() instanceof JAXXObjectActionSupport) { + log.info(String.format("Menu (%s) item (%s) will %s", jMenu.getName(), component.getName(), state)); + component.putClientProperty(JAXXObjectActionSupport.ACTIVATE_FROM_POPUP, activateFromPopup); + } + } + } + } finally { + adjusting = false; + } + } +} ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/popup/AutoSelectWithMoveUpAndDownShowPopupAction.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.content.data.table.popup; */ import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUI; +import fr.ird.observe.client.datasource.editor.content.data.table.actions.MakeActionsEnabledOnlyIfMenuItemParentIsOpenedPopupMenuListener; import fr.ird.observe.client.datasource.editor.content.data.table.actions.MoveBottom; import fr.ird.observe.client.datasource.editor.content.data.table.actions.MoveDown; import fr.ird.observe.client.datasource.editor.content.data.table.actions.MoveTop; @@ -42,13 +43,13 @@ import java.util.Objects; */ public class AutoSelectWithMoveUpAndDownShowPopupAction extends AutoSelectRowAndShowPopupActionSupport { - private final ContentTableUI ui; + private final ContentTableUI<?, ?, ?> ui; private final JMenuItem moveTop; private final JMenuItem moveUp; private final JMenuItem moveDown; private final JMenuItem moveBottom; - public AutoSelectWithMoveUpAndDownShowPopupAction(ContentTableUI ui) { + public AutoSelectWithMoveUpAndDownShowPopupAction(ContentTableUI<?, ?, ?> ui) { super(Objects.requireNonNull(ui).getTableScrollPane(), ui.getTable()); this.ui = ui; JPopupMenu popup = getPopup(); @@ -71,15 +72,6 @@ public class AutoSelectWithMoveUpAndDownShowPopupAction extends AutoSelectRowAnd moveUp.setEnabled(false); moveDown.setEnabled(false); } -// TableModel model = ui.getTable().getModel(); -// ContentTableUIModel model1 = ui.getModel(); -// boolean notEdit = !model1.isCanSaveRow(); -// boolean canMoveUp = !model1.isCanSaveRow() && modelRowIndex > 0; -// boolean canMoveDown = ; -// moveTop.setEnabled(canMoveUp); -// moveUp.setEnabled(canMoveUp); -// moveDown.setEnabled(canMoveDown); -// moveBottom.setEnabled(canMoveDown); } } ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -224,7 +224,9 @@ observe.actions.longline.pairing=Longline activities pairing observe.actions.longline.pairing.config=Pairing configuration observe.actions.longline.pairing.description=Longline activities pairing observe.actions.longline.pairing.message.operation.done=Pairing operation done in %1$s. -observe.actions.longline.pairing.table.selected=To be processed +observe.actions.longline.pairing.table.logbook.activity=Observation activities +observe.actions.longline.pairing.table.observation.activity=Logbook activities +observe.actions.longline.pairing.table.selected=To be saved observe.actions.longline.pairing.tip=Longline activities pairing observe.actions.longline.pairing.title=Longline activities pairing observe.actions.longline.pairing.title.tip=Longline activities pairing ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -224,7 +224,9 @@ observe.actions.longline.pairing=Longline activities pairing \#TODO observe.actions.longline.pairing.config=Pairing configuration \#TODO observe.actions.longline.pairing.description=Longline activities pairing \#TODO observe.actions.longline.pairing.message.operation.done=Pairing operation done in %1$s. \#TODO -observe.actions.longline.pairing.table.selected=Debe tratarse +observe.actions.longline.pairing.table.logbook.activity=Observation activities \#TODO +observe.actions.longline.pairing.table.observation.activity=Logbook activities \#TODO +observe.actions.longline.pairing.table.selected=Debe grabar \#TODO observe.actions.longline.pairing.tip=Longline activities pairing \#TODO observe.actions.longline.pairing.title=Longline activities pairing \#TODO observe.actions.longline.pairing.title.tip=Longline activities pairing \#TODO ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -224,7 +224,9 @@ observe.actions.longline.pairing=Appairement des activités palangre observe.actions.longline.pairing.config=Configuration de l'appairement observe.actions.longline.pairing.description=Appairement des activités palangre observe.actions.longline.pairing.message.operation.done=Opération terminées en %1$s. -observe.actions.longline.pairing.table.selected=À traiter +observe.actions.longline.pairing.table.logbook.activity=Activités Observation +observe.actions.longline.pairing.table.observation.activity=Activités Livre de Bord +observe.actions.longline.pairing.table.selected=À enregistrer observe.actions.longline.pairing.tip=Appairement des activités palangre observe.actions.longline.pairing.title=Appairement des activités palangre observe.actions.longline.pairing.title.tip=Appairement des activités palangre ===================================== pom.xml ===================================== @@ -176,7 +176,7 @@ <!-- <lib.version.java4all.topia>1.17</lib.version.java4all.topia>--> <!-- <lib.version.java4all.eugene>3.0-alpha-34-SNAPSHOT</lib.version.java4all.eugene>--> - <lib.version.java4all.jaxx>3.0-alpha-74</lib.version.java4all.jaxx> + <lib.version.java4all.jaxx>3.0-alpha-75</lib.version.java4all.jaxx> <!--<lib.version.java4all.application-context>1.0.3-SNAPSHOT</lib.version.java4all.application-context>--> <!--<lib.version.java4all.application-template>1.0.2-SNAPSHOT</lib.version.java4all.application-template>--> <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>--> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7fb3d456ec3de07fbc2302d8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7fb3d456ec3de07fbc2302d8… You're receiving this email because of your account on gitlab.com.
1 0
0 0
[Git][ultreiaio/ird-observe][develop] [LL] Appairement des activités : cosmétique - Closes #1537
by Tony CHEMIT 06 Jul '20

06 Jul '20
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7fb3d456 by Tony Chemit at 2020-07-06T11:13:53+02:00 [LL] Appairement des activités : cosmétique - Closes #1537 - - - - - 4 changed files: - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/tree/ActivityLonglinePairingTreeTableModel.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: ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/tree/ActivityLonglinePairingTreeTableModel.java ===================================== @@ -48,8 +48,8 @@ public class ActivityLonglinePairingTreeTableModel extends DefaultTreeTableModel public ActivityLonglinePairingTreeTableModel(ActivityLonglinePairingModel uiModel, ActivityLonglinePairingRootNode rootNode) { super(Objects.requireNonNull(rootNode), Arrays.asList( - I18n.t("observe.common.data"), - I18n.t("observe.data.ll.logbook.Activity.relatedObservedActivity"), + I18n.t("observe.actions.longline.pairing.table.logbook.activity"), + I18n.t("observe.actions.longline.pairing.table.observation.activity"), I18n.t("observe.actions.longline.pairing.table.selected"))); this.uiModel = Objects.requireNonNull(uiModel); } ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -224,7 +224,9 @@ observe.actions.longline.pairing=Longline activities pairing observe.actions.longline.pairing.config=Pairing configuration observe.actions.longline.pairing.description=Longline activities pairing observe.actions.longline.pairing.message.operation.done=Pairing operation done in %1$s. -observe.actions.longline.pairing.table.selected=To be processed +observe.actions.longline.pairing.table.logbook.activity=Observation activities +observe.actions.longline.pairing.table.observation.activity=Logbook activities +observe.actions.longline.pairing.table.selected=To be saved observe.actions.longline.pairing.tip=Longline activities pairing observe.actions.longline.pairing.title=Longline activities pairing observe.actions.longline.pairing.title.tip=Longline activities pairing ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -224,7 +224,9 @@ observe.actions.longline.pairing=Longline activities pairing \#TODO observe.actions.longline.pairing.config=Pairing configuration \#TODO observe.actions.longline.pairing.description=Longline activities pairing \#TODO observe.actions.longline.pairing.message.operation.done=Pairing operation done in %1$s. \#TODO -observe.actions.longline.pairing.table.selected=Debe tratarse +observe.actions.longline.pairing.table.logbook.activity=Observation activities #TODO +observe.actions.longline.pairing.table.observation.activity=Logbook activities #TODO +observe.actions.longline.pairing.table.selected=Debe grabar #TODO observe.actions.longline.pairing.tip=Longline activities pairing \#TODO observe.actions.longline.pairing.title=Longline activities pairing \#TODO observe.actions.longline.pairing.title.tip=Longline activities pairing \#TODO ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -224,7 +224,9 @@ observe.actions.longline.pairing=Appairement des activités palangre observe.actions.longline.pairing.config=Configuration de l'appairement observe.actions.longline.pairing.description=Appairement des activités palangre observe.actions.longline.pairing.message.operation.done=Opération terminées en %1$s. -observe.actions.longline.pairing.table.selected=À traiter +observe.actions.longline.pairing.table.logbook.activity=Activités Observation +observe.actions.longline.pairing.table.observation.activity=Activités Livre de Bord +observe.actions.longline.pairing.table.selected=À enregistrer observe.actions.longline.pairing.tip=Appairement des activités palangre observe.actions.longline.pairing.title=Appairement des activités palangre observe.actions.longline.pairing.title.tip=Appairement des activités palangre View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7fb3d456ec3de07fbc2302d85… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7fb3d456ec3de07fbc2302d85… You're receiving this email because of your account on gitlab.com.
1 0
0 0
[Git][ultreiaio/ird-observe][develop] [PS] Pratiques de remises à l'eau : le mode de libération n'est pas supprimé...
by Tony CHEMIT 06 Jul '20

06 Jul '20
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f7687614 by Tony Chemit at 2020-07-06T10:21:36+02:00 [PS] Pratiques de remises à l&#39;eau : le mode de libération n&#39;est pas supprimé si on change d&#39;espèce - Closes #1575 - - - - - 1 changed file: - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetCatchReleaseUIHandler.java Changes: ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetCatchReleaseUIHandler.java ===================================== @@ -43,6 +43,7 @@ import fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleaseConfor import fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleaseStatusReference; import fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleasingTimeReference; import fr.ird.observe.dto.result.SaveResultDto; +import io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.spi.UIHandler; @@ -263,17 +264,25 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetNon } private void updateSpecies(SpeciesReference species) { + JaxxComboBox<SpeciesGroupReleaseModeReference> speciesGroupReleaseModeEditor = getUi().getSpeciesGroupReleaseMode(); if (species == null) { - ui.getSpeciesGroupReleaseMode().setData(Collections.emptyList()); - setFormFocusOwner(ui.getSpecies()); + log.debug("Reset speciesGroupReleaseMode, there is no species selected."); + speciesGroupReleaseModeEditor.setSelectedItem(null); + speciesGroupReleaseModeEditor.setData(Collections.emptyList()); return; } String speciesGroupId = species.getSpeciesGroupId(); - SpeciesGroupDto speciesGroupDto = speciesGroupDtoMap.get(speciesGroupId); - Objects.requireNonNull(speciesGroupDto); - log.info(prefix + "Will use speciesGroup: " + speciesGroupDto.getLabel2()); - ui.getSpeciesGroupReleaseMode().setData(speciesGroupDto.getSpeciesGroupReleaseMode()); + SpeciesGroupDto speciesGroupDto = Objects.requireNonNull(speciesGroupDtoMap.get(speciesGroupId)); + log.debug(String.format("Will use speciesGroup: %s", speciesGroupDto)); + + SpeciesGroupReleaseModeReference speciesGroupReleaseMode = getModel().getTableEditBean().getSpeciesGroupReleaseMode(); + List<SpeciesGroupReleaseModeReference> speciesGroupReleaseModeList = speciesGroupDto.getSpeciesGroupReleaseMode(); + speciesGroupReleaseModeEditor.setSelectedItem(null); + speciesGroupReleaseModeEditor.setData(speciesGroupReleaseModeList); + if (speciesGroupReleaseModeList.contains(speciesGroupReleaseMode)) { + log.debug(String.format("Set back speciesGroupReleaseMode: %s", speciesGroupReleaseMode)); + speciesGroupReleaseModeEditor.setSelectedItem(speciesGroupReleaseMode); + } SwingUtilities.invokeLater(ui::revalidate); - setFormFocusOwner(ui.getSex()); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f7687614cf6f87f0d8e60aa16… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f7687614cf6f87f0d8e60aa16… You're receiving this email because of your account on gitlab.com.
1 0
0 0
[Git][ultreiaio/ird-observe][develop-7.x] [PS] Pratiques de remises à l'eau : le mode de libération n'est pas supprimé...
by Tony CHEMIT 06 Jul '20

06 Jul '20
Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 37a54994 by Tony Chemit at 2020-07-06T10:19:41+02:00 [PS] Pratiques de remises à l&#39;eau : le mode de libération n&#39;est pas supprimé si on change d&#39;espèce - Closes #1575 - - - - - 1 changed file: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java ===================================== @@ -43,6 +43,7 @@ import fr.ird.observe.dto.referential.seine.NonTargetCatchReleaseConformityRefer import fr.ird.observe.dto.referential.seine.NonTargetCatchReleaseStatusReference; import fr.ird.observe.dto.referential.seine.NonTargetCatchReleasingTimeReference; import fr.ird.observe.dto.result.SaveResultDto; +import io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.spi.UIHandler; @@ -95,20 +96,24 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei private void updateSpecies(SpeciesReference species) { + JaxxComboBox<SpeciesGroupReleaseModeReference> speciesGroupReleaseModeEditor = getUi().getSpeciesGroupReleaseMode(); if (species == null) { - getUi().getSpeciesGroupReleaseMode().setData(Collections.emptyList()); + log.debug("Reset speciesGroupReleaseMode, there is no species selected."); + speciesGroupReleaseModeEditor.setSelectedItem(null); + speciesGroupReleaseModeEditor.setData(Collections.emptyList()); return; } String speciesGroupId = species.getSpeciesGroupId(); - SpeciesGroupDto speciesGroupDto = speciesGroupDtoMap.get(speciesGroupId); - Objects.requireNonNull(speciesGroupDto); - log.info("Will use speciesGroup: " + speciesGroupDto.getLabel2()); + SpeciesGroupDto speciesGroupDto = Objects.requireNonNull(speciesGroupDtoMap.get(speciesGroupId)); + log.debug(String.format("Will use speciesGroup: %s", speciesGroupDto)); + SpeciesGroupReleaseModeReference speciesGroupReleaseMode = getModel().getTableEditBean().getSpeciesGroupReleaseMode(); List<SpeciesGroupReleaseModeReference> speciesGroupReleaseModeList = speciesGroupDto.getSpeciesGroupReleaseMode(); - getUi().getSpeciesGroupReleaseMode().setData(speciesGroupReleaseModeList); - getUi().getSpeciesGroupReleaseMode().setSelectedItem(null); + speciesGroupReleaseModeEditor.setSelectedItem(null); + speciesGroupReleaseModeEditor.setData(speciesGroupReleaseModeList); if (speciesGroupReleaseModeList.contains(speciesGroupReleaseMode)) { - getUi().getSpeciesGroupReleaseMode().setSelectedItem(speciesGroupReleaseMode); + log.debug(String.format("Set back speciesGroupReleaseMode: %s", speciesGroupReleaseMode)); + speciesGroupReleaseModeEditor.setSelectedItem(speciesGroupReleaseMode); } SwingUtilities.invokeLater(getUi()::revalidate); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/37a54994074d2fc50659d5be3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/37a54994074d2fc50659d5be3… You're receiving this email because of your account on gitlab.com.
1 0
0 0
[Git][ultreiaio/ird-observe][develop] Clean license headers
by Tony CHEMIT 06 Jul '20

06 Jul '20
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b8607fa4 by Tony Chemit at 2020-07-06T09:31:01+02:00 Clean license headers - - - - - 30 changed files: - client-configuration/src/main/resources/log4j2.xml - client-core/src/main/i18n/templates/initStorage_en_GB.ftl - client-core/src/main/i18n/templates/initStorage_es_ES.ftl - client-core/src/main/i18n/templates/initStorage_fr_FR.ftl - client-datasource-actions/pom.xml - client-datasource-actions/src/main/i18n/templates/validationReport_en_GB.ftl - client-datasource-actions/src/main/i18n/templates/validationReport_es_ES.ftl - client-datasource-actions/src/main/i18n/templates/validationReport_fr_FR.ftl - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminActionModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminActionWorker.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminStep.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jcss - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUI.jcss - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIBodyContent.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminTabUIActionSupport.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminUIActionSupport.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/Cancel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/Close.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/CopyToClipBoard.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/NextStep.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/PreviousStep.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/SelectData.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigUI.jcss The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b8607fa43292e251137f5cb3e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b8607fa43292e251137f5cb3e… You're receiving this email because of your account on gitlab.com.
1 0
0 0
[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Integrates back toolkit since we won't use it anywhere else
by Tony CHEMIT 06 Jul '20

06 Jul '20
Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 59055c83 by Tony Chemit at 2020-07-06T09:27:28+02:00 Integrates back toolkit since we won&#39;t use it anywhere else - - - - - 7f3e2d5e by Tony Chemit at 2020-07-06T09:27:29+02:00 Clean license headers - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/resources/log4j2.xml - client-configuration/src/main/resources/observe-log4j2.xml - client-core/pom.xml - client-core/src/main/assembly/map.xml - client-core/src/main/java/fr/ird/observe/client/package.html - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/ShowUniqueKeysAction.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/report/ReportConfigUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/report/ReportUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/save/SaveLocalUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/legacy/SynchronizeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialReplaceUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/ReferentialSelectionTree.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/ReferentialSelectionTreePane.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/ReferentialSelectionTreePane.jcss - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/ReferentialSelectionTreePaneHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/actions/CollapseAll.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/actions/ExpandAll.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/actions/ReferentialSelectionTreePaneActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/actions/SelectAll.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/actions/SelectUnselect.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/actions/UnselectAll.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f2837cc69a96fad5c1f1497b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f2837cc69a96fad5c1f1497b… You're receiving this email because of your account on gitlab.com.
1 0
0 0
  • ← Newer
  • 1
  • 2
  • 3
  • 4
  • 5
  • 6
  • 7
  • 8
  • 9
  • 10
  • Older →

HyperKitty Powered by HyperKitty version 1.3.12.