Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2ba617f5 by Tony CHEMIT at 2017-08-19T11:31:43+00:00 fix species screen loading - - - - - ae7cc206 by Tony CHEMIT at 2017-08-19T11:31:45+00:00 Permettre l'utilisation de la molette de la souris même sur des zones protégées (See #854) - - - - - 3 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/table/ObserveContentTableUI.java - services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUI.jaxx @@ -41,6 +41,7 @@ fr.ird.observe.client.ui.actions.main.global.NewNextDataGlobalUIAction fr.ird.observe.client.ui.actions.main.global.ResetDataGlobalUIAction fr.ird.observe.client.ui.actions.main.global.SaveDataGlobalUIAction + fr.ird.observe.client.ui.util.ObserveBlockingLayerUI org.nuiton.jaxx.widgets.select.BeanListHeader org.nuiton.jaxx.validator.swing.SwingValidator @@ -70,7 +71,7 @@ <ReferentialDto id='bean'/> - <BlockingLayerUI id='editKeyTableLayerUI'/> + <ObserveBlockingLayerUI id='editKeyTableLayerUI'/> <CardLayout2Ext id='viewLayout' constructorParams='this, "body"'/> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/ObserveContentTableUI.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/ObserveContentTableUI.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/ObserveContentTableUI.java @@ -23,11 +23,11 @@ package fr.ird.observe.client.ui.content.table; */ import fr.ird.observe.client.ui.content.ObserveContentUI; +import fr.ird.observe.client.ui.util.ObserveBlockingLayerUI; import fr.ird.observe.services.dto.IdDto; import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.ListSelectionModel; -import org.nuiton.jaxx.runtime.swing.BlockingLayerUI; import org.nuiton.jaxx.validator.swing.SwingValidator; /** @@ -59,9 +59,9 @@ public interface ObserveContentTableUI<E extends IdDto, D extends IdDto, U exten ListSelectionModel getSelectionModel(); - BlockingLayerUI getBlockLayerUI(); + ObserveBlockingLayerUI getBlockLayerUI(); - BlockingLayerUI getEditorBlockLayerUI(); + ObserveBlockingLayerUI getEditorBlockLayerUI(); SwingValidator<E> getValidator(); ===================================== services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java +++ b/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java @@ -1473,6 +1473,7 @@ public class ObserveDtoInitializer { flushReferential(referentialFormBuilder((SpeciesDto.class)) .addKey(SpeciesDto.PROPERTY_OCEAN, referenceSetDefinition(OceanDto.class)) + .addKey(SpeciesDto.PROPERTY_SIZE_MEASURE_TYPE, referenceSetDefinition(SizeMeasureTypeDto.class)) .addKey(SpeciesDto.PROPERTY_SPECIES_GROUP, referenceSetDefinition(SpeciesGroupDto.class))); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/026dddd36e299a2dd5f01708d40... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/026dddd36e299a2dd5f01708d40... You're receiving this email because of your account on gitlab.com.