From f48a54956ea1d891e8567f225f4f5ea303ec39eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 7 Dec 2009 19:26:57 +0100 Subject: [PATCH] ItEr38S05ValidacionEProbasFuncionaisItEr37S06: [Bug #125] Renaming edit command to double click command --- .../navalplanner/web/planner/DataForPlanner.java | 2 +- .../src/main/java/org/zkoss/ganttz/GanttPanel.java | 4 ++-- .../src/main/java/org/zkoss/ganttz/Planner.java | 8 ++++---- .../src/main/java/org/zkoss/ganttz/TaskList.java | 14 +++++++------- .../ganttz/adapters/PlannerConfiguration.java | 10 +++++----- .../web/planner/order/OrderPlanningModel.java | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java b/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java index b1c9fe362..ac00a8332 100644 --- a/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java +++ b/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java @@ -98,7 +98,7 @@ public class DataForPlanner { } }); - configuration.setEditTaskCommand(new ICommandOnTask() { + configuration.setDoubleClickCommand(new ICommandOnTask() { @Override public void doAction( diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/GanttPanel.java b/ganttzk/src/main/java/org/zkoss/ganttz/GanttPanel.java index 7536af8cd..c75970088 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/GanttPanel.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/GanttPanel.java @@ -43,14 +43,14 @@ public class GanttPanel extends XulElement implements AfterCompose { public GanttPanel( FunctionalityExposedForExtensions context, List> commandsOnTasksContextualized, - CommandOnTaskContextualized editTaskCommand, + CommandOnTaskContextualized doubleClickCommand, IDisabilityConfiguration disabilityConfiguration) { this.diagramGraph = context.getDiagramGraph(); timeTrackerComponent = timeTrackerForGanttPanel(context .getTimeTracker()); appendChild(timeTrackerComponent); dependencyList = new DependencyList(context); - tasksLists = TaskList.createFor(context, editTaskCommand, + tasksLists = TaskList.createFor(context, doubleClickCommand, commandsOnTasksContextualized, disabilityConfiguration); appendChild(tasksLists); appendChild(dependencyList); diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java index 8f020425e..cb747ad4d 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java @@ -71,7 +71,7 @@ public class Planner extends HtmlMacroComponent { private List> commandsOnTasksContextualized; - private CommandOnTaskContextualized editTaskCommand; + private CommandOnTaskContextualized doubleClickCommand; private FunctionalityExposedForExtensions context; @@ -161,8 +161,8 @@ public class Planner extends HtmlMacroComponent { configuration.getCommandsOnTasks()); goingDownInLastArrowCommand = contextualize(newContext, configuration .getGoingDownInLastArrowCommand()); - editTaskCommand = contextualize(newContext, configuration - .getEditTaskCommand()); + doubleClickCommand = contextualize(newContext, configuration + .getDoubleClickCommand()); this.context = newContext; this.disabilityConfiguration = configuration; newContext.add(configuration.getData()); @@ -234,7 +234,7 @@ public class Planner extends HtmlMacroComponent { insertGlobalCommands(); this.leftPane = new LeftPane(this.diagramGraph.getTopLevelTasks()); this.ganttPanel = new GanttPanel(this.context, - commandsOnTasksContextualized, editTaskCommand, + commandsOnTasksContextualized, doubleClickCommand, disabilityConfiguration); } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java index 9beb29120..2a3a3d015 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java @@ -61,7 +61,7 @@ public class TaskList extends XulElement implements AfterCompose { private List originalTasks; - private final CommandOnTaskContextualized editTaskCommand; + private final CommandOnTaskContextualized doubleClickCommand; private final List> commandsOnTasksContextualized; @@ -71,12 +71,12 @@ public class TaskList extends XulElement implements AfterCompose { public TaskList( FunctionalityExposedForExtensions context, - CommandOnTaskContextualized editTaskCommand, + CommandOnTaskContextualized doubleClickCommand, List tasks, List> commandsOnTasksContextualized, IDisabilityConfiguration disabilityConfiguration) { this.context = context; - this.editTaskCommand = editTaskCommand; + this.doubleClickCommand = doubleClickCommand; this.originalTasks = tasks; this.commandsOnTasksContextualized = commandsOnTasksContextualized; this.disabilityConfiguration = disabilityConfiguration; @@ -84,10 +84,10 @@ public class TaskList extends XulElement implements AfterCompose { public static TaskList createFor( FunctionalityExposedForExtensions context, - CommandOnTaskContextualized editTaskCommand, + CommandOnTaskContextualized doubleClickCommand, List> commandsOnTasksContextualized, IDisabilityConfiguration disabilityConfiguration) { - TaskList result = new TaskList(context, editTaskCommand, context + TaskList result = new TaskList(context, doubleClickCommand, context .getDiagramGraph().getTopLevelTasks(), commandsOnTasksContextualized, disabilityConfiguration); return result; @@ -195,14 +195,14 @@ public class TaskList extends XulElement implements AfterCompose { private void addListenerForTaskComponentEditForm( final TaskComponent taskComponent) { - if (editTaskCommand == null) { + if (doubleClickCommand == null) { return; } taskComponent.addEventListener("onDoubleClick", new EventListener() { @Override public void onEvent(Event event) throws Exception { - editTaskCommand.doAction(taskComponent); + doubleClickCommand.doAction(taskComponent); } }); } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/adapters/PlannerConfiguration.java b/ganttzk/src/main/java/org/zkoss/ganttz/adapters/PlannerConfiguration.java index d4bb3a7c1..2c6b19982 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/adapters/PlannerConfiguration.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/adapters/PlannerConfiguration.java @@ -80,7 +80,7 @@ public class PlannerConfiguration implements IDisabilityConfiguration { private ICommand goingDownInLastArrowCommand = new NullCommand(); - private ICommandOnTask editTaskCommand = new NullCommandOnTask(); + private ICommandOnTask doubleClickCommand = new NullCommandOnTask(); private Component chartComponent; @@ -149,13 +149,13 @@ public class PlannerConfiguration implements IDisabilityConfiguration { this.goingDownInLastArrowCommand = goingDownInLastArrowCommand; } - public ICommandOnTask getEditTaskCommand() { - return editTaskCommand; + public ICommandOnTask getDoubleClickCommand() { + return doubleClickCommand; } - public void setEditTaskCommand(ICommandOnTask editTaskCommand) { + public void setDoubleClickCommand(ICommandOnTask editTaskCommand) { Validate.notNull(editTaskCommand); - this.editTaskCommand = editTaskCommand; + this.doubleClickCommand = editTaskCommand; } public void setChartComponent(Component chartComponent) { 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 ccdb54db5..f0c8675ee 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 @@ -173,7 +173,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { configuration .addCommandOnTask(buildCalendarAllocationCommand(calendarAllocationController)); - configuration.setEditTaskCommand(buildEditTaskCommand(editTaskController)); + configuration.setDoubleClickCommand(buildEditTaskCommand(editTaskController)); Tabbox chartComponent = new Tabbox(); chartComponent.setOrient("vertical"); chartComponent.setHeight("200px");