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

ItEr27S05RFControlAvancesIncompatiblesEnUnidadesTraballoItEr26S06: Fixing typo.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-09-23 18:50:41 +02:00 • committed by Javier Moran Rua
parent d5823435f0
commit 010dee857d
6 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java
View file

@ -64,25 +64,25 @@ public class OrderLineGroup extends OrderElement implements IOrderLineGroup {
@Override
public void remove(OrderElement child) {
getManipulator().remove(child);
removeIndirectAdvanceAssigments(child);
removeIndirectAdvanceAssignments(child);
}
@Override
public void replace(OrderElement oldOrderElement, OrderElement orderElement) {
getManipulator().replace(oldOrderElement, orderElement);
addIndirectAdvanceAssigments(orderElement);
removeIndirectAdvanceAssigments(oldOrderElement);
addIndirectAdvanceAssignments(orderElement);
removeIndirectAdvanceAssignments(oldOrderElement);
}
@Override
public void add(OrderElement orderElement) {
getManipulator().add(orderElement);
addIndirectAdvanceAssigments(orderElement);
addIndirectAdvanceAssignments(orderElement);
}
private void addIndirectAdvanceAssigments(OrderElement orderElement) {
private void addIndirectAdvanceAssignments(OrderElement orderElement) {
for (DirectAdvanceAssignment directAdvanceAssignment : orderElement.directAdvanceAssignments) {
IndirectAdvanceAssignment indirectAdvanceAssignment = IndirectAdvanceAssignment
.create();
@ -100,7 +100,7 @@ public class OrderLineGroup extends OrderElement implements IOrderLineGroup {
}
}
private void removeIndirectAdvanceAssigments(OrderElement orderElement) {
private void removeIndirectAdvanceAssignments(OrderElement orderElement) {
for (DirectAdvanceAssignment directAdvanceAssignment : orderElement.directAdvanceAssignments) {
this.removeIndirectAdvanceAssignment(directAdvanceAssignment
.getAdvanceType());
@ -153,7 +153,7 @@ public class OrderLineGroup extends OrderElement implements IOrderLineGroup {
public void add(int position, OrderElement orderElement) {
children.add(position, orderElement);
addIndirectAdvanceAssigments(orderElement);
addIndirectAdvanceAssignments(orderElement);
}
@Override
@ -189,7 +189,7 @@ public class OrderLineGroup extends OrderElement implements IOrderLineGroup {
.equals(PredefinedAdvancedTypes.CHILDREN.getTypeName())) {
return getAdvancePercentageChildren(date);
} else {
DirectAdvanceAssignment directAdvanceAssignment = calculateFakeDirectAdvanceAssigment(indirectAdvanceAssignment);
DirectAdvanceAssignment directAdvanceAssignment = calculateFakeDirectAdvanceAssignment(indirectAdvanceAssignment);
return directAdvanceAssignment.getAdvancePercentage(date);
}
}
@ -222,11 +222,11 @@ public class OrderLineGroup extends OrderElement implements IOrderLineGroup {
return result;
}
public DirectAdvanceAssignment calculateFakeDirectAdvanceAssigment(
public DirectAdvanceAssignment calculateFakeDirectAdvanceAssignment(
IndirectAdvanceAssignment indirectAdvanceAssignment) {
if (indirectAdvanceAssignment.getAdvanceType().getUnitName().equals(
PredefinedAdvancedTypes.CHILDREN.getTypeName())) {
return calculateFakeDirectAdvanceAssigmentChildren(indirectAdvanceAssignment);
return calculateFakeDirectAdvanceAssignmentChildren(indirectAdvanceAssignment);
} else {
Set<DirectAdvanceAssignment> directAdvanceAssignments = getAllDirectAdvanceAssignments(indirectAdvanceAssignment
.getAdvanceType());
@ -235,7 +235,7 @@ public class OrderLineGroup extends OrderElement implements IOrderLineGroup {
}
}
private DirectAdvanceAssignment calculateFakeDirectAdvanceAssigmentChildren(
private DirectAdvanceAssignment calculateFakeDirectAdvanceAssignmentChildren(
IndirectAdvanceAssignment indirectAdvanceAssignment) {
DirectAdvanceAssignment newDirectAdvanceAssignment = DirectAdvanceAssignment
.create();

4
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java
View file

@ -19,9 +19,9 @@ import org.navalplanner.business.resources.entities.Resource;
public abstract class DayAssignment extends BaseEntity {
public static int sum(Collection<? extends DayAssignment> assigments) {
public static int sum(Collection<? extends DayAssignment> assignments) {
int result = 0;
for (DayAssignment dayAssignment : assigments) {
for (DayAssignment dayAssignment : assignments) {
result += dayAssignment.getHours();
}
return result;

8
navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/OrderElementTest.java
View file

@ -446,7 +446,7 @@ public class OrderElementTest {
for (IndirectAdvanceAssignment indirectAdvanceAssignment : indirectAdvanceAssignments) {
if (indirectAdvanceAssignment.getAdvanceType().equals(advanceType)) {
advanceAssignment = ((OrderLineGroup) orderElement)
.calculateFakeDirectAdvanceAssigment(indirectAdvanceAssignment);
.calculateFakeDirectAdvanceAssignment(indirectAdvanceAssignment);
break;
}
}
@ -548,7 +548,7 @@ public class OrderElementTest {
for (IndirectAdvanceAssignment indirectAdvanceAssignment : indirectAdvanceAssignments) {
if (indirectAdvanceAssignment.getAdvanceType().equals(advanceType)) {
advanceAssignment = ((OrderLineGroup) orderElement)
.calculateFakeDirectAdvanceAssigment(indirectAdvanceAssignment);
.calculateFakeDirectAdvanceAssignment(indirectAdvanceAssignment);
break;
}
}
@ -606,7 +606,7 @@ public class OrderElementTest {
if (indirectAdvanceAssignment.getAdvanceType().getUnitName()
.equals(PredefinedAdvancedTypes.CHILDREN.getTypeName())) {
advanceAssignment = ((OrderLineGroup) orderElement)
.calculateFakeDirectAdvanceAssigment(indirectAdvanceAssignment);
.calculateFakeDirectAdvanceAssignment(indirectAdvanceAssignment);
break;
}
}
@ -792,7 +792,7 @@ public class OrderElementTest {
for (IndirectAdvanceAssignment indirectAdvanceAssignment : indirectAdvanceAssignments) {
if (indirectAdvanceAssignment.getAdvanceType().equals(advanceType)) {
advanceAssignment = ((OrderLineGroup) orderElement)
.calculateFakeDirectAdvanceAssigment(indirectAdvanceAssignment);
.calculateFakeDirectAdvanceAssignment(indirectAdvanceAssignment);
break;
}
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IManageOrderElementAdvancesModel.java
View file

@ -64,7 +64,7 @@ public interface IManageOrderElementAdvancesModel {
public BigDecimal getPercentageAdvanceMeasurement(
AdvanceMeasurement advanceMeasurement);
public DirectAdvanceAssignment calculateFakeDirectAdvanceAssigment(
public DirectAdvanceAssignment calculateFakeDirectAdvanceAssignment(
IndirectAdvanceAssignment indirectAdvanceAssignment);
public BigDecimal getAdvancePercentageChildren();

16
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java
View file

@ -272,7 +272,7 @@ public class ManageOrderElementAdvancesController extends
if (advanceAssignment instanceof IndirectAdvanceAssignment) {
maxValue.setDisabled(true);
directAdvanceAssignment = manageOrderElementAdvancesModel
.calculateFakeDirectAdvanceAssigment((IndirectAdvanceAssignment) advanceAssignment);
.calculateFakeDirectAdvanceAssignment((IndirectAdvanceAssignment) advanceAssignment);
} else {
directAdvanceAssignment = (DirectAdvanceAssignment) advanceAssignment;
}
@ -313,7 +313,7 @@ public class ManageOrderElementAdvancesController extends
DirectAdvanceAssignment directAdvanceAssignment;
if (advanceAssignment instanceof IndirectAdvanceAssignment) {
directAdvanceAssignment = manageOrderElementAdvancesModel
.calculateFakeDirectAdvanceAssigment((IndirectAdvanceAssignment) advanceAssignment);
.calculateFakeDirectAdvanceAssignment((IndirectAdvanceAssignment) advanceAssignment);
} else {
directAdvanceAssignment = (DirectAdvanceAssignment) advanceAssignment;
}
@ -341,7 +341,7 @@ public class ManageOrderElementAdvancesController extends
DirectAdvanceAssignment directAdvanceAssignment;
if (advanceAssignment instanceof IndirectAdvanceAssignment) {
directAdvanceAssignment = manageOrderElementAdvancesModel
.calculateFakeDirectAdvanceAssigment((IndirectAdvanceAssignment) advanceAssignment);
.calculateFakeDirectAdvanceAssignment((IndirectAdvanceAssignment) advanceAssignment);
} else {
directAdvanceAssignment = (DirectAdvanceAssignment) advanceAssignment;
}
@ -369,7 +369,7 @@ public class ManageOrderElementAdvancesController extends
DirectAdvanceAssignment directAdvanceAssignment;
if (advanceAssignment instanceof IndirectAdvanceAssignment) {
directAdvanceAssignment = manageOrderElementAdvancesModel
.calculateFakeDirectAdvanceAssigment((IndirectAdvanceAssignment) advanceAssignment);
.calculateFakeDirectAdvanceAssignment((IndirectAdvanceAssignment) advanceAssignment);
} else {
directAdvanceAssignment = (DirectAdvanceAssignment) advanceAssignment;
}
@ -456,7 +456,7 @@ public class ManageOrderElementAdvancesController extends
DirectAdvanceAssignment directAdvanceAssignment;
if (advanceAssignment instanceof IndirectAdvanceAssignment) {
directAdvanceAssignment = manageOrderElementAdvancesModel
.calculateFakeDirectAdvanceAssigment((IndirectAdvanceAssignment) advanceAssignment);
.calculateFakeDirectAdvanceAssignment((IndirectAdvanceAssignment) advanceAssignment);
} else {
directAdvanceAssignment = (DirectAdvanceAssignment) advanceAssignment;
}
@ -484,7 +484,7 @@ public class ManageOrderElementAdvancesController extends
DirectAdvanceAssignment directAdvanceAssignment;
if (advanceAssignment instanceof IndirectAdvanceAssignment) {
directAdvanceAssignment = manageOrderElementAdvancesModel
.calculateFakeDirectAdvanceAssigment((IndirectAdvanceAssignment) advanceAssignment);
.calculateFakeDirectAdvanceAssignment((IndirectAdvanceAssignment) advanceAssignment);
} else {
directAdvanceAssignment = (DirectAdvanceAssignment) advanceAssignment;
}
@ -518,7 +518,7 @@ public class ManageOrderElementAdvancesController extends
DirectAdvanceAssignment directAdvanceAssignment;
if (advanceAssignment instanceof IndirectAdvanceAssignment) {
directAdvanceAssignment = manageOrderElementAdvancesModel
.calculateFakeDirectAdvanceAssigment((IndirectAdvanceAssignment) advanceAssignment);
.calculateFakeDirectAdvanceAssignment((IndirectAdvanceAssignment) advanceAssignment);
} else {
directAdvanceAssignment = (DirectAdvanceAssignment) advanceAssignment;
}
@ -589,7 +589,7 @@ public class ManageOrderElementAdvancesController extends
DirectAdvanceAssignment directAdvanceAssignment;
if (advance instanceof IndirectAdvanceAssignment) {
directAdvanceAssignment = manageOrderElementAdvancesModel
.calculateFakeDirectAdvanceAssigment((IndirectAdvanceAssignment) advance);
.calculateFakeDirectAdvanceAssignment((IndirectAdvanceAssignment) advance);
} else {
directAdvanceAssignment = (DirectAdvanceAssignment) advance;
}

8
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java
View file

@ -110,7 +110,7 @@ public class ManageOrderElementAdvancesModel implements
public void prepareEditAdvanceMeasurements(AdvanceAssignment advanceAssignment) {
if (advanceAssignment instanceof IndirectAdvanceAssignment) {
this.advanceAssignment = ((OrderLineGroup) this.orderElement)
.calculateFakeDirectAdvanceAssigment((IndirectAdvanceAssignment) advanceAssignment);
.calculateFakeDirectAdvanceAssignment((IndirectAdvanceAssignment) advanceAssignment);
this.isIndirectAdvanceAssignment = true;
} else {
this.advanceAssignment = (DirectAdvanceAssignment) advanceAssignment;
@ -402,7 +402,7 @@ public class ManageOrderElementAdvancesModel implements
BigDecimal maxValue;
if (advanceAssignment instanceof IndirectAdvanceAssignment) {
maxValue = ((OrderLineGroup) this.orderElement)
.calculateFakeDirectAdvanceAssigment(
.calculateFakeDirectAdvanceAssignment(
(IndirectAdvanceAssignment) advanceAssignment)
.getMaxValue();
} else {
@ -425,7 +425,7 @@ public class ManageOrderElementAdvancesModel implements
@Override
@Transactional(readOnly = true)
public DirectAdvanceAssignment calculateFakeDirectAdvanceAssigment(
public DirectAdvanceAssignment calculateFakeDirectAdvanceAssignment(
IndirectAdvanceAssignment indirectAdvanceAssignment) {
if (orderElement == null) {
return null;
@ -438,7 +438,7 @@ public class ManageOrderElementAdvancesModel implements
reattachmentOrderElement();
return ((OrderLineGroup) orderElement)
.calculateFakeDirectAdvanceAssigment(indirectAdvanceAssignment);
.calculateFakeDirectAdvanceAssignment(indirectAdvanceAssignment);
}
@Override