diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java index d67552e38..d0f760aab 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java @@ -98,7 +98,7 @@ public abstract class OrderElement extends BaseEntity { List childrenStates = getChildrenStates(); SchedulingState result = childrenStates.isEmpty() ? new SchedulingState( getSchedulingStateType()) - : new SchedulingState(childrenStates); + : new SchedulingState(schedulingStateType, childrenStates); result.addTypeChangeListener(new ITypeChangedListener() { @Override public void typeChanged(Type newType) { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java index 85c0c99a7..75996f1c0 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java @@ -138,7 +138,8 @@ public class SchedulingState { public SchedulingState() { } - public SchedulingState(List children) { + public SchedulingState(Type type, List children) { + this(type); for (SchedulingState each : children) { if (!each.isRoot()) { throw new IllegalArgumentException(each diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/SchedulingStateTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/SchedulingStateTest.java index 7f6e37f15..ca8ae2f98 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/SchedulingStateTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/SchedulingStateTest.java @@ -91,7 +91,7 @@ public class SchedulingStateTest { @Test(expected = IllegalArgumentException.class) public void cannotCreateASchedulingStateWithChildrenAlreadyAssigned() { - new SchedulingState(Arrays.asList(childA)); + new SchedulingState(Type.NO_SCHEDULED, Arrays.asList(childA)); } @Test