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

Rename method to a more accurate name

Browse source 
FEA: ItEr74S04BugFixing
This commit is contained in:
Óscar González Fernández 2011-05-11 16:05:37 +02:00
parent a553aade8c
commit 252f5165f1
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/Gap.java
View file

@ -287,7 +287,7 @@ public class Gap implements Comparable<Gap> {
*/
public boolean canFit(LimitingResourceQueueElement candidate) {
LocalDate startAfter = LocalDate.fromDateFields(candidate
.getEarlierStartDateBecauseOfGantt());
.getEarliestStartDateBecauseOfGantt());
LocalDate endsAfter = LocalDate.fromDateFields(candidate
.getEarliestEndDateBecauseOfGantt());

2
navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/InsertionRequirements.java
View file

@ -92,7 +92,7 @@ public class InsertionRequirements {
LimitingResourceQueueElement element,
List<LimitingResourceQueueDependency> dependenciesAffectingStart) {
return DateAndHour.max(asDateAndHour(element
.getEarlierStartDateBecauseOfGantt()),
.getEarliestStartDateBecauseOfGantt()),
max(dependenciesAffectingStart));
}

2
navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceAllocator.java
View file

@ -267,7 +267,7 @@ public class LimitingResourceAllocator {
}
private static DateAndHour getStartTimeBecauseOfGantt(LimitingResourceQueueElement element) {
return new DateAndHour(new LocalDate(element.getEarlierStartDateBecauseOfGantt()), 0);
return new DateAndHour(new LocalDate(element.getEarliestStartDateBecauseOfGantt()), 0);
}
private static Gap createLastGap(

2
navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueElement.java
View file

@ -170,7 +170,7 @@ public class LimitingResourceQueueElement extends BaseEntity {
return new Duration(start, end);
}
public Date getEarlierStartDateBecauseOfGantt() {
public Date getEarliestStartDateBecauseOfGantt() {
return earlierStartDateBecauseOfGantt;
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java
View file

@ -238,7 +238,7 @@ public class LimitingResourcesController extends GenericForwardComposer {
final Order order = limitingResourceQueueModel.getOrderByTask(task);
return new LimitingResourceQueueElementDTO(element, order
.getName(), task.getName(), element
.getEarlierStartDateBecauseOfGantt());
.getEarliestStartDateBecauseOfGantt());
}
public static String getResourceOrCriteria(
@ -384,7 +384,7 @@ public class LimitingResourcesController extends GenericForwardComposer {
LimitingResourceQueueElement dest) {
dest.setEarlierStartDateBecauseOfGantt(source
.getEarlierStartDateBecauseOfGantt());
.getEarliestStartDateBecauseOfGantt());
for (LimitingResourceQueueDependency each : source
.getDependenciesAsOrigin()) {

8
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java
View file

@ -140,7 +140,7 @@ public class ManualAllocationController extends GenericForwardComposer {
}
private DateAndHour getStartDayBecauseOfGantt(LimitingResourceQueueElement element) {
return new DateAndHour(new LocalDate(element.getEarlierStartDateBecauseOfGantt()), 0);
return new DateAndHour(new LocalDate(element.getEarliestStartDateBecauseOfGantt()), 0);
}
private void feedValidGapsSince(LimitingResourceQueueElement element, LimitingResourceQueue queue, DateAndHour since) {
@ -176,7 +176,7 @@ public class ManualAllocationController extends GenericForwardComposer {
selectStartDate.setSelected(true);
startAllocationDate.setDisabled(false);
startAllocationDate.setValue(beingEdited.getEarlierStartDateBecauseOfGantt());
startAllocationDate.setValue(beingEdited.getEarliestStartDateBecauseOfGantt());
} else {
listCandidateGaps.setDisabled(false);
@ -314,7 +314,7 @@ public class ManualAllocationController extends GenericForwardComposer {
final LocalDate selectedDay = new LocalDate(startAllocationDate.getValue());
if (isAppropriative()) {
LimitingResourceQueueElement beingEdited = getBeingEditedElement();
if (selectedDay.compareTo(new LocalDate(beingEdited.getEarlierStartDateBecauseOfGantt())) < 0) {
if (selectedDay.compareTo(new LocalDate(beingEdited.getEarliestStartDateBecauseOfGantt())) < 0) {
throw new WrongValueException(startAllocationDate, _("Day is not valid"));
}
return new DateAndHour(selectedDay, 0);
@ -403,7 +403,7 @@ public class ManualAllocationController extends GenericForwardComposer {
if (isAppropriative()) {
final LimitingResourceQueueElement beingEdited = getBeingEditedElement();
highlightDaysFromDate(datebox.getUuid(), new LocalDate(beingEdited.getEarlierStartDateBecauseOfGantt()));
highlightDaysFromDate(datebox.getUuid(), new LocalDate(beingEdited.getEarliestStartDateBecauseOfGantt()));
} else {
highlightDaysInGap(datebox.getUuid(), getSelectedGap());
}