Attachment #114572 for bug #249995

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

Lines 49-54 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/contexts/ContextService.java (-2 / +14 lines)
49	*/	49	*/
50	private final ContextPersistence contextPersistence;	50	private final ContextPersistence contextPersistence;
51		51
		52	private ContextActivation SEND_ACTIVATION;
		53
		54	private ContextActivation DEFER_ACTIVATION;
		55
52	/**	56	/**
53	* Constructs a new instance of <code>ContextService</code> using a	57	* Constructs a new instance of <code>ContextService</code> using a
54	* context manager.	58	* context manager.
Lines 64-69 Link Here
64	this.contextManager = contextManager;	68	this.contextManager = contextManager;
65	this.contextAuthority = new ContextAuthority(contextManager, this);	69	this.contextAuthority = new ContextAuthority(contextManager, this);
66	this.contextPersistence = new ContextPersistence(contextManager);	70	this.contextPersistence = new ContextPersistence(contextManager);
		71	SEND_ACTIVATION = new ContextActivation(ContextAuthority.SEND_EVENTS, null, this);
		72	DEFER_ACTIVATION = new ContextActivation(ContextAuthority.DEFER_EVENTS, null, this);
67	}	73	}
68		74
69	/*	75	/*
Lines 83-90 Link Here
83	*/	89	*/
84	public final IContextActivation activateContext(final String contextId,	90	public final IContextActivation activateContext(final String contextId,
85	final Expression expression) {	91	final Expression expression) {
86	final IContextActivation activation = new ContextActivation(contextId,	92	final IContextActivation activation;
87	expression, this);	93	if (ContextAuthority.SEND_EVENTS.equals(contextId)) {
		94	activation = SEND_ACTIVATION;
		95	} else if (ContextAuthority.DEFER_EVENTS.equals(contextId)) {
		96	activation = DEFER_ACTIVATION;
		97	} else {
		98	activation = new ContextActivation(contextId, expression, this);
		99	}
88	contextAuthority.activateContext(activation);	100	contextAuthority.activateContext(activation);
89	return activation;	101	return activation;
90	}	102	}

Lines 86-91 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/contexts/SlaveContextService.java (-5 / +24 lines)
86	*/	86	*/
87	private Collection fRegisteredShells;	87	private Collection fRegisteredShells;
88		88
		89	private ContextActivation SEND_ACTIVATION;
		90
		91	private ContextActivation DEFER_ACTIVATION;
		92
89	/**	93	/**
90	* Construct the new slave.	94	* Construct the new slave.
91	*	95	*
Lines 109-114 Link Here
109	fContextManagerListeners = new ArrayList();	113	fContextManagerListeners = new ArrayList();
110	fSourceProviders = new ArrayList();	114	fSourceProviders = new ArrayList();
111	fRegisteredShells = new ArrayList();	115	fRegisteredShells = new ArrayList();
		116	SEND_ACTIVATION = new ContextActivation(ContextAuthority.SEND_EVENTS, null, this);
		117	DEFER_ACTIVATION = new ContextActivation(ContextAuthority.DEFER_EVENTS, null, this);
112	}	118	}
113		119
114	/*	120	/*
Lines 117-124 Link Here
117	* @see org.eclipse.ui.contexts.IContextService#activateContext(java.lang.String)	123	* @see org.eclipse.ui.contexts.IContextService#activateContext(java.lang.String)
118	*/	124	*/
119	public IContextActivation activateContext(String contextId) {	125	public IContextActivation activateContext(String contextId) {
120	ContextActivation activation = new ContextActivation(contextId,	126	final ContextActivation activation;
121	fDefaultExpression, this);	127	if (ContextAuthority.SEND_EVENTS.equals(contextId)) {
		128	activation = SEND_ACTIVATION;
		129	} else if (ContextAuthority.DEFER_EVENTS.equals(contextId)) {
		130	activation = DEFER_ACTIVATION;
		131	} else {
		132	activation = new ContextActivation(contextId, fDefaultExpression,
		133	this);
		134	}
122	return doActivateContext(activation);	135	return doActivateContext(activation);
123	}	136	}
124		137
Lines 156-166 Link Here
156	andExpression.add(expression);	169	andExpression.add(expression);
157	}	170	}
158	}	171	}
159	if (fDefaultExpression!=null) {	172	if (fDefaultExpression != null) {
160	andExpression.add(fDefaultExpression);	173	andExpression.add(fDefaultExpression);
161	}	174	}
162	ContextActivation activation = new ContextActivation(contextId,	175	final ContextActivation activation;
163	andExpression, this);	176	if (ContextAuthority.SEND_EVENTS.equals(contextId)) {
		177	activation = SEND_ACTIVATION;
		178	} else if (ContextAuthority.DEFER_EVENTS.equals(contextId)) {
		179	activation = DEFER_ACTIVATION;
		180	} else {
		181	activation = new ContextActivation(contextId, andExpression, this);
		182	}
164	return doActivateContext(activation);	183	return doActivateContext(activation);
165	}	184	}
166		185

Return to bug 249995