diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/chart/ContiguousDaysLine.java b/libreplan-business/src/main/java/org/libreplan/business/planner/chart/ContiguousDaysLine.java index d615d35bc..5e37116c2 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/chart/ContiguousDaysLine.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/chart/ContiguousDaysLine.java @@ -33,7 +33,7 @@ import java.util.TreeMap; import org.apache.commons.lang.Validate; import org.joda.time.Days; import org.joda.time.LocalDate; -import org.libreplan.business.planner.chart.ContiguousDaysLine.ONDay; +import org.libreplan.business.planner.chart.ContiguousDaysLine.OnDay; import org.libreplan.business.planner.entities.DayAssignment; import org.libreplan.business.workingday.EffortDuration; @@ -45,15 +45,15 @@ import org.libreplan.business.workingday.EffortDuration; * @author Óscar González Fernández * */ -public class ContiguousDaysLine implements Iterable> { +public class ContiguousDaysLine implements Iterable> { - public static class ONDay { + public static class OnDay { private final LocalDate day; private final T value; - private ONDay(LocalDate day, T value) { + private OnDay(LocalDate day, T value) { Validate.notNull(day); this.day = day; this.value = value; @@ -175,7 +175,7 @@ public class ContiguousDaysLine implements Iterable> { public static SortedMap toSortedMap( ContiguousDaysLine line) { SortedMap result = new TreeMap(); - for (ONDay each : line) { + for (OnDay each : line) { result.put(each.getDay(), each.getValue()); } return result; @@ -266,7 +266,7 @@ public class ContiguousDaysLine implements Iterable> { min(getEndExclusive(), endExclusive)); ContiguousDaysLine result = new ContiguousDaysLine(newStart, days.getDays()); - for (ONDay each : result) { + for (OnDay each : result) { result.set(each.getDay(), this.get(each.getDay())); } return result; @@ -332,7 +332,7 @@ public class ContiguousDaysLine implements Iterable> { } ContiguousDaysLine result = ContiguousDaysLine.create( startInclusive, getEndExclusive()); - for (ONDay onDay : this) { + for (OnDay onDay : this) { LocalDate day = onDay.getDay(); result.set(day, doubleTransformer.transform(day, onDay.getValue())); } @@ -368,9 +368,9 @@ public class ContiguousDaysLine implements Iterable> { } @Override - public Iterator> iterator() { + public Iterator> iterator() { final Iterator iterator = values.iterator(); - return new Iterator>() { + return new Iterator>() { private LocalDate current = startInclusive; @@ -380,9 +380,9 @@ public class ContiguousDaysLine implements Iterable> { } @Override - public ONDay next() { + public OnDay next() { T next = iterator.next(); - ONDay result = new ONDay(current, next); + OnDay result = new OnDay(current, next); current = current.plusDays(1); return result; } diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/planner/chart/ContiguousDaysLineTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/planner/chart/ContiguousDaysLineTest.java index df477e497..f0a6c9ee0 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/planner/chart/ContiguousDaysLineTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/planner/chart/ContiguousDaysLineTest.java @@ -17,7 +17,7 @@ import org.joda.time.LocalDate; import org.junit.Test; import org.libreplan.business.planner.chart.ContiguousDaysLine; import org.libreplan.business.planner.chart.ContiguousDaysLine.IValueTransformer; -import org.libreplan.business.planner.chart.ContiguousDaysLine.ONDay; +import org.libreplan.business.planner.chart.ContiguousDaysLine.OnDay; public class ContiguousDaysLineTest { @@ -50,7 +50,7 @@ public class ContiguousDaysLineTest { @Test public void initiallyTheValuesAreNull() { - for (ONDay onDay : ContiguousDaysLine.create(someDate, + for (OnDay onDay : ContiguousDaysLine.create(someDate, someDate.plusDays(2), String.class)) { assertThat(onDay.getValue(), nullValue()); } @@ -71,7 +71,7 @@ public class ContiguousDaysLineTest { public boolean matches(Object object) { if (object instanceof ContiguousDaysLine) { ContiguousDaysLine line = (ContiguousDaysLine) object; - for (ONDay each : line) { + for (OnDay each : line) { if(! ObjectUtils.equals(value, each.getValue())){ return false; } @@ -178,7 +178,7 @@ public class ContiguousDaysLineTest { public boolean matches(Object object) { if (object instanceof ContiguousDaysLine) { ContiguousDaysLine another = (ContiguousDaysLine) object; - for (ONDay each : line) { + for (OnDay each : line) { if (!ObjectUtils.equals(each.getValue(), another.get(each.getDay()))) { return false; @@ -192,7 +192,7 @@ public class ContiguousDaysLineTest { @Override public void describeTo(Description description) { List values = new ArrayList(); - for (ONDay each : line) { + for (OnDay each : line) { values.add(each.getValue()); } description.appendText("the line has values: " + values); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java index c4ea06937..921da84f9 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java @@ -59,7 +59,7 @@ import org.libreplan.business.orders.entities.Order; import org.libreplan.business.orders.entities.OrderElement; import org.libreplan.business.orders.entities.OrderStatusEnum; import org.libreplan.business.planner.chart.ContiguousDaysLine; -import org.libreplan.business.planner.chart.ContiguousDaysLine.ONDay; +import org.libreplan.business.planner.chart.ContiguousDaysLine.OnDay; import org.libreplan.business.planner.chart.ResourceLoadChartData; import org.libreplan.business.planner.entities.DayAssignment; import org.libreplan.business.planner.entities.ICostCalculator; @@ -1205,10 +1205,10 @@ public class OrderPlanningModel implements IOrderPlanningModel { ContiguousDaysLine> orderAssignments) { List filteredAssignments = new ArrayList(); - Iterator>> iterator = orderAssignments + Iterator>> iterator = orderAssignments .iterator(); while (iterator.hasNext()) { - ONDay> onDay = iterator.next(); + OnDay> onDay = iterator.next(); Set resources = getResources(onDay.getValue()); filteredAssignments.addAll(filterAssignmentsByResource( allAssignments.get(onDay.getDay()), resources));