diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/WorkerFilterEnum.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnumByResourceAndCriterion.java similarity index 89% rename from libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/WorkerFilterEnum.java rename to libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnumByResourceAndCriterion.java index a22a8d2b2..13e752167 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/WorkerFilterEnum.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnumByResourceAndCriterion.java @@ -26,7 +26,7 @@ import org.libreplan.business.resources.entities.Resource; * * @author Manuel Rego Casasnovas */ -public enum WorkerFilterEnum implements IFilterEnum { +public enum ResourceFilterEnumByResourceAndCriterion implements IFilterEnum { RESOURCE(_("Resource")), CRITERION(_("Criterion")); @@ -39,7 +39,7 @@ public enum WorkerFilterEnum implements IFilterEnum { private String description; - private WorkerFilterEnum(String description) { + private ResourceFilterEnumByResourceAndCriterion(String description) { this.description = description; } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/WorkerMultipleFiltersFinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceMultipleFiltersFinderByResourceAndCriterion.java similarity index 95% rename from libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/WorkerMultipleFiltersFinder.java rename to libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceMultipleFiltersFinderByResourceAndCriterion.java index 179f01865..82b93706f 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/WorkerMultipleFiltersFinder.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceMultipleFiltersFinderByResourceAndCriterion.java @@ -41,12 +41,12 @@ import org.springframework.beans.factory.annotation.Autowired; * * @author Manuel Rego Casasnovas */ -public class WorkerMultipleFiltersFinder extends MultipleFiltersFinder { +public class ResourceMultipleFiltersFinderByResourceAndCriterion extends MultipleFiltersFinder { @Autowired private PredefinedDatabaseSnapshots databaseSnapshots; - protected WorkerMultipleFiltersFinder() { + protected ResourceMultipleFiltersFinderByResourceAndCriterion() { } @Override @@ -79,7 +79,7 @@ public class WorkerMultipleFiltersFinder extends MultipleFiltersFinder { private void addResource(Class className, Resource resource) { String pattern = resource.getName(); getListMatching().add( - new FilterPair(WorkerFilterEnum.RESOURCE, className + new FilterPair(ResourceFilterEnumByResourceAndCriterion.RESOURCE, className .getSimpleName(), pattern, resource)); } @@ -105,7 +105,7 @@ public class WorkerMultipleFiltersFinder extends MultipleFiltersFinder { private void addCriterion(CriterionType type, Criterion criterion) { String pattern = criterion.getName() + " ( " + type.getName() + " )"; getListMatching().add( - new FilterPair(WorkerFilterEnum.CRITERION, type + new FilterPair(ResourceFilterEnumByResourceAndCriterion.CRITERION, type .getResource().toLowerCase(), pattern, criterion)); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java index e764bb1c5..d35028fdd 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java @@ -549,7 +549,7 @@ public class ResourceLoadController implements Composer { private String getFinderToUse() { if (isFilteringByResource()) { - return "workerMultipleFiltersFinder"; + return "resourceMultipleFiltersFinderByResourceAndCriterion"; } else { return "criterionMultipleFiltersFinder"; } diff --git a/libreplan-webapp/src/main/resources/libreplan-webapp-spring-config.xml b/libreplan-webapp/src/main/resources/libreplan-webapp-spring-config.xml index 5a4eba029..42a3cbd6e 100644 --- a/libreplan-webapp/src/main/resources/libreplan-webapp-spring-config.xml +++ b/libreplan-webapp/src/main/resources/libreplan-webapp-spring-config.xml @@ -41,7 +41,7 @@ - +