Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 21c79565 by Tony Chemit at 2021-09-28T10:51:02+02:00 L'UI Confirmation pour insérer les référentiels manquants ne rentre pas dans l'écran - Closes #2004 - - - - - 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: ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java ===================================== @@ -500,7 +500,7 @@ public class ObserveSwingDataSource extends ObserveServicesProviderSupport imple public SetMultimap<Class<? extends ReferentialDto>, ToolkitIdLabel> getReferentialMap(SetMultimap<Class<? extends ReferentialDto>, String> referentialIds) { SetMultimap<Class<? extends ReferentialDto>, ToolkitIdLabel> result = LinkedHashMultimap.create(); - for (Class<? extends ReferentialDto> dtoType : referentialIds.keys()) { + for (Class<? extends ReferentialDto> dtoType : referentialIds.keySet()) { Set<String> ids = referentialIds.get(dtoType); Class<ReferentialDtoReference> referenceType = ObserveBusinessProject.get().getMapping().getReferenceType(dtoType); Set<ReferentialDtoReference> references = getReferentialReferenceSet(referenceType).subSet(ids).collect(Collectors.toSet()); ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.java ===================================== @@ -22,7 +22,6 @@ package fr.ird.observe.client.datasource.actions.actions; * #L% */ -import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.SetMultimap; import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.client.datasource.editor.api.content.referential.usage.UsageForDisplayUIHandler; ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsagePanel.jaxx ===================================== @@ -17,18 +17,14 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<Table fill="both" constraints="BorderLayout.CENTER"> +<JPanel id="usages" border='{new TitledBorder(t("observe.ui.usage.usageTitle"))}' layout="{new BorderLayout()}"> <import> static io.ultreia.java4all.i18n.I18n.t </import> - <row> - <cell weighty="1" weightx="1"> - <JPanel id="usages" border='{new TitledBorder(t("observe.ui.usage.usageTitle"))}' layout="{new BorderLayout()}"> - <JPanel id="usagesCount" constraints="BorderLayout.WEST" layout="{new GridLayout(0, 1)}"/> - <JScrollPane id="dataPane" constraints='BorderLayout.CENTER'> - <JList id="dataList" genericType="String"/> - </JScrollPane> - </JPanel> - </cell> - </row> -</Table> + <JScrollPane id="usagesPane" constraints='BorderLayout.WEST' horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}'> + <JPanel id="usagesCount" layout="{new GridLayout(0, 1)}"/> + </JScrollPane> + <JScrollPane id="dataPane" constraints='BorderLayout.CENTER'> + <JList id="dataList" genericType="String"/> + </JScrollPane> +</JPanel> \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/21c795653e122a9ef33851f56f... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/21c795653e122a9ef33851f56f... You're receiving this email because of your account on gitlab.com.