Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
2ba617f5
by Tony CHEMIT at 2017-08-19T11:31:43+00:00
-
ae7cc206
by Tony CHEMIT at 2017-08-19T11:31:45+00:00
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:
| ... | ... | @@ -41,6 +41,7 @@ |
| 41 | 41 |
fr.ird.observe.client.ui.actions.main.global.NewNextDataGlobalUIAction
|
| 42 | 42 |
fr.ird.observe.client.ui.actions.main.global.ResetDataGlobalUIAction
|
| 43 | 43 |
fr.ird.observe.client.ui.actions.main.global.SaveDataGlobalUIAction
|
| 44 |
+ fr.ird.observe.client.ui.util.ObserveBlockingLayerUI
|
|
| 44 | 45 |
|
| 45 | 46 |
org.nuiton.jaxx.widgets.select.BeanListHeader
|
| 46 | 47 |
org.nuiton.jaxx.validator.swing.SwingValidator
|
| ... | ... | @@ -70,7 +71,7 @@ |
| 70 | 71 |
|
| 71 | 72 |
<ReferentialDto id='bean'/>
|
| 72 | 73 |
|
| 73 |
- <BlockingLayerUI id='editKeyTableLayerUI'/>
|
|
| 74 |
+ <ObserveBlockingLayerUI id='editKeyTableLayerUI'/>
|
|
| 74 | 75 |
|
| 75 | 76 |
<CardLayout2Ext id='viewLayout' constructorParams='this, "body"'/>
|
| 76 | 77 |
|
| ... | ... | @@ -23,11 +23,11 @@ package fr.ird.observe.client.ui.content.table; |
| 23 | 23 |
*/
|
| 24 | 24 |
|
| 25 | 25 |
import fr.ird.observe.client.ui.content.ObserveContentUI;
|
| 26 |
+import fr.ird.observe.client.ui.util.ObserveBlockingLayerUI;
|
|
| 26 | 27 |
import fr.ird.observe.services.dto.IdDto;
|
| 27 | 28 |
import javax.swing.JComponent;
|
| 28 | 29 |
import javax.swing.JTable;
|
| 29 | 30 |
import javax.swing.ListSelectionModel;
|
| 30 |
-import org.nuiton.jaxx.runtime.swing.BlockingLayerUI;
|
|
| 31 | 31 |
import org.nuiton.jaxx.validator.swing.SwingValidator;
|
| 32 | 32 |
|
| 33 | 33 |
/**
|
| ... | ... | @@ -59,9 +59,9 @@ public interface ObserveContentTableUI<E extends IdDto, D extends IdDto, U exten |
| 59 | 59 |
|
| 60 | 60 |
ListSelectionModel getSelectionModel();
|
| 61 | 61 |
|
| 62 |
- BlockingLayerUI getBlockLayerUI();
|
|
| 62 |
+ ObserveBlockingLayerUI getBlockLayerUI();
|
|
| 63 | 63 |
|
| 64 |
- BlockingLayerUI getEditorBlockLayerUI();
|
|
| 64 |
+ ObserveBlockingLayerUI getEditorBlockLayerUI();
|
|
| 65 | 65 |
|
| 66 | 66 |
SwingValidator<E> getValidator();
|
| 67 | 67 |
|
| ... | ... | @@ -1473,6 +1473,7 @@ public class ObserveDtoInitializer { |
| 1473 | 1473 |
|
| 1474 | 1474 |
flushReferential(referentialFormBuilder((SpeciesDto.class))
|
| 1475 | 1475 |
.addKey(SpeciesDto.PROPERTY_OCEAN, referenceSetDefinition(OceanDto.class))
|
| 1476 |
+ .addKey(SpeciesDto.PROPERTY_SIZE_MEASURE_TYPE, referenceSetDefinition(SizeMeasureTypeDto.class))
|
|
| 1476 | 1477 |
.addKey(SpeciesDto.PROPERTY_SPECIES_GROUP, referenceSetDefinition(SpeciesGroupDto.class)));
|
| 1477 | 1478 |
}
|
| 1478 | 1479 |
|