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

ItEr57S04ValidacionEProbasFuncionaisItEr56S04: Refactor. Remove unnecessary createElement method.

Browse source 
Only was used for OrderTemplate but was implemented on all hierarchy.
This commit is contained in:
Óscar González Fernández 2010-06-11 00:16:54 +02:00
parent bf0cb4b5e3
commit 7ea78b7b70
5 changed files with 5 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderElementTemplate.java
View file

@ -56,10 +56,10 @@ import org.navalplanner.business.orders.entities.SchedulingState;
import org.navalplanner.business.orders.entities.SchedulingState.ITypeChangedListener;
import org.navalplanner.business.orders.entities.SchedulingState.Type;
import org.navalplanner.business.qualityforms.entities.QualityForm;
import org.navalplanner.business.templates.daos.IOrderElementTemplateDAO;
import org.navalplanner.business.requirements.entities.CriterionRequirement;
import org.navalplanner.business.requirements.entities.DirectCriterionRequirement;
import org.navalplanner.business.requirements.entities.IndirectCriterionRequirement;
import org.navalplanner.business.templates.daos.IOrderElementTemplateDAO;
import org.navalplanner.business.trees.ITreeNode;
/**
@ -270,8 +270,6 @@ public abstract class OrderElementTemplate extends BaseEntity implements
}
}
public abstract OrderElement createElement();
public abstract OrderElement createElement(OrderLineGroup parent);
public SchedulingState getSchedulingState() {

7
navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineGroupTemplate.java
View file

@ -260,13 +260,6 @@ public class OrderLineGroupTemplate extends OrderElementTemplate implements
}
}
@Override
public OrderLineGroup createElement() {
OrderLineGroup orderLineGroup = OrderLineGroup.create();
orderLineGroup.initializeTemplate(this);
return setupGroupParts(setupSchedulingStateType(orderLineGroup));
}
@Override
public OrderElement createElement(OrderLineGroup parent) {
OrderLineGroup result = setupSchedulingStateType(OrderLineGroup

8
navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java
View file

@ -34,8 +34,6 @@ import org.navalplanner.business.orders.entities.HoursGroup;
import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.business.orders.entities.OrderLine;
import org.navalplanner.business.orders.entities.OrderLineGroup;
import org.navalplanner.business.requirements.entities.CriterionRequirement;
import org.navalplanner.business.requirements.entities.DirectCriterionRequirement;
/**
* @author Óscar González Fernández <ogonzalez@igalia.com>
@ -109,12 +107,6 @@ public class OrderLineTemplate extends OrderElementTemplate {
return true;
}
@Override
public OrderLine createElement() {
return setupElementParts(setupSchedulingStateType(OrderLine
.createOrderLineWithUnfixedPercentage(getWorkHours())));
}
@Override
public OrderElement createElement(OrderLineGroup parent) {
OrderLine line = setupSchedulingStateType(OrderLine

2
navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java
View file

@ -50,7 +50,7 @@ public class OrderTemplate extends OrderLineGroupTemplate {
throw new UnsupportedOperationException();
}
public Order createElement() {
public Order createOrder() {
Order order = Order.create();
order.setInitDate(today());
order.setCalendar(calendar);

6
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
View file

@ -420,13 +420,13 @@ public class OrderModel implements IOrderModel {
}
private Order createOrderFrom(OrderTemplate template) {
return (Order) createOrderElementFrom(null, template);
return template.createOrder();
}
private OrderElement createOrderElementFrom(OrderLineGroup parent,
OrderElementTemplate template) {
return (parent != null) ? template.createElement(parent) : template
.createElement();
Validate.notNull(parent);
return template.createElement(parent);
}
private void setDefaultOrderCode() throws ConcurrentModificationException {