From dcd7cd8c09e8aff722a73d4565d61a2b54984db6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= Date: Wed, 30 Jan 2013 17:13:38 +0100 Subject: [PATCH] Refactored to OrderStatusEnum static method to get default visible project status --- .../business/orders/entities/OrderStatusEnum.java | 10 ++++++++++ .../web/planner/company/CompanyPlanningModel.java | 7 ++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java index 814e817bd..9f9386ef1 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java @@ -23,6 +23,8 @@ package org.libreplan.business.orders.entities; import static org.libreplan.business.i18n.I18nHelper._; +import java.util.EnumSet; + /** * @author Susana Montes Pedreiera @@ -53,4 +55,12 @@ public enum OrderStatusEnum { public static OrderStatusEnum getDefault() { return PRE_SALES; } + + public static EnumSet getVisibleStatus() { + return EnumSet.of(OrderStatusEnum.PRE_SALES, OrderStatusEnum.OFFERED, + OrderStatusEnum.OUTSOURCED, OrderStatusEnum.ACCEPTED, + OrderStatusEnum.STARTED, OrderStatusEnum.ON_HOLD, + OrderStatusEnum.FINISHED); + } + } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java index dd3b2a234..db9507225 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java @@ -160,11 +160,8 @@ public class CompanyPlanningModel implements ICompanyPlanningModel { private LocalDate filterFinishDate; // All the status but CANCELLED and STORED - private static final EnumSet STATUS_VISUALIZED = EnumSet - .of(OrderStatusEnum.PRE_SALES, OrderStatusEnum.OFFERED, - OrderStatusEnum.OUTSOURCED, OrderStatusEnum.ACCEPTED, - OrderStatusEnum.STARTED, OrderStatusEnum.ON_HOLD, - OrderStatusEnum.FINISHED); + private static final EnumSet STATUS_VISUALIZED = OrderStatusEnum + .getVisibleStatus(); public void setPlanningControllerEntryPoints( MultipleTabsPlannerController entryPoints) {