Révision 3196
tmp/org.txm.practically.rcp/src/practicallymacro/dialogs/MacroDefinitionsPage.java (revision 3196) | ||
---|---|---|
224 | 224 |
madeChange=false; |
225 | 225 |
for (Map.Entry<MacroHolder, Set<MacroHolder>> entry: inUseMap.entrySet()) |
226 | 226 |
{ |
227 |
MacroHolder holder=entry.getKey();
|
|
228 |
Set<MacroHolder> inUseSet=inUseMap.get(holder);
|
|
227 |
MacroHolder holder = entry.getKey();
|
|
228 |
Set<MacroHolder> inUseSet = inUseMap.get(holder);
|
|
229 | 229 |
|
230 | 230 |
//remove any deleted items from this set |
231 |
Set<MacroHolder> toRemove = new HashSet<MacroHolder>(); |
|
231 | 232 |
for (EditorMacro deletedMacro : deletedItems) { |
232 |
inUseSet.remove(deletedMacro); |
|
233 |
for (MacroHolder mh : inUseSet) { |
|
234 |
if (mh.getEditorMacro().equals(deletedMacro)) { |
|
235 |
toRemove.add(mh); |
|
236 |
} |
|
237 |
} |
|
233 | 238 |
} |
239 |
inUseSet.removeAll(toRemove); |
|
234 | 240 |
|
235 | 241 |
if (inUseSet.size()>0) |
236 | 242 |
{ |
... | ... | |
513 | 519 |
return mSessionMacroID.hashCode(); |
514 | 520 |
} |
515 | 521 |
|
522 |
public EditorMacro getEditorMacro() { |
|
523 |
return mMacro; |
|
524 |
} |
|
516 | 525 |
|
517 | 526 |
} |
518 | 527 |
|
Formats disponibles : Unified diff