diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java index 7f4c66774..0bcf945c4 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java @@ -122,39 +122,7 @@ public class Planner extends XulElement { this.context = context; clear(); context.add(configuration.getData()); - visualizeTabs(context, configuration.getTabFactories()); - } - - private TabsRegistry createTabs(IContext context, - List> factories) { - List tabs = new ArrayList(); - tabs.add(createTasksPlanningTab()); - for (ITabFactory factory : factories) { - tabs.add(factory.create(context)); - } - TabsRegistry tabsRegistry = new TabsRegistry(this); - for (ITab t : tabs) { - tabsRegistry.add(t); - } - return tabsRegistry; - } - - private void visualizeTabs( - FunctionalityExposedForExtensions context, - List> tabFactories) { - TabsRegistry tabs = createTabs(context, tabFactories); - registryTabs(tabs); - tabs.showFirst(); - } - - private void registryTabs(TabsRegistry tabs) { - if (!getMenuItemsRegisterLocator().isRegistered()) - return; - tabs.registerAtMenu(getMenuItemsRegisterLocator().retrieve()); - } - - private OnZKDesktopRegistry getMenuItemsRegisterLocator() { - return OnZKDesktopRegistry.getLocatorFor(IMenuItemsRegister.class); + setupComponents(); } private void clear() { @@ -200,17 +168,17 @@ public class Planner extends XulElement { return diagramGraph; } - private TasksPlanningTab createTasksPlanningTab() { + private void setupComponents() { this.leftPane = new LeftPane(contextualizedGlobalCommands, this.diagramGraph.getTopLevelTasks()); this.ganttPanel = new GanttPanel(this.context, commandsOnTasksContextualized, editTaskCommand); - TasksPlanningTab result = new TasksPlanningTab(this, leftPane, - ganttPanel); - result.afterCompose(); + leftPane.setParent(this); + ganttPanel.setParent(this); + leftPane.afterCompose(); + ganttPanel.afterCompose(); this.leftPane .setGoingDownInLastArrowCommand(goingDownInLastArrowCommand); - return result; } void removeTask(Task task) { diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TasksPlanningTab.java b/ganttzk/src/main/java/org/zkoss/ganttz/TasksPlanningTab.java deleted file mode 100644 index e55a89b50..000000000 --- a/ganttzk/src/main/java/org/zkoss/ganttz/TasksPlanningTab.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.zkoss.ganttz; - -import org.zkoss.ganttz.extensions.ITab; -import org.zkoss.zk.ui.Component; - -public class TasksPlanningTab implements ITab { - - private final Planner planner; - private final LeftPane leftPane; - private final GanttPanel ganttPanel; - - public TasksPlanningTab(Planner planner, LeftPane leftPane, - GanttPanel ganttPanel) { - this.planner = planner; - this.leftPane = leftPane; - this.ganttPanel = ganttPanel; - } - - public void afterCompose() { - leftPane.setParent(planner); - ganttPanel.setParent(planner); - leftPane.afterCompose(); - ganttPanel.afterCompose(); - } - - @Override - public void addToParent(Component parent) { - } - - @Override - public void hide() { - leftPane.detach(); - ganttPanel.detach(); - } - - @Override - public void show() { - leftPane.setParent(planner); - ganttPanel.setParent(planner); - ganttPanel.comingFromAnotherTab(); - } - - @Override - public String getName() { - return "Tasks Planning"; - } -} diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/adapters/PlannerConfiguration.java b/ganttzk/src/main/java/org/zkoss/ganttz/adapters/PlannerConfiguration.java index b5c447ab5..e3f9fcd32 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/adapters/PlannerConfiguration.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/adapters/PlannerConfiguration.java @@ -9,7 +9,6 @@ import org.zkoss.ganttz.extensions.ICommand; import org.zkoss.ganttz.extensions.ICommandOnTask; import org.zkoss.ganttz.extensions.IContext; import org.zkoss.ganttz.extensions.IContextWithPlannerTask; -import org.zkoss.ganttz.extensions.ITabFactory; /** * A object that defines several extension points for gantt planner @@ -59,8 +58,6 @@ public class PlannerConfiguration { private ICommandOnTask editTaskCommand = new NullCommandOnTask(); - private List> tabFactories = new ArrayList>(); - public PlannerConfiguration(IAdapterToTaskFundamentalProperties adapter, IStructureNavigator navigator, List data) { this.adapter = adapter; @@ -116,13 +113,4 @@ public class PlannerConfiguration { Validate.notNull(editTaskCommand); this.editTaskCommand = editTaskCommand; } - - public void addTab(ITabFactory tabCreator) { - Validate.notNull(tabCreator); - this.tabFactories.add(tabCreator); - } - - public List> getTabFactories() { - return Collections.unmodifiableList(tabFactories); - } } 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 e17f76b3b..6787da85b 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 @@ -31,7 +31,6 @@ import org.zkoss.ganttz.extensions.ICommandOnTask; import org.zkoss.ganttz.extensions.IContext; import org.zkoss.ganttz.extensions.IContextWithPlannerTask; import org.zkoss.ganttz.extensions.ITab; -import org.zkoss.ganttz.extensions.ITabFactory; import org.zkoss.ganttz.resourceload.ResourcesLoadPanel; import org.zkoss.zk.ui.Component; @@ -54,53 +53,9 @@ public class DataForPlanner { private PlannerConfiguration setup( PlannerConfiguration configuration) { addCommands(configuration); - addTabs(configuration); return configuration; } - private void addTabs( - PlannerConfiguration configuration) { - configuration.addTab(new ITabFactory() { - - @Override - public ITab create( - final IContext context) { - return new ITab() { - - private Component parent; - - private ResourcesLoadPanel loadPanel; - - @Override - public void show() { - loadPanel = new ResourcesLoadPanel( - createFakeDataForResourcesLoad(), context - .getTimeTracker()); - parent.appendChild(loadPanel); - loadPanel.afterCompose(); - } - - @Override - public void hide() { - if (loadPanel != null) { - loadPanel.detach(); - } - } - - @Override - public String getName() { - return _("Resource Load"); - } - - @Override - public void addToParent(Component parent) { - this.parent = parent; - } - }; - } - }); - } - private List createFakeDataForResourcesLoad() { List result = new ArrayList(); LoadTimeLine resource1 = new LoadTimeLine("resource1",