Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 86240e68 by tchemit at 2019-05-20T12:34:46Z Impossible de remplir le champ espèces - Closes #1273 - - - - - 14 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/LonglineGlobalCompositionLogbookUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/LonglineGlobalCompositionLogbookUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineGlobalCompositionObsUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineGlobalCompositionObsUI.jcss Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUI.jaxx ===================================== @@ -125,9 +125,9 @@ public void resetEdit() { <JPanel id='contentContainer'> <JXLayer UI='{blockLayerUI}' constraints='BorderLayout.CENTER'> - + <JScrollPane id='bodyScrollPane'> <JPanel id='body'/> - + </JScrollPane> </JXLayer> <Table id='actions' constraints='BorderLayout.SOUTH'/> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUI.jcss ===================================== @@ -67,3 +67,7 @@ borderPainted:false; } +#bodyScrollPane { + verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}; + horizontalScrollBarPolicy:{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}; +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUI.jaxx ===================================== @@ -68,13 +68,13 @@ public abstract ContentListUIHandler<E, C, R, U> getHandler(); ]]></script> <JPanel id='body'> - <JScrollPane id='listPane' constraints='BorderLayout.CENTER' onFocusGained='list.requestFocus()' columnHeaderView='{listHeader}'> - <JPanel id='listPanel'> + <JPanel id='listPanel' constraints='BorderLayout.CENTER' > <JLabel id="emptyLabel" constraints='"empty"' styleClass="skipI18n"/> - <JList id='list' genericType='R' constraints='"list"' onMouseClicked='getHandler().onDataSelected(event)'/> + <JScrollPane id='listPane' constraints='"list"' onFocusGained='list.requestFocus()' columnHeaderView='{listHeader}'> + <JList id='list' genericType='R' onMouseClicked='getHandler().onDataSelected(event)'/> + <BeanListHeader id='listHeader' genericType='R'/> + </JScrollPane> </JPanel> - <BeanListHeader id='listHeader' genericType='R'/> - </JScrollPane> </JPanel> <Table id="actions" weightx='1' insets='0' fill="both"> @@ -105,4 +105,6 @@ public abstract ContentListUIHandler<E, C, R, U> getHandler(); </Table> <JButton id="showTechnicalInformations"/> + <!-- To override vertical policy --> + <JScrollPane id="bodyScrollPane"/> </fr.ird.observe.client.ui.content.api.ContentUI> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUI.jcss ===================================== @@ -30,6 +30,7 @@ #listPane { minimumSize:{new Dimension(10,150)}; + verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}; } #listPanelLayout { @@ -104,3 +105,7 @@ #showTechnicalInformations { enabled:{model.isOneSelectedData()}; } + +#bodyScrollPane { + verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_NEVER}; +} \ No newline at end of file ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUIHandler.java ===================================== @@ -125,11 +125,11 @@ public abstract class ContentListUIHandler<D extends IdDto, C extends DataDto, R getUi().getListSelectionModel().clearSelection(); if (!getModel().isEmpty()) { getUi().getListSelectionModel().setSelectionInterval(0, 0); - getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED); - } else { - - getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); +// getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED); } +// else { +// getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); +// } }); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUI.jaxx ===================================== @@ -187,4 +187,6 @@ public abstract SwingValidator<C> getValidatorTable(); </JToolBar> </JPanel> + <!-- To override vertical policy --> + <JScrollPane id="bodyScrollPane"/> </fr.ird.observe.client.ui.content.api.ContentUI> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUI.jcss ===================================== @@ -136,3 +136,8 @@ verticalAlignment:"center"; horizontalAlignment:"center"; } + +#bodyScrollPane { + verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_NEVER}; +} + ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIInitializer.java ===================================== @@ -90,7 +90,7 @@ public class ContentTableUIInitializer<D extends DataDto, C extends DataDto, U e if (ui.getBody() != null) { // on supprime le layer de blocage en mode disable - UIHelper.setLayerUI(ui.getBody(), null); + UIHelper.setLayerUI(ui.getBodyScrollPane(), null); } if (ui.getExtraZone() != null) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/LonglineGlobalCompositionLogbookUI.jaxx ===================================== @@ -136,4 +136,6 @@ <HooksCompositionLogbookUIModel id="hooksCompositionModel" initializer="hooksCompositionUI.getModel()"/> <BaitsCompositionLogbookUIModel id="baitsCompositionModel" initializer="baitsCompositionUI.getModel()"/> + <!-- To override vertical policy --> + <JScrollPane id="bodyScrollPane"/> </fr.ird.observe.client.ui.content.api.data.simple.ContentSimpleUI> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/LonglineGlobalCompositionLogbookUI.jcss ===================================== @@ -34,3 +34,7 @@ mitigationType { universeLabel:{t("observe.common.SetLonglineLogbookGlobalCompositionDto.availableMitigationType")}; selectedLabel:{t("observe.common.SetLonglineLogbookGlobalCompositionDto.selectedMitigationType")}; } + +#bodyScrollPane { + verticalScrollBarPolicy:{javax.swing.JScrollPane.VERTICAL_SCROLLBAR_NEVER}; +} \ No newline at end of file ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUI.jaxx ===================================== @@ -184,4 +184,7 @@ <BranchlineObsUIModel id="branchlineDetailUIModel" initializer="branchlineDetailUI.getModel()"/> + <!-- To override vertical policy --> + <JScrollPane id="bodyScrollPane"/> + </fr.ird.observe.client.ui.content.api.data.simple.ContentSimpleUI> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUI.jcss ===================================== @@ -191,3 +191,7 @@ #branchlineDetailTab { enabled: {compositionTab.isEnabled() && model.isCompositionTabValid() && !branchlinesTableModel.isSelectionEmpty()}; } + +#bodyScrollPane { + verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_NEVER}; +} \ No newline at end of file ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineGlobalCompositionObsUI.jaxx ===================================== @@ -137,4 +137,6 @@ <HooksCompositionObsUIModel id="hooksCompositionModel" initializer="hooksCompositionUI.getModel()"/> <BaitsCompositionObsUIModel id="baitsCompositionModel" initializer="baitsCompositionUI.getModel()"/> + <!-- To override vertical policy --> + <JScrollPane id="bodyScrollPane"/> </fr.ird.observe.client.ui.content.api.data.simple.ContentSimpleUI> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineGlobalCompositionObsUI.jcss ===================================== @@ -34,3 +34,7 @@ universeLabel:{t("observe.common.SetLonglineObsGlobalCompositionDto.availableMitigationType")}; selectedLabel:{t("observe.common.SetLonglineObsGlobalCompositionDto.selectedMitigationType")}; } + +#bodyScrollPane { + verticalScrollBarPolicy:{javax.swing.JScrollPane.VERTICAL_SCROLLBAR_NEVER}; +} \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/86240e6876e9760f5f93103e8c59... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/86240e6876e9760f5f93103e8c59... You're receiving this email because of your account on gitlab.com.