From 82d78afec48891211edf617482d7fecc776d724b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= <ltilve@igalia.com>
Date: Thu, 31 Jan 2013 19:48:21 +0100
Subject: [PATCH] Moved method to generate label name and type pattern for
 finders to Label class

FEA: ItEr77S15FilteringEnhancements
---
 .../java/org/libreplan/business/labels/entities/Label.java    | 4 ++++
 .../finders/OrderElementsMultipleFiltersFinder.java           | 4 ++--
 .../components/finders/OrdersMultipleFiltersFinder.java       | 4 ++--
 .../components/finders/TaskElementsMultipleFiltersFinder.java | 4 ++--
 .../components/finders/TaskGroupsMultipleFiltersFinder.java   | 4 ++--
 .../web/planner/company/CompanyPlanningController.java        | 2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/libreplan-business/src/main/java/org/libreplan/business/labels/entities/Label.java b/libreplan-business/src/main/java/org/libreplan/business/labels/entities/Label.java
index d68a2aa7e..9cb5886e1 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/labels/entities/Label.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/labels/entities/Label.java
@@ -132,4 +132,8 @@ public class Label extends IntegrationEntity implements Comparable<Label> {
         return getTypeAndName().compareToIgnoreCase(o.getTypeAndName());
     }
 
+    public String getFinderPattern() {
+        return String.format("%s ( %s )", name, type.getName());
+    }
+
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementsMultipleFiltersFinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementsMultipleFiltersFinder.java
index 99d49a024..d0eae3b9e 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementsMultipleFiltersFinder.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementsMultipleFiltersFinder.java
@@ -193,9 +193,9 @@ public class OrderElementsMultipleFiltersFinder extends MultipleFiltersFinder {
     }
 
     private void addLabel(LabelType type, Label label) {
-        String pattern = label.getName() + " ( " + type.getName() + " )";
         getListMatching().add(
-                new FilterPair(OrderElementFilterEnum.Label, pattern, label));
+                new FilterPair(OrderElementFilterEnum.Label, label
+                        .getFinderPattern(), label));
     }
 
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrdersMultipleFiltersFinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrdersMultipleFiltersFinder.java
index 0c554a37d..7a7957d59 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrdersMultipleFiltersFinder.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrdersMultipleFiltersFinder.java
@@ -302,9 +302,9 @@ public class OrdersMultipleFiltersFinder extends MultipleFiltersFinder {
     }
 
     private void addLabel(LabelType type, Label label) {
-        String pattern = label.getName() + " ( " + type.getName() + " )";
         getListMatching().add(
-                new FilterPair(OrderFilterEnum.Label, pattern, label));
+                new FilterPair(OrderFilterEnum.Label, label.getFinderPattern(),
+                        label));
     }
 
     private void addExternalCompany(ExternalCompany externalCompany) {
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementsMultipleFiltersFinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementsMultipleFiltersFinder.java
index 3fdeddac8..8aa7efc75 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementsMultipleFiltersFinder.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementsMultipleFiltersFinder.java
@@ -196,9 +196,9 @@ public class TaskElementsMultipleFiltersFinder extends MultipleFiltersFinder {
     }
 
     private void addLabel(LabelType type, Label label) {
-        String pattern = label.getName() + " ( " + type.getName() + " )";
         getListMatching().add(
-                new FilterPair(TaskElementFilterEnum.Label, pattern, label));
+                new FilterPair(TaskElementFilterEnum.Label, label
+                        .getFinderPattern(), label));
     }
 
     private List<FilterPair> fillWithFirstTenFiltersResources() {
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupsMultipleFiltersFinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupsMultipleFiltersFinder.java
index 9d47b7fa8..71cbeaba7 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupsMultipleFiltersFinder.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupsMultipleFiltersFinder.java
@@ -307,9 +307,9 @@ public class TaskGroupsMultipleFiltersFinder extends MultipleFiltersFinder {
     }
 
     private void addLabel(LabelType type, Label label) {
-        String pattern = label.getName() + " ( " + type.getName() + " )";
         getListMatching().add(
-                new FilterPair(TaskGroupFilterEnum.Label, pattern, label));
+                new FilterPair(TaskGroupFilterEnum.Label, label
+                        .getFinderPattern(), label));
     }
 
     private void addExternalCompany(ExternalCompany externalCompany) {
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
index 82133d1ac..cae913493 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
@@ -168,7 +168,7 @@ public class CompanyPlanningController implements Composer {
         if ((user != null) && (user.getProjectsFilterLabel() != null)) {
             bdFilters.addSelectedElement(new FilterPair(
                     TaskGroupFilterEnum.Label, user.getProjectsFilterLabel()
-                            .getCompleteName(), user
+                            .getFinderPattern(), user
                             .getProjectsFilterLabel()));
         }
     }