From 0efbdff9ba23409faed076adefd340accd7321be Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Sat, 2 Apr 2011 21:44:17 +0200
Subject: [PATCH] [Bug #962] Refactor addNewLineAdvanceAssignment

FEA: ItEr73S04BugFixing
---
 .../IManageOrderElementAdvancesModel.java     |  2 +-
 .../ManageOrderElementAdvancesController.java |  2 +-
 .../ManageOrderElementAdvancesModel.java      | 26 ++++++++++---------
 3 files changed, 16 insertions(+), 14 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 51d5493a5..f59515205 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
@@ -50,7 +50,7 @@ public interface IManageOrderElementAdvancesModel {
 
     public void initEdit(OrderElement orderElement);
 
-    public boolean addNewLineAdvaceAssignment();
+    public boolean addNewLineAdvanceAssignment();
 
     public AdvanceMeasurement addNewLineAdvaceMeasurement();
 
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 e69a8c2ba..33c208dba 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
@@ -267,7 +267,7 @@ public class ManageOrderElementAdvancesController extends
     public void goToCreateLineAdvanceAssignment() {
         findErrorsInMeasurements();
         boolean fineResult = manageOrderElementAdvancesModel
-                .addNewLineAdvaceAssignment();
+                .addNewLineAdvanceAssignment();
         if (fineResult) {
             int position = getAdvanceAssignments().size() - 1;
             selectAdvanceLine(position);
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 a9d8c0d5d..fd06c78c0 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
@@ -279,28 +279,30 @@ public class ManageOrderElementAdvancesModel implements
     }
 
     @Override
-    public boolean addNewLineAdvaceAssignment() {
+    public boolean addNewLineAdvanceAssignment() {
         DirectAdvanceAssignment newAdvance = DirectAdvanceAssignment.create();
-        newAdvance.setOrderElement(this.orderElement);
+        newAdvance.setOrderElement(orderElement);
 
-        /*
-         * set the first advance type of the list as the default
-         */
+        // Set first advance type of the list as default
         List<AdvanceType> listAdvanceType = getPossibleAdvanceTypes(newAdvance);
-        if (!listAdvanceType.isEmpty()) {
-            newAdvance.setAdvanceType(listAdvanceType.get(0));
-            newAdvance.setMaxValue(getMaxValue(listAdvanceType.get(0)));
-        } else {
+        if (listAdvanceType.isEmpty()) {
             return false;
         }
 
-        if (listAdvanceAssignments.isEmpty()) {
-            newAdvance.setReportGlobalAdvance(true);
-        }
+        // Create new progress type and add it to list
+        final AdvanceType progressType = first(listAdvanceType);
+        newAdvance.setAdvanceType(progressType);
+        newAdvance.setMaxValue(getMaxValue(progressType));
+        newAdvance.setReportGlobalAdvance(listAdvanceAssignments.isEmpty());
         listAdvanceAssignments.add(newAdvance);
+
         return true;
     }
 
+    private AdvanceType first(List<AdvanceType> listAdvanceType) {
+        return listAdvanceType.get(0);
+    }
+
     @Override
     public BigDecimal getMaxValue(AdvanceType advanceType) {
         if (advanceType != null) {