From d0c2bb4db380efa1ce3f6a09d20951b9a5e5fcb1 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Thu, 10 Sep 2009 12:05:06 +0200 Subject: [PATCH] ItEr25S06RFControlAvancesIncompatiblesEnUnidadesTraballoItEr24S06: Fixed typo in method name. --- .../orders/entities/OrderElement.java | 2 +- ...ddAdvanceAssigmentsToOrderElementTest.java | 32 +++++++++---------- .../ManageOrderElementAdvancesModel.java | 4 +-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java index 1036c3792..832c4c7c9 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java @@ -158,7 +158,7 @@ public abstract class OrderElement extends BaseEntity { * @throws DuplicateValueTrueReportGlobalAdvanceException * @throws DuplicateAdvanceAssigmentForOrderElementException */ - public void addAvanceAssigment(AdvanceAssigment newAdvanceAssigment) + public void addAdvanceAssigment(AdvanceAssigment newAdvanceAssigment) throws DuplicateValueTrueReportGlobalAdvanceException, DuplicateAdvanceAssigmentForOrderElementException { if(newAdvanceAssigment.getType().equals(AdvanceAssigment.Type.DIRECT)){ diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssigmentsToOrderElementTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssigmentsToOrderElementTest.java index 2ce8d46d2..5e3fe8f23 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssigmentsToOrderElementTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssigmentsToOrderElementTest.java @@ -120,7 +120,7 @@ public class AddAdvanceAssigmentsToOrderElementTest { order.add(orderLine); orderDao.save(order); - orderLine.addAvanceAssigment(advanceAssigment); + orderLine.addAdvanceAssigment(advanceAssigment); order.add(orderLine); orderDao.save(order); @@ -151,11 +151,11 @@ public class AddAdvanceAssigmentsToOrderElementTest { order.add(orderLine); orderDao.save(order); - orderLine.addAvanceAssigment(advanceAssigmentA); + orderLine.addAdvanceAssigment(advanceAssigmentA); AdvanceAssigment advanceAssigmentB = createValidAdvanceAssigment(false); advanceAssigmentB.setAdvanceType(advanceTypeB); - orderLine.addAvanceAssigment(advanceAssigmentB); + orderLine.addAdvanceAssigment(advanceAssigmentB); } @Test @@ -168,13 +168,13 @@ public class AddAdvanceAssigmentsToOrderElementTest { AdvanceAssigment advanceAssigmentA = createValidAdvanceAssigment(true); advanceAssigmentA.setAdvanceType(advanceTypeA); - orderLine.addAvanceAssigment(advanceAssigmentA); + orderLine.addAdvanceAssigment(advanceAssigmentA); AdvanceAssigment advanceAssigmentB = createValidAdvanceAssigment(false); advanceAssigmentB.setAdvanceType(advanceTypeA); try { - orderLine.addAvanceAssigment(advanceAssigmentB); + orderLine.addAdvanceAssigment(advanceAssigmentB); fail("It should throw an exception"); } catch (DuplicateAdvanceAssigmentForOrderElementException e) { // Ok @@ -192,12 +192,12 @@ public class AddAdvanceAssigmentsToOrderElementTest { advanceAssigmentA.setAdvanceType(advanceTypeA); - orderLine.addAvanceAssigment(advanceAssigmentA); + orderLine.addAdvanceAssigment(advanceAssigmentA); AdvanceAssigment advanceAssigmentB = createValidAdvanceAssigment(true); advanceAssigmentB.setAdvanceType(advanceTypeB); try { - orderLine.addAvanceAssigment(advanceAssigmentB); + orderLine.addAdvanceAssigment(advanceAssigmentB); fail("It should throw an exception "); } catch (DuplicateValueTrueReportGlobalAdvanceException e) { // Ok @@ -225,8 +225,8 @@ public class AddAdvanceAssigmentsToOrderElementTest { advanceAssigmentB.getAdvanceMeasurements().add(advanceMeasurement); - container.addAvanceAssigment(advanceAssigmentA); - son.addAvanceAssigment(advanceAssigmentB); + container.addAdvanceAssigment(advanceAssigmentA); + son.addAdvanceAssigment(advanceAssigmentB); } @Test @@ -241,7 +241,7 @@ public class AddAdvanceAssigmentsToOrderElementTest { AdvanceAssigment advanceAssigmentA = createValidAdvanceAssigment(true); advanceAssigmentA.setAdvanceType(advanceTypeA); - container.addAvanceAssigment(advanceAssigmentA); + container.addAdvanceAssigment(advanceAssigmentA); assertThat(container.getAdvanceAssigments().size(), equalTo(1)); } @@ -260,11 +260,11 @@ public class AddAdvanceAssigmentsToOrderElementTest { AdvanceAssigment anotherAssigmentWithSameType = createValidAdvanceAssigment(false); anotherAssigmentWithSameType.setAdvanceType(advanceTypeA); - father.addAvanceAssigment(advanceAssigmentA); + father.addAdvanceAssigment(advanceAssigmentA); try { OrderElement child = (OrderElement) father.getChildren().get(0); - child.addAvanceAssigment(anotherAssigmentWithSameType); + child.addAdvanceAssigment(anotherAssigmentWithSameType); fail("It should throw an exception "); } catch (DuplicateAdvanceAssigmentForOrderElementException e) { // Ok @@ -293,10 +293,10 @@ public class AddAdvanceAssigmentsToOrderElementTest { advanceAssigmentB.setAdvanceType(advanceTypeA); advanceAssigmentB.getAdvanceMeasurements().add(advanceMeasurement); - grandSon.addAvanceAssigment(advanceAssigmentA); + grandSon.addAdvanceAssigment(advanceAssigmentA); try { - parent.addAvanceAssigment(advanceAssigmentB); + parent.addAdvanceAssigment(advanceAssigmentB); fail("It should throw an exception "); } catch (DuplicateAdvanceAssigmentForOrderElementException e) { // Ok @@ -322,8 +322,8 @@ public class AddAdvanceAssigmentsToOrderElementTest { AdvanceAssigment assigmentWithSameType = createValidAdvanceAssigment(false); assigmentWithSameType.setAdvanceType(typeReloaded); - line.addAvanceAssigment(assigment); - line.addAvanceAssigment(assigmentWithSameType); + line.addAdvanceAssigment(assigment); + line.addAdvanceAssigment(assigmentWithSameType); } private AdvanceType reloadType(AdvanceType type) { 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 300e2e653..6103dfdbf 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 @@ -351,7 +351,7 @@ public class ManageOrderElementAdvancesModel implements private void addAdvanceAssigment(AdvanceAssigment newAdvanceAssigment) throws DuplicateAdvanceAssigmentForOrderElementException, DuplicateValueTrueReportGlobalAdvanceException{ - this.orderElement.addAvanceAssigment(newAdvanceAssigment); + this.orderElement.addAdvanceAssigment(newAdvanceAssigment); } private void removeAdvanceAssigment(AdvanceAssigment advanceAssigment){ @@ -400,7 +400,7 @@ public class ManageOrderElementAdvancesModel implements findCalculatedAdvanceInParent(parent,newAdvanceAssigmentDTO.getAdvanceType().getId()); if(indirectAdvanceAssigment == null){ indirectAdvanceAssigment = initNewCalculatedAdvanceAssigment(parent,newAdvanceAssigmentDTO); - parent.addAvanceAssigment(indirectAdvanceAssigment); + parent.addAdvanceAssigment(indirectAdvanceAssigment); } addIncrementMaxValueToAdvanceAssigment(newAdvanceAssigmentDTO,indirectAdvanceAssigment); addCalculatedAdvanceMeasurements(newAdvanceAssigmentDTO,indirectAdvanceAssigment);