RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move min method to EffortDuration

Browse source 
FEA: ItEr60S19TimeUnitDataType
This commit is contained in:
Óscar González Fernández 2010-09-13 17:12:39 +02:00
parent fcbf40bea1
commit f53a002d15
5 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
navalplanner-business/src/main/java/org/navalplanner/business/workingday/EffortDuration.java
View file

@ -21,6 +21,8 @@
package org.navalplanner.business.workingday;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Collections;
import java.util.EnumMap;
import java.util.Map.Entry;
@ -224,6 +226,10 @@ public class EffortDuration implements Comparable<EffortDuration> {
return Math.max(1, roundHalfUpToHours(this.decompose()));
}
public static EffortDuration min(EffortDuration... durations) {
return Collections.min(Arrays.asList(durations));
}
private static int roundHalfUpToHours(
EnumMap<Granularity, Integer> components) {
int seconds = components.get(Granularity.SECONDS);

5
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java
View file

@ -26,7 +26,6 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
@ -94,10 +93,6 @@ public abstract class ChartFiller implements IChartFiller {
}
}
protected static EffortDuration min(EffortDuration... durations) {
return Collections.min(Arrays.asList(durations));
}
protected static EffortDuration sumCalendarCapacitiesForDay(
Collection<? extends Resource> resources, LocalDate day) {
EffortDuration sum = zero();

1
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
View file

@ -20,6 +20,7 @@
package org.navalplanner.web.planner.company;
import static org.navalplanner.business.workingday.EffortDuration.min;
import static org.navalplanner.business.workingday.EffortDuration.zero;
import static org.navalplanner.web.I18nHelper._;

1
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
View file

@ -21,6 +21,7 @@
package org.navalplanner.web.planner.order;
import static org.navalplanner.business.common.AdHocTransactionService.readOnlyProxy;
import static org.navalplanner.business.workingday.EffortDuration.min;
import static org.navalplanner.business.workingday.EffortDuration.zero;
import static org.navalplanner.web.I18nHelper._;

1
navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
View file

@ -20,6 +20,7 @@
package org.navalplanner.web.resourceload;
import static org.navalplanner.business.workingday.EffortDuration.min;
import static org.navalplanner.business.workingday.EffortDuration.zero;
import static org.navalplanner.web.I18nHelper._;