diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java index 48e8f9281..5d6ab7911 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java @@ -35,7 +35,7 @@ import org.navalplanner.web.common.Level; import org.navalplanner.web.common.MessagesForUser; import org.navalplanner.web.common.OnlyOneVisible; import org.navalplanner.web.common.Util; -import org.navalplanner.web.planner.IOrderPlanningControllerEntryPoints; +import org.navalplanner.web.planner.IOrderPlanningGate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; @@ -76,7 +76,7 @@ public class OrderCRUDController extends GenericForwardComposer { private boolean confirmingSchedule; - private IOrderPlanningControllerEntryPoints planningControllerEntryPoints; + private IOrderPlanningGate planningControllerEntryPoints; public List getOrders() { return orderModel.getOrders(); @@ -158,7 +158,7 @@ public class OrderCRUDController extends GenericForwardComposer { } private void goToShedulingView(Order order) { - planningControllerEntryPoints.showSchedule(order); + planningControllerEntryPoints.goToScheduleOf(order); } private void showScheduleConfirmingWindow() { @@ -265,7 +265,7 @@ public class OrderCRUDController extends GenericForwardComposer { } public void setPlanningControllerEntryPoints( - IOrderPlanningControllerEntryPoints planningControllerEntryPoints) { + IOrderPlanningGate planningControllerEntryPoints) { this.planningControllerEntryPoints = planningControllerEntryPoints; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningControllerEntryPoints.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningGate.java similarity index 75% rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningControllerEntryPoints.java rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningGate.java index 4326fe85b..388e84729 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningControllerEntryPoints.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningGate.java @@ -21,15 +21,12 @@ package org.navalplanner.web.planner; import org.navalplanner.business.orders.entities.Order; -import org.navalplanner.web.common.entrypoints.EntryPoint; -import org.navalplanner.web.common.entrypoints.EntryPoints; /** + * This interface allows to go to the schedule of an {@link Order} * @author Óscar González Fernández */ -@EntryPoints(page = "/planner/order.zul", registerAs = "planningControllerEntryPoints") -public interface IOrderPlanningControllerEntryPoints { +public interface IOrderPlanningGate { - @EntryPoint("plan") - public void showSchedule(Order order); + public void goToScheduleOf(Order order); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningController.java index ae02d8eb4..7baf5d9ff 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningController.java @@ -23,7 +23,6 @@ package org.navalplanner.web.planner; import org.navalplanner.business.orders.entities.Order; import org.navalplanner.web.common.ViewSwitcher; import org.navalplanner.web.common.entrypoints.IURLHandlerRegistry; -import org.navalplanner.web.common.entrypoints.URLHandler; import org.navalplanner.web.planner.allocation.ResourceAllocationController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; @@ -39,8 +38,7 @@ import org.zkoss.ganttz.util.script.IScriptsRegister; */ @Component @Scope(BeanDefinition.SCOPE_PROTOTYPE) -public class OrderPlanningController implements - IOrderPlanningControllerEntryPoints { +public class OrderPlanningController { @Autowired private ViewSwitcher viewSwitcher; @@ -84,8 +82,7 @@ public class OrderPlanningController implements .retrieve(); } - @Override - public void showSchedule(Order order) { + private void setConfigurationForGiven(Order order) { model.setConfigurationToPlanner(planner, order, viewSwitcher, resourceAllocationController, editTaskController, splittingController, calendarAllocationController); @@ -93,9 +90,6 @@ public class OrderPlanningController implements public void registerPlanner(Planner planner) { this.planner = planner; - final URLHandler handler = urlHandlerRegistry - .getRedirectorFor(IOrderPlanningControllerEntryPoints.class); - handler.registerListener(this, planner.getPage()); } public SplittingController getSplittingController() { 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 4aa4ab3f8..42d911dcf 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 @@ -30,7 +30,7 @@ import org.navalplanner.business.orders.entities.Order; import org.navalplanner.web.common.Util; import org.navalplanner.web.orders.OrderCRUDController; import org.navalplanner.web.planner.CompanyPlanningController; -import org.navalplanner.web.planner.IOrderPlanningControllerEntryPoints; +import org.navalplanner.web.planner.IOrderPlanningGate; import org.navalplanner.web.planner.tabs.CreatedOnDemandTab.IComponentCreator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; @@ -219,7 +219,7 @@ public class MultipleTabsPlannerController implements Composer { } private OrderCRUDController setupOrderCrudController() { - orderCRUDController.setPlanningControllerEntryPoints(new IOrderPlanningControllerEntryPoints() { + orderCRUDController.setPlanningControllerEntryPoints(new IOrderPlanningGate() { @Override public void showSchedule(Order order) {