Bug 278189 - [ui] Install new software dialog should have selection buttons

2 files changed, 37 insertions, 28 deletions

diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUGroup.java
index c4fcd9c1e..aab30eb38 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUGroup.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AvailableIUGroup.java
@@ -440,9 +440,12 @@ public class AvailableIUGroup extends StructuredIUGroup {
 	 */
 	public void setChecked(Object[] selections) {
 		filteredTree.getCheckboxTreeViewer().setCheckedElements(selections);
-		// Relying on knowledge that DelayedFilterCheckbox doesn't care which element is in the listener
-		Object element = selections.length > 0 ? selections[0] : new Object();
-		filteredTree.getCheckboxTreeViewer().fireCheckStateChanged(element, true);
+		// TODO HACK ALERT!
+		// Since We don't have API for setAllChecked(boolean), clients have to use this method.
+		// We need to signal DelayedFilterCheckboxTree when everything needs to be deselected since
+		// we aren't firing an event for each item.
+		Object element = selections.length == 0 ? DelayedFilterCheckboxTree.ALL_ITEMS_HACK : selections[0];
+		filteredTree.getCheckboxTreeViewer().fireCheckStateChanged(element, selections.length > 0);
 	}
 
 	public void setRepositoryFilter(int filterFlag, URI repoLocation) {
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/DelayedFilterCheckboxTree.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/DelayedFilterCheckboxTree.java
index 25c222924..296faa04d 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/DelayedFilterCheckboxTree.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/DelayedFilterCheckboxTree.java
@@ -36,6 +36,8 @@ public class DelayedFilterCheckboxTree extends FilteredTree {
 
 	private static final long FILTER_DELAY = 400;
 
+	public static final Object ALL_ITEMS_HACK = new Object();
+
 	ToolBar toolBar;
 	Display display;
 	PatternFilter patternFilter;
@@ -64,35 +66,39 @@ public class DelayedFilterCheckboxTree extends FilteredTree {
 				// We use an additive check state cache so we need to remove
 				// previously checked items if the user unchecked them.
 				if (!event.getChecked() && checkState != null) {
-					ArrayList<Object> toRemove = new ArrayList<Object>(1);
-					// See bug 258117.  Ideally we would get check state changes 
-					// for children when the parent state changed, but we aren't, so
-					// we need to remove all children from the additive check state
-					// cache.
-					if (contentProvider.hasChildren(event.getElement())) {
-						Set<Object> unchecked = new HashSet<Object>();
-						Object[] children = contentProvider.getChildren(event.getElement());
-						for (int i = 0; i < children.length; i++) {
-							unchecked.add(children[i]);
-						}
-						Iterator<Object> iter = checkState.iterator();
-						while (iter.hasNext()) {
-							Object current = iter.next();
-							if (current != null && unchecked.contains(current)) {
-								toRemove.add(current);
+					if (event.getElement() == ALL_ITEMS_HACK)
+						clearCheckStateCache();
+					else {
+						ArrayList<Object> toRemove = new ArrayList<Object>(1);
+						// See bug 258117.  Ideally we would get check state changes 
+						// for children when the parent state changed, but we aren't, so
+						// we need to remove all children from the additive check state
+						// cache.
+						if (contentProvider.hasChildren(event.getElement())) {
+							Set<Object> unchecked = new HashSet<Object>();
+							Object[] children = contentProvider.getChildren(event.getElement());
+							for (int i = 0; i < children.length; i++) {
+								unchecked.add(children[i]);
 							}
-						}
-					} else {
-						for (Object element : checkState) {
-							if (checkboxViewer.getComparer().equals(element, event.getElement())) {
-								toRemove.add(element);
-								// Do not break out of the loop.  We may have duplicate equal
-								// elements in the cache.  Since the cache is additive, we want
-								// to be sure we've gotten everything.
+							Iterator<Object> iter = checkState.iterator();
+							while (iter.hasNext()) {
+								Object current = iter.next();
+								if (current != null && unchecked.contains(current)) {
+									toRemove.add(current);
+								}
+							}
+						} else {
+							for (Object element : checkState) {
+								if (checkboxViewer.getComparer().equals(element, event.getElement())) {
+									toRemove.add(element);
+									// Do not break out of the loop.  We may have duplicate equal
+									// elements in the cache.  Since the cache is additive, we want
+									// to be sure we've gotten everything.
+								}
 							}
 						}
+						checkState.removeAll(toRemove);
 					}
-					checkState.removeAll(toRemove);
 				} else if (event.getChecked()) {
 					rememberLeafCheckState();
 				}