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

Create fields instead of implicitly passing the data

Browse source 
FEA: ItEr75S11PreventLooseChanges
This commit is contained in:
Óscar González Fernández 2011-08-05 19:00:31 +02:00
parent 12d7d8bcad
commit 2ead73273f
2 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
View file

@ -109,6 +109,10 @@ public class ResourcesLoadPanel extends HtmlMacroComponent {
private final boolean expandResourceLoadViewCharts;
private Component firstOptionalFilter;
private Component secondOptionalFilter;
public ResourcesLoadPanel(List<LoadTimeLine> groups,
TimeTracker timeTracker, Component componentOnWhichGiveFeedback,
boolean expandResourceLoadViewCharts, PaginationType paginationType) {
@ -345,11 +349,11 @@ public class ResourcesLoadPanel extends HtmlMacroComponent {
getFellow("insertionPointTimetracker").appendChild(timeTrackerHeader);
// Insert additional filters if any
Component additionalFilter = (Component) getVariable("additionalFilter1", true);
Component additionalFilter = getFirstOptionalFilter();
if(additionalFilter != null) {
getFellow("additionalFilterInsertionPoint1").appendChild(additionalFilter);
}
additionalFilter = (Component) getVariable("additionalFilter2", true);
additionalFilter = getSecondOptionalFilter();
if(additionalFilter != null) {
getFellow("additionalFilterInsertionPoint2").appendChild(additionalFilter);
}
@ -374,6 +378,22 @@ public class ResourcesLoadPanel extends HtmlMacroComponent {
savePreviousData();
}
public Component getFirstOptionalFilter() {
return firstOptionalFilter;
}
public void setFirstOptionalFilter(Component firstOptionalFilter) {
this.firstOptionalFilter = firstOptionalFilter;
}
public Component getSecondOptionalFilter() {
return secondOptionalFilter;
}
public void setSecondOptionalFilter(Component secondOptionalFilter) {
this.secondOptionalFilter = secondOptionalFilter;
}
public void clearComponents() {
getFellow("insertionPointLeftPanel").getChildren().clear();
getFellow("insertionPointRightPanel").getChildren().clear();

6
navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
View file

@ -344,8 +344,7 @@ public class ResourceLoadController implements Composer {
hbox.appendChild(bandBox);
hbox.appendChild(button);
hbox.setAlign("center");
resourcesLoadPanel.setVariable("additionalFilter2", hbox, true);
resourcesLoadPanel.setSecondOptionalFilter(hbox);
}
private void addTimeFilter() {
@ -379,8 +378,7 @@ public class ResourceLoadController implements Composer {
hbox.appendChild(label2);
hbox.appendChild(endDate);
hbox.setAlign("center");
resourcesLoadPanel.setVariable("additionalFilter1", hbox, true);
resourcesLoadPanel.setFirstOptionalFilter(hbox);
}
private void setupNameFilter() {