mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Fix editor tests depending on reconciler

Browse source
This commit is contained in:
Anton Leherbauer 2007-12-04 10:49:53 +00:00
parent 84d57de16e
commit bb020742a9
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/EditorTestHelper.java
View file

@ -81,6 +81,7 @@ import org.eclipse.cdt.ui.PreferenceConstants;
import org.eclipse.cdt.ui.testplugin.CTestPlugin; import org.eclipse.cdt.ui.testplugin.CTestPlugin;
import org.eclipse.cdt.internal.ui.text.CReconcilingStrategy; import org.eclipse.cdt.internal.ui.text.CReconcilingStrategy;
import org.eclipse.cdt.internal.ui.text.CompositeReconcilingStrategy;
/** /**
@ -344,17 +345,22 @@ public class EditorTestHelper {
if (reconciler == null) if (reconciler == null)
return true; return true;
final Accessor backgroundThreadAccessor= getBackgroundThreadAccessor(reconciler); final Accessor backgroundThreadAccessor= getBackgroundThreadAccessor(reconciler);
final Accessor cReconcilerAccessor; Accessor reconcilerAccessor= null;
if (reconciler instanceof MonoReconciler) { if (reconciler instanceof MonoReconciler) {
IReconcilingStrategy strategy= reconciler.getReconcilingStrategy(IDocument.DEFAULT_CONTENT_TYPE); IReconcilingStrategy strategy= reconciler.getReconcilingStrategy(IDocument.DEFAULT_CONTENT_TYPE);
if (strategy instanceof CReconcilingStrategy) { if (strategy instanceof CReconcilingStrategy) {
cReconcilerAccessor= new Accessor(strategy, CReconcilingStrategy.class); reconcilerAccessor= new Accessor(strategy, CReconcilingStrategy.class);
} else { } else if (strategy instanceof CompositeReconcilingStrategy) {
cReconcilerAccessor= null; IReconcilingStrategy[] strategies= ((CompositeReconcilingStrategy)strategy).getReconcilingStrategies();
for (int i = 0; i < strategies.length; i++) {
if (strategies[i] instanceof CReconcilingStrategy) {
reconcilerAccessor= new Accessor(strategies[i], CReconcilingStrategy.class);
break;
} }
} else {
cReconcilerAccessor= null;
} }
}
}
final Accessor cReconcilerAccessor= reconcilerAccessor;
DisplayHelper helper= new DisplayHelper() { DisplayHelper helper= new DisplayHelper() {
public boolean condition() { public boolean condition() {
return !isRunning(cReconcilerAccessor, backgroundThreadAccessor); return !isRunning(cReconcilerAccessor, backgroundThreadAccessor);