From 1e3201a4bd8214fca85d8624dfaa36225896b4ff Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Tue, 19 Jul 2011 15:04:19 +0200
Subject: [PATCH] Change the format of the matching results of a search in the
 projects view.

FEA: ItEr75S09ImproveBandboxFinders
---
 .../OrderElementsMultipleFiltersFinder.java    | 18 ++++++------------
 .../finders/OrdersMultipleFiltersFinder.java   | 18 ++++++------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementsMultipleFiltersFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementsMultipleFiltersFinder.java
index 317011abd..28bd6d377 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementsMultipleFiltersFinder.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementsMultipleFiltersFinder.java
@@ -66,10 +66,7 @@ public class OrderElementsMultipleFiltersFinder extends MultipleFiltersFinder {
             for (int i = 0; getListMatching().size() < 10
                     && i < mapLabels.get(type).size(); i++) {
                 Label label = mapLabels.get(type).get(i);
-                String pattern = type.getName() + " :: " + label.getName();
-                getListMatching().add(
-                        new FilterPair(OrderElementFilterEnum.Label, pattern,
-                        label));
+                addLabel(type, label);
             }
         }
         return getListMatching();
@@ -88,10 +85,7 @@ public class OrderElementsMultipleFiltersFinder extends MultipleFiltersFinder {
             for (int i = 0; getListMatching().size() < 10
                     && i < mapCriterions.get(type).size(); i++) {
                 Criterion criterion = mapCriterions.get(type).get(i);
-                String pattern = type.getName() + " :: " + criterion.getName();
-                getListMatching().add(
-                        new FilterPair(OrderElementFilterEnum.Criterion,
-                        pattern, criterion));
+                addCriterion(type, criterion);
             }
         }
         return getListMatching();
@@ -192,14 +186,14 @@ public class OrderElementsMultipleFiltersFinder extends MultipleFiltersFinder {
     }
 
     private void addCriterion(CriterionType type, Criterion criterion) {
-        String pattern = type.getName() + " :: " + criterion.getName();
+        String pattern = criterion.getName() + " ( " + type.getName() + " )";
         getListMatching().add(
-                new FilterPair(OrderElementFilterEnum.Criterion, pattern,
-                criterion));
+                new FilterPair(OrderElementFilterEnum.Criterion, type
+                        .getResource().toLowerCase(), pattern, criterion));
     }
 
     private void addLabel(LabelType type, Label label) {
-        String pattern = type.getName() + " :: " + label.getName();
+        String pattern = label.getName() + " ( " + type.getName() + " )";
         getListMatching().add(
                 new FilterPair(OrderElementFilterEnum.Label, pattern, label));
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrdersMultipleFiltersFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrdersMultipleFiltersFinder.java
index 4efdbca09..4cb2c2157 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrdersMultipleFiltersFinder.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrdersMultipleFiltersFinder.java
@@ -74,10 +74,7 @@ public class OrdersMultipleFiltersFinder extends MultipleFiltersFinder {
             for (int i = 0; getListMatching().size() < 10
                     && i < mapLabels.get(type).size(); i++) {
                 Label label = mapLabels.get(type).get(i);
-                String pattern = type.getName() + " :: " + label.getName();
-                getListMatching().add(
-                        new FilterPair(OrderFilterEnum.Label, pattern,
-                        label));
+                addLabel(type, label);
             }
         }
         return getListMatching();
@@ -92,10 +89,7 @@ public class OrdersMultipleFiltersFinder extends MultipleFiltersFinder {
             for (int i = 0; getListMatching().size() < 10
                     && i < mapCriterions.get(type).size(); i++) {
                 Criterion criterion = mapCriterions.get(type).get(i);
-                String pattern = type.getName() + " :: " + criterion.getName();
-                getListMatching().add(
-                        new FilterPair(OrderFilterEnum.Criterion,
-                        pattern, criterion));
+                addCriterion(type, criterion);
             }
         }
         return getListMatching();
@@ -301,14 +295,14 @@ public class OrdersMultipleFiltersFinder extends MultipleFiltersFinder {
     }
 
     private void addCriterion(CriterionType type, Criterion criterion) {
-        String pattern = type.getName() + " :: " + criterion.getName();
+        String pattern = criterion.getName() + " ( " + type.getName() + " )";
         getListMatching().add(
-                new FilterPair(OrderFilterEnum.Criterion, pattern,
-                criterion));
+                new FilterPair(OrderFilterEnum.Criterion, type.getResource()
+                        .toLowerCase(), pattern, criterion));
     }
 
     private void addLabel(LabelType type, Label label) {
-        String pattern = type.getName() + " :: " + label.getName();
+        String pattern = label.getName() + " ( " + type.getName() + " )";
         getListMatching().add(
                 new FilterPair(OrderFilterEnum.Label, pattern, label));
     }