|
Lines 16-21
Link Here
|
| 16 |
import java.util.HashMap; |
16 |
import java.util.HashMap; |
| 17 |
import java.util.Iterator; |
17 |
import java.util.Iterator; |
| 18 |
import java.util.List; |
18 |
import java.util.List; |
|
|
19 |
import java.util.Map; |
| 19 |
import java.util.Set; |
20 |
import java.util.Set; |
| 20 |
|
21 |
|
| 21 |
import org.eclipse.core.runtime.CoreException; |
22 |
import org.eclipse.core.runtime.CoreException; |
|
Lines 53-70
Link Here
|
| 53 |
* Remove all action sets. |
54 |
* Remove all action sets. |
| 54 |
*/ |
55 |
*/ |
| 55 |
public void clearActionSets() { |
56 |
public void clearActionSets() { |
| 56 |
List oldList = copyActionSets(); |
57 |
List oldList = copyActionSets(mapDescToRec); |
| 57 |
Iterator iter = oldList.iterator(); |
58 |
Iterator iter = oldList.iterator(); |
| 58 |
while (iter.hasNext()) { |
59 |
while (iter.hasNext()) { |
| 59 |
IActionSetDescriptor desc = (IActionSetDescriptor)iter.next(); |
60 |
IActionSetDescriptor desc = (IActionSetDescriptor)iter.next(); |
| 60 |
removeActionSet(desc); |
61 |
removeActionSet(desc); |
| 61 |
} |
62 |
} |
|
|
63 |
|
| 64 |
oldList = copyActionSets(invisibleBars); |
| 65 |
iter = oldList.iterator(); |
| 66 |
while (iter.hasNext()) { |
| 67 |
IActionSetDescriptor desc = (IActionSetDescriptor)iter.next(); |
| 68 |
removeActionSet(desc); |
| 69 |
} |
| 70 |
|
| 62 |
} |
71 |
} |
| 63 |
/** |
72 |
/** |
| 64 |
* Returns a copy of the visible action set. |
73 |
* Returns a copy of the visible action set. |
| 65 |
*/ |
74 |
*/ |
| 66 |
private List copyActionSets() { |
75 |
private List copyActionSets(Map map) { |
| 67 |
Set keys = mapDescToRec.keySet(); |
76 |
Set keys = map.keySet(); |
| 68 |
ArrayList list = new ArrayList(keys.size()); |
77 |
ArrayList list = new ArrayList(keys.size()); |
| 69 |
Iterator iter = keys.iterator(); |
78 |
Iterator iter = keys.iterator(); |
| 70 |
while (iter.hasNext()) { |
79 |
while (iter.hasNext()) { |
|
Lines 77-82
Link Here
|
| 77 |
*/ |
86 |
*/ |
| 78 |
public void removeActionSet(IActionSetDescriptor desc) { |
87 |
public void removeActionSet(IActionSetDescriptor desc) { |
| 79 |
SetRec rec = (SetRec)mapDescToRec.get(desc); |
88 |
SetRec rec = (SetRec)mapDescToRec.get(desc); |
|
|
89 |
if (rec == null) { |
| 90 |
rec = (SetRec) invisibleBars.get(desc); |
| 91 |
} |
| 80 |
if (rec != null) { |
92 |
if (rec != null) { |
| 81 |
mapDescToRec.remove(desc); |
93 |
mapDescToRec.remove(desc); |
| 82 |
// Remove from the map that stores invisible bars |
94 |
// Remove from the map that stores invisible bars |
|
Lines 97-103
Link Here
|
| 97 |
public void setActionSets(IActionSetDescriptor [] newArray) { |
109 |
public void setActionSets(IActionSetDescriptor [] newArray) { |
| 98 |
// Convert array to list. |
110 |
// Convert array to list. |
| 99 |
List newList = Arrays.asList(newArray); |
111 |
List newList = Arrays.asList(newArray); |
| 100 |
List oldList = copyActionSets(); |
112 |
List oldList = copyActionSets(mapDescToRec); |
| 101 |
|
113 |
|
| 102 |
// Remove obsolete actions. |
114 |
// Remove obsolete actions. |
| 103 |
Iterator iter = oldList.iterator(); |
115 |
Iterator iter = oldList.iterator(); |
