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

[Bug #867] Fix bug

Browse source 
use method equal in the comparisons and fix the formatted.

FEA : ItEr71S04BugFixing
This commit is contained in:
Susana Montes Pedreira 2011-02-22 20:14:23 +01:00
parent 7cd133bd0f
commit 18a345afe5
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java
View file

@ -29,6 +29,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.hibernate.validator.AssertTrue;
import org.hibernate.validator.NotEmpty;
@ -713,9 +714,16 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar {
public boolean isLastCalendarAvailability(
CalendarAvailability calendarAvailability) {
return getLastCalendarAvailability() != null ? calendarAvailability
.getId() == getLastCalendarAvailability().getId()
: false;
if (getLastCalendarAvailability() == null
|| calendarAvailability == null) {
return false;
}
if (getLastCalendarAvailability().getId() == null
&& calendarAvailability.getId() == null) {
return getLastCalendarAvailability() == calendarAvailability;
}
return ObjectUtils.equals(getLastCalendarAvailability().getId(),
calendarAvailability.getId());
}
public void setStartDate(CalendarAvailability calendarAvailability,

4
navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java
View file

@ -1216,10 +1216,10 @@ public abstract class BaseCalendarEditionController extends
private LocalDate getAppropiateEndDate(
CalendarAvailability calendarAvailability, Date endDate) {
if(endDate == null){
if (endDate == null) {
if (baseCalendarModel
.isLastActivationPeriod(calendarAvailability)) {
return null;
return null;
} else {
throw new IllegalArgumentException(
_("Only the last activation period allows to delete end date."));