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

[Bug #830] Remove unnecessary code

Browse source 
FEA: ItEr69S04BugFixing
This commit is contained in:
Diego Pino Garcia 2011-02-02 12:31:00 +01:00
parent c4a137708b
commit db3dda2ed0
2 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java
View file

@ -94,8 +94,6 @@ public class LimitingResourcesController extends GenericForwardComposer {
private List<IToolbarCommand> commands = new ArrayList<IToolbarCommand>();
private org.zkoss.zk.ui.Component parent;
private LimitingResourcesPanel limitingResourcesPanel;
private TimeTracker timeTracker;
@ -122,7 +120,6 @@ public class LimitingResourcesController extends GenericForwardComposer {
@Override
public void doAfterCompose(org.zkoss.zk.ui.Component comp) throws Exception {
super.doAfterCompose(comp);
this.parent = comp;
}
public void reload() {
@ -138,7 +135,7 @@ public class LimitingResourcesController extends GenericForwardComposer {
// FIXME: Temporary fix, it seems the page was already rendered,
// so
// clear it all as it's going to be rendered again
parent.getChildren().clear();
self.getChildren().clear();
limitingResourceQueueModel.initGlobalView();
@ -146,7 +143,7 @@ public class LimitingResourcesController extends GenericForwardComposer {
timeTracker = buildTimeTracker();
limitingResourcesPanel = buildLimitingResourcesPanel();
parent.appendChild(limitingResourcesPanel);
self.appendChild(limitingResourcesPanel);
limitingResourcesPanel.afterCompose();
cbSelectAll = (Checkbox) limitingResourcesPanel
@ -205,7 +202,7 @@ public class LimitingResourcesController extends GenericForwardComposer {
return timeTracker = new TimeTracker(limitingResourceQueueModel
.getViewInterval(), ZoomLevel.DETAIL_THREE,
SeveralModificators.create(),
SeveralModificators.create(BankHolidaysMarker.create(getDefaultCalendar())),parent);
SeveralModificators.create(BankHolidaysMarker.create(getDefaultCalendar())),self);
}
private BaseCalendar getDefaultCalendar() {
@ -322,9 +319,6 @@ public class LimitingResourcesController extends GenericForwardComposer {
}
public void filterBy(Order order) {
}
public void saveQueues() {
limitingResourceQueueModel.confirm();
notifyUserThatSavingIsDone();

6
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java
View file

@ -27,7 +27,6 @@ import static org.navalplanner.web.planner.tabs.MultipleTabsPlannerController.ge
import java.util.HashMap;
import java.util.Map;
import org.navalplanner.business.orders.entities.Order;
import org.navalplanner.web.limitingresources.LimitingResourcesController;
import org.navalplanner.web.planner.tabs.CreatedOnDemandTab.IComponentCreator;
import org.zkoss.ganttz.extensions.ITab;
@ -57,6 +56,7 @@ public class LimitingResourcesTabCreator {
}
private final Mode mode;
private final LimitingResourcesController limitingResourcesController;
private final LimitingResourcesController limitingResourcesControllerGlobal;
@ -89,11 +89,8 @@ public class LimitingResourcesTabCreator {
public org.zkoss.zk.ui.Component create(
org.zkoss.zk.ui.Component parent) {
Map<String, Object> arguments = new HashMap<String, Object>();
// LimitingResourcesController.add(upCommand);
arguments.put("LimitingResourcesController",
limitingResourcesController);
Order currentOrder = mode.getOrder();
limitingResourcesController.filterBy(currentOrder);
return Executions.createComponents(
"/limitingresources/_limitingresources.zul", parent,
arguments);
@ -128,7 +125,6 @@ public class LimitingResourcesTabCreator {
Map<String, Object> arguments = new HashMap<String, Object>();
arguments.put("LimitingResourcesController",
limitingResourcesControllerGlobal);
limitingResourcesControllerGlobal.filterBy(null);
return Executions.createComponents(
"/limitingresources/_limitingresources.zul", parent,
arguments);