From 937e2711d0d1a8c135c4e0740962f5daa159d840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= Date: Wed, 21 Dec 2011 11:01:16 +0100 Subject: [PATCH] Fixed wrong criteria string format FEA: ItEr76S04BugFixing --- .../org/libreplan/business/resources/entities/Criterion.java | 2 +- .../common/components/finders/CriterionBandboxFinder.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java index d985ab580..2c2239aa1 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java +++ b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java @@ -320,7 +320,7 @@ public class Criterion extends IntegrationEntity implements ICriterion, } public String getCompleteName() { - return type.getName() + " :: " + name; + return name + "(" + type.getName() + ")"; } public boolean isActive() { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/CriterionBandboxFinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/CriterionBandboxFinder.java index c369d2a4d..0b85db42e 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/CriterionBandboxFinder.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/CriterionBandboxFinder.java @@ -81,8 +81,7 @@ public class CriterionBandboxFinder extends BandboxFinder implements IBandboxFin @Transactional(readOnly = true) public String objectToString(Object obj) { Criterion criterion = (Criterion) obj; - return criterion.getType().getName() + " :: " - + getNamesHierarchy(criterion, new String()); + return criterion.getCompleteName(); } @Override @@ -117,7 +116,7 @@ public class CriterionBandboxFinder extends BandboxFinder implements IBandboxFin Criterion parent = criterion.getParent(); if(parent != null){ etiqueta = getNamesHierarchy(parent,etiqueta); - etiqueta = etiqueta.concat(" -> "); + etiqueta = etiqueta.concat(" > "); } return etiqueta.concat(criterion.getName()); }