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

Remove useless methods, some of them to force loading some data.

Browse source 
FEA: ItEr60S17CambiosPantallaVistaEmpresa
This commit is contained in:
Jacobo Aragunde Pérez 2010-08-31 11:36:41 +02:00
parent 2f5f3049f1
commit af96a69ca1
2 changed files with 1 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
View file

@ -48,7 +48,6 @@ import org.navalplanner.business.common.daos.IConfigurationDAO;
import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
import org.navalplanner.business.orders.daos.IOrderDAO;
import org.navalplanner.business.orders.entities.Order;
import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.business.orders.entities.OrderStatusEnum;
import org.navalplanner.business.planner.daos.IDayAssignmentDAO;
import org.navalplanner.business.planner.daos.ITaskElementDAO;
@ -174,8 +173,6 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
private Scenario currentScenario;
private List<Order> ordersToShow;
private Date filterStartDate;
private Date filterFinishDate;
private static final EnumSet<OrderStatusEnum> STATUS_VISUALIZED = EnumSet
@ -655,25 +652,14 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
List<TaskElement> toShow;
toShow = retainOnlyTopLevel(predicate);
forceLoadOfDataAssociatedTo(toShow);
forceLoadOfDependenciesCollections(toShow);
forceLoadOfWorkingHours(toShow);
forceLoadOfLabels(toShow);
return new PlannerConfiguration<TaskElement>(taskElementAdapter,
new TaskElementNavigator(), toShow);
}
private void forceLoadOfDataAssociatedTo(List<TaskElement> toShow) {
for (TaskElement each : toShow) {
OrderPlanningModel.forceLoadOfDataAssociatedTo(each);
}
}
private List<TaskElement> retainOnlyTopLevel(IPredicate predicate) {
List<TaskElement> result = new ArrayList<TaskElement>();
User user;
ordersToShow = new ArrayList<Order>();
List<Order> ordersToShow = new ArrayList<Order>();
try {
user = userDAO.findByLoginName(SecurityUtils.getSessionUserLoginName());
@ -724,50 +710,9 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
return result;
}
private void forceLoadOfWorkingHours(List<TaskElement> initial) {
for (TaskElement taskElement : initial) {
OrderElement orderElement = taskElement.getOrderElement();
if (orderElement != null) {
orderElement.getWorkHours();
}
if (!taskElement.isLeaf()) {
forceLoadOfWorkingHours(taskElement.getChildren());
}
}
}
private void forceLoadOfDependenciesCollections(
Collection<? extends TaskElement> elements) {
for (TaskElement task : elements) {
forceLoadOfDepedenciesCollections(task);
if (!task.isLeaf()) {
forceLoadOfDependenciesCollections(task.getChildren());
}
}
}
private void forceLoadOfDepedenciesCollections(TaskElement task) {
task.getDependenciesWithThisOrigin().size();
task.getDependenciesWithThisDestination().size();
}
private void forceLoadOfLabels(List<TaskElement> initial) {
for (TaskElement taskElement : initial) {
OrderElement orderElement = taskElement.getOrderElement();
if (orderElement != null) {
orderElement.getLabels().size();
}
}
}
// spring method injection
protected abstract ITaskElementAdapter getTaskElementAdapter();
@Override
public List<Order> getOrdersToShow() {
return ordersToShow;
}
@Override
public Date getFilterStartDate() {
return filterStartDate;

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/ICompanyPlanningModel.java
View file

@ -52,8 +52,6 @@ public interface ICompanyPlanningModel {
public void setTabsController(MultipleTabsPlannerController tabsController);
List<Order> getOrdersToShow();
Date getFilterStartDate();
Date getFilterFinishDate();