Attachment 12546 Details for Bug 67913 – Remove invisibleBars

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Remove invisibleBars

bug67913.p1 (text/plain), 2.03 KB, created by Michael Fraenkel

on 2004-06-18 21:53:20 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Fraenkel

Created: 2004-06-18 21:53:20 EDT

Size: 2.03 KB

patch

obsolete

>Index: ActionPresentation.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionPresentation.java,v
>retrieving revision 1.12
>diff -u -r1.12 ActionPresentation.java
>--- ActionPresentation.java	15 Dec 2003 19:18:46 -0000	1.12
>+++ ActionPresentation.java	19 Jun 2004 01:42:59 -0000
>@@ -16,6 +16,7 @@
> import java.util.HashMap;
> import java.util.Iterator;
> import java.util.List;
>+import java.util.Map;
> import java.util.Set;
> 
> import org.eclipse.core.runtime.CoreException;
>@@ -53,18 +54,26 @@
>  * Remove all action sets.
>  */
> public void clearActionSets() {
>-	List oldList = copyActionSets();
>+	List oldList = copyActionSets(mapDescToRec);
> 	Iterator iter = oldList.iterator();
> 	while (iter.hasNext()) {
> 		IActionSetDescriptor desc = (IActionSetDescriptor)iter.next();
> 		removeActionSet(desc);
> 	}
>+	
>+	oldList = copyActionSets(invisibleBars);
>+	iter = oldList.iterator();
>+	while (iter.hasNext()) {
>+		IActionSetDescriptor desc = (IActionSetDescriptor)iter.next();
>+		removeActionSet(desc);
>+	}
>+
> }
> /**
>  * Returns a copy of the visible action set.
>  */
>-private List copyActionSets() {
>-	Set keys = mapDescToRec.keySet();
>+private List copyActionSets(Map map) {
>+	Set keys = map.keySet();
> 	ArrayList list = new ArrayList(keys.size());
> 	Iterator iter = keys.iterator();
> 	while (iter.hasNext()) {
>@@ -77,6 +86,9 @@
>  */
> public void removeActionSet(IActionSetDescriptor desc) {
> 	SetRec rec = (SetRec)mapDescToRec.get(desc);
>+	if (rec == null) {
>+		rec = (SetRec) invisibleBars.get(desc);
>+	}
> 	if (rec != null) {
> 		mapDescToRec.remove(desc);
> 		// Remove from the map that stores invisible bars
>@@ -97,7 +109,7 @@
> public void setActionSets(IActionSetDescriptor [] newArray) {
> 	// Convert array to list.
> 	List newList = Arrays.asList(newArray);
>-	List oldList = copyActionSets();
>+	List oldList = copyActionSets(mapDescToRec);
> 
> 	// Remove obsolete actions.
> 	Iterator iter = oldList.iterator();

Actions: View | Diff

Attachments on bug 67913: 12546