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 ccd37fbf8..2556f08a7 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 @@ -61,8 +61,6 @@ public class ManageOrderElementAdvancesModel implements private List listAdvanceAssignments; - private SortedSet listAdvanceMeasurements; - private List listAdvanceTypes; @Autowired @@ -159,16 +157,10 @@ public class ManageOrderElementAdvancesModel implements private void fillVariables() { this.listAdvanceAssignments = new ArrayList(); - this.listAdvanceMeasurements = new TreeSet( - new AdvanceMeasurementComparator()); for (DirectAdvanceAssignment advanceAssignment : this.orderElement .getDirectAdvanceAssignments()) { this.listAdvanceAssignments.add(advanceAssignment); - for (AdvanceMeasurement advanceMeasurement : advanceAssignment - .getAdvanceMeasurements()) { - this.listAdvanceMeasurements.add(advanceMeasurement); - } } if (this.orderElement instanceof OrderLineGroup) { @@ -305,18 +297,6 @@ public class ManageOrderElementAdvancesModel implements AdvanceAssignment advance = yetExistAdvanceAssignment(advanceAssignment); if (advance == null) { removeAdvanceAssignment(advanceAssignment); - }else{ - if (advance instanceof DirectAdvanceAssignment) { - for (AdvanceMeasurement advanceMeasurement : this.listAdvanceMeasurements) { - if (advanceMeasurement.getAdvanceAssignment().equals( - advance) - && !yetExistAdvanceMeasurement( - (DirectAdvanceAssignment) advance, - advanceMeasurement)) { - removeAdvanceMeasurement(advanceMeasurement); - } - } - } } } }