diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java b/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java index fcbfa4ca5..0bc837267 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java @@ -386,8 +386,7 @@ public class LeftTasksTreeRow extends GenericForwardComposer { task.moveTo(begin); } else if (updatedComponent == getEndDateBox()) { Date newEnd = getEndDateBox().getValue(); - task.setLengthMilliseconds(newEnd.getTime() - - task.getBeginDate().getTime()); + task.setEndDate(newEnd); } } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java index c8eeaf49a..5bd1ffae0 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java @@ -34,8 +34,8 @@ import org.apache.commons.logging.LogFactory; import org.zkoss.ganttz.adapters.IDisabilityConfiguration; import org.zkoss.ganttz.data.Milestone; import org.zkoss.ganttz.data.Task; -import org.zkoss.ganttz.data.TaskContainer; import org.zkoss.ganttz.data.Task.IReloadResourcesTextRequested; +import org.zkoss.ganttz.data.TaskContainer; import org.zkoss.ganttz.data.constraint.Constraint; import org.zkoss.ganttz.data.constraint.Constraint.IConstraintViolationListener; import org.zkoss.lang.Objects; @@ -348,7 +348,8 @@ public class TaskComponent extends Div implements AfterCompose { void doUpdateSize(String size) { int pixels = stripPx(size); - this.task.setLengthMilliseconds(getMapper().toMilliseconds(pixels)); + this.task.setEndDate(new Date(this.task.getBeginDate().getTime() + + getMapper().toMilliseconds(pixels))); updateWidth(); } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java index 194f9858d..27064307b 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java @@ -97,8 +97,7 @@ public class TaskEditFormComposer extends GenericForwardComposer { result.name = task.getName(); result.beginDate = task.getBeginDate(); - result.endDate = new Date(task.getBeginDate().getTime() - + task.getLengthMilliseconds()); + result.endDate = task.getEndDate(); result.notes = task.getNotes(); result.deadlineDate = task.getDeadline(); @@ -108,8 +107,7 @@ public class TaskEditFormComposer extends GenericForwardComposer { private void copyFromDTO(TaskDTO taskDTO, Task currentTask) { currentTask.setName(taskDTO.name); currentTask.setBeginDate(taskDTO.beginDate); - currentTask.setLengthMilliseconds(taskDTO.endDate.getTime() - - taskDTO.beginDate.getTime()); + currentTask.setEndDate(taskDTO.endDate); currentTask.setNotes(taskDTO.notes); currentTask.setDeadline(taskDTO.deadlineDate); } 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 da5816c7c..0fbd14d44 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java @@ -95,15 +95,6 @@ public class DefaultFundamentalProperties implements ITaskFundamentalProperties return lengthMilliseconds; } - public void setLengthMilliseconds(long lengthMilliseconds) { - if (lengthMilliseconds < 0) { - throw new IllegalArgumentException( - "a task must not have a negative length. Received value: " - + lengthMilliseconds); - } - this.lengthMilliseconds = lengthMilliseconds; - } - @Override public Date getEndDate() { return new Date(beginDate + 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 659566a66..48ae51486 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java @@ -52,14 +52,10 @@ public interface ITaskFundamentalProperties { public Date getConsolidatedline(); - public void setLengthMilliseconds(long lengthMilliseconds); - public Date getEndDate(); public void setEndDate(Date endDate); - public long getLengthMilliseconds(); - public String getNotes(); public void setNotes(String notes); diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/criticalpath/Node.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/criticalpath/Node.java index 74a12b966..c496c503b 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/criticalpath/Node.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/criticalpath/Node.java @@ -114,8 +114,7 @@ public class Node { } private LocalDate getTaskEndDate() { - return new LocalDate(task.getBeginDate().getTime() - + task.getLengthMilliseconds()); + return new LocalDate(task.getEndDate()); } @Override diff --git a/ganttzk/src/test/java/org/zkoss/ganttz/data/criticalpath/CriticalPathCalculatorTest.java b/ganttzk/src/test/java/org/zkoss/ganttz/data/criticalpath/CriticalPathCalculatorTest.java index 1e3057359..1dcc47768 100644 --- a/ganttzk/src/test/java/org/zkoss/ganttz/data/criticalpath/CriticalPathCalculatorTest.java +++ b/ganttzk/src/test/java/org/zkoss/ganttz/data/criticalpath/CriticalPathCalculatorTest.java @@ -56,9 +56,8 @@ public class CriticalPathCalculatorTest { int durationDays) { ITaskFundamentalProperties result = createNiceMock(ITaskFundamentalProperties.class); expect(result.getBeginDate()).andReturn(toDate(start)).anyTimes(); - expect(result.getLengthMilliseconds()).andReturn( - toDate(start.plusDays(durationDays)).getTime() - - toDate(start).getTime()).anyTimes(); + expect(result.getEndDate()).andReturn( + toDate(start.plusDays(durationDays))).anyTimes(); replay(result); return result; } @@ -67,9 +66,8 @@ public class CriticalPathCalculatorTest { LocalDate start, int durationDays, LocalDate date) { ITaskFundamentalProperties result = createNiceMock(ITaskFundamentalProperties.class); expect(result.getBeginDate()).andReturn(toDate(start)).anyTimes(); - expect(result.getLengthMilliseconds()).andReturn( - toDate(start.plusDays(durationDays)).getTime() - - toDate(start).getTime()).anyTimes(); + expect(result.getEndDate()).andReturn( + toDate(start.plusDays(durationDays))).anyTimes(); Constraint constraint = DateConstraint.biggerOrEqualThan(date .toDateTimeAtStartOfDay().toDate()); @@ -84,9 +82,8 @@ public class CriticalPathCalculatorTest { LocalDate start, int durationDays, LocalDate date) { ITaskFundamentalProperties result = createNiceMock(ITaskFundamentalProperties.class); expect(result.getBeginDate()).andReturn(toDate(start)).anyTimes(); - expect(result.getLengthMilliseconds()).andReturn( - toDate(start.plusDays(durationDays)).getTime() - - toDate(start).getTime()).anyTimes(); + expect(result.getEndDate()).andReturn( + toDate(start.plusDays(durationDays))).anyTimes(); Constraint constraint = DateConstraint.equalTo(date .toDateTimeAtStartOfDay().toDate()); @@ -113,9 +110,10 @@ public class CriticalPathCalculatorTest { return localDate.toDateTimeAtStartOfDay().toDate(); } - private int toDays(long millis) { - return Days.daysBetween(new LocalDate(0), new LocalDate(millis)) - .getDays(); + private int daysBetweenStartAndEnd(ITaskFundamentalProperties task) { + LocalDate start = LocalDate.fromDateFields(task.getBeginDate()); + LocalDate end = LocalDate.fromDateFields(task.getEndDate()); + return Days.daysBetween(start, end).getDays(); } /** @@ -1396,7 +1394,7 @@ public class CriticalPathCalculatorTest { .calculateCriticalPath(diagramGraphExample); assertThat(criticalPath.size(), equalTo(1)); - assertThat(toDays(criticalPath.get(0).getLengthMilliseconds()), + assertThat(daysBetweenStartAndEnd(criticalPath.get(0)), equalTo(10)); } @@ -1470,8 +1468,7 @@ public class CriticalPathCalculatorTest { .calculateCriticalPath(diagramGraphExample); assertThat(criticalPath.size(), equalTo(1)); - assertThat(toDays(criticalPath.get(0).getLengthMilliseconds()), - equalTo(10)); + assertThat(daysBetweenStartAndEnd(criticalPath.get(0)), equalTo(10)); } @Test @@ -1482,8 +1479,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(10), - equalTo(5))); + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(10), equalTo(5))); } } @@ -1495,8 +1492,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(10), - equalTo(5))); + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(10), equalTo(5))); } } @@ -1508,8 +1505,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(6), - equalTo(4))); + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(6), equalTo(4))); } } @@ -1521,8 +1518,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(5), - equalTo(10))); + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(5), equalTo(10))); } } @@ -1533,8 +1530,7 @@ public class CriticalPathCalculatorTest { .calculateCriticalPath(diagramGraphExample); assertThat(criticalPath.size(), equalTo(1)); - assertThat(toDays(criticalPath.get(0).getLengthMilliseconds()), - equalTo(20)); + assertThat(daysBetweenStartAndEnd(criticalPath.get(0)), equalTo(20)); } @Test @@ -1554,8 +1550,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(4), - equalTo(10))); + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(4), equalTo(10))); } } @@ -1567,8 +1563,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(4), - equalTo(5))); + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(4), equalTo(5))); } } @@ -1580,8 +1576,7 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(4), - equalTo(5))); + assertThat(daysBetweenStartAndEnd(task), anyOf(equalTo(4), equalTo(5))); } } @@ -1593,8 +1588,7 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(5), - equalTo(10))); + assertThat(daysBetweenStartAndEnd(task), anyOf(equalTo(5), equalTo(10))); } } @@ -1606,8 +1600,7 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(3)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(4), - equalTo(5), equalTo(10))); + assertThat(daysBetweenStartAndEnd(task), anyOf(equalTo(4), equalTo(5), equalTo(10))); } } @@ -1620,8 +1613,7 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(3)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(6), - equalTo(4), equalTo(10))); + assertThat(daysBetweenStartAndEnd(task), anyOf(equalTo(6), equalTo(4), equalTo(10))); } } @@ -1634,8 +1626,7 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(3)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(4), - equalTo(10), equalTo(8))); + assertThat(daysBetweenStartAndEnd(task), anyOf(equalTo(4), equalTo(10), equalTo(8))); } } @@ -1647,8 +1638,7 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(6), - equalTo(20))); + assertThat(daysBetweenStartAndEnd(task), anyOf(equalTo(6), equalTo(20))); } } @@ -1660,8 +1650,7 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(4)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(4), - equalTo(8), equalTo(3), equalTo(10))); + assertThat(daysBetweenStartAndEnd(task), anyOf(equalTo(4), equalTo(8), equalTo(3), equalTo(10))); } } @@ -1673,9 +1662,10 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(6)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(4), - equalTo(8), equalTo(3), equalTo(10), equalTo(6), - equalTo(19))); + assertThat( + daysBetweenStartAndEnd(task), + anyOf(equalTo(4), equalTo(8), equalTo(3), equalTo(10), + equalTo(6), equalTo(19))); } } @@ -1687,8 +1677,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(5), - equalTo(10))); + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(5), equalTo(10))); } } @@ -1699,8 +1689,7 @@ public class CriticalPathCalculatorTest { .calculateCriticalPath(diagramGraphExample); assertThat(criticalPath.size(), equalTo(1)); - assertThat(toDays(criticalPath.get(0).getLengthMilliseconds()), - equalTo(8)); + assertThat(daysBetweenStartAndEnd(criticalPath.get(0)), equalTo(8)); } @Test @@ -1711,7 +1700,7 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), equalTo(5)); + assertThat(daysBetweenStartAndEnd(task), equalTo(5)); } } @@ -1723,7 +1712,7 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(4), + assertThat(daysBetweenStartAndEnd(task), anyOf(equalTo(4), equalTo(6))); } } @@ -1736,7 +1725,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(4), + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(4), equalTo(15))); } } @@ -1749,8 +1739,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(5), - equalTo(6))); + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(5), equalTo(6))); } } @@ -1762,7 +1752,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(2), + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(2), equalTo(10))); } } @@ -1775,7 +1766,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(4)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(4), + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(4), equalTo(7), equalTo(5), equalTo(6))); } } @@ -1788,7 +1780,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(5), + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(5), equalTo(10))); } } @@ -1801,7 +1794,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(3)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(5), + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(5), equalTo(4), equalTo(8))); } } @@ -1814,7 +1808,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(5), + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(5), equalTo(8))); } } @@ -1827,7 +1822,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(10), + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(10), equalTo(5))); } } @@ -1839,8 +1835,7 @@ public class CriticalPathCalculatorTest { .calculateCriticalPath(diagramGraphExample); assertThat(criticalPath.size(), equalTo(1)); - assertThat(toDays(criticalPath.get(0).getLengthMilliseconds()), - equalTo(10)); + assertThat(daysBetweenStartAndEnd(criticalPath.get(0)), equalTo(10)); } @Test @@ -1851,7 +1846,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(4), + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(4), equalTo(3))); } } @@ -1863,8 +1859,7 @@ public class CriticalPathCalculatorTest { .calculateCriticalPath(diagramGraphExample); assertThat(criticalPath.size(), equalTo(1)); - assertThat(toDays(criticalPath.get(0).getLengthMilliseconds()), - equalTo(6)); + assertThat(daysBetweenStartAndEnd(criticalPath.get(0)), equalTo(6)); } @Test @@ -1875,7 +1870,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(3)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(5), + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(5), equalTo(3), equalTo(2))); } } @@ -1888,7 +1884,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(4), + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(4), equalTo(6))); } } @@ -1901,7 +1898,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(5), + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(5), equalTo(4))); } } @@ -1914,7 +1912,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(3)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(5), + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(5), equalTo(4), equalTo(3))); } } @@ -1926,8 +1925,7 @@ public class CriticalPathCalculatorTest { .calculateCriticalPath(diagramGraphExample); assertThat(criticalPath.size(), equalTo(1)); - assertThat(toDays(criticalPath.get(0).getLengthMilliseconds()), - equalTo(10)); + assertThat(daysBetweenStartAndEnd(criticalPath.get(0)), equalTo(10)); } @Test @@ -1938,8 +1936,7 @@ public class CriticalPathCalculatorTest { .calculateCriticalPath(diagramGraphExample); assertThat(criticalPath.size(), equalTo(1)); - assertThat(toDays(criticalPath.get(0).getLengthMilliseconds()), - equalTo(3)); + assertThat(daysBetweenStartAndEnd(criticalPath.get(0)), equalTo(3)); } @Test @@ -1951,7 +1948,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(3)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(2), + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(2), equalTo(5), equalTo(3))); } } @@ -1964,8 +1962,7 @@ public class CriticalPathCalculatorTest { .calculateCriticalPath(diagramGraphExample); assertThat(criticalPath.size(), equalTo(1)); - assertThat(toDays(criticalPath.get(0).getLengthMilliseconds()), - equalTo(3)); + assertThat(daysBetweenStartAndEnd(criticalPath.get(0)), equalTo(3)); } @Test @@ -1977,7 +1974,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(2), + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(2), equalTo(6))); } } @@ -1990,7 +1988,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), equalTo(10)); + assertThat(daysBetweenStartAndEnd(task), + equalTo(10)); } } @@ -2002,7 +2001,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(2)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), equalTo(10)); + assertThat(daysBetweenStartAndEnd(task), + equalTo(10)); } } @@ -2014,7 +2014,8 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(3)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(10), + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(10), equalTo(5))); } } @@ -2027,9 +2028,9 @@ public class CriticalPathCalculatorTest { assertThat(criticalPath.size(), equalTo(3)); for (ITaskFundamentalProperties task : criticalPath) { - assertThat(toDays(task.getLengthMilliseconds()), anyOf(equalTo(10), - equalTo(5))); + assertThat(daysBetweenStartAndEnd(task), + anyOf(equalTo(10), equalTo(5))); } } -} \ No newline at end of file +} 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 c59a3a2d3..4c6c1281d 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 @@ -182,11 +182,6 @@ public class TaskElementAdapter implements ITaskElementAdapter { return taskElement.getStartDate(); } - @Override - public long getLengthMilliseconds() { - return taskElement.getLengthMilliseconds(); - } - @Override public void setBeginDate(final Date beginDate) { transactionService @@ -200,12 +195,6 @@ public class TaskElementAdapter implements ITaskElementAdapter { }); } - @Override - public void setLengthMilliseconds(final long lengthMilliseconds) { - setEndDate(new Date(getBeginDate().getTime() - + lengthMilliseconds)); - } - @Override public Date getEndDate() { return taskElement.getEndDate(); @@ -295,7 +284,7 @@ public class TaskElementAdapter implements ITaskElementAdapter { } private LocalDate calculateLimitDate(BigDecimal advancePercentage) { - Long totalMillis = getLengthMilliseconds(); + Long totalMillis = taskElement.getLengthMilliseconds(); Long advanceMillis = advancePercentage.multiply( new BigDecimal(totalMillis)).longValue(); return new LocalDate(getBeginDate().getTime() + advanceMillis);