Attachment #134337 for bug #274904

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




package org.eclipse.mylyn.internal.context.core;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;


		return activeNode;
	}

	public void delete(Collection<IInteractionElement> nodes) {

		List<InteractionEvent> eventsToRemove = new ArrayList<InteractionEvent>();
		Set<String> handlesToRemove = new HashSet<String>();
		for (IInteractionElement node : nodes) {
			handlesToRemove.add(node.getHandleIdentifier());
			landmarkMap.remove(node.getHandleIdentifier());
			elementMap.remove(node.getHandleIdentifier());

			if (activeNode != null && node.getHandleIdentifier().equals(activeNode.getHandleIdentifier())) {
				activeNode = null;
			}
		}

		for (InteractionEvent event : interactionHistory) {
			if (handlesToRemove.contains(event.getStructureHandle())) {
				eventsToRemove.add(event);
			}
		}
		interactionHistory.removeAll(eventsToRemove);

	}

	public void delete(IInteractionElement node) {
		landmarkMap.remove(node.getHandleIdentifier());
		elementMap.remove(node.getHandleIdentifier());




		notifyElementsDeleted(getActiveContext(), Arrays.asList(new IInteractionElement[] { element }));
	}

	public void deleteElements(Collection<IInteractionElement> elements) {
		IInteractionContext context = getActiveContext();

		if (elements == null || elements.size() == 0 || context == null) {
			return;
		}

		context.delete(elements);

		if (elements.size() > 0) {
			notifyElementsDeleted(getActiveContext(), new ArrayList<IInteractionElement>(elements));
		}
	}

	private void delete(IInteractionElement element, IInteractionContext context) {
		if (element == null || context == null) {
			return;

Lines 12-17 Link Here

(-)src/org/eclipse/mylyn/internal/context/core/CompositeInteractionContext.java (+7 lines)
12	package org.eclipse.mylyn.internal.context.core;	12	package org.eclipse.mylyn.internal.context.core;
13		13
14	import java.util.ArrayList;	14	import java.util.ArrayList;
		15	import java.util.Collection;
15	import java.util.HashMap;	16	import java.util.HashMap;
16	import java.util.HashSet;	17	import java.util.HashSet;
17	import java.util.List;	18	import java.util.List;
Lines 109-114 Link Here
109	}	110	}
110	}	111	}
111		112
		113	public void delete(Collection<IInteractionElement> nodes) {
		114	for (InteractionContext taskscape : contexts.values()) {
		115	taskscape.delete(nodes);
		116	}
		117	}
		118
112	public void clear() {	119	public void clear() {
113	for (InteractionContext taskscape : contexts.values()) {	120	for (InteractionContext taskscape : contexts.values()) {
114	taskscape.reset();	121	taskscape.reset();

Lines 11-16 Link Here

(-)src/org/eclipse/mylyn/context/core/IInteractionContextManager.java (+6 lines)
11		11
12	package org.eclipse.mylyn.context.core;	12	package org.eclipse.mylyn.context.core;
13		13
		14	import java.util.Collection;
14	import java.util.Set;	15	import java.util.Set;
15		16
16	import org.eclipse.mylyn.monitor.core.InteractionEvent;	17	import org.eclipse.mylyn.monitor.core.InteractionEvent;
Lines 47-52 Link Here
47		48
48	public abstract void deleteElement(IInteractionElement element);	49	public abstract void deleteElement(IInteractionElement element);
49		50
		51	/**
		52	* @since 3.2
		53	*/
		54	public abstract void deleteElements(Collection<IInteractionElement> element);
		55
50	public IInteractionElement getActiveElement();	56	public IInteractionElement getActiveElement();
51		57
52	public IInteractionElement processInteractionEvent(InteractionEvent event);	58	public IInteractionElement processInteractionEvent(InteractionEvent event);

Lines 11-16 Link Here

(-)src/org/eclipse/mylyn/context/core/IInteractionContext.java (+6 lines)
11		11
12	package org.eclipse.mylyn.context.core;	12	package org.eclipse.mylyn.context.core;
13		13
		14	import java.util.Collection;
14	import java.util.List;	15	import java.util.List;
15		16
16	import org.eclipse.mylyn.monitor.core.InteractionEvent;	17	import org.eclipse.mylyn.monitor.core.InteractionEvent;
Lines 46-51 Link Here
46		47
47	public abstract void delete(IInteractionElement element);	48	public abstract void delete(IInteractionElement element);
48		49
		50	/**
		51	* @since 3.2
		52	*/
		53	public abstract void delete(Collection<IInteractionElement> elements);
		54
49	public abstract void updateElementHandle(IInteractionElement element, String newHandle);	55	public abstract void updateElementHandle(IInteractionElement element, String newHandle);
50		56
51	public abstract List<IInteractionElement> getAllElements();	57	public abstract List<IInteractionElement> getAllElements();

Lines 391-399 Link Here

(-)src/org/eclipse/mylyn/internal/context/ui/editors/ContextEditorFormPage.java (-3 / +1 lines)
391	}	391	}
392	}	392	}
393	allToRemove.removeAll(allVisibleElements);	393	allToRemove.removeAll(allVisibleElements);
394	for (IInteractionElement interactionElement : allToRemove) {	394	ContextCore.getContextManager().deleteElements(allToRemove);
395	ContextCore.getContextManager().deleteElement(interactionElement);
396	}
397	} else {	395	} else {
398	MessageDialog.openInformation(Display.getCurrent().getActiveShell(),	396	MessageDialog.openInformation(Display.getCurrent().getActiveShell(),
399	Messages.ContextEditorFormPage_Remove_Invisible,	397	Messages.ContextEditorFormPage_Remove_Invisible,

Return to bug 274904

Lines 457-462 Link Here

(-)src/org/eclipse/mylyn/internal/context/core/InteractionContextManager.java (+14 lines)
457	notifyElementsDeleted(getActiveContext(), Arrays.asList(new IInteractionElement[] { element }));	457	notifyElementsDeleted(getActiveContext(), Arrays.asList(new IInteractionElement[] { element }));
458	}	458	}
459		459
		460	public void deleteElements(Collection<IInteractionElement> elements) {
		461	IInteractionContext context = getActiveContext();
		462
		463	if (elements == null \|\| elements.size() == 0 \|\| context == null) {
		464	return;
		465	}
		466
		467	context.delete(elements);
		468
		469	if (elements.size() > 0) {
		470	notifyElementsDeleted(getActiveContext(), new ArrayList<IInteractionElement>(elements));
		471	}
		472	}
		473
460	private void delete(IInteractionElement element, IInteractionContext context) {	474	private void delete(IInteractionElement element, IInteractionContext context) {
461	if (element == null \|\| context == null) {	475	if (element == null \|\| context == null) {
462	return;	476	return;