RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid FormBinder.getCurrentRows

Browse source 
It is potentially unsafe.

FEA: ItEr75S23FixAllocationModel
This commit is contained in:
Óscar González Fernández 2011-08-29 18:56:20 +02:00 • committed by Óscar González Fernández
parent 0053c5e5d2
commit cfc7c01a1e
3 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java
View file

@ -760,4 +760,9 @@ public abstract class AllocationRow {
});
}
public boolean isNotFlat() {
return getOrigin() != null
&& getOrigin().getAssignmentFunction() != null;
}
}

10
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java
View file

@ -906,4 +906,14 @@ public class FormBinder {
this.behaviour = behaviour;
}
public boolean isAnyNotFlat() {
for (AllocationRow allocationRow : allocationRowsHandler
.getCurrentRows()) {
if (allocationRow.isNotFlat()) {
return true;
}
}
return false;
}
}

14
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java
View file

@ -720,19 +720,7 @@ public class ResourceAllocationController extends GenericForwardComposer {
}
public boolean isAnyNotFlat() {
if (formBinder == null) {
return false;
}
List<AllocationRow> currentRows = formBinder.getCurrentRows();
for (AllocationRow allocationRow : currentRows) {
if ((allocationRow.getOrigin() != null)
&& (allocationRow.getOrigin().getAssignmentFunction() != null)) {
return true;
}
}
return false;
return formBinder != null && formBinder.isAnyNotFlat();
}
}