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

[Bug #931] Reuse invalidValue() method from ValidationException

Browse source 
FEA: ItEr74S04BugFixing
This commit is contained in:
Diego Pino Garcia 2011-04-06 18:28:20 +02:00
parent 937080fd0c
commit 5f3ddcb576
1 changed files with 41 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java
View file

@ -31,7 +31,6 @@ import java.util.Set;
import org.apache.commons.lang.StringUtils;
import org.hibernate.validator.AssertFalse;
import org.hibernate.validator.AssertTrue;
import org.hibernate.validator.InvalidValue;
import org.hibernate.validator.NotEmpty;
import org.hibernate.validator.NotNull;
import org.hibernate.validator.Valid;
@ -144,6 +143,47 @@ public class CostCategory extends IntegrationEntity {
}
}
public static void checkOverlapping(
List<ResourcesCostCategoryAssignment> costCategoryAssignments) {
for (int i = 0; i < costCategoryAssignments.size(); i++) {
LocalDate initDate = costCategoryAssignments.get(i).getInitDate();
LocalDate endDate = costCategoryAssignments.get(i).getEndDate();
for (int j = i + 1; j < costCategoryAssignments.size(); j++) {
ResourcesCostCategoryAssignment costCategory = costCategoryAssignments
.get(j);
if (endDate == null && costCategory.getEndDate() == null) {
throw ValidationException.invalidValue(_("Some cost category assignments overlap in time"), costCategory);
} else if ((endDate == null && costCategory.getEndDate()
.compareTo(initDate) >= 0)
|| (costCategory.getEndDate() == null && costCategory
.getInitDate().compareTo(endDate) <= 0)) {
throw ValidationException.invalidValue(_("Some cost category assignments overlap in time"), costCategory);
} else if ((endDate != null && costCategory.getEndDate() != null)
&& ((costCategory.getEndDate().compareTo(initDate) >= 0 && // (1)
// listElement.getEndDate()
// inside
// [initDate,
// endDate]
costCategory.getEndDate().compareTo(endDate) <= 0)
|| (costCategory.getInitDate().compareTo(
initDate) >= 0 && // (2)
// listElement.getInitDate()
// inside [initDate,
// endDate]
costCategory.getInitDate().compareTo(endDate) <= 0) || (costCategory
.getInitDate().compareTo(initDate) <= 0 && // (3)
// [listElement.getInitDate(),
// listElement.getEndDate()]
costCategory.getEndDate().compareTo(endDate) >= 0))) { // contains
// [initDate,
// endDate]
throw ValidationException.invalidValue(_("Some cost category assignments overlap in time"), costCategory);
}
}
}
}
protected CostCategory(String name) {
this.name = name;
}
@ -271,49 +311,4 @@ public class CostCategory extends IntegrationEntity {
return lastHourCostSequenceCode;
}
public static void checkOverlapping(
List<ResourcesCostCategoryAssignment> costCategoryAssignments) {
for (int i = 0; i < costCategoryAssignments.size(); i++) {
LocalDate initDate = costCategoryAssignments.get(i).getInitDate();
LocalDate endDate = costCategoryAssignments.get(i).getEndDate();
for (int j = i + 1; j < costCategoryAssignments.size(); j++) {
ResourcesCostCategoryAssignment costCategory = costCategoryAssignments
.get(j);
if (endDate == null && costCategory.getEndDate() == null) {
throw new ValidationException(invalidValue(_("Some cost category assignments overlap in time"), costCategory));
} else if ((endDate == null && costCategory.getEndDate()
.compareTo(initDate) >= 0)
|| (costCategory.getEndDate() == null && costCategory
.getInitDate().compareTo(endDate) <= 0)) {
throw new ValidationException(invalidValue(_("Some cost category assignments overlap in time"), costCategory));
} else if ((endDate != null && costCategory.getEndDate() != null)
&& ((costCategory.getEndDate().compareTo(initDate) >= 0 && // (1)
// listElement.getEndDate()
// inside
// [initDate,
// endDate]
costCategory.getEndDate().compareTo(endDate) <= 0)
|| (costCategory.getInitDate().compareTo(
initDate) >= 0 && // (2)
// listElement.getInitDate()
// inside [initDate,
// endDate]
costCategory.getInitDate().compareTo(endDate) <= 0) || (costCategory
.getInitDate().compareTo(initDate) <= 0 && // (3)
// [listElement.getInitDate(),
// listElement.getEndDate()]
costCategory.getEndDate().compareTo(endDate) >= 0))) { // contains
// [initDate,
// endDate]
throw new ValidationException(invalidValue(_("Some cost category assignments overlap in time"), costCategory));
}
}
}
}
private static InvalidValue invalidValue(String message, ResourcesCostCategoryAssignment each) {
return new InvalidValue(message, null, "", each, null);
}
}