Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 63734157 by tchemit at 2019-05-21T08:56:21Z Impossible d'éditer nouveau DCP - Closes #1279 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveFloatingObjectSeineUIAction.java - dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/ObjectMaterialDto.java Changes: ===================================== 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; import fr.ird.observe.client.ui.actions.content.api.data.edit.SaveEditDataUIActionSupport; import fr.ird.observe.client.ui.content.data.ps.observation.FloatingObjectUI; import fr.ird.observe.client.ui.content.data.ps.observation.FloatingObjectUIModel; +import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.dto.data.ps.observation.FloatingObjectDto; import fr.ird.observe.dto.data.ps.observation.FloatingObjectPartDto; import fr.ird.observe.dto.data.ps.observation.FloatingObjectReference; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.navigation.model.edit.ObserveEditNode; +import fr.ird.observe.navigation.tree.MultipleReferenceContainerNode; +import fr.ird.observe.navigation.tree.ReferenceNode; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.jetbrains.annotations.NotNull; + +import java.util.function.Function; /** * Created by tchemit on 28/09/2018. @@ -68,4 +74,8 @@ public class SaveFloatingObjectSeineUIAction extends SaveEditDataUIActionSupport return true; } + @Override + protected @NotNull Function<FloatingObjectReference, ReferenceNode<FloatingObjectDto, FloatingObjectReference>> getNodeFactory(NavigationTreeNodeSupport parent) { + return ((MultipleReferenceContainerNode) parent)::newChildNode; + } } ===================================== dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/ObjectMaterialDto.java ===================================== @@ -29,19 +29,19 @@ public class ObjectMaterialDto extends GeneratedObjectMaterialDto { private static final long serialVersionUID = 1L; //FIXME-PROTECTED-ID public boolean isBoolean() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#0".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#0".equals(objectMaterialType.getId()); } //FIXME-PROTECTED-ID public boolean isText() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#3".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#3".equals(objectMaterialType.getId()); } //FIXME-PROTECTED-ID public boolean isInteger() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#2".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#2".equals(objectMaterialType.getId()); } //FIXME-PROTECTED-ID public boolean isFloat() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#1".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#1".equals(objectMaterialType.getId()); } public boolean withValidation() { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/63734157250fb8d534899af3f7da... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/63734157250fb8d534899af3f7da... You're receiving this email because of your account on gitlab.com.