Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
21c79565
by Tony Chemit at 2021-09-28T10:51:02+02:00
3 changed files:
- client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java
- client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsagePanel.jaxx
Changes:
| ... | ... | @@ -500,7 +500,7 @@ public class ObserveSwingDataSource extends ObserveServicesProviderSupport imple |
| 500 | 500 |
|
| 501 | 501 |
public SetMultimap<Class<? extends ReferentialDto>, ToolkitIdLabel> getReferentialMap(SetMultimap<Class<? extends ReferentialDto>, String> referentialIds) {
|
| 502 | 502 |
SetMultimap<Class<? extends ReferentialDto>, ToolkitIdLabel> result = LinkedHashMultimap.create();
|
| 503 |
- for (Class<? extends ReferentialDto> dtoType : referentialIds.keys()) {
|
|
| 503 |
+ for (Class<? extends ReferentialDto> dtoType : referentialIds.keySet()) {
|
|
| 504 | 504 |
Set<String> ids = referentialIds.get(dtoType);
|
| 505 | 505 |
Class<ReferentialDtoReference> referenceType = ObserveBusinessProject.get().getMapping().getReferenceType(dtoType);
|
| 506 | 506 |
Set<ReferentialDtoReference> references = getReferentialReferenceSet(referenceType).subSet(ids).collect(Collectors.toSet());
|
| ... | ... | @@ -22,7 +22,6 @@ package fr.ird.observe.client.datasource.actions.actions; |
| 22 | 22 |
* #L%
|
| 23 | 23 |
*/
|
| 24 | 24 |
|
| 25 |
-import com.google.common.collect.LinkedHashMultimap;
|
|
| 26 | 25 |
import com.google.common.collect.SetMultimap;
|
| 27 | 26 |
import fr.ird.observe.client.datasource.api.ObserveSwingDataSource;
|
| 28 | 27 |
import fr.ird.observe.client.datasource.editor.api.content.referential.usage.UsageForDisplayUIHandler;
|
| ... | ... | @@ -17,18 +17,14 @@ |
| 17 | 17 |
<http://www.gnu.org/licenses/gpl-3.0.html>.
|
| 18 | 18 |
#L%
|
| 19 | 19 |
-->
|
| 20 |
-<Table fill="both" constraints="BorderLayout.CENTER">
|
|
| 20 |
+<JPanel id="usages" border='{new TitledBorder(t("observe.ui.usage.usageTitle"))}' layout="{new BorderLayout()}">
|
|
| 21 | 21 |
<import>
|
| 22 | 22 |
static io.ultreia.java4all.i18n.I18n.t
|
| 23 | 23 |
</import>
|
| 24 |
- <row>
|
|
| 25 |
- <cell weighty="1" weightx="1">
|
|
| 26 |
- <JPanel id="usages" border='{new TitledBorder(t("observe.ui.usage.usageTitle"))}' layout="{new BorderLayout()}">
|
|
| 27 |
- <JPanel id="usagesCount" constraints="BorderLayout.WEST" layout="{new GridLayout(0, 1)}"/>
|
|
| 28 |
- <JScrollPane id="dataPane" constraints='BorderLayout.CENTER'>
|
|
| 29 |
- <JList id="dataList" genericType="String"/>
|
|
| 30 |
- </JScrollPane>
|
|
| 31 |
- </JPanel>
|
|
| 32 |
- </cell>
|
|
| 33 |
- </row>
|
|
| 34 |
-</Table>
|
|
| 24 |
+ <JScrollPane id="usagesPane" constraints='BorderLayout.WEST' horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}'>
|
|
| 25 |
+ <JPanel id="usagesCount" layout="{new GridLayout(0, 1)}"/>
|
|
| 26 |
+ </JScrollPane>
|
|
| 27 |
+ <JScrollPane id="dataPane" constraints='BorderLayout.CENTER'>
|
|
| 28 |
+ <JList id="dataList" genericType="String"/>
|
|
| 29 |
+ </JScrollPane>
|
|
| 30 |
+</JPanel>
|
|
| \ No newline at end of file |