diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java index d5d4dcf2f..da5816c7c 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java @@ -87,9 +87,8 @@ public class DefaultFundamentalProperties implements ITaskFundamentalProperties return new Date(beginDate); } - public long setBeginDate(Date beginDate) { + public void setBeginDate(Date beginDate) { this.beginDate = beginDate.getTime(); - return lengthMilliseconds; } public long getLengthMilliseconds() { diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java index dc2a2d30c..659566a66 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java @@ -36,11 +36,9 @@ public interface ITaskFundamentalProperties { public void setName(String name); /** - * Sets the beginDate. As result of this, the length of the task can change. - * So the new value is returned - * @return the new length + * Sets the beginDate. */ - public long setBeginDate(Date beginDate); + public void setBeginDate(Date beginDate); public Date getBeginDate(); diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java index 78a0f937f..6e92992f4 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java @@ -174,13 +174,12 @@ public abstract class Task implements ITaskFundamentalProperties { Validate.notNull(dependenciesEnforcerHook); } - public long setBeginDate(Date newStart) { + public void setBeginDate(Date newStart) { Date previousValue = fundamentalProperties.getBeginDate(); Date previousEnd = fundamentalProperties.getEndDate(); fundamentalProperties.setBeginDate(newStart); dependenciesEnforcerHook.setStartDate(previousValue, previousEnd, newStart); - return fundamentalProperties.getLengthMilliseconds(); } private void reloadResourcesTextIfChange(Date newDate, Date previousDate) { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java index 5035161c8..c59a3a2d3 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java @@ -188,22 +188,16 @@ public class TaskElementAdapter implements ITaskElementAdapter { } @Override - public long setBeginDate(final Date beginDate) { - Long runOnReadOnlyTransaction = transactionService - .runOnReadOnlyTransaction(new IOnTransaction() { + public void setBeginDate(final Date beginDate) { + transactionService + .runOnReadOnlyTransaction(new IOnTransaction() { @Override - public Long execute() { + public Void execute() { stepsBeforePossibleReallocation(); - Long result = setBeginDateInsideTransaction(beginDate); - return result; + taskElement.moveTo(currentScenario, beginDate); + return null; } }); - return runOnReadOnlyTransaction; - } - - private Long setBeginDateInsideTransaction(final Date beginDate) { - taskElement.moveTo(currentScenario, beginDate); - return getLengthMilliseconds(); } @Override