From 9c898cb61ffd55074441c0cccb3dcf3751a6b54b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Wed, 26 Aug 2009 11:28:22 +0200
Subject: [PATCH] ItEr23S10CUAsignacionGrupoRecursosAPlanificacionItEr22S10:
 Renaming package to show better its relationship with TimeTracker

---
 .../src/main/java/org/zkoss/ganttz/DependencyList.java    | 4 ++--
 .../zkoss/ganttz/FunctionalityExposedForExtensions.java   | 2 +-
 ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java      | 4 ++--
 .../zkoss/ganttz/resourceload/ResourceLoadComponent.java  | 4 ++--
 .../org/zkoss/ganttz/resourceload/ResourceLoadList.java   | 4 ++--
 .../java/org/zkoss/ganttz/timetracker/TimeTracker.java    | 8 ++++----
 .../zkoss/ganttz/timetracker/TimeTrackerComponent.java    | 6 +++---
 .../zoom/DetailFiveTimeTrackerState.java                  | 2 +-
 .../zoom/DetailFourTimeTrackerState.java                  | 2 +-
 .../zoom/DetailOneTimeTrackerState.java                   | 2 +-
 .../zoom/DetailThreeTimeTrackerState.java                 | 2 +-
 .../zoom/DetailTwoTimeTrackerState.java                   | 2 +-
 .../zoom/IZoomLevelChangedListener.java                   | 2 +-
 .../{util => timetracker}/zoom/TimeTrackerState.java      | 2 +-
 .../zoom/TimeTrackerStateUsingJodaTime.java               | 2 +-
 .../ganttz/{util => timetracker}/zoom/ZoomLevel.java      | 2 +-
 16 files changed, 25 insertions(+), 25 deletions(-)
 rename ganttzk/src/main/java/org/zkoss/ganttz/{util => timetracker}/zoom/DetailFiveTimeTrackerState.java (98%)
 rename ganttzk/src/main/java/org/zkoss/ganttz/{util => timetracker}/zoom/DetailFourTimeTrackerState.java (97%)
 rename ganttzk/src/main/java/org/zkoss/ganttz/{util => timetracker}/zoom/DetailOneTimeTrackerState.java (98%)
 rename ganttzk/src/main/java/org/zkoss/ganttz/{util => timetracker}/zoom/DetailThreeTimeTrackerState.java (98%)
 rename ganttzk/src/main/java/org/zkoss/ganttz/{util => timetracker}/zoom/DetailTwoTimeTrackerState.java (99%)
 rename ganttzk/src/main/java/org/zkoss/ganttz/{util => timetracker}/zoom/IZoomLevelChangedListener.java (71%)
 rename ganttzk/src/main/java/org/zkoss/ganttz/{util => timetracker}/zoom/TimeTrackerState.java (99%)
 rename ganttzk/src/main/java/org/zkoss/ganttz/{util => timetracker}/zoom/TimeTrackerStateUsingJodaTime.java (98%)
 rename ganttzk/src/main/java/org/zkoss/ganttz/{util => timetracker}/zoom/ZoomLevel.java (96%)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java b/ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java
index a61c27750..8a808848b 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java
@@ -12,10 +12,10 @@ import org.zkoss.ganttz.data.DependencyType;
 import org.zkoss.ganttz.data.Task;
 import org.zkoss.ganttz.timetracker.TimeTracker;
 import org.zkoss.ganttz.timetracker.TimeTrackerComponent;
+import org.zkoss.ganttz.timetracker.zoom.IZoomLevelChangedListener;
+import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
 import org.zkoss.ganttz.util.MenuBuilder;
 import org.zkoss.ganttz.util.MenuBuilder.ItemAction;
-import org.zkoss.ganttz.util.zoom.IZoomLevelChangedListener;
-import org.zkoss.ganttz.util.zoom.ZoomLevel;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.ext.AfterCompose;
 import org.zkoss.zul.Menupopup;
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java b/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java
index 0c6ed0fb5..2f0f56e3c 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java
@@ -22,8 +22,8 @@ import org.zkoss.ganttz.data.TaskContainer;
 import org.zkoss.ganttz.data.TaskLeaf;
 import org.zkoss.ganttz.extensions.IContext;
 import org.zkoss.ganttz.timetracker.TimeTracker;
+import org.zkoss.ganttz.timetracker.zoom.TimeTrackerState;
 import org.zkoss.ganttz.util.Interval;
-import org.zkoss.ganttz.util.zoom.TimeTrackerState;
 import org.zkoss.zk.ui.Component;
 
 public class FunctionalityExposedForExtensions<T> implements IContext<T> {
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java
index b0ff827d9..af20b0b1e 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java
@@ -13,10 +13,10 @@ import org.zkoss.ganttz.data.Position;
 import org.zkoss.ganttz.data.Task;
 import org.zkoss.ganttz.timetracker.TimeTracker;
 import org.zkoss.ganttz.timetracker.TimeTrackerComponent;
+import org.zkoss.ganttz.timetracker.zoom.IZoomLevelChangedListener;
+import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
 import org.zkoss.ganttz.util.MenuBuilder;
 import org.zkoss.ganttz.util.MenuBuilder.ItemAction;
-import org.zkoss.ganttz.util.zoom.IZoomLevelChangedListener;
-import org.zkoss.ganttz.util.zoom.ZoomLevel;
 import org.zkoss.zk.au.out.AuInvoke;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.event.Event;
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java
index b03d188fc..4054977fe 100755
--- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java
@@ -8,8 +8,8 @@ import org.zkoss.ganttz.IDatesMapper;
 import org.zkoss.ganttz.data.resourceload.LoadPeriod;
 import org.zkoss.ganttz.data.resourceload.LoadTimeLine;
 import org.zkoss.ganttz.timetracker.TimeTracker;
-import org.zkoss.ganttz.util.zoom.IZoomLevelChangedListener;
-import org.zkoss.ganttz.util.zoom.ZoomLevel;
+import org.zkoss.ganttz.timetracker.zoom.IZoomLevelChangedListener;
+import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
 import org.zkoss.zul.Div;
 import org.zkoss.zul.impl.XulElement;
 
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadList.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadList.java
index 50a17b721..214be195f 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadList.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadList.java
@@ -6,8 +6,8 @@ import java.util.List;
 import org.zkoss.ganttz.data.resourceload.LoadTimeLine;
 import org.zkoss.ganttz.data.resourceload.LoadTimelinesGroup;
 import org.zkoss.ganttz.timetracker.TimeTracker;
-import org.zkoss.ganttz.util.zoom.IZoomLevelChangedListener;
-import org.zkoss.ganttz.util.zoom.ZoomLevel;
+import org.zkoss.ganttz.timetracker.zoom.IZoomLevelChangedListener;
+import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
 import org.zkoss.zk.au.out.AuInvoke;
 import org.zkoss.zul.impl.XulElement;
 
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java
index cb5a7bb68..a41700e41 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java
@@ -9,13 +9,13 @@ import org.joda.time.LocalDate;
 import org.zkoss.ganttz.DatesMapperOnInterval;
 import org.zkoss.ganttz.IDatesMapper;
 import org.zkoss.ganttz.data.Task;
+import org.zkoss.ganttz.timetracker.zoom.IZoomLevelChangedListener;
+import org.zkoss.ganttz.timetracker.zoom.TimeTrackerState;
+import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
+import org.zkoss.ganttz.timetracker.zoom.TimeTrackerState.DetailItem;
 import org.zkoss.ganttz.util.Interval;
 import org.zkoss.ganttz.util.WeakReferencedListeners;
 import org.zkoss.ganttz.util.WeakReferencedListeners.IListenerNotification;
-import org.zkoss.ganttz.util.zoom.IZoomLevelChangedListener;
-import org.zkoss.ganttz.util.zoom.TimeTrackerState;
-import org.zkoss.ganttz.util.zoom.ZoomLevel;
-import org.zkoss.ganttz.util.zoom.TimeTrackerState.DetailItem;
 
 public class TimeTracker {
 
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackerComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackerComponent.java
index 6ec5510bf..d19c2ac77 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackerComponent.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackerComponent.java
@@ -2,9 +2,9 @@ package org.zkoss.ganttz.timetracker;
 
 import java.util.Collection;
 
-import org.zkoss.ganttz.util.zoom.IZoomLevelChangedListener;
-import org.zkoss.ganttz.util.zoom.TimeTrackerState;
-import org.zkoss.ganttz.util.zoom.ZoomLevel;
+import org.zkoss.ganttz.timetracker.zoom.IZoomLevelChangedListener;
+import org.zkoss.ganttz.timetracker.zoom.TimeTrackerState;
+import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
 import org.zkoss.zk.au.AuRequest;
 import org.zkoss.zk.au.Command;
 import org.zkoss.zk.au.ComponentCommand;
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailFiveTimeTrackerState.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailFiveTimeTrackerState.java
similarity index 98%
rename from ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailFiveTimeTrackerState.java
rename to ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailFiveTimeTrackerState.java
index 7d39a5956..18720669a 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailFiveTimeTrackerState.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailFiveTimeTrackerState.java
@@ -1,4 +1,4 @@
-package org.zkoss.ganttz.util.zoom;
+package org.zkoss.ganttz.timetracker.zoom;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailFourTimeTrackerState.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailFourTimeTrackerState.java
similarity index 97%
rename from ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailFourTimeTrackerState.java
rename to ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailFourTimeTrackerState.java
index 51a77cad4..6550a6ed0 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailFourTimeTrackerState.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailFourTimeTrackerState.java
@@ -1,4 +1,4 @@
-package org.zkoss.ganttz.util.zoom;
+package org.zkoss.ganttz.timetracker.zoom;
 
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailOneTimeTrackerState.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailOneTimeTrackerState.java
similarity index 98%
rename from ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailOneTimeTrackerState.java
rename to ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailOneTimeTrackerState.java
index 454ae82c6..fc33d5266 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailOneTimeTrackerState.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailOneTimeTrackerState.java
@@ -1,4 +1,4 @@
-package org.zkoss.ganttz.util.zoom;
+package org.zkoss.ganttz.timetracker.zoom;
 
 import java.util.Collection;
 import java.util.Vector;
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailThreeTimeTrackerState.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailThreeTimeTrackerState.java
similarity index 98%
rename from ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailThreeTimeTrackerState.java
rename to ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailThreeTimeTrackerState.java
index 0af92d09d..52ceb4684 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailThreeTimeTrackerState.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailThreeTimeTrackerState.java
@@ -1,4 +1,4 @@
-package org.zkoss.ganttz.util.zoom;
+package org.zkoss.ganttz.timetracker.zoom;
 
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailTwoTimeTrackerState.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailTwoTimeTrackerState.java
similarity index 99%
rename from ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailTwoTimeTrackerState.java
rename to ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailTwoTimeTrackerState.java
index 084234a72..40823d6ef 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/DetailTwoTimeTrackerState.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailTwoTimeTrackerState.java
@@ -1,4 +1,4 @@
-package org.zkoss.ganttz.util.zoom;
+package org.zkoss.ganttz.timetracker.zoom;
 
 import java.util.ArrayList;
 import java.util.Calendar;
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/IZoomLevelChangedListener.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/IZoomLevelChangedListener.java
similarity index 71%
rename from ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/IZoomLevelChangedListener.java
rename to ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/IZoomLevelChangedListener.java
index 2a216690a..86d9d1bf8 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/IZoomLevelChangedListener.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/IZoomLevelChangedListener.java
@@ -1,4 +1,4 @@
-package org.zkoss.ganttz.util.zoom;
+package org.zkoss.ganttz.timetracker.zoom;
 
 
 public interface IZoomLevelChangedListener {
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/TimeTrackerState.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/TimeTrackerState.java
similarity index 99%
rename from ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/TimeTrackerState.java
rename to ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/TimeTrackerState.java
index 88dc494b5..bab9d91f2 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/TimeTrackerState.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/TimeTrackerState.java
@@ -1,4 +1,4 @@
-package org.zkoss.ganttz.util.zoom;
+package org.zkoss.ganttz.timetracker.zoom;
 
 import java.util.ArrayList;
 import java.util.Calendar;
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/TimeTrackerStateUsingJodaTime.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/TimeTrackerStateUsingJodaTime.java
similarity index 98%
rename from ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/TimeTrackerStateUsingJodaTime.java
rename to ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/TimeTrackerStateUsingJodaTime.java
index 8aa123bba..37fde43d8 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/TimeTrackerStateUsingJodaTime.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/TimeTrackerStateUsingJodaTime.java
@@ -1,4 +1,4 @@
-package org.zkoss.ganttz.util.zoom;
+package org.zkoss.ganttz.timetracker.zoom;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/ZoomLevel.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java
similarity index 96%
rename from ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/ZoomLevel.java
rename to ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java
index 80936eb1f..73047b3ab 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/util/zoom/ZoomLevel.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java
@@ -1,4 +1,4 @@
-package org.zkoss.ganttz.util.zoom;
+package org.zkoss.ganttz.timetracker.zoom;
 
 /**
  * @author Francisco Javier Moran Rúa