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

Avoid using equals to compare if task progress is zero or one, use compareTo instead.

Browse source 
BigDecimal.ZERO and BigDecimal("0.0000") are not conceptually the same
thus equals returns false.

FEA: ItEr75S27PerProjectDashboard
This commit is contained in:
Nacho Barrientos 2011-11-14 17:42:56 +01:00 • committed by Manuel Rego Casasnovas
parent 0658e9b290
commit f30e2f0c5a
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libreplan-business/src/main/java/org/libreplan/business/planner/entities/Task.java
View file

@ -1134,7 +1134,7 @@ public class Task extends TaskElement implements ITaskPositionConstrained {
if (this.currentStatus != null) {
return this.currentStatus == TaskStatusEnum.FINISHED;
} else {
boolean outcome = this.getAdvancePercentage().equals(BigDecimal.ONE);
boolean outcome = this.advancePercentageIsOne();
if (outcome == true) {
this.currentStatus = TaskStatusEnum.FINISHED;
}
@ -1147,9 +1147,8 @@ public class Task extends TaskElement implements ITaskPositionConstrained {
if (this.currentStatus != null) {
return this.currentStatus == TaskStatusEnum.IN_PROGRESS;
} else {
BigDecimal currentAdvancePercentage = this.getAdvancePercentage();
boolean advanceBetweenZeroAndOne = this.advancePertentageIsGreaterThanZero() &&
!currentAdvancePercentage.equals(BigDecimal.ONE);
!advancePercentageIsOne();
boolean outcome = advanceBetweenZeroAndOne || this.hasAttachedWorkReports();
if (outcome == true) {
this.currentStatus = TaskStatusEnum.IN_PROGRESS;
@ -1205,7 +1204,11 @@ public class Task extends TaskElement implements ITaskPositionConstrained {
}
private boolean advancePercentageIsZero() {
return this.getAdvancePercentage().equals(BigDecimal.ZERO);
return this.getAdvancePercentage().compareTo(BigDecimal.ZERO) == 0;
}
private boolean advancePercentageIsOne() {
return this.getAdvancePercentage().compareTo(BigDecimal.ONE) == 0;
}
private boolean hasAttachedWorkReports() {