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

Commits:

8 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/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/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/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() {

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