From a35a1d60b4c2ac747c3c530f10109771edadbd8d Mon Sep 17 00:00:00 2001 From: Diego Pino Garcia Date: Wed, 7 Apr 2010 16:35:51 +0200 Subject: [PATCH] ItEr53S12CUCreacionRecursosLimitantesItEr52S13: Rename limitedResource as limitingResource --- .../business/resources/entities/Resource.java | 14 ++-- .../resources/entities/VirtualWorker.java | 2 +- .../resources/entities/Resources.hbm.xml | 2 +- .../machine/MachineCRUDController.java | 38 +++++------ .../resources/search/ResourcePredicate.java | 12 ++-- .../worker/WorkerCRUDController.java | 68 +++++++++---------- .../webapp/resources/machine/_editMachine.zul | 8 +-- .../resources/machine/_listMachines.zul | 4 +- .../resources/search/_resourceFilter.zul | 8 +-- .../main/webapp/resources/worker/_edition.zul | 10 +-- .../main/webapp/resources/worker/_list.zul | 4 +- 11 files changed, 85 insertions(+), 85 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java index 1a1012c46..7500efaab 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java @@ -94,7 +94,7 @@ public abstract class Resource extends IntegrationEntity { private Set resourcesCostCategoryAssignments = new HashSet(); - private Boolean limitedResource = Boolean.FALSE; + private Boolean limitingResource = Boolean.FALSE; private void clearCachedData() { assignmentsByDayCached = null; @@ -1046,16 +1046,16 @@ public abstract class Resource extends IntegrationEntity { return Registry.getResourceDAO(); } - public Boolean isLimitedResource() { - return limitedResource; + public Boolean isLimitingResource() { + return limitingResource; } - public void setLimitedResource(Boolean limitedResource) { - this.limitedResource = limitedResource; + public void setLimitingResource(Boolean limitingResource) { + this.limitingResource = limitingResource; } - public String getLimitedResourceAsString() { - return (Boolean.TRUE.equals(isLimitedResource())) ? _("yes") : _("no"); + public String getLimitingResourceAsString() { + return (Boolean.TRUE.equals(isLimitingResource())) ? _("yes") : _("no"); } } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/VirtualWorker.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/VirtualWorker.java index 38f357fb1..7b53a5a9d 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/VirtualWorker.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/VirtualWorker.java @@ -94,7 +94,7 @@ public class VirtualWorker extends Worker { } @Override - public Boolean isLimitedResource() { + public Boolean isLimitingResource() { return false; } diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/resources/entities/Resources.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/resources/entities/Resources.hbm.xml index af5dd3aba..676ff1810 100644 --- a/navalplanner-business/src/main/resources/org/navalplanner/business/resources/entities/Resources.hbm.xml +++ b/navalplanner-business/src/main/resources/org/navalplanner/business/resources/entities/Resources.hbm.xml @@ -15,7 +15,7 @@ - + diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java index d150eecb1..d6c3296ab 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java @@ -49,7 +49,7 @@ import org.navalplanner.web.costcategories.ResourcesCostCategoryAssignmentContro import org.navalplanner.web.resources.search.ResourcePredicate; import org.navalplanner.web.resources.worker.CriterionsController; import org.navalplanner.web.resources.worker.CriterionsMachineController; -import org.navalplanner.web.resources.worker.WorkerCRUDController.LimitedResourceEnum; +import org.navalplanner.web.resources.worker.WorkerCRUDController.LimitingResourceEnum; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.WrongValueException; import org.zkoss.zk.ui.util.GenericForwardComposer; @@ -101,7 +101,7 @@ public class MachineCRUDController extends GenericForwardComposer { private Datebox filterFinishDate; - private Listbox filterLimitedResource; + private Listbox filterLimitingResource; private Textbox txtfilter; @@ -145,8 +145,8 @@ public class MachineCRUDController extends GenericForwardComposer { .getFellowIfAny("filterFinishDate"); this.filterStartDate = (Datebox) listWindow .getFellowIfAny("filterStartDate"); - this.filterLimitedResource = (Listbox) listWindow - .getFellowIfAny("filterLimitedResource"); + this.filterLimitingResource = (Listbox) listWindow + .getFellowIfAny("filterLimitingResource"); this.bdFilters = (BandboxMultipleSearch) listWindow .getFellowIfAny("bdFilters"); this.txtfilter = (Textbox) listWindow.getFellowIfAny("txtfilter"); @@ -520,18 +520,18 @@ public class MachineCRUDController extends GenericForwardComposer { .getValue()); } - final Listitem item = filterLimitedResource.getSelectedItem(); - Boolean isLimitedResource = (item != null) ? LimitedResourceEnum - .valueOf((LimitedResourceEnum) item.getValue()) : null; + final Listitem item = filterLimitingResource.getSelectedItem(); + Boolean isLimitingResource = (item != null) ? LimitingResourceEnum + .valueOf((LimitingResourceEnum) item.getValue()) : null; if (listFilters.isEmpty() && (personalFilter == null || personalFilter.isEmpty()) && startDate == null && finishDate == null - && isLimitedResource == null) { + && isLimitingResource == null) { return null; } return new ResourcePredicate(listFilters, personalFilter, startDate, - finishDate, isLimitedResource); + finishDate, isLimitingResource); } private void filterByPredicate(ResourcePredicate predicate) { @@ -552,25 +552,25 @@ public class MachineCRUDController extends GenericForwardComposer { listing.invalidate(); } - public Set getLimitedResourceFilterOptionList() { - return LimitedResourceEnum.getLimitedResourceFilterOptionList(); + public Set getLimitingResourceFilterOptionList() { + return LimitingResourceEnum.getLimitingResourceFilterOptionList(); } - public Set getLimitedResourceOptionList() { - return LimitedResourceEnum.getLimitedResourceOptionList(); + public Set getLimitingResourceOptionList() { + return LimitingResourceEnum.getLimitingResourceOptionList(); } - public Object getLimitedResource() { + public Object getLimitingResource() { final Machine machine = getMachine(); - return (machine != null) ? LimitedResourceEnum.valueOf(machine - .isLimitedResource()) - : LimitedResourceEnum.NON_LIMITED_RESOURCE; // Default option + return (machine != null) ? LimitingResourceEnum.valueOf(machine + .isLimitingResource()) + : LimitingResourceEnum.NON_LIMITING_RESOURCE; // Default option } - public void setLimitedResource(LimitedResourceEnum option) { + public void setLimitingResource(LimitingResourceEnum option) { Machine machine = getMachine(); if (machine != null) { - machine.setLimitedResource(LimitedResourceEnum.LIMITED_RESOURCE.equals(option)); + machine.setLimitingResource(LimitingResourceEnum.LIMITING_RESOURCE.equals(option)); } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/ResourcePredicate.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/ResourcePredicate.java index bc65f13e6..420c17926 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/ResourcePredicate.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/ResourcePredicate.java @@ -52,18 +52,18 @@ public class ResourcePredicate implements IPredicate { private String[] personalFilters; - private Boolean isLimitedResource; + private Boolean isLimitingResource; private List assignedResourcesInIntervalDates; public ResourcePredicate(List filters, String personalFilters, LocalDate startDate, LocalDate finishDate, - Boolean isLimitedResource) { + Boolean isLimitingResource) { this.filters = filters; this.startDate = startDate; this.finishDate = finishDate; - this.isLimitedResource = isLimitedResource; + this.isLimitingResource = isLimitingResource; this.personalFilters = personalFilters.split(" "); } @@ -78,14 +78,14 @@ public class ResourcePredicate implements IPredicate { return false; } if (acceptFilters(resource) && acceptPersonalFilters(resource) - && acceptFiltersDates(resource) && acceptFilterIsLimitedResource(resource)) { + && acceptFiltersDates(resource) && acceptFilterIsLimitingResource(resource)) { return true; } return false; } - private boolean acceptFilterIsLimitedResource(Resource resource) { - return (isLimitedResource != null) ? isLimitedResource.equals(resource.isLimitedResource()) : true; + private boolean acceptFilterIsLimitingResource(Resource resource) { + return (isLimitingResource != null) ? isLimitingResource.equals(resource.isLimitingResource()) : true; } private boolean acceptFilters(Resource resource) { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java index 83bae25bc..fa4353714 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java @@ -111,7 +111,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements private Datebox filterFinishDate; - private Listbox filterLimitedResource; + private Listbox filterLimitingResource; private BandboxMultipleSearch bdFilters; @@ -297,8 +297,8 @@ public class WorkerCRUDController extends GenericForwardComposer implements .getFellowIfAny("filterFinishDate"); this.filterStartDate = (Datebox) listWindow .getFellowIfAny("filterStartDate"); - this.filterLimitedResource = (Listbox) listWindow - .getFellowIfAny("filterLimitedResource"); + this.filterLimitingResource = (Listbox) listWindow + .getFellowIfAny("filterLimitingResource"); this.bdFilters = (BandboxMultipleSearch) listWindow .getFellowIfAny("bdFilters"); this.txtfilter = (Textbox) listWindow.getFellowIfAny("txtfilter"); @@ -607,18 +607,18 @@ public class WorkerCRUDController extends GenericForwardComposer implements finishDate = LocalDate.fromDateFields(filterFinishDate.getValue()); } - final Listitem item = filterLimitedResource.getSelectedItem(); - Boolean isLimitedResource = (item != null) ? LimitedResourceEnum - .valueOf((LimitedResourceEnum) item.getValue()) : null; + final Listitem item = filterLimitingResource.getSelectedItem(); + Boolean isLimitingResource = (item != null) ? LimitingResourceEnum + .valueOf((LimitingResourceEnum) item.getValue()) : null; if (listFilters.isEmpty() && (personalFilter == null || personalFilter.isEmpty()) && startDate == null && finishDate == null - && isLimitedResource == null) { + && isLimitingResource == null) { return null; } return new ResourcePredicate(listFilters, personalFilter, startDate, - finishDate, isLimitedResource); + finishDate, isLimitingResource); } private void filterByPredicate(ResourcePredicate predicate) { @@ -639,14 +639,14 @@ public class WorkerCRUDController extends GenericForwardComposer implements listing.invalidate(); } - public enum LimitedResourceEnum { + public enum LimitingResourceEnum { ALL(_("ALL")), - LIMITED_RESOURCE(_("LIMITED RESOURCE")), - NON_LIMITED_RESOURCE(_("NON LIMITED RESOURCE")); + LIMITING_RESOURCE(_("LIMITING RESOURCE")), + NON_LIMITING_RESOURCE(_("NON LIMITING RESOURCE")); private String option; - private LimitedResourceEnum(String option) { + private LimitingResourceEnum(String option) { this.option = option; } @@ -654,53 +654,53 @@ public class WorkerCRUDController extends GenericForwardComposer implements return option; } - public static LimitedResourceEnum valueOf(Boolean isLimitedResource) { - return (Boolean.TRUE.equals(isLimitedResource)) ? LIMITED_RESOURCE : NON_LIMITED_RESOURCE; + public static LimitingResourceEnum valueOf(Boolean isLimitingResource) { + return (Boolean.TRUE.equals(isLimitingResource)) ? LIMITING_RESOURCE : NON_LIMITING_RESOURCE; } - public static Boolean valueOf(LimitedResourceEnum option) { - if (LIMITED_RESOURCE.equals(option)) { + public static Boolean valueOf(LimitingResourceEnum option) { + if (LIMITING_RESOURCE.equals(option)) { return true; - } else if (NON_LIMITED_RESOURCE.equals(option)) { + } else if (NON_LIMITING_RESOURCE.equals(option)) { return false; } else { return null; } } - public static Set getLimitedResourceOptionList() { + public static Set getLimitingResourceOptionList() { return EnumSet.of( - LimitedResourceEnum.LIMITED_RESOURCE, - LimitedResourceEnum.NON_LIMITED_RESOURCE); + LimitingResourceEnum.LIMITING_RESOURCE, + LimitingResourceEnum.NON_LIMITING_RESOURCE); } - public static Set getLimitedResourceFilterOptionList() { - return EnumSet.of(LimitedResourceEnum.ALL, - LimitedResourceEnum.LIMITED_RESOURCE, - LimitedResourceEnum.NON_LIMITED_RESOURCE); + public static Set getLimitingResourceFilterOptionList() { + return EnumSet.of(LimitingResourceEnum.ALL, + LimitingResourceEnum.LIMITING_RESOURCE, + LimitingResourceEnum.NON_LIMITING_RESOURCE); } } - public Set getLimitedResourceFilterOptionList() { - return LimitedResourceEnum.getLimitedResourceFilterOptionList(); + public Set getLimitingResourceFilterOptionList() { + return LimitingResourceEnum.getLimitingResourceFilterOptionList(); } - public Set getLimitedResourceOptionList() { - return LimitedResourceEnum.getLimitedResourceOptionList(); + public Set getLimitingResourceOptionList() { + return LimitingResourceEnum.getLimitingResourceOptionList(); } - public Object getLimitedResource() { + public Object getLimitingResource() { final Worker worker = getWorker(); - return (worker != null) ? LimitedResourceEnum.valueOf(worker - .isLimitedResource()) - : LimitedResourceEnum.NON_LIMITED_RESOURCE; // Default option + return (worker != null) ? LimitingResourceEnum.valueOf(worker + .isLimitingResource()) + : LimitingResourceEnum.NON_LIMITING_RESOURCE; // Default option } - public void setLimitedResource(LimitedResourceEnum option) { + public void setLimitingResource(LimitingResourceEnum option) { Worker worker = getWorker(); if (worker != null) { - worker.setLimitedResource(LimitedResourceEnum.LIMITED_RESOURCE.equals(option)); + worker.setLimitingResource(LimitingResourceEnum.LIMITING_RESOURCE.equals(option)); } } diff --git a/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul b/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul index 4aaf043a5..053c7cba3 100644 --- a/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul +++ b/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul @@ -56,10 +56,10 @@ diff --git a/navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul b/navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul index 7680eadbc..abc82ca5a 100644 --- a/navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul +++ b/navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul @@ -33,7 +33,7 @@ - + @@ -41,7 +41,7 @@