From 55cede59793674bb78689e466178b9de6fab2889 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:47 +0200 Subject: [PATCH] ItEr17S10CUCreacionProxectoPlanificacionItEr16S12: Moving some classes to new package in order to highlight their role. --- .../src/main/java/org/zkoss/ganttz/Dependency.java | 4 ++-- .../main/java/org/zkoss/ganttz/DependencyList.java | 2 +- .../ganttz/FunctionalityExposedForExtensions.java | 12 ++++++------ .../src/main/java/org/zkoss/ganttz/GanttPanel.java | 2 +- .../src/main/java/org/zkoss/ganttz/LeftPane.java | 2 +- .../main/java/org/zkoss/ganttz/LeftTasksTree.java | 4 ++-- .../java/org/zkoss/ganttz/LeftTasksTreeRow.java | 2 +- .../src/main/java/org/zkoss/ganttz/Planner.java | 6 +++--- .../src/main/java/org/zkoss/ganttz/Task.java | 4 ++-- .../main/java/org/zkoss/ganttz/TaskContainer.java | 6 +++--- .../org/zkoss/ganttz/TaskEditFormComposer.java | 2 +- .../src/main/java/org/zkoss/ganttz/TaskList.java | 4 ++-- .../org/zkoss/ganttz/adapters/AutoAdapter.java | 2 +- .../zkoss/ganttz/adapters/DomainDependency.java | 4 ++-- .../IAdapterToTaskFundamentalProperties.java | 2 +- .../ganttz/adapters/IDomainAndBeansMapper.java | 2 +- .../DefaultFundamentalProperties.java | 2 +- .../ganttz/{util => data}/DependencyBean.java | 2 +- .../ganttz/{util => data}/DependencyType.java | 2 +- .../ganttz/{util => data}/GanttDiagramGraph.java | 2 +- .../{util => data}/ITaskFundamentalProperties.java | 2 +- .../org/zkoss/ganttz/{util => data}/TaskBean.java | 2 +- .../ganttz/{util => data}/TaskContainerBean.java | 3 ++- .../zkoss/ganttz/{util => data}/TaskLeafBean.java | 2 +- .../navalplanner/web/planner/DataForPlanner.java | 14 +++++++------- .../web/planner/TaskElementAdapter.java | 4 ++-- 26 files changed, 48 insertions(+), 47 deletions(-) rename navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/{util => data}/DefaultFundamentalProperties.java (97%) rename navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/{util => data}/DependencyBean.java (99%) rename navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/{util => data}/DependencyType.java (98%) rename navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/{util => data}/GanttDiagramGraph.java (99%) rename navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/{util => data}/ITaskFundamentalProperties.java (93%) rename navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/{util => data}/TaskBean.java (99%) rename navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/{util => data}/TaskContainerBean.java (98%) rename navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/{util => data}/TaskLeafBean.java (95%) diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/Dependency.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/Dependency.java index 62629831d..f8a419739 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/Dependency.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/Dependency.java @@ -8,8 +8,8 @@ package org.zkoss.ganttz; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import org.zkoss.ganttz.util.DependencyBean; -import org.zkoss.ganttz.util.DependencyType; +import org.zkoss.ganttz.data.DependencyBean; +import org.zkoss.ganttz.data.DependencyType; import org.zkoss.zk.au.out.AuInvoke; import org.zkoss.zk.ui.ext.AfterCompose; import org.zkoss.zul.impl.XulElement; diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/DependencyList.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/DependencyList.java index 9f2464497..91ba16685 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/DependencyList.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/DependencyList.java @@ -12,8 +12,8 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.zkoss.ganttz.data.TaskBean; import org.zkoss.ganttz.util.MenuBuilder; -import org.zkoss.ganttz.util.TaskBean; import org.zkoss.ganttz.util.WeakReferencedListeners; import org.zkoss.ganttz.util.MenuBuilder.ItemAction; import org.zkoss.ganttz.util.WeakReferencedListeners.ListenerNotification; diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java index a1cbdc683..6bdf8c5f3 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java @@ -11,13 +11,13 @@ import org.zkoss.ganttz.adapters.DomainDependency; import org.zkoss.ganttz.adapters.IAdapterToTaskFundamentalProperties; import org.zkoss.ganttz.adapters.IDomainAndBeansMapper; import org.zkoss.ganttz.adapters.IStructureNavigator; +import org.zkoss.ganttz.data.DependencyBean; +import org.zkoss.ganttz.data.GanttDiagramGraph; +import org.zkoss.ganttz.data.ITaskFundamentalProperties; +import org.zkoss.ganttz.data.TaskBean; +import org.zkoss.ganttz.data.TaskContainerBean; +import org.zkoss.ganttz.data.TaskLeafBean; import org.zkoss.ganttz.extensions.IContext; -import org.zkoss.ganttz.util.DependencyBean; -import org.zkoss.ganttz.util.GanttDiagramGraph; -import org.zkoss.ganttz.util.ITaskFundamentalProperties; -import org.zkoss.ganttz.util.TaskBean; -import org.zkoss.ganttz.util.TaskContainerBean; -import org.zkoss.ganttz.util.TaskLeafBean; public class FunctionalityExposedForExtensions implements IContext { diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/GanttPanel.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/GanttPanel.java index 22cbc73a9..0c808e900 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/GanttPanel.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/GanttPanel.java @@ -1,6 +1,6 @@ package org.zkoss.ganttz; -import org.zkoss.ganttz.util.GanttDiagramGraph; +import org.zkoss.ganttz.data.GanttDiagramGraph; import org.zkoss.zk.au.AuRequest; import org.zkoss.zk.au.Command; import org.zkoss.zk.au.ComponentCommand; diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftPane.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftPane.java index 85fe7c52c..1394d2fc6 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftPane.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftPane.java @@ -2,7 +2,7 @@ package org.zkoss.ganttz; import java.util.List; -import org.zkoss.ganttz.util.TaskBean; +import org.zkoss.ganttz.data.TaskBean; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.HtmlMacroComponent; import org.zkoss.zul.Button; diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java index 88a778403..07ac7cc3d 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java @@ -13,9 +13,9 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.zkoss.ganttz.LeftTasksTreeRow.ILeftTasksTreeNavigator; +import org.zkoss.ganttz.data.TaskBean; +import org.zkoss.ganttz.data.TaskContainerBean; import org.zkoss.ganttz.util.MutableTreeModel; -import org.zkoss.ganttz.util.TaskBean; -import org.zkoss.ganttz.util.TaskContainerBean; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.HtmlMacroComponent; diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java index 902f1237a..13afff7db 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java @@ -9,7 +9,7 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.zkoss.ganttz.util.TaskBean; +import org.zkoss.ganttz.data.TaskBean; import org.zkoss.util.Locales; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; 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 a7267b5d8..c3627a796 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 @@ -10,11 +10,11 @@ import org.zkoss.ganttz.adapters.DomainDependency; import org.zkoss.ganttz.adapters.IAdapterToTaskFundamentalProperties; import org.zkoss.ganttz.adapters.IDomainAndBeansMapper; import org.zkoss.ganttz.adapters.PlannerConfiguration; +import org.zkoss.ganttz.data.DependencyBean; +import org.zkoss.ganttz.data.GanttDiagramGraph; +import org.zkoss.ganttz.data.TaskBean; import org.zkoss.ganttz.extensions.ICommand; import org.zkoss.ganttz.extensions.IContext; -import org.zkoss.ganttz.util.DependencyBean; -import org.zkoss.ganttz.util.GanttDiagramGraph; -import org.zkoss.ganttz.util.TaskBean; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; import org.zkoss.zul.impl.XulElement; diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/Task.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/Task.java index 6ad6be2d9..585e20954 100755 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/Task.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/Task.java @@ -17,8 +17,8 @@ import java.util.UUID; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.zkoss.ganttz.util.TaskBean; -import org.zkoss.ganttz.util.TaskContainerBean; +import org.zkoss.ganttz.data.TaskBean; +import org.zkoss.ganttz.data.TaskContainerBean; import org.zkoss.lang.Objects; import org.zkoss.xml.HTMLs; import org.zkoss.zk.au.AuRequest; diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskContainer.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskContainer.java index f89b5dfb2..5e6f9bab5 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskContainer.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskContainer.java @@ -4,9 +4,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.zkoss.ganttz.util.TaskBean; -import org.zkoss.ganttz.util.TaskContainerBean; -import org.zkoss.ganttz.util.TaskContainerBean.IExpandListener; +import org.zkoss.ganttz.data.TaskBean; +import org.zkoss.ganttz.data.TaskContainerBean; +import org.zkoss.ganttz.data.TaskContainerBean.IExpandListener; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.ext.AfterCompose; diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java index 11596086c..0b6f8a106 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java @@ -3,7 +3,7 @@ package org.zkoss.ganttz; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import org.zkoss.ganttz.util.TaskBean; +import org.zkoss.ganttz.data.TaskBean; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.util.GenericForwardComposer; diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskList.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskList.java index ca274c8c0..23c78a7e6 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskList.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskList.java @@ -13,9 +13,9 @@ import java.util.List; import java.util.ListIterator; import java.util.Map; -import org.zkoss.ganttz.util.DependencyBean; +import org.zkoss.ganttz.data.DependencyBean; +import org.zkoss.ganttz.data.TaskBean; import org.zkoss.ganttz.util.MenuBuilder; -import org.zkoss.ganttz.util.TaskBean; import org.zkoss.ganttz.util.WeakReferencedListeners; import org.zkoss.ganttz.util.MenuBuilder.ItemAction; import org.zkoss.ganttz.util.WeakReferencedListeners.ListenerNotification; diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/AutoAdapter.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/AutoAdapter.java index e937ba465..cb58c1d32 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/AutoAdapter.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/AutoAdapter.java @@ -3,7 +3,7 @@ package org.zkoss.ganttz.adapters; import java.util.ArrayList; import java.util.List; -import org.zkoss.ganttz.util.ITaskFundamentalProperties; +import org.zkoss.ganttz.data.ITaskFundamentalProperties; /** * @author Óscar González Fernández diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/DomainDependency.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/DomainDependency.java index c7990a4fe..43e5c960d 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/DomainDependency.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/DomainDependency.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.zkoss.ganttz.util.DependencyBean; -import org.zkoss.ganttz.util.DependencyType; +import org.zkoss.ganttz.data.DependencyBean; +import org.zkoss.ganttz.data.DependencyType; /** * Represents a dependency in the domain. diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/IAdapterToTaskFundamentalProperties.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/IAdapterToTaskFundamentalProperties.java index 2fcf3b07e..731eba811 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/IAdapterToTaskFundamentalProperties.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/IAdapterToTaskFundamentalProperties.java @@ -2,7 +2,7 @@ package org.zkoss.ganttz.adapters; import java.util.List; -import org.zkoss.ganttz.util.ITaskFundamentalProperties; +import org.zkoss.ganttz.data.ITaskFundamentalProperties; /** * Converts a domain object into a {@link ITaskFundamentalProperties} diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/IDomainAndBeansMapper.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/IDomainAndBeansMapper.java index 0b2974590..e303cb512 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/IDomainAndBeansMapper.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/IDomainAndBeansMapper.java @@ -1,6 +1,6 @@ package org.zkoss.ganttz.adapters; -import org.zkoss.ganttz.util.TaskBean; +import org.zkoss.ganttz.data.TaskBean; /** * @author Óscar González Fernández diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/DefaultFundamentalProperties.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java similarity index 97% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/DefaultFundamentalProperties.java rename to navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java index 240ea1471..fcbf79c07 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/DefaultFundamentalProperties.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java @@ -1,4 +1,4 @@ -package org.zkoss.ganttz.util; +package org.zkoss.ganttz.data; import java.util.Date; diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/DependencyBean.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/DependencyBean.java similarity index 99% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/DependencyBean.java rename to navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/DependencyBean.java index f0dc2dc68..011e17382 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/DependencyBean.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/DependencyBean.java @@ -1,4 +1,4 @@ -package org.zkoss.ganttz.util; +package org.zkoss.ganttz.data; import java.util.Collection; import java.util.Date; diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/DependencyType.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/DependencyType.java similarity index 98% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/DependencyType.java rename to navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/DependencyType.java index 62884d11d..3fbd77f53 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/DependencyType.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/DependencyType.java @@ -1,4 +1,4 @@ -package org.zkoss.ganttz.util; +package org.zkoss.ganttz.data; import java.util.Date; diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/GanttDiagramGraph.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java similarity index 99% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/GanttDiagramGraph.java rename to navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java index d4f794326..1cbb7bf92 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/GanttDiagramGraph.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java @@ -1,4 +1,4 @@ -package org.zkoss.ganttz.util; +package org.zkoss.ganttz.data; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/ITaskFundamentalProperties.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java similarity index 93% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/ITaskFundamentalProperties.java rename to navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java index 41da5734b..31690f48d 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/ITaskFundamentalProperties.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java @@ -1,4 +1,4 @@ -package org.zkoss.ganttz.util; +package org.zkoss.ganttz.data; import java.util.Date; diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/TaskBean.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/TaskBean.java similarity index 99% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/TaskBean.java rename to navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/TaskBean.java index 071df0f32..376aa5071 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/TaskBean.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/TaskBean.java @@ -1,4 +1,4 @@ -package org.zkoss.ganttz.util; +package org.zkoss.ganttz.data; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/TaskContainerBean.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/TaskContainerBean.java similarity index 98% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/TaskContainerBean.java rename to navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/TaskContainerBean.java index 04fb9bb12..3c2633a38 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/TaskContainerBean.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/TaskContainerBean.java @@ -1,4 +1,4 @@ -package org.zkoss.ganttz.util; +package org.zkoss.ganttz.data; import java.util.ArrayList; import java.util.Collection; @@ -6,6 +6,7 @@ import java.util.Comparator; import java.util.Date; import java.util.List; +import org.zkoss.ganttz.util.WeakReferencedListeners; import org.zkoss.ganttz.util.WeakReferencedListeners.ListenerNotification; /** diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/TaskLeafBean.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/TaskLeafBean.java similarity index 95% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/TaskLeafBean.java rename to navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/TaskLeafBean.java index 5555b346c..9dedc70ce 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/TaskLeafBean.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/data/TaskLeafBean.java @@ -1,4 +1,4 @@ -package org.zkoss.ganttz.util; +package org.zkoss.ganttz.data; import java.util.List; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java index 1396f0993..93f792a04 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java @@ -9,15 +9,15 @@ import org.zkoss.ganttz.adapters.AutoAdapter; import org.zkoss.ganttz.adapters.DomainDependency; import org.zkoss.ganttz.adapters.IStructureNavigator; import org.zkoss.ganttz.adapters.PlannerConfiguration; +import org.zkoss.ganttz.data.DefaultFundamentalProperties; +import org.zkoss.ganttz.data.DependencyType; +import org.zkoss.ganttz.data.GanttDiagramGraph; +import org.zkoss.ganttz.data.ITaskFundamentalProperties; +import org.zkoss.ganttz.data.TaskBean; +import org.zkoss.ganttz.data.TaskContainerBean; +import org.zkoss.ganttz.data.TaskLeafBean; import org.zkoss.ganttz.extensions.ICommand; import org.zkoss.ganttz.extensions.IContext; -import org.zkoss.ganttz.util.DefaultFundamentalProperties; -import org.zkoss.ganttz.util.DependencyType; -import org.zkoss.ganttz.util.GanttDiagramGraph; -import org.zkoss.ganttz.util.ITaskFundamentalProperties; -import org.zkoss.ganttz.util.TaskBean; -import org.zkoss.ganttz.util.TaskContainerBean; -import org.zkoss.ganttz.util.TaskLeafBean; /** * Some test data for planner
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java index 0cac71b03..09fba5e52 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java @@ -13,8 +13,8 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import org.zkoss.ganttz.adapters.DomainDependency; -import org.zkoss.ganttz.util.DependencyType; -import org.zkoss.ganttz.util.ITaskFundamentalProperties; +import org.zkoss.ganttz.data.DependencyType; +import org.zkoss.ganttz.data.ITaskFundamentalProperties; /** * Responsible of adaptating a {@link TaskElement} into a