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

[Bug #857] Fix bug

Browse source 
reattach the satisfied criteria and its criterion
type of the machine to edit, if it is necessary.

FEA : ItEr70S04BugFixing
This commit is contained in:
Susana Montes Pedreira 2011-02-16 17:44:17 +01:00
parent ef893e3b5b
commit e2f48c5e72
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java
View file

@ -120,14 +120,17 @@ public class AssignedMachineCriterionsModel extends IntegrationEntityModel
private void initializeCriterionSatisfactions(
Set<CriterionSatisfaction> criterionsSatisfaction) {
Set<CriterionType> types = new HashSet<CriterionType>();
for (CriterionSatisfaction criterionSatisfaction : criterionsSatisfaction) {
initializeCriterionSatisfaction(criterionSatisfaction);
}
}
Criterion criterion = criterionSatisfaction.getCriterion();
initializeCriterion(criterion);
private void initializeCriterionSatisfaction(
CriterionSatisfaction criterionSatisfaction) {
initializeCriterion(criterionSatisfaction.getCriterion());
if (!types.contains(criterionSatisfaction.getCriterion().getType())) {
types.add(criterionSatisfaction.getCriterion().getType());
reattachCriterionType(criterionSatisfaction.getCriterion()
.getType());
}
}
}
private void initializeCriterion(Criterion criterion) {
@ -136,7 +139,6 @@ public class AssignedMachineCriterionsModel extends IntegrationEntityModel
if (criterion.getParent() != null) {
criterion.getParent().getName();
}
reattachCriterionType(criterion.getType());
}
private void reattachCriterionType(CriterionType criterionType) {