From 90c368a65325301fb387b205a2e2fb40a8882302 Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smpedreira@gmail.com>
Date: Tue, 25 Aug 2009 09:33:07 +0200
Subject: [PATCH]  ItEr23S07CUIntroducionAvanceUnidadeTraballoItEr22S07 :
 Renaming the methods

---
 .../web/orders/IManageOrderElementAdvancesModel.java      | 6 +++---
 .../web/orders/ManageOrderElementAdvancesController.java  | 8 ++++----
 .../web/orders/ManageOrderElementAdvancesModel.java       | 6 +++---
 .../src/main/webapp/orders/_listOrderElementAdvances.zul  | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

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 9ecac4ad5..75c71454f 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
@@ -16,13 +16,13 @@ import org.navalplanner.business.orders.entities.OrderElement;
 public interface IManageOrderElementAdvancesModel {
     public List<IAdvanceMeasurementDTO> getAdvanceMeasurements();
     public void init(OrderElement orderElement);
-    public void prepareForCreate();
-    public void prepareForRemove(IAdvanceMeasurementDTO advanceDTO);
+    public void addNewLine();
+    public void removeLine(IAdvanceMeasurementDTO advanceDTO);
     public List<AdvanceType> getActivesAdvanceTypes();
     public boolean isPrecisionValid(IAdvanceMeasurementDTO advanceDTO, BigDecimal value);
     public boolean greatThanMaxValue(IAdvanceMeasurementDTO advanceDTO, BigDecimal value);
     public boolean isGreatValidDate(IAdvanceMeasurementDTO advanceDTO, Date value);
-    public void confirm()throws InstanceNotFoundException,
+    public void accept()throws InstanceNotFoundException,
             DuplicateAdvanceAssigmentForOrderElementException,
             DuplicateValueTrueReportGlobalAdvanceException;
 }
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 709de9324..78a14f220 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
@@ -66,7 +66,7 @@ public class ManageOrderElementAdvancesController extends
         Util.reloadBindings(window.getParent());
     }
 
-    public void acept() throws org.navalplanner.business.common.exceptions.InstanceNotFoundException, DuplicateValueTrueReportGlobalAdvanceException {
+    public void accept() throws org.navalplanner.business.common.exceptions.InstanceNotFoundException, DuplicateValueTrueReportGlobalAdvanceException {
         if(!validateDataForm()){
                messagesForUser.showMessage(
             Level.INFO, _("Values are not valid, the values must not be null"));
@@ -78,7 +78,7 @@ public class ManageOrderElementAdvancesController extends
             return;
         }
         try{
-            this.manageOrderElementAdvancesModel.confirm();
+            this.manageOrderElementAdvancesModel.accept();
             window.setVisible(false);
             Util.reloadBindings(window.getParent());
         }catch(DuplicateAdvanceAssigmentForOrderElementException e){
@@ -98,7 +98,7 @@ public class ManageOrderElementAdvancesController extends
     }
 
     public void goToCreateLine() {
-        manageOrderElementAdvancesModel.prepareForCreate();
+        manageOrderElementAdvancesModel.addNewLine();
         Util.reloadBindings(window);
     }
 
@@ -107,7 +107,7 @@ public class ManageOrderElementAdvancesController extends
         Listitem listItem = listAdvances.getSelectedItem();
         if(listItem != null){
             IAdvanceMeasurementDTO advanceDTO = (IAdvanceMeasurementDTO) listItem.getValue();
-            manageOrderElementAdvancesModel.prepareForRemove(advanceDTO);
+            manageOrderElementAdvancesModel.removeLine(advanceDTO);
             Util.reloadBindings(window);
         }
     }
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 22f1c952f..f3d074a4a 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
@@ -97,13 +97,13 @@ public class ManageOrderElementAdvancesModel implements
     }
 
     @Override
-    public void prepareForCreate() {
+    public void addNewLine() {
         AdvanceMeasurementDTO newAdvance = new AdvanceMeasurementDTO();
         this.advanceMeasurementDTOs.add(newAdvance);
     }
 
     @Override
-    public void prepareForRemove(IAdvanceMeasurementDTO advanceDTO) {
+    public void removeLine(IAdvanceMeasurementDTO advanceDTO) {
         this.advanceMeasurementDTOs.remove(advanceDTO);
     }
 
@@ -122,7 +122,7 @@ public class ManageOrderElementAdvancesModel implements
 
     @Override
     @Transactional(readOnly = true)
-    public void confirm()throws InstanceNotFoundException,
+    public void accept()throws InstanceNotFoundException,
             DuplicateAdvanceAssigmentForOrderElementException,
             DuplicateValueTrueReportGlobalAdvanceException{
             orderElementDAO.checkVersion(orderElement);
diff --git a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul
index 181add4d3..91f86fbea 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul
@@ -25,7 +25,7 @@
     </vbox>
     <separator bar="true" spacing="12px" orient="horizontal"/>
     <hbox>
-       <button id="aceptAdvance" onClick="manageOrderElementAdvancesController.acept();" label="${i18n:_('Acept')}"/>
+       <button id="aceptAdvance" onClick="manageOrderElementAdvancesController.accept();" label="${i18n:_('Accept')}"/>
        <button id="cancelAdvance" onClick="manageOrderElementAdvancesController.cancel();" label="${i18n:_('Cancel')}"/>
     </hbox>
 </vbox>