From 010dee857dc3f4220f89fc7b985d186d47e1d0d0 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Wed, 23 Sep 2009 18:50:41 +0200 Subject: [PATCH] ItEr27S05RFControlAvancesIncompatiblesEnUnidadesTraballoItEr26S06: Fixing typo. --- .../orders/entities/OrderLineGroup.java | 22 +++++++++---------- .../planner/entities/DayAssignment.java | 4 ++-- .../orders/entities/OrderElementTest.java | 8 +++---- .../IManageOrderElementAdvancesModel.java | 2 +- .../ManageOrderElementAdvancesController.java | 16 +++++++------- .../ManageOrderElementAdvancesModel.java | 8 +++---- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java index 54d7ff21f..aef0b6242 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java @@ -64,25 +64,25 @@ public class OrderLineGroup extends OrderElement implements IOrderLineGroup { @Override public void remove(OrderElement child) { getManipulator().remove(child); - removeIndirectAdvanceAssigments(child); + removeIndirectAdvanceAssignments(child); } @Override public void replace(OrderElement oldOrderElement, OrderElement orderElement) { getManipulator().replace(oldOrderElement, orderElement); - addIndirectAdvanceAssigments(orderElement); - removeIndirectAdvanceAssigments(oldOrderElement); + addIndirectAdvanceAssignments(orderElement); + removeIndirectAdvanceAssignments(oldOrderElement); } @Override public void add(OrderElement orderElement) { getManipulator().add(orderElement); - addIndirectAdvanceAssigments(orderElement); + addIndirectAdvanceAssignments(orderElement); } - private void addIndirectAdvanceAssigments(OrderElement orderElement) { + private void addIndirectAdvanceAssignments(OrderElement orderElement) { for (DirectAdvanceAssignment directAdvanceAssignment : orderElement.directAdvanceAssignments) { IndirectAdvanceAssignment indirectAdvanceAssignment = IndirectAdvanceAssignment .create(); @@ -100,7 +100,7 @@ public class OrderLineGroup extends OrderElement implements IOrderLineGroup { } } - private void removeIndirectAdvanceAssigments(OrderElement orderElement) { + private void removeIndirectAdvanceAssignments(OrderElement orderElement) { for (DirectAdvanceAssignment directAdvanceAssignment : orderElement.directAdvanceAssignments) { this.removeIndirectAdvanceAssignment(directAdvanceAssignment .getAdvanceType()); @@ -153,7 +153,7 @@ public class OrderLineGroup extends OrderElement implements IOrderLineGroup { public void add(int position, OrderElement orderElement) { children.add(position, orderElement); - addIndirectAdvanceAssigments(orderElement); + addIndirectAdvanceAssignments(orderElement); } @Override @@ -189,7 +189,7 @@ public class OrderLineGroup extends OrderElement implements IOrderLineGroup { .equals(PredefinedAdvancedTypes.CHILDREN.getTypeName())) { return getAdvancePercentageChildren(date); } else { - DirectAdvanceAssignment directAdvanceAssignment = calculateFakeDirectAdvanceAssigment(indirectAdvanceAssignment); + DirectAdvanceAssignment directAdvanceAssignment = calculateFakeDirectAdvanceAssignment(indirectAdvanceAssignment); return directAdvanceAssignment.getAdvancePercentage(date); } } @@ -222,11 +222,11 @@ public class OrderLineGroup extends OrderElement implements IOrderLineGroup { return result; } - public DirectAdvanceAssignment calculateFakeDirectAdvanceAssigment( + public DirectAdvanceAssignment calculateFakeDirectAdvanceAssignment( IndirectAdvanceAssignment indirectAdvanceAssignment) { if (indirectAdvanceAssignment.getAdvanceType().getUnitName().equals( PredefinedAdvancedTypes.CHILDREN.getTypeName())) { - return calculateFakeDirectAdvanceAssigmentChildren(indirectAdvanceAssignment); + return calculateFakeDirectAdvanceAssignmentChildren(indirectAdvanceAssignment); } else { Set directAdvanceAssignments = getAllDirectAdvanceAssignments(indirectAdvanceAssignment .getAdvanceType()); @@ -235,7 +235,7 @@ public class OrderLineGroup extends OrderElement implements IOrderLineGroup { } } - private DirectAdvanceAssignment calculateFakeDirectAdvanceAssigmentChildren( + private DirectAdvanceAssignment calculateFakeDirectAdvanceAssignmentChildren( IndirectAdvanceAssignment indirectAdvanceAssignment) { DirectAdvanceAssignment newDirectAdvanceAssignment = DirectAdvanceAssignment .create(); diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java index 3058430f5..ee6606dc8 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java @@ -19,9 +19,9 @@ import org.navalplanner.business.resources.entities.Resource; public abstract class DayAssignment extends BaseEntity { - public static int sum(Collection assigments) { + public static int sum(Collection assignments) { int result = 0; - for (DayAssignment dayAssignment : assigments) { + for (DayAssignment dayAssignment : assignments) { result += dayAssignment.getHours(); } return result; diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/OrderElementTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/OrderElementTest.java index f66cf0dd5..7055c05f0 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/OrderElementTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/OrderElementTest.java @@ -446,7 +446,7 @@ public class OrderElementTest { for (IndirectAdvanceAssignment indirectAdvanceAssignment : indirectAdvanceAssignments) { if (indirectAdvanceAssignment.getAdvanceType().equals(advanceType)) { advanceAssignment = ((OrderLineGroup) orderElement) - .calculateFakeDirectAdvanceAssigment(indirectAdvanceAssignment); + .calculateFakeDirectAdvanceAssignment(indirectAdvanceAssignment); break; } } @@ -548,7 +548,7 @@ public class OrderElementTest { for (IndirectAdvanceAssignment indirectAdvanceAssignment : indirectAdvanceAssignments) { if (indirectAdvanceAssignment.getAdvanceType().equals(advanceType)) { advanceAssignment = ((OrderLineGroup) orderElement) - .calculateFakeDirectAdvanceAssigment(indirectAdvanceAssignment); + .calculateFakeDirectAdvanceAssignment(indirectAdvanceAssignment); break; } } @@ -606,7 +606,7 @@ public class OrderElementTest { if (indirectAdvanceAssignment.getAdvanceType().getUnitName() .equals(PredefinedAdvancedTypes.CHILDREN.getTypeName())) { advanceAssignment = ((OrderLineGroup) orderElement) - .calculateFakeDirectAdvanceAssigment(indirectAdvanceAssignment); + .calculateFakeDirectAdvanceAssignment(indirectAdvanceAssignment); break; } } @@ -792,7 +792,7 @@ public class OrderElementTest { for (IndirectAdvanceAssignment indirectAdvanceAssignment : indirectAdvanceAssignments) { if (indirectAdvanceAssignment.getAdvanceType().equals(advanceType)) { advanceAssignment = ((OrderLineGroup) orderElement) - .calculateFakeDirectAdvanceAssigment(indirectAdvanceAssignment); + .calculateFakeDirectAdvanceAssignment(indirectAdvanceAssignment); break; } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IManageOrderElementAdvancesModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IManageOrderElementAdvancesModel.java index cc0d04a82..d71d6d147 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IManageOrderElementAdvancesModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IManageOrderElementAdvancesModel.java @@ -64,7 +64,7 @@ public interface IManageOrderElementAdvancesModel { public BigDecimal getPercentageAdvanceMeasurement( AdvanceMeasurement advanceMeasurement); - public DirectAdvanceAssignment calculateFakeDirectAdvanceAssigment( + public DirectAdvanceAssignment calculateFakeDirectAdvanceAssignment( IndirectAdvanceAssignment indirectAdvanceAssignment); public BigDecimal getAdvancePercentageChildren(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java index 1105326cb..00fe2d4c1 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java @@ -272,7 +272,7 @@ public class ManageOrderElementAdvancesController extends if (advanceAssignment instanceof IndirectAdvanceAssignment) { maxValue.setDisabled(true); directAdvanceAssignment = manageOrderElementAdvancesModel - .calculateFakeDirectAdvanceAssigment((IndirectAdvanceAssignment) advanceAssignment); + .calculateFakeDirectAdvanceAssignment((IndirectAdvanceAssignment) advanceAssignment); } else { directAdvanceAssignment = (DirectAdvanceAssignment) advanceAssignment; } @@ -313,7 +313,7 @@ public class ManageOrderElementAdvancesController extends DirectAdvanceAssignment directAdvanceAssignment; if (advanceAssignment instanceof IndirectAdvanceAssignment) { directAdvanceAssignment = manageOrderElementAdvancesModel - .calculateFakeDirectAdvanceAssigment((IndirectAdvanceAssignment) advanceAssignment); + .calculateFakeDirectAdvanceAssignment((IndirectAdvanceAssignment) advanceAssignment); } else { directAdvanceAssignment = (DirectAdvanceAssignment) advanceAssignment; } @@ -341,7 +341,7 @@ public class ManageOrderElementAdvancesController extends DirectAdvanceAssignment directAdvanceAssignment; if (advanceAssignment instanceof IndirectAdvanceAssignment) { directAdvanceAssignment = manageOrderElementAdvancesModel - .calculateFakeDirectAdvanceAssigment((IndirectAdvanceAssignment) advanceAssignment); + .calculateFakeDirectAdvanceAssignment((IndirectAdvanceAssignment) advanceAssignment); } else { directAdvanceAssignment = (DirectAdvanceAssignment) advanceAssignment; } @@ -369,7 +369,7 @@ public class ManageOrderElementAdvancesController extends DirectAdvanceAssignment directAdvanceAssignment; if (advanceAssignment instanceof IndirectAdvanceAssignment) { directAdvanceAssignment = manageOrderElementAdvancesModel - .calculateFakeDirectAdvanceAssigment((IndirectAdvanceAssignment) advanceAssignment); + .calculateFakeDirectAdvanceAssignment((IndirectAdvanceAssignment) advanceAssignment); } else { directAdvanceAssignment = (DirectAdvanceAssignment) advanceAssignment; } @@ -456,7 +456,7 @@ public class ManageOrderElementAdvancesController extends DirectAdvanceAssignment directAdvanceAssignment; if (advanceAssignment instanceof IndirectAdvanceAssignment) { directAdvanceAssignment = manageOrderElementAdvancesModel - .calculateFakeDirectAdvanceAssigment((IndirectAdvanceAssignment) advanceAssignment); + .calculateFakeDirectAdvanceAssignment((IndirectAdvanceAssignment) advanceAssignment); } else { directAdvanceAssignment = (DirectAdvanceAssignment) advanceAssignment; } @@ -484,7 +484,7 @@ public class ManageOrderElementAdvancesController extends DirectAdvanceAssignment directAdvanceAssignment; if (advanceAssignment instanceof IndirectAdvanceAssignment) { directAdvanceAssignment = manageOrderElementAdvancesModel - .calculateFakeDirectAdvanceAssigment((IndirectAdvanceAssignment) advanceAssignment); + .calculateFakeDirectAdvanceAssignment((IndirectAdvanceAssignment) advanceAssignment); } else { directAdvanceAssignment = (DirectAdvanceAssignment) advanceAssignment; } @@ -518,7 +518,7 @@ public class ManageOrderElementAdvancesController extends DirectAdvanceAssignment directAdvanceAssignment; if (advanceAssignment instanceof IndirectAdvanceAssignment) { directAdvanceAssignment = manageOrderElementAdvancesModel - .calculateFakeDirectAdvanceAssigment((IndirectAdvanceAssignment) advanceAssignment); + .calculateFakeDirectAdvanceAssignment((IndirectAdvanceAssignment) advanceAssignment); } else { directAdvanceAssignment = (DirectAdvanceAssignment) advanceAssignment; } @@ -589,7 +589,7 @@ public class ManageOrderElementAdvancesController extends DirectAdvanceAssignment directAdvanceAssignment; if (advance instanceof IndirectAdvanceAssignment) { directAdvanceAssignment = manageOrderElementAdvancesModel - .calculateFakeDirectAdvanceAssigment((IndirectAdvanceAssignment) advance); + .calculateFakeDirectAdvanceAssignment((IndirectAdvanceAssignment) advance); } else { directAdvanceAssignment = (DirectAdvanceAssignment) advance; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java index 3b34e26a2..ead0f1281 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java @@ -110,7 +110,7 @@ public class ManageOrderElementAdvancesModel implements public void prepareEditAdvanceMeasurements(AdvanceAssignment advanceAssignment) { if (advanceAssignment instanceof IndirectAdvanceAssignment) { this.advanceAssignment = ((OrderLineGroup) this.orderElement) - .calculateFakeDirectAdvanceAssigment((IndirectAdvanceAssignment) advanceAssignment); + .calculateFakeDirectAdvanceAssignment((IndirectAdvanceAssignment) advanceAssignment); this.isIndirectAdvanceAssignment = true; } else { this.advanceAssignment = (DirectAdvanceAssignment) advanceAssignment; @@ -402,7 +402,7 @@ public class ManageOrderElementAdvancesModel implements BigDecimal maxValue; if (advanceAssignment instanceof IndirectAdvanceAssignment) { maxValue = ((OrderLineGroup) this.orderElement) - .calculateFakeDirectAdvanceAssigment( + .calculateFakeDirectAdvanceAssignment( (IndirectAdvanceAssignment) advanceAssignment) .getMaxValue(); } else { @@ -425,7 +425,7 @@ public class ManageOrderElementAdvancesModel implements @Override @Transactional(readOnly = true) - public DirectAdvanceAssignment calculateFakeDirectAdvanceAssigment( + public DirectAdvanceAssignment calculateFakeDirectAdvanceAssignment( IndirectAdvanceAssignment indirectAdvanceAssignment) { if (orderElement == null) { return null; @@ -438,7 +438,7 @@ public class ManageOrderElementAdvancesModel implements reattachmentOrderElement(); return ((OrderLineGroup) orderElement) - .calculateFakeDirectAdvanceAssigment(indirectAdvanceAssignment); + .calculateFakeDirectAdvanceAssignment(indirectAdvanceAssignment); } @Override