From 13eef3a2315ddf861b3b822c857e97117d0f7850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 1 Sep 2009 11:30:02 +0200 Subject: [PATCH] ItEr24S08CUAsignacionGrupoRecursosAPlanificacionItEr23S10: Planner declares dependencies using new script dependencies support --- .../src/main/java/org/zkoss/ganttz/Planner.java | 12 ++++++++++++ .../zkoss/ganttz/ScriptsRequiredByPlanner.java | 15 +++++++++++++++ .../src/main/java/org/zkoss/ganttz/YUIMin.java | 10 ++++++++++ ganttzk/src/main/resources/web/ganttz/planner.dsp | 9 --------- 4 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 ganttzk/src/main/java/org/zkoss/ganttz/ScriptsRequiredByPlanner.java create mode 100644 ganttzk/src/main/java/org/zkoss/ganttz/YUIMin.java diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java index 0867e458c..7f4c66774 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java @@ -17,6 +17,7 @@ import org.zkoss.ganttz.extensions.ITab; import org.zkoss.ganttz.extensions.ITabFactory; import org.zkoss.ganttz.util.IMenuItemsRegister; import org.zkoss.ganttz.util.OnZKDesktopRegistry; +import org.zkoss.ganttz.util.script.IScriptsRegister; import org.zkoss.zk.ui.Executions; import org.zkoss.zul.impl.XulElement; @@ -39,6 +40,12 @@ public class Planner extends XulElement { private FunctionalityExposedForExtensions context; public Planner() { + registerNeededScripts(); + } + + private void registerNeededScripts() { + IScriptsRegister register = getScriptsRegister(); + register.register(ScriptsRequiredByPlanner.class); } TaskList getTaskList() { @@ -214,4 +221,9 @@ public class Planner extends XulElement { taskList.adjustZoomColumnsHeight(); getDependencyList().redrawDependencies(); } + + private IScriptsRegister getScriptsRegister() { + return OnZKDesktopRegistry.getLocatorFor(IScriptsRegister.class) + .retrieve(); + } } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/ScriptsRequiredByPlanner.java b/ganttzk/src/main/java/org/zkoss/ganttz/ScriptsRequiredByPlanner.java new file mode 100644 index 000000000..4033ab46e --- /dev/null +++ b/ganttzk/src/main/java/org/zkoss/ganttz/ScriptsRequiredByPlanner.java @@ -0,0 +1,15 @@ +package org.zkoss.ganttz; + +import org.zkoss.ganttz.util.script.ScriptsRequiredDeclaration; + +@ScriptsRequiredDeclaration(dependsOn = YUIMin.class) +public class ScriptsRequiredByPlanner { + + public static final String SELECTOR = "/zkau/web/js/yui/2.7.0/selector/selector-min.js"; + public static final String YAHOO_DOM_EVENT = "zkau/web/js/yui/2.7.0/yahoo-dom-event/yahoo-dom-event.js"; + public static final String DRAGDROPMIN = "zkau/web/js/yui/2.7.0/dragdrop/dragdrop-min.js"; + + public static final String ELEMENT_MIN = "zkau/web/js/yui/2.7.0/element/element-min.js"; + public static final String RESIZE_MIN = "zkau/web/js/yui/2.7.0/resize/resize-min.js"; + public static final String LOGGER_MIN = "zkau/web/js/yui/2.7.0/logger/logger-min.js"; +} diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/YUIMin.java b/ganttzk/src/main/java/org/zkoss/ganttz/YUIMin.java new file mode 100644 index 000000000..eb797cdce --- /dev/null +++ b/ganttzk/src/main/java/org/zkoss/ganttz/YUIMin.java @@ -0,0 +1,10 @@ +package org.zkoss.ganttz; + +import org.zkoss.ganttz.util.script.ScriptsRequiredDeclaration; + +@ScriptsRequiredDeclaration +public class YUIMin { + + public static final String YUI_MIN = "/zkau/web/js/yui/2.7.0/yahoo/yahoo-min.js"; + +} diff --git a/ganttzk/src/main/resources/web/ganttz/planner.dsp b/ganttzk/src/main/resources/web/ganttz/planner.dsp index 35e02704a..3c1943805 100644 --- a/ganttzk/src/main/resources/web/ganttz/planner.dsp +++ b/ganttzk/src/main/resources/web/ganttz/planner.dsp @@ -5,17 +5,8 @@ - - - - - - - - -