Attachment #121942 for bug #260362

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

View | Details | Raw Unified | Return to bug 260362
Collapse All | Expand All




				setPreferenceStore(createChainedPreferenceStore(project));
			}
		}
		if (fSourceViewer != null) {
			Iterator iterator= fSourceViewer.iterator();
			while (iterator.hasNext()) {
				SourceViewer sourceViewer= (SourceViewer)iterator.next();
				sourceViewer.unconfigure();
				sourceViewer.configure(getSourceViewerConfiguration(sourceViewer, null));
			}
    	}
    	super.setInput(input);
    }


			JavaTextTools tools= JavaCompareUtilities.getJavaTextTools();
			if (tools != null) {
				IEditorInput editorInput= getEditorInput(sourceViewer);
				if (editorInput == null)
					return;
				sourceViewer.unconfigure();
				if (editorInput == null) {
					sourceViewer.configure(getSourceViewerConfiguration(sourceViewer, null));
					return;
				}
				getSourceViewerConfiguration(sourceViewer, editorInput);
			}
		}

Return to bug 260362

Lines 145-158 Link Here

(-)ui/org/eclipse/jdt/internal/ui/compare/JavaMergeViewer.java (-10 / +4 lines)
145	setPreferenceStore(createChainedPreferenceStore(project));	145	setPreferenceStore(createChainedPreferenceStore(project));
146	}	146	}
147	}	147	}
148	if (fSourceViewer != null) {
149	Iterator iterator= fSourceViewer.iterator();
150	while (iterator.hasNext()) {
151	SourceViewer sourceViewer= (SourceViewer)iterator.next();
152	sourceViewer.unconfigure();
153	sourceViewer.configure(getSourceViewerConfiguration(sourceViewer, null));
154	}
155	}
156	super.setInput(input);	148	super.setInput(input);
157	}	149	}
158		150
Lines 208-216 Link Here
208	JavaTextTools tools= JavaCompareUtilities.getJavaTextTools();	200	JavaTextTools tools= JavaCompareUtilities.getJavaTextTools();
209	if (tools != null) {	201	if (tools != null) {
210	IEditorInput editorInput= getEditorInput(sourceViewer);	202	IEditorInput editorInput= getEditorInput(sourceViewer);
211	if (editorInput == null)
212	return;
213	sourceViewer.unconfigure();	203	sourceViewer.unconfigure();
		204	if (editorInput == null) {
		205	sourceViewer.configure(getSourceViewerConfiguration(sourceViewer, null));
		206	return;
		207	}
214	getSourceViewerConfiguration(sourceViewer, editorInput);	208	getSourceViewerConfiguration(sourceViewer, editorInput);
215	}	209	}
216	}	210	}