Attachment #12383 for bug #67046

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




		ISourceViewer sourceViewer= getSourceViewer();
		if (!(sourceViewer instanceof ISourceViewerExtension2)) {
			setPreferenceStore(createCombinedPreferenceStore(input));
			super.doSetInput(input);
			internalDoSetInput(input);
			return;
		}

		((ISourceViewerExtension2)sourceViewer).unconfigure();
		
		setPreferenceStore(createCombinedPreferenceStore(input));
		super.doSetInput(input);
		
		// install & register preference store listener 
		sourceViewer.configure(getSourceViewerConfiguration());

	}
	
	private void internalDoSetInput(IEditorInput input) throws CoreException {
		super.doSetInput(input);
		
		if (fEncodingSupport != null)
			fEncodingSupport.reset();

Return to bug 67046

Lines 2705-2710 Link Here

(-)JavaEditor.java (-1 / +2 lines)
2705	ISourceViewer sourceViewer= getSourceViewer();	2753	ISourceViewer sourceViewer= getSourceViewer();
2706	if (!(sourceViewer instanceof ISourceViewerExtension2)) {	2754	if (!(sourceViewer instanceof ISourceViewerExtension2)) {
2707	setPreferenceStore(createCombinedPreferenceStore(input));	2755	setPreferenceStore(createCombinedPreferenceStore(input));
		2756	super.doSetInput(input);
2708	internalDoSetInput(input);	2757	internalDoSetInput(input);
2709	return;	2758	return;
2710	}	2759	}
Lines 2716-2721 Link Here
2716	((ISourceViewerExtension2)sourceViewer).unconfigure();	2765	((ISourceViewerExtension2)sourceViewer).unconfigure();
2717		2766
2718	setPreferenceStore(createCombinedPreferenceStore(input));	2767	setPreferenceStore(createCombinedPreferenceStore(input));
		2768	super.doSetInput(input);
2719		2769
2720	// install & register preference store listener	2770	// install & register preference store listener
2721	sourceViewer.configure(getSourceViewerConfiguration());	2771	sourceViewer.configure(getSourceViewerConfiguration());
Lines 2727-2733 Link Here
2727	}	2777	}
2728		2778
2729	private void internalDoSetInput(IEditorInput input) throws CoreException {	2779	private void internalDoSetInput(IEditorInput input) throws CoreException {
2730	super.doSetInput(input);
2731		2780
2732	if (fEncodingSupport != null)	2781	if (fEncodingSupport != null)
2733	fEncodingSupport.reset();	2782	fEncodingSupport.reset();