Skip to content

Commit f5105e2

Browse files
committed
bug6122: use SelectionCheckboxColumn.createHeader() in other course creation panels
1 parent d8a5416 commit f5105e2

File tree

3 files changed

+6
-54
lines changed

3 files changed

+6
-54
lines changed

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/coursecreation/CourseTemplatePanel.java

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.google.gwt.user.cellview.client.AbstractCellTable;
2323
import com.google.gwt.user.cellview.client.Column;
2424
import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler;
25+
import com.google.gwt.user.cellview.client.Header;
2526
import com.google.gwt.user.client.Window;
2627
import com.google.gwt.user.client.rpc.AsyncCallback;
2728
import com.google.gwt.user.client.ui.FlowPanel;
@@ -52,8 +53,6 @@
5253
import com.sap.sse.security.ui.client.component.EditOwnershipDialog;
5354
import com.sap.sse.security.ui.client.component.SecuredDTOOwnerColumn;
5455
import com.sap.sse.security.ui.client.component.editacl.EditACLDialog;
55-
import com.google.gwt.cell.client.CheckboxCell;
56-
import com.google.gwt.user.cellview.client.Header;
5756

5857
public class CourseTemplatePanel extends FlowPanel implements FilterablePanelProvider<CourseTemplateDTO>{
5958
private static AdminConsoleTableResources tableResources = GWT.create(AdminConsoleTableResources.class);
@@ -202,22 +201,7 @@ public int hashCode(CourseTemplateDTO t) {
202201
return t.getUuid().hashCode();
203202
}
204203
}, filterableCourseTemplatePanel.getAllListDataProvider(), courseTemplateTable);
205-
checkColumn.setSortable(false);
206-
CheckboxCell selectAllCell = new CheckboxCell();
207-
Header<Boolean> selectAllHeader = new Header<Boolean>(selectAllCell) {
208-
@Override
209-
public Boolean getValue() {
210-
return false;
211-
}
212-
};
213-
selectAllHeader.setUpdater(value -> {
214-
for (CourseTemplateDTO ct : courseTemplateListDataProvider.getList()) {
215-
if (refreshableSelectionModel != null) {
216-
refreshableSelectionModel.setSelected(ct, value);
217-
}
218-
}
219-
value = !value;
220-
});
204+
final Header<Boolean> selectAllHeader = checkColumn.createHeader();
221205
courseTemplateTable.addColumn(checkColumn, selectAllHeader);
222206
courseTemplateTable.setColumnWidth(checkColumn, 40, Unit.PX);
223207
// id

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/coursecreation/MarkRolePanel.java

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import com.google.gwt.user.cellview.client.AbstractCellTable;
1717
import com.google.gwt.user.cellview.client.Column;
1818
import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler;
19+
import com.google.gwt.user.cellview.client.Header;
1920
import com.google.gwt.user.client.Command;
2021
import com.google.gwt.user.client.rpc.AsyncCallback;
2122
import com.google.gwt.user.client.ui.FlowPanel;
@@ -47,8 +48,6 @@
4748
import com.sap.sse.security.ui.client.component.EditOwnershipDialog;
4849
import com.sap.sse.security.ui.client.component.SecuredDTOOwnerColumn;
4950
import com.sap.sse.security.ui.client.component.editacl.EditACLDialog;
50-
import com.google.gwt.cell.client.CheckboxCell;
51-
import com.google.gwt.user.cellview.client.Header;
5251

5352
public class MarkRolePanel extends FlowPanel implements FilterablePanelProvider<MarkRoleDTO>{
5453

@@ -72,7 +71,6 @@ public MarkRolePanel(SailingServiceWriteAsync sailingServiceWrite, ErrorReporter
7271
add(buttonAndFilterPanel);
7372
allMarkRoles = new ArrayList<>();
7473
buttonAndFilterPanel.addUnsecuredAction(stringMessages.refresh(), new Command() {
75-
7674
@Override
7775
public void execute() {
7876
loadMarkRoles();
@@ -189,22 +187,7 @@ public int hashCode(MarkRoleDTO t) {
189187
return t.getUuid().hashCode();
190188
}
191189
}, filterableMarkRoles.getAllListDataProvider(), markRolesTable);
192-
checkColumn.setSortable(false);
193-
final CheckboxCell selectAllCell = new CheckboxCell();
194-
final Header<Boolean> selectAllHeader = new Header<Boolean>(selectAllCell) {
195-
@Override
196-
public Boolean getValue() {
197-
return false;
198-
}
199-
};
200-
selectAllHeader.setUpdater(value -> {
201-
for (final MarkRoleDTO role : markRoleListDataProvider.getList()) {
202-
if (refreshableSelectionModel != null) {
203-
refreshableSelectionModel.setSelected(role, value);
204-
}
205-
}
206-
value = !value;
207-
});
190+
final Header<Boolean> selectAllHeader = checkColumn.createHeader();
208191
markRolesTable.addColumn(checkColumn, selectAllHeader);
209192
markRolesTable.setColumnWidth(checkColumn, 40, Unit.PX);
210193
// id

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/coursecreation/MarkTemplatePanel.java

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import com.google.gwt.user.cellview.client.AbstractCellTable;
1515
import com.google.gwt.user.cellview.client.Column;
1616
import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler;
17+
import com.google.gwt.user.cellview.client.Header;
1718
import com.google.gwt.user.client.Command;
1819
import com.google.gwt.user.client.rpc.AsyncCallback;
1920
import com.google.gwt.user.client.ui.FlowPanel;
@@ -43,8 +44,6 @@
4344
import com.sap.sse.security.ui.client.component.EditOwnershipDialog;
4445
import com.sap.sse.security.ui.client.component.SecuredDTOOwnerColumn;
4546
import com.sap.sse.security.ui.client.component.editacl.EditACLDialog;
46-
import com.google.gwt.cell.client.CheckboxCell;
47-
import com.google.gwt.user.cellview.client.Header;
4847

4948
public class MarkTemplatePanel extends FlowPanel implements FilterablePanelProvider<MarkTemplateDTO>{
5049
private static AdminConsoleTableResources tableResources = GWT.create(AdminConsoleTableResources.class);
@@ -154,21 +153,7 @@ public int hashCode(MarkTemplateDTO t) {
154153
return t.getUuid().hashCode();
155154
}
156155
}, filterableMarkTemplates.getAllListDataProvider(), markTemplateTable);
157-
checkColumn.setSortable(false);
158-
CheckboxCell selectAllCell = new CheckboxCell();
159-
Header<Boolean> selectAllHeader = new Header<Boolean>(selectAllCell) {
160-
private boolean checked = false;
161-
@Override
162-
public Boolean getValue() {
163-
return checked;
164-
}
165-
};
166-
selectAllHeader.setUpdater(value -> {
167-
for (MarkTemplateDTO mt : markTemplateListDataProvider.getList()) {
168-
refreshableSelectionModel.setSelected(mt, value);
169-
}
170-
value = !value;
171-
});
156+
Header<Boolean> selectAllHeader = checkColumn.createHeader();
172157
markTemplateTable.addColumn(checkColumn, selectAllHeader);
173158
markTemplateTable.setColumnWidth(checkColumn, 40, Unit.PX);
174159
// id

0 commit comments

Comments
 (0)