From b0860f98d005c065f1d124cd218864c7cb642844 Mon Sep 17 00:00:00 2001 From: Susana Montes Pedreira Date: Tue, 19 Jul 2011 14:56:06 +0200 Subject: [PATCH] it adds the property description in the class FilterPair. FEA: ItEr75S09ImproveBandboxFinders --- .../common/components/finders/FilterPair.java | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/FilterPair.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/FilterPair.java index 1820bebac..dae9082a6 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/FilterPair.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/FilterPair.java @@ -21,6 +21,8 @@ package org.navalplanner.web.common.components.finders; +import org.apache.commons.lang.StringUtils; + /** * @author Susana Montes Pedreira */ @@ -28,6 +30,8 @@ public class FilterPair extends Object { private IFilterEnum type; + private String typeDescription; + private String pattern; private Object value; @@ -35,6 +39,14 @@ public class FilterPair extends Object { public FilterPair() { } + public FilterPair(IFilterEnum type, String typeDescription, String pattern, + Object value) { + this.type = type; + this.typeDescription = typeDescription; + this.value = value; + this.pattern = pattern; + } + public FilterPair(IFilterEnum type, String pattern, Object value) { this.type = type; this.value = value; @@ -64,4 +76,24 @@ public class FilterPair extends Object { public void setPattern(String pattern) { this.pattern = pattern; } + + public void setTypeDescription(String typeDescription) { + this.typeDescription = typeDescription; + } + + public String getTypeDescription() { + return typeDescription; + } + + public String getTypeComplete() { + if (getType() == null) { + return ""; + } + + String descriptionComplete = getType().toString(); + if (!StringUtils.isBlank(this.getTypeDescription())) { + descriptionComplete += " ( " + getTypeDescription() + " )"; + } + return descriptionComplete; + } }