From 0c459b2502667615a3a15ee266ae42e46c326da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 20 Jul 2009 15:37:39 +0200 Subject: [PATCH] ItEr17S10CUCreacionProxectoPlanificacionItEr16S12: ListDetails renamed to LeftTasksTree and TaskDetail renamed to LeftTasksTreeRow. --- .../{ListDetails.java => LeftTasksTree.java} | 36 +++++++++---------- ...{TaskDetail.java => LeftTasksTreeRow.java} | 34 +++++++++--------- .../main/java/org/zkoss/ganttz/Planner.java | 13 +++---- .../main/resources/metainfo/zk/lang-addon.xml | 6 ++-- .../{listdetails.zul => leftTasksTree.zul} | 0 .../{taskdetail.zul => leftTasksTreeRow.zul} | 0 6 files changed, 45 insertions(+), 44 deletions(-) rename navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/{ListDetails.java => LeftTasksTree.java} (88%) rename navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/{TaskDetail.java => LeftTasksTreeRow.java} (90%) rename navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/{listdetails.zul => leftTasksTree.zul} (100%) rename navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/{taskdetail.zul => leftTasksTreeRow.zul} (100%) diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/ListDetails.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java similarity index 88% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/ListDetails.java rename to navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java index 6e1c398fe..227eed2bf 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/ListDetails.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java @@ -12,7 +12,7 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.zkoss.ganttz.TaskDetail.ITaskDetailNavigator; +import org.zkoss.ganttz.LeftTasksTreeRow.ILeftTasksTreeNavigator; import org.zkoss.ganttz.util.MutableTreeModel; import org.zkoss.ganttz.util.TaskBean; import org.zkoss.ganttz.util.TaskContainerBean; @@ -29,7 +29,7 @@ import org.zkoss.zul.Treecell; import org.zkoss.zul.Treeitem; import org.zkoss.zul.TreeitemRenderer; -public class ListDetails extends HtmlMacroComponent { +public class LeftTasksTree extends HtmlMacroComponent { private final class TaskBeanRenderer implements TreeitemRenderer { public void render(Treeitem item, Object data) throws Exception { @@ -38,21 +38,21 @@ public class ListDetails extends HtmlMacroComponent { final int[] path = tasksTreeModel.getPath(tasksTreeModel.getRoot(), taskBean); String cssClass = "depth_" + path.length; - TaskDetail taskDetail = TaskDetail.create(taskBean, + LeftTasksTreeRow leftTasksTreeRow = LeftTasksTreeRow.create(taskBean, new TreeNavigator(tasksTreeModel, taskBean)); if (taskBean.isContainer()) { expandWhenOpened((TaskContainerBean) taskBean, item); } Component row = Executions.getCurrent().createComponents( - "~./ganttz/zul/taskdetail.zul", item, null); - taskDetail.doAfterCompose(row); + "~./ganttz/zul/leftTasksTreeRow.zul", item, null); + leftTasksTreeRow.doAfterCompose(row); List rowChildren = row.getChildren(); List treeCells = Planner.findComponentsOfType( Treecell.class, rowChildren); for (Treecell cell : treeCells) { cell.setSclass(cssClass); } - detailsForBeans.put(taskBean, taskDetail); + detailsForBeans.put(taskBean, leftTasksTreeRow); } private void expandWhenOpened(final TaskContainerBean taskBean, @@ -73,15 +73,15 @@ public class ListDetails extends HtmlMacroComponent { } private final class DetailsForBeans { - private Map map = new HashMap(); + private Map map = new HashMap(); private Set focusRequested = new HashSet(); - public void put(TaskBean taskBean, TaskDetail taskDetail) { - map.put(taskBean, taskDetail); + public void put(TaskBean taskBean, LeftTasksTreeRow leftTasksTreeRow) { + map.put(taskBean, leftTasksTreeRow); if (focusRequested.contains(taskBean)) { focusRequested.remove(taskBean); - taskDetail.receiveFocus(); + leftTasksTreeRow.receiveFocus(); } } @@ -89,7 +89,7 @@ public class ListDetails extends HtmlMacroComponent { focusRequested.add(taskBean); } - public TaskDetail get(TaskBean taskbean) { + public LeftTasksTreeRow get(TaskBean taskbean) { return map.get(taskbean); } @@ -97,7 +97,7 @@ public class ListDetails extends HtmlMacroComponent { private DetailsForBeans detailsForBeans = new DetailsForBeans(); - private final class TreeNavigator implements ITaskDetailNavigator { + private final class TreeNavigator implements ILeftTasksTreeNavigator { private final int[] pathToNode; private final TaskBean task; @@ -108,7 +108,7 @@ public class ListDetails extends HtmlMacroComponent { } @Override - public TaskDetail getAboveDetail() { + public LeftTasksTreeRow getAboveRow() { TaskBean parent = getParent(pathToNode); int lastPosition = pathToNode[pathToNode.length - 1]; if (lastPosition != 0) { @@ -119,17 +119,17 @@ public class ListDetails extends HtmlMacroComponent { return null; } - private TaskDetail getChild(TaskBean parent, int position) { + private LeftTasksTreeRow getChild(TaskBean parent, int position) { TaskBean child = tasksTreeModel.getChild(parent, position); return getDetailFor(child); } - private TaskDetail getDetailFor(TaskBean child) { + private LeftTasksTreeRow getDetailFor(TaskBean child) { return detailsForBeans.get(child); } @Override - public TaskDetail getBelowDetail() { + public LeftTasksTreeRow getBelowRow() { if (isExpanded() && hasChildren()) { return getChild(task, 0); } @@ -208,7 +208,7 @@ public class ListDetails extends HtmlMacroComponent { } - private static Log LOG = LogFactory.getLog(ListDetails.class); + private static Log LOG = LogFactory.getLog(LeftTasksTree.class); private TaskRemovedListener taskRemovedListener; @@ -218,7 +218,7 @@ public class ListDetails extends HtmlMacroComponent { private Tree tasksTree; - public ListDetails(List taskBeans) { + public LeftTasksTree(List taskBeans) { this.taskBeans = taskBeans; } diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskDetail.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java similarity index 90% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskDetail.java rename to navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java index b18b0ab63..8f88d9beb 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskDetail.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java @@ -21,15 +21,15 @@ import org.zkoss.zul.Textbox; import org.zkoss.zul.Treecell; import org.zkoss.zul.api.Treerow; -public class TaskDetail extends GenericForwardComposer { +public class LeftTasksTreeRow extends GenericForwardComposer { - public interface ITaskDetailNavigator { - TaskDetail getBelowDetail(); + public interface ILeftTasksTreeNavigator { + LeftTasksTreeRow getBelowRow(); - TaskDetail getAboveDetail(); + LeftTasksTreeRow getAboveRow(); } - private static final Log LOG = LogFactory.getLog(TaskDetail.class); + private static final Log LOG = LogFactory.getLog(LeftTasksTreeRow.class); private final TaskBean taskBean; @@ -45,18 +45,18 @@ public class TaskDetail extends GenericForwardComposer { private DateFormat dateFormat; - private final ITaskDetailNavigator taskDetailNavigator; + private final ILeftTasksTreeNavigator leftTasksTreeNavigator; - public static TaskDetail create(TaskBean bean, - ITaskDetailNavigator taskDetailnavigator) { - return new TaskDetail(bean, taskDetailnavigator); + public static LeftTasksTreeRow create(TaskBean bean, + ILeftTasksTreeNavigator taskDetailnavigator) { + return new LeftTasksTreeRow(bean, taskDetailnavigator); } - private TaskDetail(TaskBean task, ITaskDetailNavigator taskDetailNavigator) { + private LeftTasksTreeRow(TaskBean task, ILeftTasksTreeNavigator leftTasksTreeNavigator) { this.taskBean = task; this.dateFormat = DateFormat.getDateInstance(DateFormat.SHORT, Locales .getCurrent()); - this.taskDetailNavigator = taskDetailNavigator; + this.leftTasksTreeNavigator = leftTasksTreeNavigator; } public TaskBean getTaskBean() { @@ -124,7 +124,7 @@ public class TaskDetail extends GenericForwardComposer { } public void focusGoUp(int position) { - TaskDetail aboveDetail = taskDetailNavigator.getAboveDetail(); + LeftTasksTreeRow aboveDetail = leftTasksTreeNavigator.getAboveRow(); if (aboveDetail != null) { aboveDetail.receiveFocus(position); } @@ -139,21 +139,21 @@ public class TaskDetail extends GenericForwardComposer { } public void focusGoDown(int position) { - TaskDetail belowDetail = taskDetailNavigator.getBelowDetail(); + LeftTasksTreeRow belowDetail = leftTasksTreeNavigator.getBelowRow(); if (belowDetail != null) { belowDetail.receiveFocus(position); } else { - ListDetails listDetails = getListDetails(); + LeftTasksTree listDetails = getListDetails(); listDetails.addTask(); } } - private ListDetails getListDetails() { + private LeftTasksTree getListDetails() { Component current = nameBox; - while (!(current instanceof ListDetails)) { + while (!(current instanceof LeftTasksTree)) { current = current.getParent(); } - return (ListDetails) current; + return (LeftTasksTree) current; } public void userWantsToMove(Textbox textbox, KeyEvent keyEvent) { diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/Planner.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/Planner.java index 1b104b41b..5fbd3f095 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/Planner.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/Planner.java @@ -30,7 +30,7 @@ public class Planner extends XulElement { private GanttDiagramGraph diagramGraph = new GanttDiagramGraph(); private DependencyRemovedListener dependencyRemovedListener; private TaskRemovedListener taskRemovedListener; - private ListDetails listDetails; + private LeftTasksTree leftTasksTree; private GanttPanel ganttPanel; @@ -93,7 +93,7 @@ public class Planner extends XulElement { private void removePreviousDetails() { List children = getChildren(); - for (ListDetails l : Planner.findComponentsOfType(ListDetails.class, + for (LeftTasksTree l : Planner.findComponentsOfType(LeftTasksTree.class, children)) { removeChild(l); } @@ -127,7 +127,7 @@ public class Planner extends XulElement { @Override public void taskRemoved(Task taskRemoved) { diagramGraph.remove(taskRemoved.getTaskBean()); - listDetails.taskRemoved(taskRemoved.getTaskBean()); + leftTasksTree.taskRemoved(taskRemoved.getTaskBean()); TaskList taskList = getTaskList(); setHeight(getHeight());// forcing smart update taskList.adjustZoomColumnsHeight(); @@ -269,11 +269,12 @@ public class Planner extends XulElement { private void recreate() { removePreviousDetails(); - this.listDetails = new ListDetails(this.diagramGraph.getTopLevelTasks()); - insertBefore(this.listDetails, + this.leftTasksTree = new LeftTasksTree(this.diagramGraph + .getTopLevelTasks()); + insertBefore(this.leftTasksTree, (Component) (getChildren().isEmpty() ? null : getChildren() .get(0))); - this.listDetails.afterCompose(); + this.leftTasksTree.afterCompose(); removePreviousGanntPanel(); this.ganttPanel = new GanttPanel(this.diagramGraph, taskEditFormComposer); diff --git a/navalplanner-gantt-zk/src/main/resources/metainfo/zk/lang-addon.xml b/navalplanner-gantt-zk/src/main/resources/metainfo/zk/lang-addon.xml index 0a409e5e1..c7d96c9a2 100755 --- a/navalplanner-gantt-zk/src/main/resources/metainfo/zk/lang-addon.xml +++ b/navalplanner-gantt-zk/src/main/resources/metainfo/zk/lang-addon.xml @@ -21,9 +21,9 @@ - listdetails - org.zkoss.ganttz.ListDetails - ~./ganttz/zul/listdetails.zul + leftTasksTree + org.zkoss.ganttz.LeftTasksTree + ~./ganttz/zul/leftTasksTree.zul diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/listdetails.zul b/navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/leftTasksTree.zul similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/listdetails.zul rename to navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/leftTasksTree.zul diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/taskdetail.zul b/navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/leftTasksTreeRow.zul similarity index 100% rename from navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/taskdetail.zul rename to navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/leftTasksTreeRow.zul