From f53a002d15f85227fcf0da0a212c62940215892d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Mon, 13 Sep 2010 17:12:39 +0200
Subject: [PATCH] Move min method to EffortDuration

FEA: ItEr60S19TimeUnitDataType
---
 .../navalplanner/business/workingday/EffortDuration.java    | 6 ++++++
 .../org/navalplanner/web/planner/chart/ChartFiller.java     | 5 -----
 .../web/planner/company/CompanyPlanningModel.java           | 1 +
 .../navalplanner/web/planner/order/OrderPlanningModel.java  | 1 +
 .../web/resourceload/ResourceLoadController.java            | 1 +
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workingday/EffortDuration.java b/navalplanner-business/src/main/java/org/navalplanner/business/workingday/EffortDuration.java
index 038c0235b..8bd4fde8b 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/workingday/EffortDuration.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/workingday/EffortDuration.java
@@ -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);
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java
index ee8fffec2..c2bea3204 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java
@@ -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();
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
index 89cb0ca7f..3859e0dad 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
@@ -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._;
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
index 1f15e4567..10183e8cc 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
@@ -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._;
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
index bb01fb009..0853f0098 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
@@ -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._;