From 3eb8fecae0d89e8fc156c5e3579a892c23ca5650 Mon Sep 17 00:00:00 2001
From: Farruco Sanjurjo <fsanjurjo@igalia.com>
Date: Thu, 12 Aug 2010 10:38:36 +0200
Subject: [PATCH] Modified how Javascript dependencies are loaded

* Since ZK 5, there is a new way to state Javascript depedencies. It's done at the *.wpd file. So that's why I'm deleting the
Scripts requirement code in Java

FEA: ItEr02S03MigracionZK5
---
 .../main/java/org/zkoss/ganttz/Planner.java   | 21 ++++---------------
 .../tabs/MultipleTabsPlannerController.java   |  2 --
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
index b01c16244..6092d2050 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
@@ -29,18 +29,18 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import org.zkoss.ganttz.adapters.IDisabilityConfiguration;
 import org.zkoss.ganttz.adapters.IDomainAndBeansMapper;
 import org.zkoss.ganttz.adapters.PlannerConfiguration;
 import org.zkoss.ganttz.data.Dependency;
 import org.zkoss.ganttz.data.GanttDiagramGraph;
-import org.zkoss.ganttz.data.Position;
-import org.zkoss.ganttz.data.Task;
 import org.zkoss.ganttz.data.GanttDiagramGraph.GanttZKDiagramGraph;
 import org.zkoss.ganttz.data.GanttDiagramGraph.IGraphChangeListener;
+import org.zkoss.ganttz.data.Position;
+import org.zkoss.ganttz.data.Task;
 import org.zkoss.ganttz.extensions.ICommand;
 import org.zkoss.ganttz.extensions.ICommandOnTask;
 import org.zkoss.ganttz.extensions.IContext;
@@ -50,11 +50,9 @@ import org.zkoss.ganttz.timetracker.TimeTrackerComponentWithoutColumns;
 import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
 import org.zkoss.ganttz.util.ComponentsFinder;
 import org.zkoss.ganttz.util.LongOperationFeedback;
-import org.zkoss.ganttz.util.OnZKDesktopRegistry;
-import org.zkoss.ganttz.util.WeakReferencedListeners;
 import org.zkoss.ganttz.util.LongOperationFeedback.ILongOperation;
+import org.zkoss.ganttz.util.WeakReferencedListeners;
 import org.zkoss.ganttz.util.WeakReferencedListeners.IListenerNotification;
-import org.zkoss.ganttz.util.script.IScriptsRegister;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.HtmlMacroComponent;
@@ -72,16 +70,6 @@ import org.zkoss.zul.South;
 
 public class Planner extends HtmlMacroComponent  {
 
-    public static void registerNeededScripts() {
-        IScriptsRegister register = getScriptsRegister();
-        register.register(ScriptsRequiredByPlanner.class);
-    }
-
-    private static IScriptsRegister getScriptsRegister() {
-        return OnZKDesktopRegistry.getLocatorFor(IScriptsRegister.class)
-                .retrieve();
-    }
-
     public static boolean guessContainersExpandedByDefaultGivenPrintParameters(
             Map<String, String> printParameters) {
         return guessContainersExpandedByDefault(convertToURLParameters(printParameters));
@@ -151,7 +139,6 @@ public class Planner extends HtmlMacroComponent  {
             .create();
 
     public Planner() {
-        registerNeededScripts();
     }
 
     TaskList getTaskList() {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
index 3207a7576..4a5d8f00d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
@@ -47,7 +47,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
-import org.zkoss.ganttz.Planner;
 import org.zkoss.ganttz.TabSwitcher;
 import org.zkoss.ganttz.TabsRegistry;
 import org.zkoss.ganttz.adapters.State;
@@ -325,7 +324,6 @@ public class MultipleTabsPlannerController implements Composer,
 
     @Override
     public void doAfterCompose(org.zkoss.zk.ui.Component comp) throws Exception {
-        Planner.registerNeededScripts();
         tabsSwitcher = (TabSwitcher) comp;
         breadcrumbs = comp.getPage().getFellow("breadcrumbs");
         tabsSwitcher.setConfiguration(buildTabsConfiguration());