Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

14 changed files:

Changes:

  • client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUI.jaxx
    ... ... @@ -125,9 +125,9 @@ public void resetEdit() {
    125 125 
       <JPanel id='contentContainer'>
    126 126
    127 127 
         <JXLayer UI='{blockLayerUI}' constraints='BorderLayout.CENTER'>
    128 
    -
    128 
    +      <JScrollPane id='bodyScrollPane'>
    129 129 
           <JPanel id='body'/>
    130 
    -
    130 
    +      </JScrollPane>
    131 131 
         </JXLayer>
    132 132
    133 133 
         <Table id='actions' constraints='BorderLayout.SOUTH'/>

  • client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUI.jcss
    ... ... @@ -67,3 +67,7 @@
    67 67 
       borderPainted:false;
    68 68 
     }
    69 69
    70 
    +#bodyScrollPane {
    71 
    +  verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED};
    72 
    +  horizontalScrollBarPolicy:{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER};
    73 
    +}

  • 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();
    68 68 
     ]]></script>
    69 69
    70 70 
       <JPanel id='body'>
    71 
    -    <JScrollPane id='listPane' constraints='BorderLayout.CENTER' onFocusGained='list.requestFocus()' columnHeaderView='{listHeader}'>
    72 
    -      <JPanel id='listPanel'>
    71 
    +      <JPanel id='listPanel' constraints='BorderLayout.CENTER' >
    73 72 
             <JLabel id="emptyLabel" constraints='"empty"' styleClass="skipI18n"/>
    74 
    -        <JList id='list' genericType='R' constraints='"list"' onMouseClicked='getHandler().onDataSelected(event)'/>
    73 
    +        <JScrollPane id='listPane' constraints='"list"' onFocusGained='list.requestFocus()' columnHeaderView='{listHeader}'>
    74 
    +          <JList id='list' genericType='R' onMouseClicked='getHandler().onDataSelected(event)'/>
    75 
    +          <BeanListHeader id='listHeader' genericType='R'/>
    76 
    +        </JScrollPane>
    75 77 
           </JPanel>
    76 
    -      <BeanListHeader id='listHeader' genericType='R'/>
    77 
    -    </JScrollPane>
    78 78 
       </JPanel>
    79 79
    80 80 
       <Table id="actions" weightx='1' insets='0' fill="both">
    ... ... @@ -105,4 +105,6 @@ public abstract ContentListUIHandler<E, C, R, U> getHandler();
    105 105 
       </Table>
    106 106 
       <JButton id="showTechnicalInformations"/>
    107 107
    108 
    +  <!-- To override vertical policy -->
    109 
    +  <JScrollPane id="bodyScrollPane"/>
    108 110 
     </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 @@
    30 30
    31 31 
     #listPane {
    32 32 
       minimumSize:{new Dimension(10,150)};
    33 
    +  verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED};
    33 34 
     }
    34 35
    35 36 
     #listPanelLayout {
    ... ... @@ -104,3 +105,7 @@
    104 105 
     #showTechnicalInformations {
    105 106 
       enabled:{model.isOneSelectedData()};
    106 107 
     }
    108 
    +
    109 
    +#bodyScrollPane {
    110 
    +  verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_NEVER};
    111 
    +}
    \ 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
    125 125 
                 getUi().getListSelectionModel().clearSelection();
    126 126 
                 if (!getModel().isEmpty()) {
    127 127 
                     getUi().getListSelectionModel().setSelectionInterval(0, 0);
    128 
    -                getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED);
    129 
    -            } else {
    130 
    -
    131 
    -                getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER);
    128 
    +//                getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED);
    132 129 
                 }
    130 
    +//            else {
    131 
    +//                getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER);
    132 
    +//            }
    133 133 
             });
    134 134 
         }
    135 135

  • 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();
    187 187 
         </JToolBar>
    188 188 
       </JPanel>
    189 189
    190 
    +  <!-- To override vertical policy -->
    191 
    +  <JScrollPane id="bodyScrollPane"/>
    190 192 
     </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 @@
    136 136 
       verticalAlignment:"center";
    137 137 
       horizontalAlignment:"center";
    138 138 
     }
    139 
    +
    140 
    +#bodyScrollPane {
    141 
    +  verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_NEVER};
    142 
    +}
    143 
    +

  • 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
    90 90
    91 91 
             if (ui.getBody() != null) {
    92 92 
                 // on supprime le layer de blocage en mode disable
    93 
    -            UIHelper.setLayerUI(ui.getBody(), null);
    93 
    +            UIHelper.setLayerUI(ui.getBodyScrollPane(), null);
    94 94 
             }
    95 95
    96 96 
             if (ui.getExtraZone() != null) {

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/LonglineGlobalCompositionLogbookUI.jaxx
    ... ... @@ -136,4 +136,6 @@
    136 136 
       <HooksCompositionLogbookUIModel id="hooksCompositionModel" initializer="hooksCompositionUI.getModel()"/>
    137 137 
       <BaitsCompositionLogbookUIModel id="baitsCompositionModel" initializer="baitsCompositionUI.getModel()"/>
    138 138
    139 
    +  <!-- To override vertical policy -->
    140 
    +  <JScrollPane id="bodyScrollPane"/>
    139 141 
     </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 {
    34 34 
       universeLabel:{t("observe.common.SetLonglineLogbookGlobalCompositionDto.availableMitigationType")};
    35 35 
       selectedLabel:{t("observe.common.SetLonglineLogbookGlobalCompositionDto.selectedMitigationType")};
    36 36 
     }
    37 
    +
    38 
    +#bodyScrollPane {
    39 
    +  verticalScrollBarPolicy:{javax.swing.JScrollPane.VERTICAL_SCROLLBAR_NEVER};
    40 
    +}
    \ 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 @@
    184 184
    185 185 
       <BranchlineObsUIModel id="branchlineDetailUIModel" initializer="branchlineDetailUI.getModel()"/>
    186 186
    187 
    +  <!-- To override vertical policy -->
    188 
    +  <JScrollPane id="bodyScrollPane"/>
    189 
    +
    187 190 
     </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 @@
    191 191 
     #branchlineDetailTab {
    192 192 
       enabled: {compositionTab.isEnabled() && model.isCompositionTabValid() && !branchlinesTableModel.isSelectionEmpty()};
    193 193 
     }
    194 
    +
    195 
    +#bodyScrollPane {
    196 
    +  verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_NEVER};
    197 
    +}
    \ 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 @@
    137 137 
       <HooksCompositionObsUIModel id="hooksCompositionModel" initializer="hooksCompositionUI.getModel()"/>
    138 138 
       <BaitsCompositionObsUIModel id="baitsCompositionModel" initializer="baitsCompositionUI.getModel()"/>
    139 139
    140 
    +  <!-- To override vertical policy -->
    141 
    +  <JScrollPane id="bodyScrollPane"/>
    140 142 
     </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 @@
    34 34 
       universeLabel:{t("observe.common.SetLonglineObsGlobalCompositionDto.availableMitigationType")};
    35 35 
       selectedLabel:{t("observe.common.SetLonglineObsGlobalCompositionDto.selectedMitigationType")};
    36 36 
     }
    37 
    +
    38 
    +#bodyScrollPane {
    39 
    +  verticalScrollBarPolicy:{javax.swing.JScrollPane.VERTICAL_SCROLLBAR_NEVER};
    40 
    +}
    \ No newline at end of file

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.