From eb1478b10087410a878a6b569078d39c50e35c1d Mon Sep 17 00:00:00 2001 From: Diego Pino Garcia Date: Wed, 7 Oct 2009 12:12:44 +0200 Subject: [PATCH] ItEr29S07CUConsultaModelosDePlanificacionItEr28S08: [Refactoring] WorkerFinder returns all elements that contain typed text --- .../navalplanner/web/common/components/finders/Finder.java | 4 ++-- .../web/common/components/finders/WorkerFinder.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/Finder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/Finder.java index 8d461ebc2..66ae682cf 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/Finder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/Finder.java @@ -51,7 +51,7 @@ public abstract class Finder implements IFinder { } /** - * Returns true if entry starts with text + * Returns true if entry contains text partly * * @param entry * Element from model @@ -60,7 +60,7 @@ public abstract class Finder implements IFinder { */ @Override public boolean entryMatchesText(String entry, String text) { - return entry.toLowerCase().startsWith(text.toLowerCase()); + return entry.toLowerCase().contains(text.toLowerCase()); } /** diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/WorkerFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/WorkerFinder.java index 3db075d4e..4c2e0aeed 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/WorkerFinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/WorkerFinder.java @@ -49,7 +49,8 @@ public class WorkerFinder extends Finder implements IFinder { @Override public String _toString(Object value) { - return ((Worker) value).getName(); + final Worker worker = (Worker) value; + return worker.getName() + " - " + worker.getNif(); } }