Define OrderPlanningModel using annotations
Initially OrderPlanningModel was defined in XML file because method-lookups were needed. Since currently the scope of OrderPlanningModel is prototype, this is no longer needed. FEA: ItEr75S04BugFixing
This commit is contained in:
Óscar González Fernández
parent
ccabbb6afc
commit
fb7d05ab0e
2 changed files with 44 additions and 60 deletions
|
|
@ -99,6 +99,9 @@ import org.navalplanner.web.planner.taskedition.ITaskPropertiesCommand;
|
|||
import org.navalplanner.web.print.CutyPrint;
|
||||
import org.navalplanner.web.security.SecurityUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.config.BeanDefinition;
|
||||
import org.springframework.context.annotation.Scope;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.zkforge.timeplot.Plotinfo;
|
||||
import org.zkforge.timeplot.Timeplot;
|
||||
|
|
@ -145,8 +148,9 @@ import org.zkoss.zul.Vbox;
|
|||
/**
|
||||
* @author Óscar González Fernández <ogonzalez@igalia.com>
|
||||
*/
|
||||
// This bean is defined at navalplanner-webapp-spring-config.xml
|
||||
public abstract class OrderPlanningModel implements IOrderPlanningModel {
|
||||
@Component
|
||||
@Scope(BeanDefinition.SCOPE_PROTOTYPE)
|
||||
public class OrderPlanningModel implements IOrderPlanningModel {
|
||||
|
||||
public static final String COLOR_CAPABILITY_LINE = "#000000"; // Black
|
||||
public static final String COLOR_ASSIGNED_LOAD_GLOBAL = "#E0F3D3"; // Soft
|
||||
|
|
@ -225,8 +229,39 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
|
|||
@Autowired
|
||||
private IScenarioManager scenarioManager;
|
||||
|
||||
@Autowired
|
||||
private ISaveCommand saveCommand;
|
||||
|
||||
@Autowired
|
||||
private IReassignCommand reassignCommand;
|
||||
|
||||
@Autowired
|
||||
private IResourceAllocationCommand resourceAllocationCommand;
|
||||
|
||||
@Autowired
|
||||
private IAddMilestoneCommand addMilestoneCommand;
|
||||
|
||||
@Autowired
|
||||
private IDeleteMilestoneCommand deleteMilestoneCommand;
|
||||
|
||||
@Autowired
|
||||
private ITaskPropertiesCommand taskPropertiesCommand;
|
||||
|
||||
@Autowired
|
||||
private IAdvanceConsolidationCommand advanceConsolidationCommand;
|
||||
|
||||
@Autowired
|
||||
private IAdvanceAssignmentPlanningCommand advanceAssignmentPlanningCommand;
|
||||
|
||||
@Autowired
|
||||
private ICalendarAllocationCommand calendarAllocationCommand;
|
||||
|
||||
@Autowired
|
||||
private ISubcontractCommand subcontractCommand;
|
||||
|
||||
private List<IZoomLevelChangedListener> keepAliveZoomListeners = new ArrayList<IZoomLevelChangedListener>();
|
||||
|
||||
@Autowired
|
||||
private ITaskElementAdapter taskElementAdapter;
|
||||
|
||||
@Autowired
|
||||
|
|
@ -657,9 +692,8 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
|
|||
}
|
||||
|
||||
private IDeleteMilestoneCommand buildDeleteMilestoneCommand() {
|
||||
IDeleteMilestoneCommand result = getDeleteMilestoneCommand();
|
||||
result.setState(planningState);
|
||||
return result;
|
||||
deleteMilestoneCommand.setState(planningState);
|
||||
return deleteMilestoneCommand;
|
||||
}
|
||||
|
||||
private void configureModificators(Order orderReloaded,
|
||||
|
|
@ -953,7 +987,6 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
|
|||
|
||||
private ICalendarAllocationCommand buildCalendarAllocationCommand(
|
||||
CalendarAllocationController calendarAllocationController) {
|
||||
ICalendarAllocationCommand calendarAllocationCommand = getCalendarAllocationCommand();
|
||||
calendarAllocationCommand
|
||||
.setCalendarAllocationController(calendarAllocationController);
|
||||
return calendarAllocationCommand;
|
||||
|
|
@ -961,15 +994,12 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
|
|||
|
||||
private ITaskPropertiesCommand buildTaskPropertiesCommand(
|
||||
EditTaskController editTaskController) {
|
||||
ITaskPropertiesCommand taskPropertiesCommand = getTaskPropertiesCommand();
|
||||
taskPropertiesCommand.initialize(editTaskController,
|
||||
planningState);
|
||||
taskPropertiesCommand.initialize(editTaskController, planningState);
|
||||
return taskPropertiesCommand;
|
||||
}
|
||||
|
||||
private IAdvanceAssignmentPlanningCommand buildAdvanceAssignmentPlanningCommand(
|
||||
AdvanceAssignmentPlanningController advanceAssignmentPlanningController) {
|
||||
IAdvanceAssignmentPlanningCommand advanceAssignmentPlanningCommand = getAdvanceAssignmentPlanningCommand();
|
||||
advanceAssignmentPlanningCommand.initialize(
|
||||
advanceAssignmentPlanningController, planningState);
|
||||
return advanceAssignmentPlanningCommand;
|
||||
|
|
@ -977,38 +1007,32 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
|
|||
|
||||
private IAdvanceConsolidationCommand buildAdvanceConsolidationCommand(
|
||||
AdvanceConsolidationController advanceConsolidationController) {
|
||||
IAdvanceConsolidationCommand advanceConsolidationCommand = getAdvanceConsolidationCommand();
|
||||
advanceConsolidationCommand.initialize(advanceConsolidationController,
|
||||
planningState);
|
||||
return advanceConsolidationCommand;
|
||||
}
|
||||
|
||||
private IAddMilestoneCommand buildMilestoneCommand() {
|
||||
IAddMilestoneCommand addMilestoneCommand = getAddMilestoneCommand();
|
||||
addMilestoneCommand.setState(planningState);
|
||||
return addMilestoneCommand;
|
||||
}
|
||||
|
||||
private IResourceAllocationCommand buildResourceAllocationCommand(
|
||||
EditTaskController editTaskController) {
|
||||
IResourceAllocationCommand resourceAllocationCommand = getResourceAllocationCommand();
|
||||
resourceAllocationCommand.initialize(editTaskController,
|
||||
planningState);
|
||||
resourceAllocationCommand.initialize(editTaskController, planningState);
|
||||
return resourceAllocationCommand;
|
||||
}
|
||||
|
||||
private ISaveCommand buildSaveCommand(
|
||||
PlannerConfiguration<TaskElement> configuration) {
|
||||
ISaveCommand saveCommand = getSaveCommand();
|
||||
saveCommand.setConfiguration(configuration);
|
||||
saveCommand.setState(planningState);
|
||||
return saveCommand;
|
||||
}
|
||||
|
||||
private ICommand<TaskElement> buildReassigningCommand() {
|
||||
IReassignCommand result = getReassignCommand();
|
||||
result.setState(planningState);
|
||||
return result;
|
||||
reassignCommand.setState(planningState);
|
||||
return reassignCommand;
|
||||
}
|
||||
|
||||
private Chart setupChart(Order orderReloaded,
|
||||
|
|
@ -1073,7 +1097,6 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
|
|||
}
|
||||
|
||||
private PlannerConfiguration<TaskElement> createConfiguration(Order order) {
|
||||
taskElementAdapter = getTaskElementAdapter();
|
||||
taskElementAdapter.useScenario(currentScenario);
|
||||
planningState = createPlanningStateFor(order);
|
||||
taskElementAdapter.setInitDate(asLocalDate(order.getInitDate()));
|
||||
|
|
@ -1101,27 +1124,6 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
|
|||
order);
|
||||
}
|
||||
|
||||
// spring method injection
|
||||
protected abstract ITaskElementAdapter getTaskElementAdapter();
|
||||
|
||||
protected abstract ISaveCommand getSaveCommand();
|
||||
|
||||
protected abstract IReassignCommand getReassignCommand();
|
||||
|
||||
protected abstract IResourceAllocationCommand getResourceAllocationCommand();
|
||||
|
||||
protected abstract IAddMilestoneCommand getAddMilestoneCommand();
|
||||
|
||||
protected abstract IDeleteMilestoneCommand getDeleteMilestoneCommand();
|
||||
|
||||
protected abstract ITaskPropertiesCommand getTaskPropertiesCommand();
|
||||
|
||||
protected abstract IAdvanceConsolidationCommand getAdvanceConsolidationCommand();
|
||||
|
||||
protected abstract IAdvanceAssignmentPlanningCommand getAdvanceAssignmentPlanningCommand();
|
||||
|
||||
protected abstract ICalendarAllocationCommand getCalendarAllocationCommand();
|
||||
|
||||
private class OrderLoadChartFiller extends ChartFiller {
|
||||
|
||||
private final Order order;
|
||||
|
|
@ -1391,14 +1393,10 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
|
|||
|
||||
private ISubcontractCommand buildSubcontractCommand(
|
||||
EditTaskController editTaskController) {
|
||||
ISubcontractCommand subcontractCommand = getSubcontractCommand();
|
||||
subcontractCommand.initialize(editTaskController,
|
||||
planningState);
|
||||
subcontractCommand.initialize(editTaskController, planningState);
|
||||
return subcontractCommand;
|
||||
}
|
||||
|
||||
protected abstract ISubcontractCommand getSubcontractCommand();
|
||||
|
||||
public Order getOrder() {
|
||||
return planningState.getOrder();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,20 +27,6 @@
|
|||
|
||||
<bean class="org.navalplanner.web.common.entrypoints.RedirectorSynthetiser"></bean>
|
||||
|
||||
<bean class="org.navalplanner.web.planner.order.OrderPlanningModel" scope="prototype">
|
||||
<lookup-method name="getTaskElementAdapter" bean="taskElementAdapter"/>
|
||||
<lookup-method name="getSaveCommand" bean="saveCommand"/>
|
||||
<lookup-method name="getResourceAllocationCommand" bean="resourceAllocationCommand"/>
|
||||
<lookup-method name="getTaskPropertiesCommand" bean="taskPropertiesCommand"/>
|
||||
<lookup-method name="getCalendarAllocationCommand" bean="calendarAllocationCommand"/>
|
||||
<lookup-method name="getAddMilestoneCommand" bean="addMilestoneCommand"/>
|
||||
<lookup-method name="getDeleteMilestoneCommand" bean="deleteMilestoneCommand"/>
|
||||
<lookup-method name="getSubcontractCommand" bean="subcontractCommand"/>
|
||||
<lookup-method name="getReassignCommand" bean="reassignCommand"/>
|
||||
<lookup-method name="getAdvanceConsolidationCommand" bean="advanceConsolidationCommand"/>
|
||||
<lookup-method name="getAdvanceAssignmentPlanningCommand" bean="advanceAssignmentPlanningCommand"/>
|
||||
</bean>
|
||||
|
||||
<bean class="org.navalplanner.web.planner.company.CompanyPlanningModel" scope="prototype">
|
||||
<lookup-method name="getTaskElementAdapter" bean="taskElementAdapter"/>
|
||||
</bean>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue