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

ItEr33S08ValidacionEProbasFuncionaisItEr32S09: Some forgotten fixes

Browse source
This commit is contained in:
Óscar González Fernández 2009-11-04 13:32:21 +01:00
parent c68e1463c0
commit 65a2993adc
5 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java
View file

@ -110,7 +110,7 @@ public class TaskComponent extends Div implements AfterCompose {
String[] requestData = request.getData();
if ((requestData != null) && (requestData.length != 1)) {
if (requestData == null || requestData.length != 1) {
throw new UiException(MZk.ILLEGAL_REQUEST_WRONG_DATA,
new Object[] { Objects.toString(requestData), this });
} else {

2
ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java
View file

@ -47,7 +47,7 @@ public class ResourceLoadComponent extends XulElement {
private final LoadTimeLine loadLine;
private final TimeTracker timeTracker;
private IZoomLevelChangedListener zoomChangedListener;
private transient IZoomLevelChangedListener zoomChangedListener;
private ResourceLoadComponent(final TimeTracker timeTracker,
final LoadTimeLine loadLine) {

3
navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java
View file

@ -163,7 +163,8 @@ public class CriterionSatisfaction extends BaseEntity {
}
public void finish(Date finish) {
Validate.isTrue(finish == null || getStartDate() == null
Validate.notNull(finish);
Validate.isTrue(getStartDate() == null
|| getStartDate().equals(finish) || getStartDate().before(finish));
Validate.isTrue(finishDate == null || isNewObject() ||
getEndDate().equals(finish) || getEndDate().before(finish));

5
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/LoadChartFiller.java
View file

@ -295,8 +295,9 @@ public abstract class LoadChartFiller implements ILoadChartFiller {
result.put(key, result.get(key) + hours);
}
}
for (LocalDate day : result.keySet()) {
result.put(day, result.get(day) / 7);
for (Entry<LocalDate, Integer> entry : result.entrySet()) {
LocalDate day = entry.getKey();
result.put(entry.getKey(), result.get(day) / 7);
}
return result;
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionSatisfactionDTO.java
View file

@ -99,11 +99,11 @@ public class CriterionSatisfactionDTO implements INewObject {
}
public Date getStartDate() {
return new Date(startDate.getTime());
return startDate != null ? new Date(startDate.getTime()) : null;
}
public Date getEndDate() {
return new Date(endDate.getTime());
return endDate != null ? new Date(endDate.getTime()) : null;
}
public CriterionSatisfaction getCriterionSatisfaction() {