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

[Bug #974] Refactor the code that handles selection of function allocation options

Browse source 
FEA: ItEr74S04BugFixing
This commit is contained in:
Diego Pino Garcia 2011-04-13 13:33:34 +02:00
parent ca8783bd87
commit 53f119e95f
1 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
View file

@ -1246,39 +1246,42 @@ class Row {
@Override
public void onEvent(Event event) throws Exception {
ResourceAllocation<?> resourceAllocation = getAllocation();
AssignmentFunction assignmentFunction = resourceAllocation
.getAssignmentFunction();
IAssignmentFunctionConfiguration choosen = (IAssignmentFunctionConfiguration) assignmentFunctionsCombo
.getSelectedItem().getValue();
boolean hasChanged = !choosen
.isTargetedTo(assignmentFunction);
boolean noPreviousAllocation = assignmentFunction == null;
if (hasChanged) {
boolean changeConfirmed = false;
if (noPreviousAllocation || (changeConfirmed = isChangeConfirmed()) ) {
choosen.applyDefaultFunction(resourceAllocation);
assignmentFunctionsCombo.setVariable("previousValue", assignmentFunctionsCombo.getValue(), true);
return;
}
if (!changeConfirmed) {
String previousValue = (String) assignmentFunctionsCombo.getVariable("previousValue", true);
assignmentFunctionsCombo.setValue(previousValue);
final String currentValue = assignmentFunctionsCombo.getValue();
if (currentValue.equals(getPreviousValue())) {
return;
}
if (showConfirmChangeFunctionDialog() == Messagebox.YES) {
IAssignmentFunctionConfiguration function = getSelectedFunction();
if (function != null) {
function.applyDefaultFunction(getAllocation());
}
} else {
setPreviousValue(currentValue);
}
}
private boolean isChangeConfirmed()
private IAssignmentFunctionConfiguration getSelectedFunction() {
Comboitem selectedItem = assignmentFunctionsCombo.getSelectedItem();
return (selectedItem != null) ? (IAssignmentFunctionConfiguration) selectedItem.getValue() : null;
}
private String getPreviousValue() {
return (String) assignmentFunctionsCombo.getVariable("previousValue", true);
}
private void setPreviousValue(String value) {
assignmentFunctionsCombo.setVariable("previousValue", value, true);
}
private int showConfirmChangeFunctionDialog()
throws InterruptedException {
int status = Messagebox
.show(
_("You are going to change the assignment function. Are you sure?"),
return Messagebox
.show(_("You are going to change the assignment function. Are you sure?"),
_("Confirm change"), Messagebox.YES
| Messagebox.NO,
Messagebox.QUESTION);
return Messagebox.YES == status;
}
});
}