RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename WorkerMultipleFiltersFinder to ResourceFilterEnumByResourceAndCriterion

Browse source 
This filter now works for any kind of resource and not only workers, that's the
main reason to rename the class.

Also the enum WorkerFilterEnum is renamed to
ResourceFilterEnumByResourceAndCriterion.

FEA: ItEr76S23ImproveFilteringArea
This commit is contained in:
Manuel Rego Casasnovas 2012-04-11 19:44:53 +02:00
parent 7570bee03c
commit 92d606ed6d
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/WorkerFilterEnum.java → libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnumByResourceAndCriterion.java
View file

@ -26,7 +26,7 @@ import org.libreplan.business.resources.entities.Resource;
*
* @author Manuel Rego Casasnovas <mrego@igalia.com>
*/
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;
}

8
libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/WorkerMultipleFiltersFinder.java → libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceMultipleFiltersFinderByResourceAndCriterion.java
View file

@ -41,12 +41,12 @@ import org.springframework.beans.factory.annotation.Autowired;
*
* @author Manuel Rego Casasnovas <rego@igalia.com>
*/
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));
}

2
libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java
View file

@ -549,7 +549,7 @@ public class ResourceLoadController implements Composer {
private String getFinderToUse() {
if (isFilteringByResource()) {
return "workerMultipleFiltersFinder";
return "resourceMultipleFiltersFinderByResourceAndCriterion";
} else {
return "criterionMultipleFiltersFinder";
}

2
libreplan-webapp/src/main/resources/libreplan-webapp-spring-config.xml
View file

@ -41,7 +41,7 @@
<bean id="nonLimitingResourceAllocationMultipleFiltersFinder" class="org.libreplan.web.common.components.finders.NonLimitingResourceAllocationMultipleFiltersFinder" scope="singleton" />
<bean id="workerMultipleFiltersFinder" class="org.libreplan.web.common.components.finders.WorkerMultipleFiltersFinder" scope="singleton"/>
<bean id="resourceMultipleFiltersFinderByResourceAndCriterion" class="org.libreplan.web.common.components.finders.ResourceMultipleFiltersFinderByResourceAndCriterion" scope="singleton"/>
<bean id="criterionMultipleFiltersFinder" class="org.libreplan.web.common.components.finders.CriterionMultipleFiltersFinder" scope="singleton"/>