From 2030a16e9ae871adc3989a52cf76c2d0c016181b Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Thu, 7 Jan 2010 17:08:54 +0100 Subject: [PATCH] ItEr42S20CUImportarTraballoRealizadoPorSubcontrataItEr41S23: Renaming EditTaskCommand and EditTaskController to TaskPropertiesCommand and TaskPropertiesController. --- .../planner/order/IOrderPlanningModel.java | 4 ++-- .../order/OrderPlanningController.java | 10 ++++----- .../web/planner/order/OrderPlanningModel.java | 21 ++++++++++--------- ...mmand.java => ITaskPropertiesCommand.java} | 7 ++++--- ...ommand.java => TaskPropertiesCommand.java} | 11 +++++----- ...ler.java => TaskPropertiesController.java} | 4 ++-- .../navalplanner-webapp-spring-config.xml | 2 +- .../src/main/webapp/planner/order.zul | 2 +- 8 files changed, 32 insertions(+), 29 deletions(-) rename navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/{IEditTaskCommand.java => ITaskPropertiesCommand.java} (82%) rename navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/{EditTaskCommand.java => TaskPropertiesCommand.java} (87%) rename navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/{EditTaskController.java => TaskPropertiesController.java} (98%) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/IOrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/IOrderPlanningModel.java index bc1f40683..a48f67753 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/IOrderPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/IOrderPlanningModel.java @@ -27,7 +27,7 @@ import org.navalplanner.business.planner.entities.TaskElement; import org.navalplanner.web.common.ViewSwitcher; import org.navalplanner.web.planner.allocation.ResourceAllocationController; import org.navalplanner.web.planner.calendar.CalendarAllocationController; -import org.navalplanner.web.planner.taskedition.EditTaskController; +import org.navalplanner.web.planner.taskedition.TaskPropertiesController; import org.zkoss.ganttz.Planner; import org.zkoss.ganttz.extensions.ICommand; @@ -39,7 +39,7 @@ public interface IOrderPlanningModel { void setConfigurationToPlanner(Planner planner, Order order, ViewSwitcher viewSwitcher, ResourceAllocationController resourceAllocationController, - EditTaskController editTaskController, + TaskPropertiesController taskPropertiesController, CalendarAllocationController calendarAllocationController, List> additional); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java index 99f26fa77..ccf259aad 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java @@ -30,7 +30,7 @@ import org.navalplanner.business.planner.entities.TaskElement; import org.navalplanner.web.common.ViewSwitcher; import org.navalplanner.web.planner.allocation.ResourceAllocationController; import org.navalplanner.web.planner.calendar.CalendarAllocationController; -import org.navalplanner.web.planner.taskedition.EditTaskController; +import org.navalplanner.web.planner.taskedition.TaskPropertiesController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; @@ -61,10 +61,10 @@ public class OrderPlanningController implements Composer { @Autowired - private EditTaskController editTaskController; + private TaskPropertiesController taskPropertiesController; - public EditTaskController getEditTaskController() { - return editTaskController; + public TaskPropertiesController getTaskPropertiesController() { + return taskPropertiesController; } @Autowired @@ -119,7 +119,7 @@ public class OrderPlanningController implements Composer { private void updateConfiguration() { model.setConfigurationToPlanner(planner, order, viewSwitcher, - resourceAllocationController, editTaskController, + resourceAllocationController, taskPropertiesController, calendarAllocationController, additional); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java index 9f638db39..56362b392 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java @@ -73,8 +73,8 @@ import org.navalplanner.web.planner.chart.EarnedValueChartFiller.EarnedValueType import org.navalplanner.web.planner.milestone.IAddMilestoneCommand; import org.navalplanner.web.planner.milestone.IDeleteMilestoneCommand; import org.navalplanner.web.planner.order.ISaveCommand.IAfterSaveListener; -import org.navalplanner.web.planner.taskedition.EditTaskController; -import org.navalplanner.web.planner.taskedition.IEditTaskCommand; +import org.navalplanner.web.planner.taskedition.ITaskPropertiesCommand; +import org.navalplanner.web.planner.taskedition.TaskPropertiesController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; @@ -178,7 +178,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { public void setConfigurationToPlanner(Planner planner, Order order, ViewSwitcher switcher, ResourceAllocationController resourceAllocationController, - EditTaskController editTaskController, + TaskPropertiesController taskPropertiesController, CalendarAllocationController calendarAllocationController, List> additional) { Order orderReloaded = reload(order); @@ -198,7 +198,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { configuration .addCommandOnTask(buildCalendarAllocationCommand(calendarAllocationController)); configuration - .addCommandOnTask(buildEditTaskCommand(editTaskController)); + .addCommandOnTask(buildTaskPropertiesCommand(taskPropertiesController)); configuration.setDoubleClickCommand(resourceAllocationCommand); Tabbox chartComponent = new Tabbox(); chartComponent.setOrient("vertical"); @@ -498,11 +498,12 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { return calendarAllocationCommand; } - private IEditTaskCommand buildEditTaskCommand( - EditTaskController editTaskController) { - IEditTaskCommand editTaskCommand = getEditTaskCommand(); - editTaskCommand.setEditTaskController(editTaskController); - return editTaskCommand; + private ITaskPropertiesCommand buildTaskPropertiesCommand( + TaskPropertiesController taskPropertiesController) { + ITaskPropertiesCommand taskPropertiesCommand = getTaskPropertiesCommand(); + taskPropertiesCommand + .setTaskPropertiesController(taskPropertiesController); + return taskPropertiesCommand; } private IAddMilestoneCommand buildMilestoneCommand() { @@ -680,7 +681,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { protected abstract IDeleteMilestoneCommand getDeleteMilestoneCommand(); - protected abstract IEditTaskCommand getEditTaskCommand(); + protected abstract ITaskPropertiesCommand getTaskPropertiesCommand(); protected abstract ICalendarAllocationCommand getCalendarAllocationCommand(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/IEditTaskCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/ITaskPropertiesCommand.java similarity index 82% rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/IEditTaskCommand.java rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/ITaskPropertiesCommand.java index d5da68668..0b837568c 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/IEditTaskCommand.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/ITaskPropertiesCommand.java @@ -24,12 +24,13 @@ import org.navalplanner.business.planner.entities.TaskElement; import org.zkoss.ganttz.extensions.ICommandOnTask; /** - * Contract for {@link EditTaskCommand}
+ * Contract for {@link TaskPropertiesCommand}
* * @author Manuel Rego Casasnovas */ -public interface IEditTaskCommand extends ICommandOnTask { +public interface ITaskPropertiesCommand extends ICommandOnTask { - void setEditTaskController(EditTaskController editTaskController); + void setTaskPropertiesController( + TaskPropertiesController taskPropertiesController); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesCommand.java similarity index 87% rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskCommand.java rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesCommand.java index 65cb24251..2427ef6d4 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskCommand.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesCommand.java @@ -40,7 +40,7 @@ import org.zkoss.ganttz.extensions.IContextWithPlannerTask; */ @Component @Scope(BeanDefinition.SCOPE_PROTOTYPE) -public class EditTaskCommand implements IEditTaskCommand { +public class TaskPropertiesCommand implements ITaskPropertiesCommand { @Autowired private ITaskElementDAO taskElementDAO; @@ -48,7 +48,7 @@ public class EditTaskCommand implements IEditTaskCommand { @Autowired private ITaskSourceDAO taskSourceDAO; - private EditTaskController editTaskController; + private TaskPropertiesController taskPropertiesController; @Override @Transactional(readOnly = true) @@ -62,7 +62,7 @@ public class EditTaskCommand implements IEditTaskCommand { forceLoadHoursGroup((Task) taskElement); } - editTaskController.showEditFormFor(context, taskElement); + taskPropertiesController.showEditFormFor(context, taskElement); } private void forceLoadHoursGroup(Task task) { @@ -75,8 +75,9 @@ public class EditTaskCommand implements IEditTaskCommand { } @Override - public void setEditTaskController(EditTaskController editTaskController) { - this.editTaskController = editTaskController; + public void setTaskPropertiesController( + TaskPropertiesController taskPropertiesController) { + this.taskPropertiesController = taskPropertiesController; } @Override diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java similarity index 98% rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java index b1a030683..891baa836 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java @@ -47,9 +47,9 @@ import org.zkoss.zul.api.Row; * * @author Manuel Rego Casasnovas */ -@org.springframework.stereotype.Component("editTaskController") +@org.springframework.stereotype.Component("taskPropertiesController") @Scope(BeanDefinition.SCOPE_PROTOTYPE) -public class EditTaskController extends GenericForwardComposer { +public class TaskPropertiesController extends GenericForwardComposer { // This is a workaround, because in business we don't have access to // I18nHelper diff --git a/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-config.xml b/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-config.xml index 7d2d5dce1..19f800ca3 100644 --- a/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-config.xml +++ b/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-config.xml @@ -27,7 +27,7 @@ - + diff --git a/navalplanner-webapp/src/main/webapp/planner/order.zul b/navalplanner-webapp/src/main/webapp/planner/order.zul index f0e6fd1e8..9f0851301 100644 --- a/navalplanner-webapp/src/main/webapp/planner/order.zul +++ b/navalplanner-webapp/src/main/webapp/planner/order.zul @@ -41,7 +41,7 @@