From da985cf27fc786db7b2ca9ea97c820a46f53dfee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 12 Apr 2011 18:26:58 +0200 Subject: [PATCH] Field must be renamed so ZK injects it FEA: ItEr74S04BugFixing --- .../web/resources/search/AllocationSelectorController.java | 6 +++--- .../search/NewAllocationSelectorComboController.java | 2 +- .../resources/search/NewAllocationSelectorController.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/AllocationSelectorController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/AllocationSelectorController.java index f83649fce..2a0118a22 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/AllocationSelectorController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/AllocationSelectorController.java @@ -28,7 +28,6 @@ import org.navalplanner.business.resources.entities.Criterion; import org.navalplanner.business.resources.entities.Resource; import org.navalplanner.web.common.components.ResourceAllocationBehaviour; import org.navalplanner.web.planner.allocation.INewAllocationsAdder; -import org.springframework.beans.factory.annotation.Autowired; import org.zkoss.zk.ui.util.GenericForwardComposer; /** @@ -38,9 +37,10 @@ import org.zkoss.zk.ui.util.GenericForwardComposer; public abstract class AllocationSelectorController extends GenericForwardComposer { - @Autowired - protected IResourcesSearcher resourceSearchModel; + // injected by name + protected IResourcesSearcher resourcesSearcher; + // injected by name protected ResourceAllocationBehaviour behaviour; public AllocationSelectorController() { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/NewAllocationSelectorComboController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/NewAllocationSelectorComboController.java index 425eed251..451521058 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/NewAllocationSelectorComboController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/NewAllocationSelectorComboController.java @@ -80,7 +80,7 @@ public class NewAllocationSelectorComboController extends } private IResourcesQuery query(ResourceEnum resourceEnum) { - return resourceSearchModel.searchBy(resourceEnum); + return resourcesSearcher.searchBy(resourceEnum); } /** diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/NewAllocationSelectorController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/NewAllocationSelectorController.java index c07efbf70..c9e572e56 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/NewAllocationSelectorController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/NewAllocationSelectorController.java @@ -202,7 +202,7 @@ public class NewAllocationSelectorController extends } private IResourcesQuery query() { - return currentAllocationType.doQueryOn(resourceSearchModel); + return currentAllocationType.doQueryOn(resourcesSearcher); } private void refreshListBoxResources() {