RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr30S15RFVisualizacionMultiplesProxectosItEr29S18: Entry points no longer used for going to OrderPlanningController so renaming interface

Browse source
This commit is contained in:
Óscar González Fernández 2009-10-13 23:44:25 +02:00
parent 58c38064df
commit 8e8fd715fb
4 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
View file

@ -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<Order> 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;
}

9
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningControllerEntryPoints.java → navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningGate.java
View file

@ -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 <ogonzalez@igalia.com>
*/
@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);
}

10
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningController.java
View file

@ -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<IOrderPlanningControllerEntryPoints> handler = urlHandlerRegistry
.getRedirectorFor(IOrderPlanningControllerEntryPoints.class);
handler.registerListener(this, planner.getPage());
}
public SplittingController getSplittingController() {

4
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
View file

@ -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) {