From 1873ca1edcf2d6680dbd8da6f9403fb676edabde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Fri, 3 Sep 2010 11:37:23 +0200 Subject: [PATCH] Move min method to ChartFiller so it can be reused easily FEA: ItEr60S19TimeUnitDataType --- .../java/org/navalplanner/web/planner/chart/ChartFiller.java | 5 +++++ .../web/planner/company/CompanyPlanningModel.java | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) 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 8633b0eae..ecde837ea 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,6 +26,7 @@ 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; @@ -142,6 +143,10 @@ public abstract class ChartFiller implements IChartFiller { } } + protected static EffortDuration min(EffortDuration... durations) { + return Collections.min(Arrays.asList(durations)); + } + @Deprecated protected final int sumHoursForDay( Collection resources, 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 daee88f66..03e3894c1 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 @@ -25,7 +25,6 @@ import static org.navalplanner.web.I18nHelper._; import java.math.BigDecimal; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Date; @@ -135,10 +134,6 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel { public static final String COLOR_CAPABILITY_LINE = "#000000"; // black public static final String COLOR_OVERLOAD_GLOBAL = "#FDBE13"; - private static EffortDuration min(EffortDuration... durations) { - return Collections.min(Arrays.asList(durations)); - } - @Autowired private IOrderDAO orderDAO;