diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java b/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java index 61a5029be..1342a16f8 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java @@ -288,6 +288,7 @@ public class FunctionalityExposedForExtensions implements IContext { addDependency(dependency.createWithType(type)); } + @Override public TimeTracker getTimeTracker() { return timeTracker; } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/ResourcesLoadPanel.java b/ganttzk/src/main/java/org/zkoss/ganttz/ResourcesLoadPanel.java index 74b08771f..d047ddef2 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/ResourcesLoadPanel.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/ResourcesLoadPanel.java @@ -8,7 +8,7 @@ public class ResourcesLoadPanel extends XulElement implements AfterCompose { private TimeTrackerComponent timeTrackerComponent; - public ResourcesLoadPanel() { + public ResourcesLoadPanel(TimeTracker timeTracker) { ResourceLoadComponent rlc1 = new ResourceLoadComponent( new ResourceLoad("ResourceLoad 1")); ResourceLoadComponent rlc2 = new ResourceLoadComponent( diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/extensions/ContextRelativeToOtherComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/extensions/ContextRelativeToOtherComponent.java index 933ef4a15..eb7990f37 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/extensions/ContextRelativeToOtherComponent.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/extensions/ContextRelativeToOtherComponent.java @@ -1,5 +1,6 @@ package org.zkoss.ganttz.extensions; +import org.zkoss.ganttz.TimeTracker; import org.zkoss.ganttz.adapters.PlannerConfiguration; import org.zkoss.ganttz.data.Position; import org.zkoss.zk.ui.Component; @@ -51,6 +52,11 @@ public class ContextRelativeToOtherComponent implements IContext { public void replace(T oldDomainObject, T newDomainObject) { context.replace(oldDomainObject, newDomainObject); + } + + @Override + public TimeTracker getTimeTracker() { + return context.getTimeTracker(); }; } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/extensions/ContextWithPlannerTask.java b/ganttzk/src/main/java/org/zkoss/ganttz/extensions/ContextWithPlannerTask.java index 50cd333d2..26c59bc0d 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/extensions/ContextWithPlannerTask.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/extensions/ContextWithPlannerTask.java @@ -1,5 +1,6 @@ package org.zkoss.ganttz.extensions; +import org.zkoss.ganttz.TimeTracker; import org.zkoss.ganttz.adapters.PlannerConfiguration; import org.zkoss.ganttz.data.Position; import org.zkoss.ganttz.data.Task; @@ -58,4 +59,9 @@ public class ContextWithPlannerTask implements IContextWithPlannerTask { return task; } + @Override + public TimeTracker getTimeTracker() { + return context.getTimeTracker(); + } + } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/extensions/IContext.java b/ganttzk/src/main/java/org/zkoss/ganttz/extensions/IContext.java index 263b2931b..f69ac5d8a 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/extensions/IContext.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/extensions/IContext.java @@ -2,6 +2,7 @@ package org.zkoss.ganttz.extensions; import org.zkoss.ganttz.Planner; import org.zkoss.ganttz.TaskComponent; +import org.zkoss.ganttz.TimeTracker; import org.zkoss.ganttz.adapters.IAdapterToTaskFundamentalProperties; import org.zkoss.ganttz.adapters.IStructureNavigator; import org.zkoss.ganttz.adapters.PlannerConfiguration; @@ -69,4 +70,10 @@ public interface IContext { */ void add(Position position, T domainObject); + /** + * Makes the time tracker available. + * @return the in use {@link TimeTracker Time Tracker} + */ + TimeTracker getTimeTracker(); + } 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 09cb5b0ba..566362d3f 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 @@ -55,7 +55,8 @@ public class DataForPlanner { configuration.addTab(new ITabFactory() { @Override - public ITab create(IContext context) { + public ITab create( + final IContext context) { return new ITab() { private Component parent; @@ -64,7 +65,8 @@ public class DataForPlanner { @Override public void show() { - loadPanel = new ResourcesLoadPanel(); + loadPanel = new ResourcesLoadPanel(context + .getTimeTracker()); parent.appendChild(loadPanel); }