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

Refactored constraintForResourcesPerDay and constraintForHoursInput

Browse source 
FEA: ItEr68OTS03XestionRecursosEstratexicosItEr67OTS03
This commit is contained in:
Diego Pino Garcia 2011-01-24 17:17:52 +01:00
parent 1f944add30
commit 16da5b7524
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -77,6 +77,9 @@ public abstract class AllocationRow {
public static final SimpleConstraint CONSTRAINT_FOR_RESOURCES_PER_DAY = new SimpleConstraint(
SimpleConstraint.NO_EMPTY | SimpleConstraint.NO_NEGATIVE);
private static final SimpleConstraint CONSTRAINT_FOR_HOURS_INPUT = new SimpleConstraint(
SimpleConstraint.NO_EMPTY | SimpleConstraint.NO_NEGATIVE);
private static final Log LOG = LogFactory.getLog(AllocationRow.class);
public static void assignHours(List<AllocationRow> rows, int[] hours) {
@ -206,8 +209,7 @@ public abstract class AllocationRow {
private Grid derivedAllocationsGrid;
private void initializeResourcesPerDayInput() {
resourcesPerDayInput.setConstraint(new SimpleConstraint(
SimpleConstraint.NO_NEGATIVE));
resourcesPerDayInput.setConstraint(CONSTRAINT_FOR_RESOURCES_PER_DAY);
resourcesPerDayInput.setWidth("80px");
Util.bind(resourcesPerDayInput, new Util.Getter<BigDecimal>() {
@ -232,9 +234,7 @@ public abstract class AllocationRow {
initializeResourcesPerDayInput();
hoursInput.setValue(0);
hoursInput.setWidth("80px");
hoursInput.setDisabled(true);
hoursInput.setConstraint(new SimpleConstraint(
SimpleConstraint.NO_NEGATIVE));
hoursInput.setConstraint(constraintForHoursInput());
}
public abstract ResourcesPerDayModification toResourcesPerDayModification(
@ -362,18 +362,12 @@ public abstract class AllocationRow {
}
private Constraint constraintForHoursInput() {
if (hoursInput.isDisabled()) {
return null;
}
return new SimpleConstraint(SimpleConstraint.NO_EMPTY
| SimpleConstraint.NO_NEGATIVE);
return (hoursInput.isDisabled()) ? null : CONSTRAINT_FOR_HOURS_INPUT;
}
private Constraint constraintForResourcesPerDayInput() {
if (resourcesPerDayInput.isDisabled()) {
return null;
}
return CONSTRAINT_FOR_RESOURCES_PER_DAY;
return (resourcesPerDayInput.isDisabled()) ? null
: CONSTRAINT_FOR_RESOURCES_PER_DAY;
}
public void loadDataFromLast() {