RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Bug #1180] Change method names in order to make explicit that work with root templates

Browse source 
FEA: ItEr75S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2011-09-21 08:32:48 +02:00
parent 2f15adcedc
commit 2e658edacb
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
navalplanner-business/src/main/java/org/navalplanner/business/templates/daos/IOrderElementTemplateDAO.java
View file

@ -36,16 +36,16 @@ public interface IOrderElementTemplateDAO extends
List<OrderElementTemplate> 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);
}

14
navalplanner-business/src/main/java/org/navalplanner/business/templates/daos/OrderElementTemplateDAO.java
View file

@ -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);
}
}

6
navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderElementTemplate.java
View file

@ -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;

2
navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java
View file

@ -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."));
}