diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionMultipleFiltersFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionMultipleFiltersFinder.java index 228ff68d8..749712080 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionMultipleFiltersFinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionMultipleFiltersFinder.java @@ -73,6 +73,7 @@ public class CriterionMultipleFiltersFinder extends MultipleFiltersFinder { getListMatching().add(new FilterPair( criterionFilterEnum, criterion.getName(), criterion)); } + addNoneFilter(); return getListMatching(); } @@ -98,9 +99,4 @@ public class CriterionMultipleFiltersFinder extends MultipleFiltersFinder { } } - private void addNoneFilter() { - getListMatching().add( - new FilterPair(OrderElementFilterEnum.None, - OrderElementFilterEnum.None.toString(), null)); - } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/FilterEnumNone.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/FilterEnumNone.java new file mode 100644 index 000000000..d850d142b --- /dev/null +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/FilterEnumNone.java @@ -0,0 +1,49 @@ +/* + * This file is part of NavalPlan + * + * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e + * Desenvolvemento Tecnolóxico de Galicia + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +/** + * @author Susana Montes Pedreira + */ +package org.navalplanner.web.common.components.finders; + +import org.navalplanner.business.i18n.I18nHelper; + +public enum FilterEnumNone implements IFilterEnum { + + None("..."); + + /** + * Forces to mark the string as needing translation + */ + private static String _(String string) { + return string; + } + + private String description; + + private FilterEnumNone(String description) { + this.description = description; + } + + public String toString() { + return I18nHelper._(this.description); + } + +} \ No newline at end of file diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java index a8d372b24..a3b4b1e82 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java @@ -65,6 +65,12 @@ public abstract class MultipleFiltersFinder implements IMultipleFiltersFinder { return filterPairRenderer; } + protected void addNoneFilter() { + getListMatching().add( + new FilterPair(FilterEnumNone.None, FilterEnumNone.None + .toString(), null)); + } + public String objectToString(Object obj) { FilterPair filterPair = (FilterPair) obj; String text = filterPair.getType() + "(" + filterPair.getPattern() @@ -89,7 +95,7 @@ public abstract class MultipleFiltersFinder implements IMultipleFiltersFinder { public boolean isValidNewFilter(Object obj) { FilterPair filter = (FilterPair) obj; - if (filter.getType().equals(OrderFilterEnum.None)) { + if (filter.getType().equals(FilterEnumNone.None)) { return false; } return true; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java index 32e4c2555..55f24a06e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java @@ -33,7 +33,7 @@ import org.navalplanner.business.orders.entities.OrderElement; */ public enum OrderElementFilterEnum implements IFilterEnum { - None("..."), Criterion(_("Criterion")), Label(_("Label")); + Criterion(_("Criterion")), Label(_("Label")); /** * Forces to mark the string as needing translation 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 d87423993..c84d462fb 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 @@ -110,9 +110,7 @@ public class OrderElementsMultipleFiltersFinder extends MultipleFiltersFinder { getListMatching().clear(); fillWithFirstTenFiltersLabels(); fillWithFirstTenFiltersCriterions(); - getListMatching().add( - new FilterPair(OrderElementFilterEnum.None, - OrderElementFilterEnum.None.toString(), null)); + addNoneFilter(); return getListMatching(); } @@ -244,10 +242,4 @@ public class OrderElementsMultipleFiltersFinder extends MultipleFiltersFinder { new FilterPair(OrderElementFilterEnum.Label, pattern, label)); } - private void addNoneFilter() { - getListMatching().add( - new FilterPair(OrderElementFilterEnum.None, - OrderElementFilterEnum.None.toString(), null)); - } - } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java index 6198122da..1d0c7e6df 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java @@ -27,7 +27,7 @@ import org.navalplanner.business.i18n.I18nHelper; public enum OrderFilterEnum implements IFilterEnum { - None("..."), Criterion(_("Criterion")), Label(_("Label")), ExternalCompany( + Criterion(_("Criterion")), Label(_("Label")), ExternalCompany( _("Customer")), State(_("State")), Code(_("Code")), CustomerReference( _("Customer Reference")); 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 9f8481592..06dd162b8 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 @@ -159,9 +159,7 @@ public class OrdersMultipleFiltersFinder extends MultipleFiltersFinder { fillWithFirstTenFiltersState(); fillWihtFirstTenFiltersCodes(); fillWihtFirstTenFiltersCustomerReferences(); - getListMatching().add( - new FilterPair(OrderFilterEnum.None, - OrderFilterEnum.None.toString(), null)); + addNoneFilter(); return getListMatching(); } @@ -417,10 +415,4 @@ public class OrdersMultipleFiltersFinder extends MultipleFiltersFinder { reference, reference)); } - private void addNoneFilter() { - getListMatching().add( - new FilterPair(OrderFilterEnum.None, - OrderFilterEnum.None.toString(), null)); - } - } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java index 2ffffc455..465cb967f 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java @@ -25,7 +25,7 @@ package org.navalplanner.web.common.components.finders; public enum ResourceFilterEnum implements IFilterEnum { - None("..."), Criterion(_("Criterion")), CostCategory(_("Cost category")); + Criterion(_("Criterion")), CostCategory(_("Cost category")); /** * Forces to mark the string as needing translation diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourcesMultipleFiltersFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourcesMultipleFiltersFinder.java index 0a21cb86f..3ec15b6f7 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourcesMultipleFiltersFinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourcesMultipleFiltersFinder.java @@ -99,9 +99,7 @@ public class ResourcesMultipleFiltersFinder extends MultipleFiltersFinder { getListMatching().clear(); fillWithFirstTenFiltersCriterions(); fillWithFirstTenFiltersCostCategories(); - getListMatching().add( - new FilterPair(OrderFilterEnum.None, - OrderFilterEnum.None.toString(), null)); + addNoneFilter(); return getListMatching(); } @@ -203,10 +201,4 @@ public class ResourcesMultipleFiltersFinder extends MultipleFiltersFinder { pattern, costCategory)); } - private void addNoneFilter() { - getListMatching().add( - new FilterPair(ResourceFilterEnum.None, - ResourceFilterEnum.None.toString(), null)); - } - } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/WorkerMultipleFiltersFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/WorkerMultipleFiltersFinder.java index 3f5874646..fd9d9b0e5 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/WorkerMultipleFiltersFinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/WorkerMultipleFiltersFinder.java @@ -73,6 +73,7 @@ public class WorkerMultipleFiltersFinder extends MultipleFiltersFinder { getListMatching().add(new FilterPair( workerFilterEnum, worker.getShortDescription(), worker)); } + addNoneFilter(); return getListMatching(); } @@ -99,9 +100,4 @@ public class WorkerMultipleFiltersFinder extends MultipleFiltersFinder { } } - private void addNoneFilter() { - getListMatching().add( - new FilterPair(OrderElementFilterEnum.None, - OrderElementFilterEnum.None.toString(), null)); - } }