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

ItEr32S12CUAsignacionGrupoRecursosAPlanificacionItEr31S15: Creating package for order planning related classes

Browse source
This commit is contained in:
Óscar González Fernández 2009-10-27 17:58:32 +01:00
parent 5f8c6b5bd4
commit fd1fbbffb6
23 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
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.IOrderPlanningGate;
import org.navalplanner.web.planner.order.IOrderPlanningGate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IResourceAllocationCommand.java
View file

@ -21,7 +21,7 @@
package org.navalplanner.web.planner.allocation;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.web.planner.PlanningState;
import org.navalplanner.web.planner.order.PlanningState;
import org.zkoss.ganttz.extensions.ICommandOnTask;
/**

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IResourceAllocationModel.java
View file

@ -28,7 +28,7 @@ import org.navalplanner.business.planner.entities.SpecificResourceAllocation;
import org.navalplanner.business.planner.entities.Task;
import org.navalplanner.business.resources.entities.Criterion;
import org.navalplanner.business.resources.entities.Worker;
import org.navalplanner.web.planner.PlanningState;
import org.navalplanner.web.planner.order.PlanningState;
/**
* Contract for {@link Task}.

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java
View file

@ -24,7 +24,7 @@ import static org.navalplanner.web.I18nHelper._;
import org.navalplanner.business.planner.entities.Task;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.web.planner.PlanningState;
import org.navalplanner.web.planner.order.PlanningState;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java
View file

@ -46,9 +46,9 @@ import org.navalplanner.web.common.MessagesForUser;
import org.navalplanner.web.common.Util;
import org.navalplanner.web.common.ViewSwitcher;
import org.navalplanner.web.common.components.WorkerSearch;
import org.navalplanner.web.planner.PlanningState;
import org.navalplanner.web.planner.allocation.AdvancedAllocationController.IAdvanceAllocationResultReceiver;
import org.navalplanner.web.planner.allocation.AdvancedAllocationController.Restriction;
import org.navalplanner.web.planner.order.PlanningState;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
import org.zkoss.ganttz.util.OnZKDesktopRegistry;

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
View file

@ -37,7 +37,7 @@ import org.navalplanner.business.resources.entities.CriterionSatisfaction;
import org.navalplanner.business.resources.entities.CriterionType;
import org.navalplanner.business.resources.entities.Resource;
import org.navalplanner.business.resources.entities.Worker;
import org.navalplanner.web.planner.PlanningState;
import org.navalplanner.web.planner.order.PlanningState;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java
View file

@ -26,7 +26,7 @@ import org.navalplanner.business.planner.daos.ITaskElementDAO;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.business.planner.entities.TaskGroup;
import org.navalplanner.business.planner.entities.TaskMilestone;
import org.navalplanner.web.planner.PlanningState;
import org.navalplanner.web.planner.order.PlanningState;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/IAddMilestoneCommand.java
View file

@ -21,7 +21,7 @@
package org.navalplanner.web.planner.milestone;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.web.planner.PlanningState;
import org.navalplanner.web.planner.order.PlanningState;
import org.zkoss.ganttz.extensions.ICommandOnTask;
/**

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningGate.java → navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/IOrderPlanningGate.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.web.planner;
package org.navalplanner.web.planner.order;
import org.navalplanner.business.orders.entities.Order;

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningModel.java → navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/IOrderPlanningModel.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.web.planner;
package org.navalplanner.web.planner.order;
import java.util.List;

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ISaveCommand.java → navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/ISaveCommand.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.web.planner;
package org.navalplanner.web.planner.order;
import org.navalplanner.business.planner.entities.TaskElement;
import org.zkoss.ganttz.extensions.ICommand;

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningController.java → navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.web.planner;
package org.navalplanner.web.planner.order;
import java.util.ArrayList;
import java.util.Arrays;

5
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java → navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.web.planner;
package org.navalplanner.web.planner.order;
import static org.navalplanner.web.I18nHelper._;
@ -45,7 +45,7 @@ import org.navalplanner.business.planner.entities.TaskMilestone;
import org.navalplanner.business.resources.daos.IResourceDAO;
import org.navalplanner.business.resources.entities.Resource;
import org.navalplanner.web.common.ViewSwitcher;
import org.navalplanner.web.planner.ISaveCommand.IAfterSaveListener;
import org.navalplanner.web.planner.ITaskElementAdapter;
import org.navalplanner.web.planner.ITaskElementAdapter.IOnMoveListener;
import org.navalplanner.web.planner.allocation.IResourceAllocationCommand;
import org.navalplanner.web.planner.allocation.ResourceAllocationController;
@ -54,6 +54,7 @@ import org.navalplanner.web.planner.calendar.ICalendarAllocationCommand;
import org.navalplanner.web.planner.loadchart.LoadChart;
import org.navalplanner.web.planner.loadchart.LoadChartFiller;
import org.navalplanner.web.planner.milestone.IAddMilestoneCommand;
import org.navalplanner.web.planner.order.ISaveCommand.IAfterSaveListener;
import org.navalplanner.web.planner.splitting.IMergeTaskCommand;
import org.navalplanner.web.planner.splitting.ISplitTaskCommand;
import org.navalplanner.web.planner.splitting.SplittingController;

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/PlanningState.java → navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/PlanningState.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.web.planner;
package org.navalplanner.web.planner.order;
import java.util.ArrayList;
import java.util.Collection;

3
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/SaveCommand.java → navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.web.planner;
package org.navalplanner.web.planner.order;
import static org.navalplanner.web.I18nHelper._;
@ -39,6 +39,7 @@ import org.navalplanner.business.planner.entities.ResourceAllocation;
import org.navalplanner.business.planner.entities.Task;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.business.planner.entities.TaskGroup;
import org.navalplanner.web.planner.order.ISaveCommand.IAfterSaveListener;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/IMergeTaskCommand.java
View file

@ -21,7 +21,7 @@
package org.navalplanner.web.planner.splitting;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.web.planner.PlanningState;
import org.navalplanner.web.planner.order.PlanningState;
import org.zkoss.ganttz.extensions.ICommandOnTask;
public interface IMergeTaskCommand extends ICommandOnTask<TaskElement> {

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/ISplitTaskCommand.java
View file

@ -21,7 +21,7 @@
package org.navalplanner.web.planner.splitting;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.web.planner.PlanningState;
import org.navalplanner.web.planner.order.PlanningState;
import org.zkoss.ganttz.extensions.ICommandOnTask;
public interface ISplitTaskCommand extends ICommandOnTask<TaskElement> {

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/MergeTaskCommand.java
View file

@ -23,7 +23,7 @@ package org.navalplanner.web.planner.splitting;
import org.navalplanner.business.planner.entities.Task;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.business.planner.entities.TaskGroup;
import org.navalplanner.web.planner.PlanningState;
import org.navalplanner.web.planner.order.PlanningState;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/SplitTaskCommand.java
View file

@ -25,7 +25,7 @@ import java.util.List;
import org.navalplanner.business.planner.entities.Task;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.business.planner.entities.TaskGroup;
import org.navalplanner.web.planner.PlanningState;
import org.navalplanner.web.planner.order.PlanningState;
import org.navalplanner.web.planner.splitting.SplittingController.IActionOnOk;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;

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

@ -27,8 +27,8 @@ import java.util.List;
import org.navalplanner.business.orders.entities.Order;
import org.navalplanner.web.orders.OrderCRUDController;
import org.navalplanner.web.planner.CompanyPlanningController;
import org.navalplanner.web.planner.IOrderPlanningGate;
import org.navalplanner.web.planner.OrderPlanningController;
import org.navalplanner.web.planner.order.IOrderPlanningGate;
import org.navalplanner.web.planner.order.OrderPlanningController;
import org.navalplanner.web.planner.tabs.Mode.ModeTypeChangedListener;
import org.navalplanner.web.resourceload.ResourceLoadController;
import org.springframework.beans.factory.annotation.Autowired;

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java
View file

@ -28,7 +28,7 @@ import java.util.Map;
import org.navalplanner.web.common.Util;
import org.navalplanner.web.orders.OrderCRUDController;
import org.navalplanner.web.planner.IOrderPlanningGate;
import org.navalplanner.web.planner.order.IOrderPlanningGate;
import org.navalplanner.web.planner.tabs.CreatedOnDemandTab.IComponentCreator;
import org.zkoss.ganttz.extensions.ITab;
import org.zkoss.zk.ui.Component;

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java
View file

@ -33,7 +33,7 @@ import org.navalplanner.business.orders.entities.Order;
import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.web.planner.CompanyPlanningController;
import org.navalplanner.web.planner.OrderPlanningController;
import org.navalplanner.web.planner.order.OrderPlanningController;
import org.navalplanner.web.planner.tabs.CreatedOnDemandTab.IComponentCreator;
import org.zkoss.ganttz.extensions.ICommandOnTask;
import org.zkoss.ganttz.extensions.IContextWithPlannerTask;

2
navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-config.xml
View file

@ -23,7 +23,7 @@
<context:annotation-config />
<bean class="org.navalplanner.web.common.entrypoints.RedirectorSynthetiser"></bean>
<bean class="org.navalplanner.web.planner.OrderPlanningModel" scope="prototype">
<bean class="org.navalplanner.web.planner.order.OrderPlanningModel" scope="prototype">
<lookup-method name="getTaskElementAdapter" bean="taskElementAdapter"/>
<lookup-method name="getSaveCommand" bean="saveCommand"/>
<lookup-method name="getResourceAllocationCommand" bean="resourceAllocationCommand"/>