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

Commits:

24 changed files:

Changes:

  • .gitlab/issue_templates/Contrat-SFA-2017-Anomalie.md
    ... ... @@ -9,6 +9,6 @@
    9 9 
     ```
    10 10
    11 11 
     /label ~"Anomalie"
    12 
    -/label ~"Contrat SFA-2017"
    13 
    -/milestone %"Contrat SFA-2017"
    12 
    +/label ~"IRD-2018-01-V8"
    13 
    +/milestone %"8.0-beta-1"
    14 14 
     /assign @tchemit
    \ No newline at end of file

  • .gitlab/issue_templates/Contrat-SFA-2017-Evolution.md
    1 1
    2 2 
     /label ~"Evolution"
    3 
    -/label ~"Contrat SFA-2017"
    3 
    +/label ~"IRD-2018-01-V8"
    4 4 
     /milestone %"Contrat SFA-2017"
    5 5 
     /assign @tchemit
    \ No newline at end of file

  • client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java
    ... ... @@ -129,7 +129,7 @@ public class RouteCloseCallback implements ObserveEditNodeCloseCallback {
    129 129
    130 130 
                 // on selection l'activity de fin de veille et on y reste
    131 131 
                 // donc on ne continue pas la fermeture de la route
    132 
    -            throw new CloseEditNodeVetoException("Fermeture abandonnée! TODO Ajouter message plus explicite.", node);
    132 
    +            throw new CloseEditNodeVetoException("Fermeture de la route abandonnée (création d'une activité de fin de veille en cours)", node);
    133 133 
             }
    134 134 
         }
    135 135
    ... ... @@ -139,7 +139,7 @@ public class RouteCloseCallback implements ObserveEditNodeCloseCallback {
    139 139
    140 140 
             MutableTreeNode routeNode = tree.select(node).orElseThrow(() -> new IllegalStateException("Can't find route node"));
    141 141
    142 
    -        MultipleReferenceContainerNode<ActivitySeineDto, ActivitySeineReference> parentNode = MultipleReferenceContainerNode.upToReferenceContainerNode(ActivitySeineReference.class, routeNode);
    142 
    +        MultipleReferenceContainerNode<ActivitySeineDto, ActivitySeineReference> parentNode = MultipleReferenceContainerNode.downToReferenceContainerNode(ActivitySeineReference.class, routeNode);
    143 143 
             tree.selectSafeNode(parentNode);
    144 144
    145 145 
             log.debug("PARENT NODE = " + parentNode);

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/CloseOpenDataFromListUIAction.java
    ... ... @@ -30,6 +30,8 @@ import fr.ird.observe.client.ui.content.api.ContentUI;
    30 30 
     import fr.ird.observe.client.ui.content.api.data.list.ContentListUI;
    31 31 
     import fr.ird.observe.client.ui.util.UIHelper;
    32 32 
     import fr.ird.observe.navigation.model.edit.CloseEditNodeVetoException;
    33 
    +import org.apache.logging.log4j.LogManager;
    34 
    +import org.apache.logging.log4j.Logger;
    33 35
    34 36 
     import static io.ultreia.java4all.i18n.I18n.n;
    35 37
    ... ... @@ -41,6 +43,7 @@ import static io.ultreia.java4all.i18n.I18n.n;
    41 43 
      */
    42 44 
     public class CloseOpenDataFromListUIAction extends AbstractContentUIAction {
    43 45
    46 
    +    private static final Logger log = LogManager.getLogger(CloseOpenDataFromListUIAction.class);
    44 47 
         public static final String ACTION_NAME = CloseOpenDataFromListUIAction.class.getName();
    45 48 
         private static final long serialVersionUID = 1L;
    46 49
    ... ... @@ -61,7 +64,8 @@ public class CloseOpenDataFromListUIAction extends AbstractContentUIAction {
    61 64 
                 CloseOpenDataUIAction.closeData(((ContentListUI) ui).getModel().getEditNode());
    62 65 
                 afterClose((ContentListUI) ui);
    63 66 
             } catch (CloseEditNodeVetoException e1) {
    64 
    -            UIHelper.handlingError(e1);
    67 
    +            log.error("Could not close data from callback", e1);
    68 
    +//            UIHelper.handlingError(e1);
    65 69 
             }
    66 70 
         }
    67 71

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/OpenOpenDataFromListUIAction.java
    ... ... @@ -28,12 +28,13 @@ import fr.ird.observe.client.ui.actions.content.api.data.open.OpenOpenDataUIActi
    28 28 
     import fr.ird.observe.client.ui.content.api.ContentUI;
    29 29 
     import fr.ird.observe.client.ui.content.api.data.list.ContentListUI;
    30 30 
     import fr.ird.observe.client.ui.tree.navigation.NavigationTree;
    31 
    -import fr.ird.observe.client.ui.util.UIHelper;
    32 31 
     import fr.ird.observe.dto.reference.DataDtoReference;
    33 32 
     import fr.ird.observe.navigation.model.edit.CloseEditNodeVetoException;
    34 33 
     import fr.ird.observe.navigation.model.edit.ObserveEditNode;
    35 34 
     import fr.ird.observe.navigation.model.select.ObserveSelectNode;
    36 35 
     import fr.ird.observe.navigation.tree.ReferenceNode;
    36 
    +import org.apache.logging.log4j.LogManager;
    37 
    +import org.apache.logging.log4j.Logger;
    37 38
    38 39 
     import static fr.ird.observe.client.ui.content.api.ContentUIHandler.getNavigationTree;
    39 40 
     import static io.ultreia.java4all.i18n.I18n.n;
    ... ... @@ -47,6 +48,7 @@ import static io.ultreia.java4all.i18n.I18n.n;
    47 48 
      */
    48 49 
     public class OpenOpenDataFromListUIAction extends AbstractContentUIAction {
    49 50
    51 
    +    private static final Logger log = LogManager.getLogger(OpenOpenDataFromListUIAction.class);
    50 52 
         public static final String ACTION_NAME = OpenOpenDataFromListUIAction.class.getName();
    51 53 
         private static final long serialVersionUID = 1L;
    52 54
    ... ... @@ -74,7 +76,8 @@ public class OpenOpenDataFromListUIAction extends AbstractContentUIAction {
    74 76 
                 OpenOpenDataUIAction.openData(editNode, selectedNode, id);
    75 77 
                 afterOpen(contentListUI, id);
    76 78 
             } catch (CloseEditNodeVetoException e1) {
    77 
    -            UIHelper.handlingError(e1);
    79 
    +            log.error("Could not close data from callback", e1);
    80 
    +            //UIHelper.handlingError(e1);
    78 81 
             }
    79 82 
         }
    80 83

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CloseOpenDataUIAction.java
    ... ... @@ -102,7 +102,8 @@ public class CloseOpenDataUIAction extends AbstractContentUIAction {
    102 102 
                 //FIXME See what does it means ?
    103 103 
                 getMainUI().getHandler().updateContentSize();
    104 104 
             } catch (CloseEditNodeVetoException e1) {
    105 
    -            UIHelper.handlingError(e1);
    105 
    +            log.error("Could not close data from callback", e1);
    106 
    +//            UIHelper.handlingError(e1);
    106 107 
             }
    107 108 
         }
    108 109

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CreateOpenDataUIAction.java
    ... ... @@ -31,6 +31,8 @@ import fr.ird.observe.client.ui.tree.navigation.NavigationTree;
    31 31 
     import fr.ird.observe.client.ui.util.UIHelper;
    32 32 
     import fr.ird.observe.navigation.model.edit.CloseEditNodeVetoException;
    33 33 
     import fr.ird.observe.navigation.tree.MultipleReferenceContainerNode;
    34 
    +import org.apache.logging.log4j.LogManager;
    35 
    +import org.apache.logging.log4j.Logger;
    34 36
    35 37 
     /**
    36 38 
      * Created on 11/11/16.
    ... ... @@ -40,6 +42,7 @@ import fr.ird.observe.navigation.tree.MultipleReferenceContainerNode;
    40 42 
      */
    41 43 
     public class CreateOpenDataUIAction extends AbstractContentUIAction {
    42 44
    45 
    +    private static final Logger log = LogManager.getLogger(CreateOpenDataUIAction.class);
    43 46 
         public static final String ACTION_NAME = CreateOpenDataUIAction.class.getName();
    44 47
    45 48 
         public CreateOpenDataUIAction(ObserveMainUI mainUI) {
    ... ... @@ -51,7 +54,8 @@ public class CreateOpenDataUIAction extends AbstractContentUIAction {
    51 54 
                 CloseOpenDataUIAction.closeData(model.getEditNode());
    52 55 
                 tree.addUnsavedNode(parentNode);
    53 56 
             } catch (CloseEditNodeVetoException e1) {
    54 
    -            UIHelper.handlingError(e1);
    57 
    +            log.error("Could not close data from callback", e1);
    58 
    +            //UIHelper.handlingError(e1);
    55 59 
             }
    56 60 
         }
    57 61

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/MoveSingleDataUIActionSupport.java
    ... ... @@ -153,7 +153,8 @@ public abstract class MoveSingleDataUIActionSupport<ChildDto extends IdDto, Chil
    153 153 
                 try {
    154 154 
                     closeNode(editNode);
    155 155 
                 } catch (CloseEditNodeVetoException e) {
    156 
    -                UIHelper.handlingError(e);
    156 
    +                log.error("Could not close data from callback", e);
    157 
    +//                UIHelper.handlingError(e);
    157 158 
                     return;
    158 159 
                 }
    159 160 
             }

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/OpenOpenDataUIAction.java
    ... ... @@ -36,6 +36,8 @@ import fr.ird.observe.navigation.model.edit.ObserveEditModelManager;
    36 36 
     import fr.ird.observe.navigation.model.edit.ObserveEditNode;
    37 37 
     import fr.ird.observe.navigation.model.edit.OpenEditNodeRequest;
    38 38 
     import fr.ird.observe.navigation.model.select.ObserveSelectNode;
    39 
    +import org.apache.logging.log4j.LogManager;
    40 
    +import org.apache.logging.log4j.Logger;
    39 41
    40 42 
     import static fr.ird.observe.client.ui.content.api.ContentUIHandler.getNavigationTree;
    41 43 
     import static io.ultreia.java4all.i18n.I18n.n;
    ... ... @@ -49,6 +51,7 @@ import static io.ultreia.java4all.i18n.I18n.n;
    49 51 
      */
    50 52 
     public class OpenOpenDataUIAction extends AbstractContentUIAction {
    51 53
    54 
    +    private static final Logger log = LogManager.getLogger(OpenOpenDataUIAction.class);
    52 55 
         public static final String ACTION_NAME = OpenOpenDataUIAction.class.getName();
    53 56 
         private static final long serialVersionUID = 1L;
    54 57
    ... ... @@ -83,7 +86,8 @@ public class OpenOpenDataUIAction extends AbstractContentUIAction {
    83 86 
                 openData(editNode, selectedNode, id);
    84 87 
                 afterOpen(openUI);
    85 88 
             } catch (CloseEditNodeVetoException e1) {
    86 
    -            UIHelper.handlingError(e1);
    89 
    +            log.error("Could not close data from callback", e1);
    90 
    +            //UIHelper.handlingError(e1);
    87 91 
             }
    88 92 
         }
    89 93

  • client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveFloatingObjectSeineUIAction.java
    ... ... @@ -28,13 +28,19 @@ import fr.ird.observe.client.ui.ObserveMainUI;
    28 28 
     import fr.ird.observe.client.ui.actions.content.api.data.edit.SaveEditDataUIActionSupport;
    29 29 
     import fr.ird.observe.client.ui.content.data.ps.observation.FloatingObjectUI;
    30 30 
     import fr.ird.observe.client.ui.content.data.ps.observation.FloatingObjectUIModel;
    31 
    +import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport;
    31 32 
     import fr.ird.observe.dto.data.ps.observation.FloatingObjectDto;
    32 33 
     import fr.ird.observe.dto.data.ps.observation.FloatingObjectPartDto;
    33 34 
     import fr.ird.observe.dto.data.ps.observation.FloatingObjectReference;
    34 35 
     import fr.ird.observe.dto.result.SaveResultDto;
    35 36 
     import fr.ird.observe.navigation.model.edit.ObserveEditNode;
    37 
    +import fr.ird.observe.navigation.tree.MultipleReferenceContainerNode;
    38 
    +import fr.ird.observe.navigation.tree.ReferenceNode;
    36 39 
     import org.apache.logging.log4j.LogManager;
    37 40 
     import org.apache.logging.log4j.Logger;
    41 
    +import org.jetbrains.annotations.NotNull;
    42 
    +
    43 
    +import java.util.function.Function;
    38 44
    39 45 
     /**
    40 46 
      * Created by tchemit on 28/09/2018.
    ... ... @@ -68,4 +74,8 @@ public class SaveFloatingObjectSeineUIAction extends SaveEditDataUIActionSupport
    68 74 
             return true;
    69 75 
         }
    70 76
    77 
    +    @Override
    78 
    +    protected @NotNull Function<FloatingObjectReference, ReferenceNode<FloatingObjectDto, FloatingObjectReference>> getNodeFactory(NavigationTreeNodeSupport parent) {
    79 
    +        return ((MultipleReferenceContainerNode) parent)::newChildNode;
    80 
    +    }
    71 81 
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/Common.jcss
    ... ... @@ -43,4 +43,9 @@ BigTextEditor {
    43 43 
     BeanCheckBox {
    44 44 
       i18nProperty:"";
    45 45 
       horizontalTextPosition:{BeanCheckBox.LEFT};
    46 
    +}
    47 
    +
    48 
    +#bodyScrollPane {
    49 
    +  verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED};
    50 
    +  horizontalScrollBarPolicy:{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER};
    46 51 
     }
    \ No newline at end of file

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

  • 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 {

  • 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.jcss
    ... ... @@ -136,3 +136,4 @@
    136 136 
       verticalAlignment:"center";
    137 137 
       horizontalAlignment:"center";
    138 138 
     }
    139 
    +

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripLonglineUI.jaxx
    ... ... @@ -80,7 +80,8 @@ protected boolean canEditOcean(java.util.LinkedHashSet<TripLonglineActivityObsDt
    80 80
    81 81 
       <!-- formulaire -->
    82 82 
       <JPanel id="body" layout='{new BorderLayout()}'>
    83 
    -    <JTabbedPane id='mainTabbedPane' constraints='BorderLayout.CENTER'>
    83 
    +    <JScrollPane id='bodyScrollPane' constraints='BorderLayout.CENTER'>
    84 
    +    <JTabbedPane id='mainTabbedPane'>
    84 85 
           <tab id='generalTab' i18nProperty="">
    85 86 
             <Table fill="both">
    86 87
    ... ... @@ -335,6 +336,7 @@ protected boolean canEditOcean(java.util.LinkedHashSet<TripLonglineActivityObsDt
    335 336 
             <TripMapUI id="tripMap"/>
    336 337 
           </tab>
    337 338 
         </JTabbedPane>
    339 
    +    </JScrollPane>
    338 340 
       </JPanel>
    339 341
    340 342 
       <!-- surcharge des actions (pour appliquer la css specifique) -->

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/TripSeineUI.jaxx
    ... ... @@ -87,7 +87,8 @@ protected boolean canEditOcean(java.util.LinkedHashSet<RouteStubDto> routes) {
    87 87
    88 88 
       <!-- formulaire -->
    89 89 
       <JPanel id="body" layout='{new BorderLayout()}'>
    90 
    -    <JTabbedPane id='mainTabbedPane' constraints='BorderLayout.CENTER'>
    90 
    +    <JScrollPane id='bodyScrollPane' constraints='BorderLayout.CENTER'>
    91 
    +    <JTabbedPane id='mainTabbedPane'>
    91 92 
           <tab id='generalTab' i18nProperty="">
    92 93 
             <Table insets="0" fill="both" id="formGeneral">
    93 94
    ... ... @@ -234,6 +235,7 @@ protected boolean canEditOcean(java.util.LinkedHashSet<RouteStubDto> routes) {
    234 235 
             <TripMapUI id="tripMap"/>
    235 236 
           </tab>
    236 237 
         </JTabbedPane>
    238 
    +    </JScrollPane>
    237 239 
       </JPanel>
    238 240
    239 241 
       <!-- surcharge des actions (pour appliquer la css specifique) -->

  • client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java
    ... ... @@ -404,6 +404,9 @@ public class NavigationTree extends JXTree {
    404 404 
             if (containerNode == null) {
    405 405 
                 return null;
    406 406 
             }
    407 
    +        if (!((NavigationTreeNodeSupport)containerNode).isLoaded()) {
    408 
    +            ((NavigationTreeNodeSupport) containerNode).populateChildren();
    409 
    +        }
    407 410 
             // got to reference
    408 411 
             return ReferenceNode.downToReferenceNode(referenceType, editNode.getId(), containerNode);
    409 412 
         }

  • client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java
    ... ... @@ -36,6 +36,7 @@ import javax.swing.JComponent;
    36 36 
     import javax.swing.JTable;
    37 37 
     import java.awt.Color;
    38 38 
     import java.awt.Component;
    39 
    +import java.util.Objects;
    39 40
    40 41 
     import static io.ultreia.java4all.i18n.I18n.t;
    41 42
    ... ... @@ -59,6 +60,7 @@ public class ObserveValidatorMessageTableRenderer extends SwingValidatorMessageT
    59 60
    60 61 
         @Override
    61 62 
         public String getFieldName(JTable table, String value, int row) {
    63 
    +        Objects.requireNonNull(value,"Value can not be null!");
    62 64 
             SwingValidatorMessageTableModel tableModel = (SwingValidatorMessageTableModel) table.getModel();
    63 65 
             SwingValidatorMessage model = tableModel.getRow(row);
    64 66 
             JComponent editor = model.getEditor();

  • dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/ObjectMaterialDto.java
    ... ... @@ -29,19 +29,19 @@ public class ObjectMaterialDto extends GeneratedObjectMaterialDto {
    29 29 
         private static final long serialVersionUID = 1L;
    30 30 
         //FIXME-PROTECTED-ID
    31 31 
         public boolean isBoolean() {
    32 
    -        return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#0".equals(objectMaterialType.getId());
    32 
    +        return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#0".equals(objectMaterialType.getId());
    33 33 
         }
    34 34 
         //FIXME-PROTECTED-ID
    35 35 
         public boolean isText() {
    36 
    -        return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#3".equals(objectMaterialType.getId());
    36 
    +        return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#3".equals(objectMaterialType.getId());
    37 37 
         }
    38 38 
         //FIXME-PROTECTED-ID
    39 39 
         public boolean isInteger() {
    40 
    -        return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#2".equals(objectMaterialType.getId());
    40 
    +        return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#2".equals(objectMaterialType.getId());
    41 41 
         }
    42 42 
         //FIXME-PROTECTED-ID
    43 43 
         public boolean isFloat() {
    44 
    -        return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#1".equals(objectMaterialType.getId());
    44 
    +        return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#1".equals(objectMaterialType.getId());
    45 45 
         }
    46 46
    47 47 
         public boolean withValidation() {

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -911,7 +911,7 @@ observe.common.DataDto.captain=Capitaine
    911 911 
     observe.common.DataDto.dataQuality=Qualité de donnée
    912 912 
     observe.common.DataDto.departureHarbour=Port de départ
    913 913 
     observe.common.DataDto.depthRecorder=Enregistreur de profondeur
    914 
    -observe.common.DataDto.endDate=Date de début
    914 
    +observe.common.DataDto.endDate=Date de fin
    915 915 
     observe.common.DataDto.haulingIdentifier=Virage
    916 916 
     observe.common.DataDto.hookLost=Hameçon perdu
    917 917 
     observe.common.DataDto.landingHarbour=Port d'arrivée
    ... ... @@ -921,7 +921,7 @@ observe.common.DataDto.observer=Observateur
    921 921 
     observe.common.DataDto.program=Programme
    922 922 
     observe.common.DataDto.settingIdentifier=Filage
    923 923 
     observe.common.DataDto.speciesFate=Devenir espèce
    924 
    -observe.common.DataDto.startDate=Date de fin
    924 
    +observe.common.DataDto.startDate=Date de début
    925 925 
     observe.common.DataDto.timer=Horloge
    926 926 
     observe.common.DataDto.timerTimeOnBoard=Horodatage de montée à bord
    927 927 
     observe.common.DataDto.traceCutOff=Bas de ligne coupé

  • pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>io.ultreia.maven</groupId>
    28 28 
         <artifactId>pom</artifactId>
    29 
    -    <version>2019.8.17</version>
    29 
    +    <version>2019.8.18</version>
    30 30 
       </parent>
    31 31
    32 32 
       <groupId>fr.ird.observe</groupId>
    ... ... @@ -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-50</lib.version.java4all.jaxx>-->
    166 
    +    <lib.version.java4all.jaxx>3.0-alpha-51</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.