diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ViewSwitcher.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ViewSwitcher.java index b502acdfa..9779ab05b 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ViewSwitcher.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ViewSwitcher.java @@ -19,19 +19,15 @@ */ package org.navalplanner.web.common; -import static org.navalplanner.web.I18nHelper._; - import java.util.HashMap; import java.util.Map; import org.navalplanner.web.planner.allocation.AdvancedAllocationController; import org.navalplanner.web.planner.allocation.AllocationResult; import org.navalplanner.web.planner.allocation.AdvancedAllocationController.IAdvanceAllocationResultReceiver; -import org.navalplanner.web.resourceload.ResourceLoadController; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; -import org.zkoss.ganttz.resourceload.ResourcesLoadPanel.IToolbarCommand; import org.zkoss.zk.ui.util.Composer; /** @@ -79,36 +75,4 @@ public class ViewSwitcher implements Composer { planningOrder.restore(); isInPlanningOrder = true; } - - public void goToResourceLoad(ResourceLoadController resourceLoadController) { - addCommands(resourceLoadController); - planningOrder = ComponentsReplacer.replaceAllChildren(parent, - "../resourceload/resourceloadfororder.zul", - argsForResourceLoad(resourceLoadController)); - isInPlanningOrder = false; - } - - private void addCommands(ResourceLoadController resourceLoadController) { - resourceLoadController.add(new IToolbarCommand() { - - @Override - public void doAction() { - goToPlanningOrderView(); - } - - @Override - public String getLabel() { - return _("Back to Order Planning View"); - } - }); - - } - - private Map argsForResourceLoad( - ResourceLoadController resourceLoadController) { - Map result = new HashMap(); - result.put("resourceLoadController", resourceLoadController); - return result; - } - } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IResourceLoadForOrderCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IResourceLoadForOrderCommand.java deleted file mode 100644 index 819b5cf5e..000000000 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IResourceLoadForOrderCommand.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of ###PROJECT_NAME### - * - * Copyright (C) 2009 Fundación para o Fomento da Calidade Industrial e - * Desenvolvemento Tecnolóxico de Galicia - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.navalplanner.web.planner; - -import org.navalplanner.business.planner.entities.TaskElement; -import org.navalplanner.web.common.ViewSwitcher; -import org.zkoss.ganttz.extensions.ICommand; - -/** - * @author Óscar González Fernández - * - */ -public interface IResourceLoadForOrderCommand extends ICommand{ - - public void initialize(ViewSwitcher switcher, PlanningState planningState); - -} diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java index 1d0e1c2c7..ddb332657 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java @@ -124,7 +124,6 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { PlannerConfiguration configuration = createConfiguration(orderReloaded); configuration.addGlobalCommand(buildSaveCommand()); - configuration.addGlobalCommand(buildResourceLoadForOrderCommand(switcher)); configuration.addCommandOnTask(buildResourceAllocationCommand(resourceAllocationController)); configuration.addCommandOnTask(buildSplitCommand(splittingController)); @@ -186,13 +185,6 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { return resourceAllocationCommand; } - private IResourceLoadForOrderCommand buildResourceLoadForOrderCommand( - ViewSwitcher switcher) { - IResourceLoadForOrderCommand resourceLoadForOrderCommand = getResourceLoadForOrderCommand(); - resourceLoadForOrderCommand.initialize(switcher, planningState); - return resourceLoadForOrderCommand; - } - private ISaveCommand buildSaveCommand() { ISaveCommand saveCommand = getSaveCommand(); saveCommand.setState(planningState); @@ -313,8 +305,6 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { protected abstract ICalendarAllocationCommand getCalendarAllocationCommand(); - protected abstract IResourceLoadForOrderCommand getResourceLoadForOrderCommand(); - private Order reload(Order order) { try { return orderDAO.find(order.getId()); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ResourceLoadForOrderCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ResourceLoadForOrderCommand.java deleted file mode 100644 index 4b6ce7589..000000000 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ResourceLoadForOrderCommand.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * This file is part of ###PROJECT_NAME### - * - * Copyright (C) 2009 Fundación para o Fomento da Calidade Industrial e - * Desenvolvemento Tecnolóxico de Galicia - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.navalplanner.web.planner; - -import static org.navalplanner.web.I18nHelper._; - -import org.navalplanner.business.planner.entities.TaskElement; -import org.navalplanner.web.common.ViewSwitcher; -import org.navalplanner.web.resourceload.ResourceLoadController; -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.extensions.IContext; -/** - * @author Óscar González Fernández - * - */ -@Component -@Scope(BeanDefinition.SCOPE_PROTOTYPE) -public class ResourceLoadForOrderCommand implements - IResourceLoadForOrderCommand { - - private PlanningState planningState; - private ViewSwitcher switcher; - - @Autowired - private ResourceLoadController resourceLoadController; - - @Override - public void initialize(ViewSwitcher switcher, PlanningState planningState) { - this.switcher = switcher; - this.planningState = planningState; - } - - @Override - public void doAction(IContext context) { - resourceLoadController.filterBy(planningState); - switcher.goToResourceLoad(resourceLoadController); - } - - @Override - public String getName() { - return _("Resource Load"); - } - -} diff --git a/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-config.xml b/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-config.xml index 54910fc37..b65e150d4 100644 --- a/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-config.xml +++ b/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-config.xml @@ -32,7 +32,6 @@ -