From 30509aa3d1c5260e1f6e6175941eea4fc45cc9f7 Mon Sep 17 00:00:00 2001 From: Diego Pino Garcia Date: Mon, 24 Jan 2011 18:39:34 +0100 Subject: [PATCH] Use Resource.getCaptionFor() for showing list of resources selected FEA: ItEr68OTS03XestionRecursosEstratexicosItEr67OTS03 --- .../search/NewAllocationSelectorController.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) 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 ecb22dd1f..6fbdf2e8f 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 @@ -185,11 +185,8 @@ public class NewAllocationSelectorController extends private String buildSelectedAllocationsString() { if (currentAllocationType == AllocationType.SPECIFIC) { - List result = new ArrayList(); - for (Resource each : getSelectedResourcesOnListbox()) { - result.add(each.getShortDescription()); - } - return StringUtils.join(result, ","); + List resources = getSelectedResources(); + return Resource.getCaptionFor(resources); } else { List criteria = getSelectedCriterions(); return currentAllocationType.asCaption(criteria); @@ -339,7 +336,7 @@ public class NewAllocationSelectorController extends if (isGenericType()) { return allResourcesShown(); } else { - return getSelectedResourcesOnListbox(); + return getSelectedResources(); } } @@ -354,7 +351,7 @@ public class NewAllocationSelectorController extends } @SuppressWarnings("unchecked") - private List getSelectedResourcesOnListbox() { + private List getSelectedResources() { List result = new ArrayList(); Set selectedItems = listBoxResources.getSelectedItems(); for (Listitem item : selectedItems) {