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

Commits:

15 changed files:

Changes:

  • client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIInitializer.java
    ... ... @@ -225,6 +225,8 @@ public class ContentUIInitializer<UI extends ContentUI> {
    225 225 
             ui.getActionMap().setParent(actionMap);
    226 226 
             ui.setInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW, inputMap);
    227 227
    228 
    +        ImmutableMap.Builder<String, JAXXValidator> extraTabUIBuilder = ImmutableMap.builder();
    229 
    +
    228 230 
             Set<Object> done = new LinkedHashSet<>();
    229 231 
             for (String name : ui.get$objectMap().keySet()) {
    230 232 
                 Object o = ui.getObjectById(name);
    ... ... @@ -305,11 +307,6 @@ public class ContentUIInitializer<UI extends ContentUI> {
    305 307 
                     init(ui, (ObserveSwingValidator<?>) o);
    306 308 
                     continue;
    307 309 
                 }
    308 
    -
    309 
    -            if (o instanceof JTabbedPane) {
    310 
    -                init((JTabbedPane) o);
    311 
    -                continue;
    312 
    -            }
    313 310 
                 if (o instanceof JLabel) {
    314 311 
                     init((JLabel) o);
    315 312 
                     continue;
    ... ... @@ -330,12 +327,26 @@ public class ContentUIInitializer<UI extends ContentUI> {
    330 327 
                     init((NormalTextEditor) o);
    331 328 
                     continue;
    332 329 
                 }
    330 
    +            if (o instanceof ContentUI) {
    331 
    +                init((ContentUI) o, extraTabUIBuilder);
    332 
    +                continue;
    333 
    +            }
    333 334
    334 335 
                 if (o instanceof Table) {
    335 336 
                     init((Table) o);
    336 337 
                 }
    337 338 
             }
    338 339
    340 
    +        // second pass to init JTabbedPane
    341 
    +        ImmutableMap<String, JAXXValidator> extraTabUis = extraTabUIBuilder.build();
    342 
    +        for (String name : ui.get$objectMap().keySet()) {
    343 
    +            Object o = ui.getObjectById(name);
    344 
    +
    345 
    +            if (o instanceof JTabbedPane) {
    346 
    +                init((JTabbedPane) o,extraTabUis);
    347 
    +            }
    348 
    +        }
    349 
    +
    339 350 
             if (!doNotBlockComponentIds.isEmpty()) {
    340 351 
                 String[] acceptedComponentNames = doNotBlockComponentIds.toArray(new String[0]);
    341 352 
                 initBlockLayerUI(acceptedComponentNames);
    ... ... @@ -431,6 +442,16 @@ public class ContentUIInitializer<UI extends ContentUI> {
    431 442 
             }
    432 443 
         }
    433 444
    445 
    +    protected void init(ContentUI editor, ImmutableMap.Builder<String, JAXXValidator> extraTabUIBuilder) {
    446 
    +        if (editor  instanceof JAXXValidator) {
    447 
    +            String tab = (String) editor.getClientProperty("tab");
    448 
    +            if (tab != null) {
    449 
    +                extraTabUIBuilder.put(tab, (JAXXValidator) editor);
    450 
    +            }
    451 
    +        }
    452 
    +
    453 
    +    }
    454 
    +
    434 455 
         protected void initBlockLayerUI(String... doNotBlockComponentIds) {
    435 456 
             ui.getBlockLayerUI().setAcceptedComponentTypes(ObserveMapPane.class, JScrollBar.class);
    436 457 
             ui.getBlockLayerUI().setAcceptedComponentNames(doNotBlockComponentIds);
    ... ... @@ -707,9 +728,9 @@ public class ContentUIInitializer<UI extends ContentUI> {
    707 728 
             addAutoSelectOnFocus(hourEditor.getTextField());
    708 729 
         }
    709 730
    710 
    -    protected void init(JTabbedPane tabbedPane) {
    731 
    +    protected void init(JTabbedPane tabbedPane, ImmutableMap<String, JAXXValidator> extraTabUis) {
    711 732 
             if (GoToTabUIActionSupport.MAIN_TABBED_PANE.equals(tabbedPane.getName())) {
    712 
    -            initMainTabbedPane(tabbedPane);
    733 
    +            initMainTabbedPane(tabbedPane,extraTabUis);
    713 734 
                 return;
    714 735 
             }
    715 736 
             if (GoToTabUIActionSupport.SUB_TABBED_PANE.equals(tabbedPane.getName())) {
    ... ... @@ -717,7 +738,7 @@ public class ContentUIInitializer<UI extends ContentUI> {
    717 738 
             }
    718 739 
         }
    719 740
    720 
    -    protected void initMainTabbedPane(JTabbedPane tabbedPane) {
    741 
    +    protected void initMainTabbedPane(JTabbedPane tabbedPane, ImmutableMap<String, JAXXValidator> extraTabUis) {
    721 742 
             int tabCount = tabbedPane.getTabCount();
    722 743 
             InputMap inputMap = ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
    723 744

  • client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/edit/ContentEditUIInitializer.java
    ... ... @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.data.edit;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    +import com.google.common.collect.ImmutableMap;
    25 26 
     import fr.ird.observe.client.ui.actions.content.api.tab.GoToTabUIActionSupport;
    26 27 
     import fr.ird.observe.client.ui.content.api.ContentUIInitializer;
    27 28 
     import org.nuiton.jaxx.validator.JAXXValidator;
    ... ... @@ -45,15 +46,15 @@ public class ContentEditUIInitializer<UI extends ContentEditUI> extends ContentU
    45 46 
         }
    46 47
    47 48 
         @Override
    48 
    -    protected void initMainTabbedPane(JTabbedPane tabbedPane) {
    49 
    -        super.initMainTabbedPane(tabbedPane);
    50 
    -        tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING);
    49 
    +    protected void initMainTabbedPane(JTabbedPane tabbedPane, ImmutableMap<String, JAXXValidator> extraTabUis) {
    50 
    +        super.initMainTabbedPane(tabbedPane, extraTabUis);
    51 
    +        tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE).addScope( NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).addExtraTab(extraTabUis).build();
    51 52 
         }
    52 53
    53 54 
         @Override
    54 55 
         protected void initSubTabbedPane(JTabbedPane tabbedPane) {
    55 56 
             super.initSubTabbedPane(tabbedPane);
    56 
    -        subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING);
    57 
    +        subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).build();
    57 58 
         }
    58 59
    59 60 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUIInitializer.java
    ... ... @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.data.open;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    +import com.google.common.collect.ImmutableMap;
    25 26 
     import fr.ird.observe.client.ui.actions.content.api.tab.GoToTabUIActionSupport;
    26 27 
     import fr.ird.observe.client.ui.content.api.ContentUIInitializer;
    27 28 
     import org.nuiton.jaxx.validator.JAXXValidator;
    ... ... @@ -29,6 +30,7 @@ import org.nuiton.jaxx.validator.swing.tab.JTabbedPaneValidator;
    29 30 
     import org.nuiton.validator.NuitonValidatorScope;
    30 31
    31 32 
     import javax.swing.JTabbedPane;
    33 
    +import java.util.Map;
    32 34
    33 35 
     /**
    34 36 
      * To initialize ui.
    ... ... @@ -45,15 +47,15 @@ public class ContentOpenableUIInitializer<UI extends ContentOpenableUI> extends
    45 47 
         }
    46 48
    47 49 
         @Override
    48 
    -    protected void initMainTabbedPane(JTabbedPane tabbedPane) {
    49 
    -        super.initMainTabbedPane(tabbedPane);
    50 
    -        tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING);
    50 
    +    protected void initMainTabbedPane(JTabbedPane tabbedPane, ImmutableMap<String, JAXXValidator> extraTabUis) {
    51 
    +        super.initMainTabbedPane(tabbedPane, extraTabUis);
    52 
    +        tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).addExtraTab((Map)extraTabUis).build();
    51 53 
         }
    52 54
    53 55 
         @Override
    54 56 
         protected void initSubTabbedPane(JTabbedPane tabbedPane) {
    55 57 
             super.initSubTabbedPane(tabbedPane);
    56 
    -        subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING);
    58 
    +        subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).build();
    57 59 
         }
    58 60
    59 61 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIInitializer.java
    ... ... @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.data.simple;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    +import com.google.common.collect.ImmutableMap;
    25 26 
     import fr.ird.observe.client.ui.actions.content.api.tab.GoToTabUIActionSupport;
    26 27 
     import fr.ird.observe.client.ui.content.api.ContentUIInitializer;
    27 28 
     import org.nuiton.jaxx.validator.JAXXValidator;
    ... ... @@ -29,6 +30,7 @@ import org.nuiton.jaxx.validator.swing.tab.JTabbedPaneValidator;
    29 30 
     import org.nuiton.validator.NuitonValidatorScope;
    30 31
    31 32 
     import javax.swing.JTabbedPane;
    33 
    +import java.util.Map;
    32 34
    33 35 
     /**
    34 36 
      * To initialize ui.
    ... ... @@ -45,15 +47,15 @@ public class ContentSimpleUIInitializer<UI extends ContentSimpleUI> extends Cont
    45 47 
         }
    46 48
    47 49 
         @Override
    48 
    -    protected void initMainTabbedPane(JTabbedPane tabbedPane) {
    49 
    -        super.initMainTabbedPane(tabbedPane);
    50 
    -        tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING);
    50 
    +    protected void initMainTabbedPane(JTabbedPane tabbedPane, ImmutableMap<String, JAXXValidator> extraTabUis) {
    51 
    +        super.initMainTabbedPane(tabbedPane, extraTabUis);
    52 
    +        tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).addExtraTab((Map)extraTabUis).build();
    51 53 
         }
    52 54
    53 55 
         @Override
    54 56 
         protected void initSubTabbedPane(JTabbedPane tabbedPane) {
    55 57 
             super.initSubTabbedPane(tabbedPane);
    56 
    -        subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING);
    58 
    +        subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).build();
    57 59 
         }
    58 60
    59 61 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIInitializer.java
    ... ... @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.data.table;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    +import com.google.common.collect.ImmutableMap;
    25 26 
     import fr.ird.observe.client.ObserveSwingApplicationContext;
    26 27 
     import fr.ird.observe.client.ui.ObserveKeyStrokes;
    27 28 
     import fr.ird.observe.client.ui.ObserveMainUI;
    ... ... @@ -41,6 +42,7 @@ import javax.swing.JComponent;
    41 42 
     import javax.swing.JTabbedPane;
    42 43 
     import javax.swing.table.DefaultTableCellRenderer;
    43 44 
     import java.awt.BorderLayout;
    45 
    +import java.util.Map;
    44 46
    45 47 
     import static io.ultreia.java4all.i18n.I18n.n;
    46 48
    ... ... @@ -69,15 +71,15 @@ public class ContentTableUIInitializer<D extends DataDto, C extends DataDto, U e
    69 71 
         }
    70 72
    71 73 
         @Override
    72 
    -    protected void initMainTabbedPane(JTabbedPane tabbedPane) {
    73 
    -        super.initMainTabbedPane(tabbedPane);
    74 
    -        tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING);
    74 
    +    protected void initMainTabbedPane(JTabbedPane tabbedPane, ImmutableMap<String, JAXXValidator> extraTabUis) {
    75 
    +        super.initMainTabbedPane(tabbedPane, extraTabUis);
    76 
    +        tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).addExtraTab((Map)extraTabUis).build();
    75 77 
         }
    76 78
    77 79 
         @Override
    78 80 
         protected void initSubTabbedPane(JTabbedPane tabbedPane) {
    79 81 
             super.initSubTabbedPane(tabbedPane);
    80 
    -        subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING);
    82 
    +        subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).build();
    81 83 
         }
    82 84
    83 85 
         @Override

  • client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIInitializer.java
    ... ... @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.ref;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    +import com.google.common.collect.ImmutableMap;
    25 26 
     import fr.ird.observe.client.ui.actions.content.api.tab.GoToTabUIActionSupport;
    26 27 
     import fr.ird.observe.client.ui.content.api.ContentUIInitializer;
    27 28 
     import fr.ird.observe.dto.reference.ReferentialDtoReference;
    ... ... @@ -58,15 +59,15 @@ public class ContentReferenceUIInitializer<E extends ReferentialDto, R extends R
    58 59 
         }
    59 60
    60 61 
         @Override
    61 
    -    protected void initMainTabbedPane(JTabbedPane tabbedPane) {
    62 
    -        super.initMainTabbedPane(tabbedPane);
    63 
    -        tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING);
    62 
    +    protected void initMainTabbedPane(JTabbedPane tabbedPane, ImmutableMap<String, JAXXValidator> extraTabUis) {
    63 
    +        super.initMainTabbedPane(tabbedPane, extraTabUis);
    64 
    +        tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE).addScope( NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).build();
    64 65 
         }
    65 66
    66 67 
         @Override
    67 68 
         protected void initSubTabbedPane(JTabbedPane tabbedPane) {
    68 69 
             super.initSubTabbedPane(tabbedPane);
    69 
    -        subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING);
    70 
    +        subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).build();
    70 71 
         }
    71 72
    72 73 
         @Override

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/LandingPartLonglineContentTableModel.java
    ... ... @@ -57,7 +57,6 @@ public class LandingPartLonglineContentTableModel extends ContentTableModel<Land
    57 57 
             parent.setLandingPart(childs);
    58 58 
         }
    59 59
    60 
    -
    61 60 
         @Override
    62 61 
         protected SwingValidator<LandingLonglineDto> getParentValidator() {
    63 62 
             return parentUI.getValidator();

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/LandingPartLonglineUIHandler.java
    ... ... @@ -23,7 +23,7 @@ package fr.ird.observe.client.ui.content.data.ll.landing;
    23 23 
      */
    24 24
    25 25 
     import fr.ird.observe.client.ObserveSwingApplicationContext;
    26 
    -import fr.ird.observe.client.ui.content.api.data.table.ContentTableUIHandler;
    26 
    +import fr.ird.observe.client.ui.content.api.data.table.NotStandaloneContentTableUIHandler;
    27 27 
     import fr.ird.observe.client.ui.content.api.spi.ContentUIReferenceCache;
    28 28 
     import fr.ird.observe.client.ui.content.api.ui.ObserveLayoutFocusTraversalPolicy;
    29 29 
     import fr.ird.observe.client.ui.util.UIHelper;
    ... ... @@ -47,7 +47,7 @@ import static io.ultreia.java4all.i18n.I18n.n;
    47 47 
      * @author Tony Chemit - dev@tchemit.fr
    48 48 
      * @since 3.7
    49 49 
      */
    50 
    -public class LandingPartLonglineUIHandler extends ContentTableUIHandler<LandingLonglineDto, LandingPartLonglineDto, LandingPartLonglineUI> implements UIHandler<LandingPartLonglineUI> {
    50 
    +public class LandingPartLonglineUIHandler extends NotStandaloneContentTableUIHandler<LandingLonglineDto, LandingPartLonglineDto, LandingPartLonglineUI> implements UIHandler<LandingPartLonglineUI> {
    51 51
    52 52 
         private static final Logger log = LogManager.getLogger(LandingPartLonglineUIHandler.class);
    53 53
    ... ... @@ -127,16 +127,6 @@ public class LandingPartLonglineUIHandler extends ContentTableUIHandler<LandingL
    127 127 
             UIHelper.askFocus(ui.getSpecies());
    128 128 
         }
    129 129
    130 
    -    @Override
    131 
    -    public void doPersist(LandingLonglineDto bean) {
    132 
    -        // not a standalone ui
    133 
    -    }
    134 
    -
    135 
    -    @Override
    136 
    -    protected void loadEditBean(String beanId) {
    137 
    -        // not a standalone ui
    138 
    -    }
    139 
    -
    140 130 
         @Override
    141 131 
         public void startEditUI() {
    142 132 
             ui.getValidatorTable().setParentValidator(ui.getValidator());

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/TripLonglineLandingUI.jaxx
    ... ... @@ -159,7 +159,7 @@
    159 159
    160 160 
                 <tab id='landingPartTab' i18nProperty="">
    161 161 
                   <JPanel id="landingPartPanel" layout='{new BorderLayout()}'>
    162 
    -                <LandingPartLonglineUIImpl id="LandingPartLonglineUI" constructorParams="this"/>
    162 
    +                <LandingPartLonglineUIImpl id="landingPartLonglineUI" constructorParams="this"/>
    163 163 
                   </JPanel>
    164 164 
                 </tab>
    165 165 
               </JTabbedPane>
    ... ... @@ -176,6 +176,6 @@
    176 176 
       <JButton id='move'/>
    177 177
    178 178 
       <Object id="delegateContentUI" initializer="mainTabbedPane"/>
    179 
    -  <LandingPartLonglineUIModel id="landingPartModel" initializer="LandingPartLonglineUI.getModel()"/>
    179 
    +  <LandingPartLonglineUIModel id="landingPartModel" initializer="landingPartLonglineUI.getModel()"/>
    180 180
    181 181 
     </fr.ird.observe.client.ui.content.api.data.open.ContentOpenableUI>

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/TripLonglineLandingUI.jcss
    ... ... @@ -44,6 +44,10 @@
    44 44 
     /*  LANDING PART TAB *********************************************************** */
    45 45 
     /* ***************************************************************************** */
    46 46
    47 
    +#landingPartLonglineUI {
    48 
    + _tab:{"landingPartTab"};
    49 
    +}
    50 
    +
    47 51 
     #comment {
    48 52 
       title:"observe.common.TripLonglineLandingDto.comment";
    49 53 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/LonglineGlobalCompositionLogbookUI.jcss
    ... ... @@ -34,3 +34,19 @@ mitigationType {
    34 34 
       universeLabel:{t("observe.common.SetLonglineLogbookGlobalCompositionDto.availableMitigationType")};
    35 35 
       selectedLabel:{t("observe.common.SetLonglineLogbookGlobalCompositionDto.selectedMitigationType")};
    36 36 
     }
    37 
    +
    38 
    +#floatlinesCompositionUI {
    39 
    +  _tab:{"floatlinesCompositionTab"};
    40 
    +}
    41 
    +
    42 
    +#branchlinesCompositionUI {
    43 
    + _tab:{"branchlinesCompositionTab"};
    44 
    +}
    45 
    +
    46 
    +#hooksCompositionUI {
    47 
    + _tab:{"hooksCompositionTab"};
    48 
    +}
    49 
    +
    50 
    +#baitsCompositionUI {
    51 
    + _tab:{"baitsCompositionTab"};
    52 
    +}

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/TripLonglineSampleLogbookUI.jcss
    ... ... @@ -44,6 +44,10 @@
    44 44 
     /*  SAMPLE PART TAB ************************************************************ */
    45 45 
     /* ***************************************************************************** */
    46 46
    47 
    +#samplePartLogbookUI {
    48 
    + _tab:{"samplePartLogbookTab"};
    49 
    +}
    50 
    +
    47 51 
     #comment {
    48 52 
       title:"observe.common.TripLonglineSampleLogbookDto.comment";
    49 53 
     }

  • 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 
    +#branchlineDetailUI {
    196 
    +  _tab:{"branchlineDetailTab"};
    197 
    +}

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineGlobalCompositionObsUI.jcss
    ... ... @@ -34,3 +34,19 @@
    34 34 
       universeLabel:{t("observe.common.SetLonglineObsGlobalCompositionDto.availableMitigationType")};
    35 35 
       selectedLabel:{t("observe.common.SetLonglineObsGlobalCompositionDto.selectedMitigationType")};
    36 36 
     }
    37 
    +
    38 
    +#floatlinesCompositionUI {
    39 
    +  _tab:{"floatlinesCompositionTab"};
    40 
    +}
    41 
    +
    42 
    +#branchlinesCompositionUI {
    43 
    + _tab:{"branchlinesCompositionTab"};
    44 
    +}
    45 
    +
    46 
    +#hooksCompositionUI {
    47 
    + _tab:{"hooksCompositionTab"};
    48 
    +}
    49 
    +
    50 
    +#baitsCompositionUI {
    51 
    + _tab:{"baitsCompositionTab"};
    52 
    +}

  • pom.xml
    ... ... @@ -163,7 +163,7 @@
    163 163
    164 164 
         <!--lib.version.java4all.topia>1.8</lib.version.java4all.topia-->
    165 165 
         <!--<lib.version.java4all.eugene>3.0-alpha-22</lib.version.java4all.eugene>-->
    166 
    -    <lib.version.java4all.jaxx>3.0-alpha-51</lib.version.java4all.jaxx>
    166 
    +    <lib.version.java4all.jaxx>3.0-alpha-52-SNAPSHOT</lib.version.java4all.jaxx>
    167 167 
         <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>-->
    168 168 
         <!--<lib.version.java4all.config>1.0.8-SNAPSHOT</lib.version.java4all.config>-->
    169 169 
         <!--<lib.version.nuiton.topia>3.4.2-SNAPSHOT</lib.version.nuiton.topia>-->

    • —
    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.