diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/templates/daos/IOrderElementTemplateDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/templates/daos/IOrderElementTemplateDAO.java index 20edb7ebb..2c8977ea2 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/templates/daos/IOrderElementTemplateDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/templates/daos/IOrderElementTemplateDAO.java @@ -36,16 +36,16 @@ public interface IOrderElementTemplateDAO extends List getRootTemplates(); - OrderElementTemplate findUniqueByName( + OrderElementTemplate findUniqueRootByName( OrderElementTemplate orderElementTemplate) throws InstanceNotFoundException; - OrderElementTemplate findUniqueByName(String name) - throws InstanceNotFoundException, NonUniqueResultException; + OrderElementTemplate findUniqueRootByName(String name) + throws InstanceNotFoundException, NonUniqueResultException; - boolean existsOtherOrderElementTemplateByName( + boolean existsOtherRootOrderElementTemplateByName( OrderElementTemplate orderElementTemplate); - boolean existsByNameAnotherTransaction( + boolean existsRootByNameAnotherTransaction( OrderElementTemplate orderElementTemplate); } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/templates/daos/OrderElementTemplateDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/templates/daos/OrderElementTemplateDAO.java index d163db9d0..1f135cb27 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/templates/daos/OrderElementTemplateDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/templates/daos/OrderElementTemplateDAO.java @@ -55,15 +55,15 @@ public class OrderElementTemplateDAO extends } @Override - public OrderElementTemplate findUniqueByName( + public OrderElementTemplate findUniqueRootByName( OrderElementTemplate orderElementTemplate) throws InstanceNotFoundException { Validate.notNull(orderElementTemplate); - return findUniqueByName(orderElementTemplate.getName()); + return findUniqueRootByName(orderElementTemplate.getName()); } @Override - public OrderElementTemplate findUniqueByName(String name) + public OrderElementTemplate findUniqueRootByName(String name) throws InstanceNotFoundException, NonUniqueResultException { // Prepare query @@ -84,10 +84,10 @@ public class OrderElementTemplateDAO extends } @Override - public boolean existsOtherOrderElementTemplateByName( + public boolean existsOtherRootOrderElementTemplateByName( OrderElementTemplate orderElementTemplate) { try { - OrderElementTemplate t = findUniqueByName(orderElementTemplate); + OrderElementTemplate t = findUniqueRootByName(orderElementTemplate); return (t != null && t != orderElementTemplate); } catch (InstanceNotFoundException e) { return false; @@ -96,9 +96,9 @@ public class OrderElementTemplateDAO extends @Override @Transactional(readOnly = true, propagation = Propagation.REQUIRES_NEW) - public boolean existsByNameAnotherTransaction( + public boolean existsRootByNameAnotherTransaction( OrderElementTemplate orderElementTemplate) { - return existsOtherOrderElementTemplateByName(orderElementTemplate); + return existsOtherRootOrderElementTemplateByName(orderElementTemplate); } } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderElementTemplate.java b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderElementTemplate.java index ea5e27a99..1466d27d4 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderElementTemplate.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderElementTemplate.java @@ -463,7 +463,7 @@ public abstract class OrderElementTemplate extends BaseEntity implements } @AssertTrue(message = "template name is already being used") - public boolean checkConstraintUniqueTemplateName() { + public boolean checkConstraintUniqueRootTemplateName() { if (getParent() != null) { return true; } @@ -472,11 +472,11 @@ public abstract class OrderElementTemplate extends BaseEntity implements .getOrderElementTemplateDAO(); if (isNewObject()) { return !orderElementTemplateDAO - .existsByNameAnotherTransaction(this); + .existsRootByNameAnotherTransaction(this); } else { try { OrderElementTemplate template = orderElementTemplateDAO - .findUniqueByName(getName()); + .findUniqueRootByName(getName()); return template.getId().equals(getId()); } catch (InstanceNotFoundException e) { return true; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java index 27923f055..76afca9e9 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java @@ -303,7 +303,7 @@ public class OrderTemplatesModel implements IOrderTemplatesModel { } getTemplate().setName(name); - if (!getTemplate().checkConstraintUniqueTemplateName()) { + if (!getTemplate().checkConstraintUniqueRootTemplateName()) { throw new IllegalArgumentException( _("There exists other template with the same name.")); }