bug6122: factored checkbox header creation into SelectionCheckboxColumn.createHeader

Author: axeluhl

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

@@ -25,6 +25,7 @@
 import com.google.gwt.user.cellview.client.AbstractCellTable;
 import com.google.gwt.user.cellview.client.Column;
 import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler;
+import com.google.gwt.user.cellview.client.Header;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.AbstractImagePrototype;
@@ -58,8 +59,6 @@
 import com.sap.sse.security.ui.client.component.EditOwnershipDialog;
 import com.sap.sse.security.ui.client.component.SecuredDTOOwnerColumn;
 import com.sap.sse.security.ui.client.component.editacl.EditACLDialog;
-import com.google.gwt.cell.client.CheckboxCell;
-import com.google.gwt.user.cellview.client.Header;
 
 public class MarkPropertiesPanel extends FlowPanel implements FilterablePanelProvider<MarkPropertiesDTO>{
     private static AdminConsoleResources resources = GWT.create(AdminConsoleResources.class);
@@ -185,21 +184,7 @@ public int hashCode(MarkPropertiesDTO t) {
                         return t.getUuid().hashCode();
                     }
                 }, filterableMarkProperties.getAllListDataProvider(), markPropertiesTable);
-        final CheckboxCell selectAllCell = new CheckboxCell();
-        Header<Boolean> selectAllHeader = new Header<Boolean>(selectAllCell) {
-            @Override
-            public Boolean getValue() {
-                return false;
-             }
-        };
-        checkColumn.setSortable(false);
-        selectAllHeader.setUpdater(value -> {
-            for (MarkPropertiesDTO mp : markPropertiesListDataProvider.getList()) {
-                if (refreshableSelectionModel != null) {
-                    refreshableSelectionModel.setSelected(mp, value);
-                }
-            }
-        });
+        final Header<Boolean> selectAllHeader = checkColumn.createHeader();
         markPropertiesTable.addColumn(checkColumn, selectAllHeader);
         markPropertiesTable.setColumnWidth(checkColumn, 40, Unit.PX);
         // id
@@ -334,13 +319,6 @@ public void onSuccess(Void result) {
         markPropertiesTable.addColumn(actionsColumn, stringMessages.actions());
         refreshableSelectionModel = checkColumn.getSelectionModel();
         markPropertiesTable.setSelectionModel(checkColumn.getSelectionModel(), checkColumn.getSelectionManager());
-        refreshableSelectionModel.addSelectionChangeHandler(e -> {
-            if (refreshableSelectionModel.getSelectedSet().isEmpty()) {
-                selectAllCell.setViewData(/* key */ selectAllHeader.getValue(), false);
-            } else if (refreshableSelectionModel.getSelectedSet().size() == markPropertiesListDataProvider.getList().size()) {
-                selectAllCell.setViewData(/* key */ selectAllHeader.getValue(), true);
-            }
-        });
     }
 
     public void refreshMarkProperties() {

java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/celltable/SelectionCheckboxColumn.java

@@ -1,6 +1,7 @@
 package com.sap.sse.gwt.client.celltable;
 
 import com.google.gwt.cell.client.Cell.Context;
+import com.google.gwt.cell.client.CheckboxCell;
 import com.google.gwt.dom.client.BrowserEvents;
 import com.google.gwt.dom.client.NativeEvent;
 import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
@@ -83,6 +84,32 @@ private SelectionCheckboxColumn(BetterCheckboxCell checkboxCell, String checkbox
         this.checkboxColumnCellCSSClass = checkboxColumnCellCSSClass;
         this.selectionEventTranslator = createSelectionEventTranslator();
         this.selectionModel = createSelectionModel(entityIdentityComparator);
+        this.setSortable(false);
+    }
+    
+    public Header<Boolean> createHeader() {
+        final CheckboxCell selectAllCell = new CheckboxCell();
+        final Header<Boolean> selectAllHeader = new Header<Boolean>(selectAllCell) {
+            @Override
+            public Boolean getValue() {
+                return false;
+             }
+        };
+        selectAllHeader.setUpdater(value -> {
+            for (final T mp : listDataProvider.getList()) {
+                if (selectionModel != null) {
+                    selectionModel.setSelected(mp, value);
+                }
+            }
+        });
+        selectionModel.addSelectionChangeHandler(e -> {
+            if (selectionModel.getSelectedSet().isEmpty()) {
+                selectAllCell.setViewData(/* key */ selectAllHeader.getValue(), false);
+            } else if (selectionModel.getSelectedSet().size() == listDataProvider.getList().size()) {
+                selectAllCell.setViewData(/* key */ selectAllHeader.getValue(), true);
+            }
+        });
+        return selectAllHeader;
     }
 
     /**