diff --git a/core/org.eclipse.cdt.ui.tests/icons/used/search_ref_obj.gif b/core/org.eclipse.cdt.ui.tests/icons/used/search_ref_obj.gif
new file mode 100644
index 00000000000..1b0c43bc1ee
Binary files /dev/null and b/core/org.eclipse.cdt.ui.tests/icons/used/search_ref_obj.gif differ
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CTestPlugin.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CTestPlugin.java
index 0e71b8c8475..d3390b7f0fe 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CTestPlugin.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CTestPlugin.java
@@ -14,6 +14,7 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
+import org.eclipse.swt.widgets.Display;
 
 
 public class CTestPlugin extends Plugin {
@@ -53,5 +54,13 @@ public class CTestPlugin extends Plugin {
 	public static String getPluginId() {
 		return PLUGIN_ID;
 	}
+	
+	public static Display getStandardDisplay() {
+		Display display= Display.getCurrent();
+		if (display == null) {
+			display= Display.getDefault();
+		}
+		return display;		
+	}
 
 }
\ No newline at end of file
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPPPopulateASTViewAction.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPPPopulateASTViewAction.java
index 4189e2d9cac..25001284fb6 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPPPopulateASTViewAction.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPPPopulateASTViewAction.java
@@ -19,6 +19,7 @@ import org.eclipse.cdt.core.dom.ast.IASTExpression;
 import org.eclipse.cdt.core.dom.ast.IASTInitializer;
 import org.eclipse.cdt.core.dom.ast.IASTName;
 import org.eclipse.cdt.core.dom.ast.IASTNode;
+import org.eclipse.cdt.core.dom.ast.IASTNodeLocation;
 import org.eclipse.cdt.core.dom.ast.IASTParameterDeclaration;
 import org.eclipse.cdt.core.dom.ast.IASTPointerOperator;
 import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIncludeStatement;
@@ -39,6 +40,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier.ICPPASTBas
 import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
 import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor.CPPBaseVisitorAction;
 import org.eclipse.cdt.internal.core.parser.scanner2.LocationMap.ASTInclusionStatement;
+import org.eclipse.core.runtime.IProgressMonitor;
 
 /**
  * @author dsteffle
@@ -61,13 +63,22 @@ public class CPPPopulateASTViewAction extends CPPBaseVisitorAction implements IP
 	}
 
 	TreeParent root = null;
+	IProgressMonitor monitor = null;
 	
-	public CPPPopulateASTViewAction(IASTTranslationUnit tu) {
+	public CPPPopulateASTViewAction(IASTTranslationUnit tu, IProgressMonitor monitor) {
 		root = new TreeParent(tu);
+		this.monitor = monitor;
 	}
 	
-	private void addRoot(IASTNode node) {
-		if (node == null) return;
+	private int addRoot(IASTNode node) {
+		if (monitor != null && monitor.isCanceled()) return PROCESS_ABORT;
+		if (node == null) return PROCESS_CONTINUE;
+		
+		IASTNodeLocation[] nodeLocations = node.getNodeLocations();
+        if (!(nodeLocations.length > 0 && 
+				nodeLocations[0].getNodeOffset() >= 0 &&
+				nodeLocations[0].getNodeLength() > 0))
+			return PROCESS_CONTINUE;
 		
 		TreeParent parent = root.findTreeParentForNode(node);
 		
@@ -84,21 +95,22 @@ public class CPPPopulateASTViewAction extends CPPBaseVisitorAction implements IP
 			tree.setFiltersFlag(TreeObject.FLAG_PREPROCESSOR);
 		if (node instanceof IASTPreprocessorIncludeStatement)
 			tree.setFiltersFlag(TreeObject.FLAG_INCLUDE_STATEMENTS);
+		
+		return PROCESS_CONTINUE;
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor.CPPBaseVisitorAction#processDeclaration(org.eclipse.cdt.core.dom.ast.IASTDeclaration)
 	 */
 	public int processDeclaration(IASTDeclaration declaration) {
-		addRoot(declaration);
-		return PROCESS_CONTINUE;
+		return addRoot(declaration);
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor.CPPBaseVisitorAction#processDeclarator(org.eclipse.cdt.core.dom.ast.IASTDeclarator)
 	 */
 	public int processDeclarator(IASTDeclarator declarator) {
-		addRoot(declarator);
+		int ret = addRoot(declarator);
 		
 		IASTPointerOperator[] ops = declarator.getPointerOperators();
 		for(int i=0; i<ops.length; i++)
@@ -124,47 +136,42 @@ public class CPPPopulateASTViewAction extends CPPBaseVisitorAction implements IP
 			}	
 		}
 		
-		return PROCESS_CONTINUE;
+		return ret;
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor.CPPBaseVisitorAction#processBaseSpecifier(org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier.ICPPASTBaseSpecifier)
 	 */
 	public int processBaseSpecifier(ICPPASTBaseSpecifier specifier) {
-		addRoot(specifier);
-		return PROCESS_CONTINUE;
+		return addRoot(specifier);
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor.CPPBaseVisitorAction#processDeclSpecifier(org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier)
 	 */
 	public int processDeclSpecifier(IASTDeclSpecifier declSpec) {
-		addRoot(declSpec);
-		return PROCESS_CONTINUE;
+		return addRoot(declSpec);
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor.CPPBaseVisitorAction#processEnumerator(org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier.IASTEnumerator)
 	 */
 	public int processEnumerator(IASTEnumerator enumerator) {
-		addRoot(enumerator);
-		return PROCESS_CONTINUE;
+		return addRoot(enumerator);
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor.CPPBaseVisitorAction#processExpression(org.eclipse.cdt.core.dom.ast.IASTExpression)
 	 */
 	public int processExpression(IASTExpression expression) {
-		addRoot(expression);
-		return PROCESS_CONTINUE;
+		return addRoot(expression);
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor.CPPBaseVisitorAction#processInitializer(org.eclipse.cdt.core.dom.ast.IASTInitializer)
 	 */
 	public int processInitializer(IASTInitializer initializer) {
-		addRoot(initializer);
-		return PROCESS_CONTINUE;
+		return addRoot(initializer);
 	}
 		
 	/* (non-Javadoc)
@@ -172,7 +179,7 @@ public class CPPPopulateASTViewAction extends CPPBaseVisitorAction implements IP
 	 */
 	public int processName(IASTName name) {
 		if (name.toString() != null)
-			addRoot(name);
+			return addRoot(name);
 		return PROCESS_CONTINUE;
 	}
 	
@@ -180,8 +187,7 @@ public class CPPPopulateASTViewAction extends CPPBaseVisitorAction implements IP
 	 * @see org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor.CPPBaseVisitorAction#processNamespace(org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamespaceDefinition)
 	 */
 	public int processNamespace(ICPPASTNamespaceDefinition namespace) {
-		addRoot(namespace);
-		return PROCESS_CONTINUE;
+		return addRoot(namespace);
 	}
 	
 	/* (non-Javadoc)
@@ -189,24 +195,21 @@ public class CPPPopulateASTViewAction extends CPPBaseVisitorAction implements IP
 	 */
 	public int processParameterDeclaration(
 			IASTParameterDeclaration parameterDeclaration) {
-		addRoot(parameterDeclaration);
-		return PROCESS_CONTINUE;
+		return addRoot(parameterDeclaration);
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor.CPPBaseVisitorAction#processStatement(org.eclipse.cdt.core.dom.ast.IASTStatement)
 	 */
 	public int processStatement(IASTStatement statement) {
-		addRoot(statement);
-		return PROCESS_CONTINUE;
+		return addRoot(statement);
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor.CPPBaseVisitorAction#processTypeId(org.eclipse.cdt.core.dom.ast.IASTTypeId)
 	 */
 	public int processTypeId(IASTTypeId typeId) {
-		addRoot(typeId);
-		return PROCESS_CONTINUE;
+		return addRoot(typeId);
 	}
 
 	private void mergeNode(ASTNode node) {
@@ -216,43 +219,34 @@ public class CPPPopulateASTViewAction extends CPPBaseVisitorAction implements IP
 			addRoot(((IASTPreprocessorMacroDefinition)node).getName());
 	}
 	
-	private void mergePreprocessorStatements(IASTPreprocessorStatement[] statements) {
+	public void mergePreprocessorStatements(IASTPreprocessorStatement[] statements) {
 		for(int i=0; i<statements.length; i++) {
+			if (monitor != null && monitor.isCanceled()) return;
+			
 			if (statements[i] instanceof ASTNode)
 				mergeNode((ASTNode)statements[i]);
 		}
 	}
 	
-	private void mergePreprocessorProblems(IASTProblem[] problems) {
+	public void mergePreprocessorProblems(IASTProblem[] problems) {
 		for(int i=0; i<problems.length; i++) {
+			if (monitor != null && monitor.isCanceled()) return;
+			
 			if (problems[i] instanceof ASTNode)
 			   mergeNode((ASTNode)problems[i]);
 		}
 	}
 	
 	public TreeParent getTree() {
-		if (root.getNode() instanceof IASTTranslationUnit) {
-			IASTTranslationUnit tu = (IASTTranslationUnit)root.getNode();
-			
-			IASTPreprocessorStatement[] statements = tu.getAllPreprocessorStatements();
-			// merge preprocessor statements to the tree
-			mergePreprocessorStatements(statements);
-			
-			// merge preprocessor problems to the tree
-			mergePreprocessorProblems(tu.getPreprocesorProblems());
-			
-			// group #includes
-			groupIncludes(statements);
-		}
-		
 		return root;
 	}
 	
-	private void groupIncludes(IASTPreprocessorStatement[] statements) {
+	public void groupIncludes(IASTPreprocessorStatement[] statements) {
 		// get all of the includes from the preprocessor statements (need the object since .equals isn't implemented)
 		IASTPreprocessorIncludeStatement[] includes = new IASTPreprocessorIncludeStatement[INITIAL_INCLUDE_STATEMENT_SIZE];
 		int index = 0;
 		for(int i=0; i<statements.length; i++) {
+			if (monitor != null && monitor.isCanceled()) return;
 			if (index+1 > includes.length) {
 				IASTPreprocessorIncludeStatement[] newIncludes = new IASTPreprocessorIncludeStatement[includes.length * 2];
 				for (int j=0; j<includes.length; j++) {
@@ -268,6 +262,7 @@ public class CPPPopulateASTViewAction extends CPPBaseVisitorAction implements IP
 		// get the tree model elements corresponding to the includes
 		TreeParent[] treeIncludes = new TreeParent[includes.length];
 		for (int i=0; i<treeIncludes.length; i++) {
+			if (monitor != null && monitor.isCanceled()) return;
 			treeIncludes[i] = root.findTreeObject(includes[i]);
 		}
 		
@@ -278,6 +273,7 @@ public class CPPPopulateASTViewAction extends CPPBaseVisitorAction implements IP
 			if (treeIncludes[i] == null) continue;
 
 			for(int j=root.getChildren().length-1; j>=0; j--) {
+				if (monitor != null && monitor.isCanceled()) return;
 				child = root.getChildren()[j]; 
 			
 				if (treeIncludes[i] != child &&
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPopulateASTViewAction.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPopulateASTViewAction.java
index dd9b915a6b1..c0a35faf592 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPopulateASTViewAction.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPopulateASTViewAction.java
@@ -35,6 +35,7 @@ import org.eclipse.cdt.core.dom.ast.c.ICASTDesignator;
 import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
 import org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction;
 import org.eclipse.cdt.internal.core.parser.scanner2.LocationMap.ASTInclusionStatement;
+import org.eclipse.core.runtime.IProgressMonitor;
 
 /**
  * @author dsteffle
@@ -55,20 +56,23 @@ public class CPopulateASTViewAction extends CBaseVisitorAction implements IPopul
 		processEnumerators    = true;
 	}
 
-	TreeParent root = null; // TODO what about using a hashtable/hashmap for the tree?
+	TreeParent root = null;
+	IProgressMonitor monitor = null;
 	
-	public CPopulateASTViewAction(IASTTranslationUnit tu) {
+	public CPopulateASTViewAction(IASTTranslationUnit tu, IProgressMonitor monitor) {
 		root = new TreeParent(tu);
+		this.monitor = monitor;
 	}
 	
-	private void addRoot(IASTNode node) {
-		if (node == null) return;
+	private int addRoot(IASTNode node) {
+		if (monitor != null && monitor.isCanceled()) return PROCESS_ABORT;
+		if (node == null) return PROCESS_CONTINUE;
 		
 		IASTNodeLocation[] nodeLocations = node.getNodeLocations();
         if (!(nodeLocations.length > 0 && 
 				nodeLocations[0].getNodeOffset() >= 0 &&
 				nodeLocations[0].getNodeLength() > 0))
-			return;
+			return PROCESS_CONTINUE;
 		
 		TreeParent parent = root.findTreeParentForNode(node);
 		
@@ -85,21 +89,22 @@ public class CPopulateASTViewAction extends CBaseVisitorAction implements IPopul
 			tree.setFiltersFlag(TreeObject.FLAG_PREPROCESSOR);
 		if (node instanceof IASTPreprocessorIncludeStatement)
 			tree.setFiltersFlag(TreeObject.FLAG_INCLUDE_STATEMENTS);
+		
+		return PROCESS_CONTINUE;
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor.CPPBaseVisitorAction#processDeclaration(org.eclipse.cdt.core.dom.ast.IASTDeclaration)
 	 */
 	public int processDeclaration(IASTDeclaration declaration) {
-		addRoot(declaration);
-		return PROCESS_CONTINUE;
+		return addRoot(declaration);
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor.CPPBaseVisitorAction#processDeclarator(org.eclipse.cdt.core.dom.ast.IASTDeclarator)
 	 */
 	public int processDeclarator(IASTDeclarator declarator) {
-		addRoot(declarator);
+		int ret = addRoot(declarator);
 		
 		IASTPointerOperator[] ops = declarator.getPointerOperators();
 		for(int i=0; i<ops.length; i++)
@@ -111,47 +116,42 @@ public class CPopulateASTViewAction extends CBaseVisitorAction implements IPopul
 				addRoot(mods[i]);	
 		}
 		
-		return PROCESS_CONTINUE;
+		return ret;
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processDesignator(org.eclipse.cdt.core.dom.ast.c.ICASTDesignator)
 	 */
 	public int processDesignator(ICASTDesignator designator) {
-		addRoot(designator);
-		return PROCESS_CONTINUE;
+		return addRoot(designator);
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processDeclSpecifier(org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier)
 	 */
 	public int processDeclSpecifier(IASTDeclSpecifier declSpec) {
-		addRoot(declSpec);
-		return PROCESS_CONTINUE;
+		return addRoot(declSpec);
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processEnumerator(org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier.IASTEnumerator)
 	 */
 	public int processEnumerator(IASTEnumerator enumerator) {
-		addRoot(enumerator);
-		return PROCESS_CONTINUE;
+		return addRoot(enumerator);
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processExpression(org.eclipse.cdt.core.dom.ast.IASTExpression)
 	 */
 	public int processExpression(IASTExpression expression) {
-		addRoot(expression);
-		return PROCESS_CONTINUE;
+		return addRoot(expression);
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processInitializer(org.eclipse.cdt.core.dom.ast.IASTInitializer)
 	 */
 	public int processInitializer(IASTInitializer initializer) {
-		addRoot(initializer);
-		return PROCESS_CONTINUE;
+		return addRoot(initializer);
 	}
 	
 	/* (non-Javadoc)
@@ -159,7 +159,7 @@ public class CPopulateASTViewAction extends CBaseVisitorAction implements IPopul
 	 */
 	public int processName(IASTName name) {
 		if ( name.toString() != null )
-			addRoot(name);
+			return addRoot(name);
 		return PROCESS_CONTINUE;
 	}
 	
@@ -168,24 +168,21 @@ public class CPopulateASTViewAction extends CBaseVisitorAction implements IPopul
 	 */
 	public int processParameterDeclaration(
 			IASTParameterDeclaration parameterDeclaration) {
-		addRoot(parameterDeclaration);
-		return PROCESS_CONTINUE;
+		return addRoot(parameterDeclaration);
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processStatement(org.eclipse.cdt.core.dom.ast.IASTStatement)
 	 */
 	public int processStatement(IASTStatement statement) {
-		addRoot(statement);
-		return PROCESS_CONTINUE;
+		return addRoot(statement);
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processTypeId(org.eclipse.cdt.core.dom.ast.IASTTypeId)
 	 */
 	public int processTypeId(IASTTypeId typeId) {
-		addRoot(typeId);
-		return PROCESS_CONTINUE;
+		return addRoot(typeId);
 	}
 	
 	private void mergeNode(ASTNode node) {
@@ -195,43 +192,34 @@ public class CPopulateASTViewAction extends CBaseVisitorAction implements IPopul
 			addRoot(((IASTPreprocessorMacroDefinition)node).getName());
 	}
 	
-	private void mergePreprocessorStatements(IASTPreprocessorStatement[] statements) {
+	public void mergePreprocessorStatements(IASTPreprocessorStatement[] statements) {
 		for(int i=0; i<statements.length; i++) {
+			if (monitor != null && monitor.isCanceled()) return;
+			
 			if (statements[i] instanceof ASTNode)
 				mergeNode((ASTNode)statements[i]);
 		}
 	}
 	
-	private void mergePreprocessorProblems(IASTProblem[] problems) {
+	public void mergePreprocessorProblems(IASTProblem[] problems) {
 		for(int i=0; i<problems.length; i++) {
+			if (monitor != null && monitor.isCanceled()) return;
+			
 			if (problems[i] instanceof ASTNode)
 			   mergeNode((ASTNode)problems[i]);
 		}
 	}
 	
 	public TreeParent getTree() {
-		if (root.getNode() instanceof IASTTranslationUnit) {
-			IASTTranslationUnit tu = (IASTTranslationUnit)root.getNode();
-			
-			IASTPreprocessorStatement[] statements = tu.getAllPreprocessorStatements();
-			// merge preprocessor statements to the tree
-			mergePreprocessorStatements(statements);
-			
-			// merge preprocessor problems to the tree
-			mergePreprocessorProblems(tu.getPreprocesorProblems());
-			
-			// group #includes
-			groupIncludes(statements);
-		}
-		
 		return root;
 	}
 	
-	private void groupIncludes(IASTPreprocessorStatement[] statements) {
+	public void groupIncludes(IASTPreprocessorStatement[] statements) {
 		// get all of the includes from the preprocessor statements (need the object since .equals isn't implemented)
 		IASTPreprocessorIncludeStatement[] includes = new IASTPreprocessorIncludeStatement[INITIAL_INCLUDE_STATEMENT_SIZE];
 		int index = 0;
 		for(int i=0; i<statements.length; i++) {
+			if (monitor != null && monitor.isCanceled()) return;
 			if (index+1 > includes.length) {
 				IASTPreprocessorIncludeStatement[] newIncludes = new IASTPreprocessorIncludeStatement[includes.length * 2];
 				for (int j=0; j<includes.length; j++) {
@@ -247,6 +235,7 @@ public class CPopulateASTViewAction extends CBaseVisitorAction implements IPopul
 		// get the tree model elements corresponding to the includes
 		TreeParent[] treeIncludes = new TreeParent[includes.length];
 		for (int i=0; i<treeIncludes.length; i++) {
+			if (monitor != null && monitor.isCanceled()) return;
 			treeIncludes[i] = root.findTreeObject(includes[i]);
 		}
 		
@@ -257,6 +246,7 @@ public class CPopulateASTViewAction extends CBaseVisitorAction implements IPopul
 			if (treeIncludes[i] == null) continue;
 
 			for(int j=root.getChildren().length-1; j>=0; j--) {
+				if (monitor != null && monitor.isCanceled()) return;
 				child = root.getChildren()[j]; 
 			
 				if (treeIncludes[i] != child &&
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java
index 505499ab004..643eb55ced8 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java
@@ -48,12 +48,18 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor.CPPBaseVisitorAct
 import org.eclipse.cdt.internal.ui.editor.CEditor;
 import org.eclipse.cdt.internal.ui.util.EditorUtility;
 import org.eclipse.cdt.ui.actions.CustomFiltersActionGroup;
+import org.eclipse.cdt.ui.testplugin.CTestPlugin;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ActionContributionItem;
 import org.eclipse.jface.action.IContributionItem;
@@ -83,11 +89,9 @@ import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.part.DrillDownAdapter;
@@ -109,8 +113,10 @@ import org.eclipse.ui.part.ViewPart;
  */
 
 public class DOMAST extends ViewPart {
+   private static final String DOM_AST_HAS_NO_CONTENT = "DOM AST has no content"; //$NON-NLS-1$
+   private static final String SEARCH_FOR_IASTNAME = "Search for IASTName"; //$NON-NLS-1$
    private static final String CLEAR = "Clear"; //$NON-NLS-1$
-private static final String DOMAST_FILTER_GROUP_ID = "org.eclipse.cdt.ui.tests.DOMAST.DOMASTFilterGroup"; //$NON-NLS-1$
+   private static final String DOMAST_FILTER_GROUP_ID = "org.eclipse.cdt.ui.tests.DOMAST.DOMASTFilterGroup"; //$NON-NLS-1$
    private static final String EXTENSION_CXX = "CXX"; //$NON-NLS-1$
    private static final String EXTENSION_CPP = "CPP"; //$NON-NLS-1$
    private static final String EXTENSION_CC = "CC"; //$NON-NLS-1$
@@ -134,6 +140,7 @@ private static final String DOMAST_FILTER_GROUP_ID = "org.eclipse.cdt.ui.tests.D
    private Action			   expandAllAction;
    private Action			   collapseAllAction;
    private Action			   clearAction;
+   private Action			   searchNamesAction;
    private IFile               file              = null;
    private IEditorPart         part              = null;
    private ParserLanguage              lang              = null;
@@ -149,23 +156,46 @@ private static final String DOMAST_FILTER_GROUP_ID = "org.eclipse.cdt.ui.tests.D
 
    public class ViewContentProvider implements IStructuredContentProvider,
          ITreeContentProvider {
-      private TreeParent invisibleRoot;
-      private IFile      aFile = null;
+      private static final String POPULATING_AST_VIEW = "Populating AST View"; //$NON-NLS-1$
+	private TreeParent invisibleRoot;
+      private TreeParent tuTreeParent = null;
+      private IASTTranslationUnit tu = null;
 
-      /**
-       *  
-       */
       public ViewContentProvider() {
       }
 
-      /**
-       *  
-       */
       public ViewContentProvider(IFile file) {
-         this.aFile = file;
+      	this(file, null);
       }
+      
+      public ViewContentProvider(IFile file, Object[] expanded) {
+       	StartInitializingASTView job = new StartInitializingASTView(new InitializeView(POPULATING_AST_VIEW, this, viewer, file), expanded);
+   		job.schedule();
 
-      public void inputChanged(Viewer v, Object oldInput, Object newInput) {
+     }
+      
+      public TreeParent getTUTreeParent() {
+      	if (tuTreeParent == null && invisibleRoot != null) {
+      		for(int i=0; i<invisibleRoot.getChildren().length; i++) {
+      			if (invisibleRoot.getChildren()[i] instanceof TreeParent && invisibleRoot.getChildren()[i].getNode() instanceof IASTTranslationUnit){
+      	      		tuTreeParent = (TreeParent)invisibleRoot.getChildren()[i];
+      			}
+      		}
+      	}
+      	
+      	return tuTreeParent;
+      }
+      
+      public IASTTranslationUnit getTU() {
+      	if (tu == null && invisibleRoot != null) {
+      		for(int i=0; i<invisibleRoot.getChildren().length; i++) {
+      			if (invisibleRoot.getChildren()[i] instanceof TreeParent && invisibleRoot.getChildren()[i].getNode() instanceof IASTTranslationUnit){
+      	      		tu = (IASTTranslationUnit)invisibleRoot.getChildren()[i].getNode();
+      			}
+      		}
+      	}
+      	
+      	return tu;
       }
 
       public void dispose() {
@@ -200,31 +230,202 @@ private static final String DOMAST_FILTER_GROUP_ID = "org.eclipse.cdt.ui.tests.D
          return false;
       }
 
-      private void initialize() {
-         if (aFile == null || lang == null)
-            return;
-
-         IPopulateDOMASTAction action = null;
-         IASTTranslationUnit tu = null;
-         try {
-            tu = CDOM.getInstance().getASTService().getTranslationUnit(
-                  aFile,
-                  CDOM.getInstance().getCodeReaderFactory(
-                        CDOM.PARSE_SAVED_RESOURCES));
-         } catch (IASTServiceProvider.UnsupportedDialectException e) {
-            return;
-         }
-         if (lang == ParserLanguage.CPP) {
-            action = new CPPPopulateASTViewAction(tu);
-            CPPVisitor.visitTranslationUnit(tu, (CPPBaseVisitorAction) action);
-         } else {
-            action = new CPopulateASTViewAction(tu);
-            CVisitor.visitTranslationUnit(tu, (CBaseVisitorAction) action);
-         }
-         // display roots
-         invisibleRoot = new TreeParent(null); //$NON-NLS-1$
-         invisibleRoot.addChild(action.getTree());
+      private class StartInitializingASTView extends Job {
+      	private static final String INITIALIZE_AST_VIEW = "Initialize AST View"; //$NON-NLS-1$
+		InitializeView job = null;
+      	Object[] expanded = null;
+      	
+      	public StartInitializingASTView(InitializeView job, Object[] expanded) {
+      		super(INITIALIZE_AST_VIEW);
+      		this.job = job;
+      		this.expanded = expanded;
+      	}
+      	
+		/* (non-Javadoc)
+		 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
+		 */
+		protected IStatus run(IProgressMonitor monitor) {
+		    job.schedule();
+	      	
+		    try {
+		    	job.join();
+		    } catch (InterruptedException ie) {
+		    	return Status.CANCEL_STATUS;
+		    }
+	      		
+	    	CTestPlugin.getStandardDisplay().asyncExec(new InitializeRunnable(viewer)); // update the view from the Display thread
+	    	// if there are objects to expand then do so now
+	    	if (expanded != null) {
+	    		CTestPlugin.getStandardDisplay().asyncExec(new Runnable() {
+					public void run() {
+			         	// set the expansion of the view based on the original snapshot (educated guess)
+			         	Tree tree = viewer.getTree();
+			         	expandTreeIfNecessary(tree.getItems(), expanded);
+						
+					}
+					
+					private void expandTreeIfNecessary(TreeItem[] tree, Object[] expanded) {
+			     		for( int i=0; i<tree.length; i++) {
+			     			for( int j=0; j<expanded.length; j++) {
+				     			if (expanded[j] instanceof TreeObject &&
+				     					tree[i].getData() instanceof TreeObject &&
+				     					((TreeObject)expanded[j]).toString().equals(((TreeObject)tree[i].getData()).toString()) && 
+				     					((TreeObject)expanded[j]).getOffset() == (((TreeObject)tree[i].getData()).getOffset())) {
+				     				tree[i].setExpanded(true);
+				     				viewer.refresh();
+				     				expandTreeIfNecessary(tree[i].getItems(), expanded);
+				     			}
+			     			}
+			     		}
+			     	}});
+	    	}
+	    	
+			return job.getResult();
+		}
+      	
       }
+      
+      private class InitializeView extends Job {
+
+      	private static final String _PREPROCESSOR_PROBLEMS_ = " preprocessor problems."; //$NON-NLS-1$
+		private static final String _PREPROCESSOR_STATEMENTS_ = " preprocessor statements."; //$NON-NLS-1$
+		private static final String MERGING_ = "Merging "; //$NON-NLS-1$
+		private static final String GROUPING_AST = "Grouping AST View according to includes."; //$NON-NLS-1$
+		private static final String GENERATING_INITIAL_TREE = "Generating initial AST Tree for the View"; //$NON-NLS-1$
+		private static final String PARSING_TRANSLATION_UNIT = "Parsing Translation Unit"; //$NON-NLS-1$
+		String name = null;
+      	TreeParent root = null;
+      	ViewContentProvider provider = null;
+      	TreeViewer view = null;
+      	IFile file = null;
+      	
+    	/**
+		 * @param name
+		 */
+		public InitializeView(String name, ViewContentProvider provider, TreeViewer view, IFile file) {
+			super(name);
+			this.name = name;
+			setUser(true);
+			this.provider = provider;
+			this.view = view;
+			this.file = file;
+		}
+		
+	    public TreeParent getInvisibleRoot() {
+	      	return root;
+	    }
+
+		/**
+    	 * @return Returns the scheduling rule for this operation
+    	 */
+    	public ISchedulingRule getScheduleRule() {
+    		return ResourcesPlugin.getWorkspace().getRoot();
+    	}
+    	
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
+		 */
+    	protected IStatus run(IProgressMonitor monitor) {
+			if (file == null || lang == null || monitor == null)
+	            return Status.CANCEL_STATUS;
+
+			if (monitor.isCanceled()) return Status.CANCEL_STATUS;
+			monitor.beginTask(name, 5);
+			
+	         IPopulateDOMASTAction action = null;
+	         IASTTranslationUnit tu = null;
+	         try {
+	         	monitor.subTask(PARSING_TRANSLATION_UNIT);
+	            tu = CDOM.getInstance().getASTService().getTranslationUnit(
+	                  file,
+	                  CDOM.getInstance().getCodeReaderFactory(
+	                        CDOM.PARSE_SAVED_RESOURCES));
+	            monitor.worked(1);
+	         } catch (IASTServiceProvider.UnsupportedDialectException e) {
+	         	return Status.CANCEL_STATUS;
+	         }
+	         
+	         if (monitor.isCanceled()) return Status.CANCEL_STATUS;
+	         monitor.subTask(GENERATING_INITIAL_TREE);
+	         if (lang == ParserLanguage.CPP) {
+	            action = new CPPPopulateASTViewAction(tu, monitor);
+	            CPPVisitor.visitTranslationUnit(tu, (CPPBaseVisitorAction) action);
+	         } else {
+	            action = new CPopulateASTViewAction(tu, monitor);
+	            CVisitor.visitTranslationUnit(tu, (CBaseVisitorAction) action);
+	         }
+	         monitor.worked(2);
+	         
+	         // display roots
+	         root = new TreeParent(null); //$NON-NLS-1$
+	         
+	         if (monitor.isCanceled()) return Status.CANCEL_STATUS;
+	         IASTPreprocessorStatement[] statements = tu.getAllPreprocessorStatements();
+	         monitor.subTask(MERGING_ + statements.length + _PREPROCESSOR_STATEMENTS_);
+	         // merge preprocessor statements to the tree
+	         action.mergePreprocessorStatements(statements);
+	         monitor.worked(3);
+
+	         if (monitor.isCanceled()) return Status.CANCEL_STATUS;
+	         IASTProblem[] problems = tu.getPreprocesorProblems();
+	         monitor.subTask(MERGING_ + problems.length + _PREPROCESSOR_PROBLEMS_);
+	         // merge preprocessor problems to the tree
+	         action.mergePreprocessorProblems(problems);
+	         monitor.worked(4);
+
+	         if (monitor.isCanceled()) return Status.CANCEL_STATUS;
+	         monitor.subTask(GROUPING_AST);
+	         // group #includes
+	         action.groupIncludes(statements);
+	         monitor.worked(5);
+
+	         root.addChild(action.getTree());
+	         
+	         provider.setInvisibleRoot(root);
+	         
+	         monitor.done();
+			
+			return Status.OK_STATUS;
+		}
+
+      }
+      
+      private void initialize() {
+      	invisibleRoot = new TreeParent(null); // blank the AST View, when the job above is complete it will update the AST View with the proper tree
+      }
+      
+      protected void setInvisibleRoot(TreeParent root) {
+      	invisibleRoot = root;
+      }
+
+	  	public class InitializeRunnable implements Runnable {
+			TreeViewer view = null;
+			
+			public InitializeRunnable(TreeViewer view) {
+				this.view = view;
+			}
+			
+			/* (non-Javadoc)
+			 * @see java.lang.Runnable#run()
+			 */
+			public void run() {
+				view.refresh();
+				
+				if (view.getTree().getItems().length > 0) {
+					TreeItem[] selection = new TreeItem[1];
+					selection[0] = view.getTree().getItems()[0];
+					
+					// select the first item to prevent it from being selected accidentally (and possibly switching editors accidentally)
+					view.getTree().setSelection(selection);
+				}
+			}
+		}
+
+		/* (non-Javadoc)
+		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+		 */
+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		}
    }
 
    class ViewLabelProvider extends LabelProvider {
@@ -305,41 +506,20 @@ private static final String DOMAST_FILTER_GROUP_ID = "org.eclipse.cdt.ui.tests.D
    public void createPartControl(Composite parent) {
 
       if (part == null) {
-         IWorkbenchPage[] pages = PlatformUI.getWorkbench()
-               .getActiveWorkbenchWindow().getPages();
-
-         if (pages.length == 0) {
-            // TODO determine how to hide view if no pages found and part==null
-         }
-
-         outerLoop: for (int i = 0; i < pages.length; i++) {
-            IEditorReference[] editorRefs = pages[i].getEditorReferences();
-            for (int j = 0; j < editorRefs.length; j++) {
-               part = editorRefs[j].getEditor(false);
-               if (part instanceof CEditor) {
-                  // TODO set the language properly if implement the above TODO
-                  lang = ParserLanguage.CPP;
-                  break outerLoop;
-               }
-            }
-         }
-
-         if (PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-               .getActivePage() != null
-               && PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-                     .getActivePage().getActiveEditor() != null)
-            part = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-                  .getActivePage().getActiveEditor();
+         part = getActiveEditor();
+         
+         if (!(part instanceof CEditor)) return;
       }
 
       viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
       drillDownAdapter = new DrillDownAdapter(viewer);
 
-      if (part instanceof CEditor)
-         viewer.setContentProvider(new ViewContentProvider(((CEditor) part)
-               .getInputFile()));
-      else
+      if (part instanceof CEditor) {
+         viewer.setContentProvider(new ViewContentProvider(((CEditor) part).getInputFile()));
+      	 setFile(((CEditor) part).getInputFile());
+      } else {
          viewer.setContentProvider(new ViewContentProvider(null)); // don't attempt to create a view based on old file info
+      }
 
       viewer.setLabelProvider(new ViewLabelProvider());
       viewer.setInput(getViewSite());
@@ -353,6 +533,7 @@ private static final String DOMAST_FILTER_GROUP_ID = "org.eclipse.cdt.ui.tests.D
 
    public void setContentProvider(ViewContentProvider vcp) {
       viewer.setContentProvider(vcp);
+      
    }
 
    private void hookContextMenu() {
@@ -393,9 +574,6 @@ private static final String DOMAST_FILTER_GROUP_ID = "org.eclipse.cdt.ui.tests.D
    }
 
    private void fillLocalPullDown(IMenuManager manager) {
-      //		manager.add(action1); // TODO determine the groups/filters to use
-      //		manager.add(new Separator());
-      //		manager.add(action2);
    }
 
    void fillContextMenu(IMenuManager manager) {
@@ -408,7 +586,7 @@ private static final String DOMAST_FILTER_GROUP_ID = "org.eclipse.cdt.ui.tests.D
    }
 
    private void fillLocalToolBar(IToolBarManager manager) {
-      manager.add(expandAllAction);
+   	  manager.add(expandAllAction);
       manager.add(collapseAllAction);
       manager.add(new Separator());
    	  manager.add(refreshAction);
@@ -416,6 +594,8 @@ private static final String DOMAST_FILTER_GROUP_ID = "org.eclipse.cdt.ui.tests.D
    	  manager.add(new Separator());
    	  manager.add(clearAction);
       manager.add(new Separator());
+      manager.add(searchNamesAction);
+      manager.add(new Separator());
       drillDownAdapter.addNavigationActions(manager);
    }
 
@@ -423,19 +603,7 @@ private static final String DOMAST_FILTER_GROUP_ID = "org.eclipse.cdt.ui.tests.D
  	  loadActiveEditorAction = new Action() {
         public void run() {
         	// get the active editor
-        	IEditorPart editor = null;
-        	if (PlatformUI.getWorkbench().getActiveWorkbenchWindow() != null &&
-        			PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPages() != null) {			
-	        	IWorkbenchPage[] pages = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPages();
-	
-	        	outerLoop: for(int i=0; i<pages.length; i++) {
-	        		editor = pages[i].getActiveEditor();
-	        		if (editor instanceof CEditor) {
-	        			break outerLoop;
-	        		}
-	        	}
-        	}
-
+        	IEditorPart editor = getActiveEditor();
         	if (editor instanceof CEditor) {
 	    		IViewPart tempView = null;
 	
@@ -456,15 +624,7 @@ private static final String DOMAST_FILTER_GROUP_ID = "org.eclipse.cdt.ui.tests.D
 	    				
 	    				((DOMAST)tempView).setFile(aFile);
 	    				((DOMAST)tempView).setPart(editor);
-	    				
-	    				IProject project = aFile.getProject();
-	    				ICFileType type = CCorePlugin.getDefault().getFileType(project, aFile.getFullPath().lastSegment());
-	    				String lid = type.getLanguage().getId();
-	    				if ( lid != null && lid.equals(ICFileTypeConstants.LANG_CXX) ) {
-	    					((DOMAST)tempView).setLang(ParserLanguage.CPP);
-	    				} else {
-	    					((DOMAST)tempView).setLang(ParserLanguage.C);
-	    				}
+	    				((DOMAST)tempView).setLang(getLanguageFromFile(aFile));
 	    				((DOMAST)tempView).setContentProvider(((DOMAST)tempView).new ViewContentProvider(((CEditor)editor).getInputFile()));
 	    			}
 	    		}
@@ -478,32 +638,12 @@ private static final String DOMAST_FILTER_GROUP_ID = "org.eclipse.cdt.ui.tests.D
      loadActiveEditorAction.setImageDescriptor(DOMASTPluginImages.DESC_DEFAULT);
    	
      refreshAction = new Action() {
-     	private void expandTreeIfNecessary(TreeItem[] tree, Object[] expanded) {
-     		for( int i=0; i<tree.length; i++) {
-     			for( int j=0; j<expanded.length; j++) {
-	     			if (expanded[j] instanceof TreeObject &&
-	     					tree[i].getData() instanceof TreeObject &&
-	     					((TreeObject)expanded[j]).toString().equals(((TreeObject)tree[i].getData()).toString()) && 
-	     					((TreeObject)expanded[j]).getOffset() == (((TreeObject)tree[i].getData()).getOffset())) {
-	     				tree[i].setExpanded(true);
-	     				viewer.refresh();
-	     				expandTreeIfNecessary(tree[i].getItems(), expanded);
-	     			}
-     			}
-     		}
-     	}
-     	
          public void run() {
             // take a snapshot of the tree expansion
          	Object[] expanded = viewer.getExpandedElements();
-         	
+
          	// set the new content provider
-         	setContentProvider(new ViewContentProvider(file));
-            
-         	// set the expansion of the view based on the original snapshot (educated guess)
-         	Tree tree = viewer.getTree();
-         	expandTreeIfNecessary(tree.getItems(), expanded);
-         	
+         	setContentProvider(new ViewContentProvider(file, expanded));
          }
       };
       refreshAction.setText(REFRESH_DOM_AST);
@@ -538,6 +678,24 @@ private static final String DOMAST_FILTER_GROUP_ID = "org.eclipse.cdt.ui.tests.D
      clearAction.setToolTipText(CLEAR);
      clearAction.setImageDescriptor(DOMASTPluginImages.DESC_CLEAR);
      
+     searchNamesAction = new Action() {
+        private void performSearch() {
+        	if (viewer.getTree().getItems().length == 0) {
+        		showMessage(DOM_AST_HAS_NO_CONTENT);
+        	}
+        	
+        	FindIASTNameDialog dialog = new FindIASTNameDialog(getSite().getShell(), new FindIASTNameTarget(viewer, lang));
+        	dialog.open();
+       }
+     	
+     	public void run() {
+     		performSearch();
+        }
+     };
+     searchNamesAction.setText(SEARCH_FOR_IASTNAME);
+     searchNamesAction.setToolTipText(SEARCH_FOR_IASTNAME);
+     searchNamesAction.setImageDescriptor(DOMASTPluginImages.DESC_SEARCH_NAMES);
+     
       openDeclarationsAction = new DisplayDeclarationsAction();
       openDeclarationsAction.setText(OPEN_DECLARATIONS);
       openDeclarationsAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages()
@@ -551,6 +709,29 @@ private static final String DOMAST_FILTER_GROUP_ID = "org.eclipse.cdt.ui.tests.D
       singleClickAction = new ASTHighlighterAction(part);
    }
 
+   private IEditorPart getActiveEditor() {
+   	IEditorPart editor = null;
+   	
+   	if (getSite().getPage().isEditorAreaVisible()) {
+	   	editor = getSite().getPage().getActiveEditor();
+	    part = editor;
+	    lang = lang = getLanguageFromFile(((CEditor)editor).getInputFile());
+   	}
+
+   	return editor;
+   }
+   
+   private ParserLanguage getLanguageFromFile(IFile file) {
+   	IProject project = file.getProject();
+	ICFileType type = CCorePlugin.getDefault().getFileType(project, file.getFullPath().lastSegment());
+	String lid = type.getLanguage().getId();
+	if ( lid != null && lid.equals(ICFileTypeConstants.LANG_CXX) ) {
+		return ParserLanguage.CPP;
+	}
+	
+	return ParserLanguage.C;
+   }
+   
    private class ASTHighlighterAction extends Action {
 	IEditorPart aPart = null;
 
@@ -668,51 +849,6 @@ private static final String DOMAST_FILTER_GROUP_ID = "org.eclipse.cdt.ui.tests.D
 	        NewSearchUI.runQuery(job);
 	     }
    }
-   
-   // TODO need to create a new action with the following for annotations (get
-   // declarations/references)
-   //	ISelection selection = viewer.getSelection();
-   //	Object obj = ((IStructuredSelection)selection).getFirstElement();
-   //	
-   //	if (aPart instanceof CEditor) {
-   //		IAnnotationModel aModel =
-   // ((CEditor)aPart).getDocumentProvider().getAnnotationModel(aPart.getEditorInput());
-   //		if ( aModel != null && obj instanceof TreeObject &&
-   // !(((TreeObject)obj).getNode() instanceof IASTTranslationUnit) ) {
-   //			Iterator itr = aModel.getAnnotationIterator();
-   //			while (itr.hasNext()) {
-   //				aModel.removeAnnotation((Annotation)itr.next());
-   //			}
-   //			
-   //			ASTViewAnnotation annotation = new ASTViewAnnotation();
-   //			annotation.setType(CMarkerAnnotation.WARNING_ANNOTATION_TYPE);
-   //			aModel.addAnnotation(annotation, new
-   // Position(((TreeObject)obj).getOffset(), ((TreeObject)obj).getLength()));
-   //		}
-   //	}
-
-   // TODO implement annotation for things like open declarations/references
-   //	private class ASTViewAnnotation extends Annotation implements
-   // IAnnotationPresentation {
-   //
-   //		/* (non-Javadoc)
-   //		 * @see org.eclipse.jface.text.source.IAnnotationPresentation#getLayer()
-   //		 */
-   //		public int getLayer() {
-   //			return IAnnotationAccessExtension.DEFAULT_LAYER;
-   //		}
-   //
-   //		/* (non-Javadoc)
-   //		 * @see
-   // org.eclipse.jface.text.source.IAnnotationPresentation#paint(org.eclipse.swt.graphics.GC,
-   // org.eclipse.swt.widgets.Canvas, org.eclipse.swt.graphics.Rectangle)
-   //		 */
-   //		public void paint(GC gc, Canvas canvas, Rectangle r) {
-   //		    // TODO implement this annotation image for
-   //			ImageUtilities.drawImage(ASTViewPluginImages.get(ASTViewPluginImages.IMG_TO_DRAW),
-   // gc, canvas, r, SWT.CENTER, SWT.TOP);
-   //		}
-   //	}
 
    private void hookSingleClickAction() {
       viewer.addSelectionChangedListener(new ISelectionChangedListener() {
@@ -734,11 +870,6 @@ private static final String DOMAST_FILTER_GROUP_ID = "org.eclipse.cdt.ui.tests.D
       viewer.getControl().setFocus();
    }
 
-   public void setFile(IFile file) {
-      this.file = file;
-      viewer.setContentProvider(new ViewContentProvider(file));
-   }
-
    public void setPart(IEditorPart part) {
       this.part = part;
 
@@ -749,5 +880,9 @@ private static final String DOMAST_FILTER_GROUP_ID = "org.eclipse.cdt.ui.tests.D
    public void setLang(ParserLanguage lang) {
       this.lang = lang;
    }
+   
+   public void setFile(IFile file) {
+    this.file = file;
+   }
 
 }
\ No newline at end of file
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTPluginImages.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTPluginImages.java
index 3023758443a..bf657c2427a 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTPluginImages.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTPluginImages.java
@@ -75,6 +75,7 @@ public class DOMASTPluginImages {
 	public static final String IMG_EXPAND_ALL = NAME_PREFIX + "expandall.gif"; //$NON-NLS-1$
 	public static final String IMG_COLLAPSE_ALL = NAME_PREFIX + "collapseall.gif"; //$NON-NLS-1$
 	public static final String IMG_CLEAR = NAME_PREFIX + "clear.gif"; //$NON-NLS-1$
+	public static final String IMG_SEARCH_NAMES = NAME_PREFIX + "search_ref_obj.gif"; //$NON-NLS-1$
 	
 	public static final ImageDescriptor DESC_IASTArrayModifier= createManaged(ICON_PREFIX, IMG_IASTArrayModifier);
 	public static final ImageDescriptor DESC_IASTDeclaration= createManaged(ICON_PREFIX, IMG_IASTDeclaration);
@@ -99,6 +100,7 @@ public class DOMASTPluginImages {
 	public static final ImageDescriptor DESC_EXPAND_ALL= createManaged(ICON_PREFIX, IMG_EXPAND_ALL);
 	public static final ImageDescriptor DESC_COLLAPSE_ALL= createManaged(ICON_PREFIX, IMG_COLLAPSE_ALL);
 	public static final ImageDescriptor DESC_CLEAR= createManaged(ICON_PREFIX, IMG_CLEAR);
+	public static final ImageDescriptor DESC_SEARCH_NAMES= createManaged(ICON_PREFIX, IMG_SEARCH_NAMES);
 	
 	private static ImageDescriptor createManaged(String prefix, String name) {
 		return createManaged(imageRegistry, prefix, name);
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameDialog.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameDialog.java
new file mode 100644
index 00000000000..1d6eb52e4ed
--- /dev/null
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameDialog.java
@@ -0,0 +1,1350 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.cdt.ui.tests.DOMAST;
+
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.PatternSyntaxException;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.events.ShellAdapter;
+import org.eclipse.swt.events.ShellEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.resource.JFaceColors;
+
+import org.eclipse.jface.text.IFindReplaceTarget;
+import org.eclipse.jface.text.IFindReplaceTargetExtension;
+import org.eclipse.jface.text.IFindReplaceTargetExtension3;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.TextUtilities;
+
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.internal.texteditor.TextEditorPlugin;
+import org.eclipse.ui.texteditor.IEditorStatusLine;
+
+/**
+ * Find/Replace dialog. The dialog is opened on a particular 
+ * target but can be re-targeted. Internally used by the <code>FindReplaceAction</code>
+ */
+class FindIASTNameDialog extends Dialog {
+
+	private static final String REGULAR_EXPRESSIONS_LABEL = "Regular expressions"; //$NON-NLS-1$
+	private static final String WHOLE_WORD_LABEL = "Whole Word"; //$NON-NLS-1$
+	private static final String CASE_SENSITIVE_LABEL = "Case Sensitive"; //$NON-NLS-1$
+	private static final String OPTIONS_LABEL = "Options"; //$NON-NLS-1$
+	private static final String BLANK_STRING = ""; //$NON-NLS-1$
+	private static final String NAME_NOT_FOUND = "Name not found."; //$NON-NLS-1$
+	private static final String FIND_NEXT_LABEL = "Find Next"; //$NON-NLS-1$
+	private static final String FIND_IASTNAME_LABEL = "Find IASTName:"; //$NON-NLS-1$
+	/**
+	 * Updates the find replace dialog on activation changes.
+	 */
+	class ActivationListener extends ShellAdapter {
+		/*
+		 * @see ShellListener#shellActivated(ShellEvent)
+		 */
+		public void shellActivated(ShellEvent e) {
+			
+			String oldText= fFindField.getText(); // XXX workaround for 10766
+			List oldList= new ArrayList();
+			oldList.addAll(fFindHistory);
+
+			readConfiguration();
+			
+
+			fFindField.removeModifyListener(fFindModifyListener);
+
+			updateCombo(fFindField, fFindHistory);
+			if (!fFindHistory.equals(oldList) && !fFindHistory.isEmpty())
+				fFindField.setText((String) fFindHistory.get(0));
+			else 
+				fFindField.setText(oldText);
+			if (findFieldHadFocus())
+				fFindField.setSelection(new Point(0, fFindField.getText().length()));
+			fFindField.addModifyListener(fFindModifyListener);
+
+			fActiveShell= (Shell)e.widget;
+			updateButtonState();
+			
+			if (findFieldHadFocus() && getShell() == fActiveShell && !fFindField.isDisposed())
+				fFindField.setFocus();
+		}
+		
+		/**
+		 * Returns <code>true</code> if the find field had focus,
+		 * <code>false</code> if it did not.
+		 * 
+		 * @return <code>true</code> if the find field had focus,
+		 *         <code>false</code> if it did not
+		 */
+		private boolean findFieldHadFocus() {
+			/*
+			 * See bug 45447. Under GTK and Motif, the focus of the find field
+			 * is already gone when shellDeactivated is called. On the other
+			 * hand focus has already been restored when shellActivated is
+			 * called.
+			 * 
+			 * Therefore, we select and give focus if either
+			 * fGiveFocusToFindField is true or the find field has focus.
+			 */
+			return fGiveFocusToFindField || okToUse(fFindField) && fFindField.isFocusControl();
+		}
+		
+		/*
+		 * @see ShellListener#shellDeactivated(ShellEvent)
+		 */
+		public void shellDeactivated(ShellEvent e) {
+			fGiveFocusToFindField= fFindField.isFocusControl();
+
+			storeSettings();
+
+//			fGlobalRadioButton.setSelection(true);
+//			fSelectedRangeRadioButton.setSelection(false);
+			fUseSelectedLines= false;
+
+			if (fTarget != null && (fTarget instanceof IFindReplaceTargetExtension))
+				((IFindReplaceTargetExtension) fTarget).setScope(null);
+			
+			fOldScope= null;
+
+			fActiveShell= null;			
+			updateButtonState();
+		}
+	}
+
+	/**
+	 * Modify listener to update the search result in case of incremental search.
+	 * @since 2.0
+	 */
+	private class FindModifyListener implements ModifyListener {
+		
+		/*
+		 * @see ModifyListener#modifyText(ModifyEvent)
+		 */
+		public void modifyText(ModifyEvent e) {
+			searchTextChanged = true;
+			
+			if (isIncrementalSearch() && !isRegExSearchAvailableAndChecked()) {
+				if (fFindField.getText().equals(BLANK_STRING) && fTarget != null) { //$NON-NLS-1$
+					// empty selection at base location
+					int offset= fIncrementalBaseLocation.x;
+
+					if (isForwardSearch() && !fNeedsInitialFindBeforeReplace || !isForwardSearch() && fNeedsInitialFindBeforeReplace)
+						offset= offset + fIncrementalBaseLocation.y;
+
+					fNeedsInitialFindBeforeReplace= false;
+					findAndSelect(offset, BLANK_STRING, isForwardSearch(), isCaseSensitiveSearch(), isWholeWordSearch(), isRegExSearchAvailableAndChecked()); //$NON-NLS-1$
+				} else {
+					performSearch(false);
+				}
+			}
+			
+			updateButtonState();
+		}
+	}
+
+	/** The size of the dialogs search history. */
+	private static final int HISTORY_SIZE= 5;
+
+	protected boolean searchTextChanged=false; 
+	private Point fLocation;
+	private Point fIncrementalBaseLocation;
+	private boolean fWrapInit, fCaseInit, fWholeWordInit, fForwardInit, fGlobalInit, fIncrementalInit;
+	/**
+	 * Tells whether an initial find operation is needed
+	 * before the replace operation.
+	 * @since 3.0 
+	 */
+	private boolean fNeedsInitialFindBeforeReplace;
+	/**
+	 * Initial value for telling whether the search string is a regular expression.
+	 * @since 3.0
+	 */
+	boolean fIsRegExInit;
+
+	private List fFindHistory;
+	private IRegion fOldScope;
+
+	private IFindReplaceTarget fTarget;
+	private Shell fParentShell;
+	private Shell fActiveShell;
+
+	private final ActivationListener fActivationListener= new ActivationListener();
+	private final ModifyListener fFindModifyListener= new FindModifyListener();
+
+	private Label fStatusLabel;
+	private Button fForwardRadioButton, fGlobalRadioButton, fSelectedRangeRadioButton;
+	private Button fCaseCheckBox, fWrapCheckBox, fWholeWordCheckBox, fIncrementalCheckBox;
+
+	/**
+	 * Checkbox for selecting whether the search string is a regular expression.
+	 * @since 3.0
+	 */
+	private Button fIsRegExCheckBox;
+	
+	private Button fFindNextButton;
+	Combo fFindField, fReplaceField;
+	private Rectangle fDialogPositionInit;
+
+	private IDialogSettings fDialogSettings;
+	/**
+	 * Tells whether the target supports regular expressions.
+	 * <code>true</code> if the target supports regular expressions
+	 * @since 3.0
+	 */
+	private boolean fIsTargetSupportingRegEx;
+	/**
+	 * Tells whether fUseSelectedLines radio is checked.
+	 * @since 3.0
+	 */
+	private boolean fUseSelectedLines;
+	/**
+	 * <code>true</code> if the find field should receive focus the next time
+	 * the dialog is activated, <code>false</code> otherwise.
+	 * @since 3.0
+	 */
+	private boolean fGiveFocusToFindField= true;
+
+
+	
+	/**
+	 * Creates a new dialog with the given shell as parent.
+	 * @param parentShell the parent shell
+	 */
+	public FindIASTNameDialog(Shell parentShell, IFindReplaceTarget target) {
+		super(parentShell);
+		
+		fParentShell= null;
+		updateTarget(target, false);
+
+		fDialogPositionInit= null;
+		fFindHistory= new ArrayList(HISTORY_SIZE - 1);
+
+		fWrapInit= false;
+		fCaseInit= false;
+		fIsRegExInit= false;
+		fWholeWordInit= false;
+		fIncrementalInit= false;
+		fGlobalInit= true;
+		fForwardInit= true;
+
+		readConfiguration();
+		
+		setShellStyle(SWT.CLOSE | SWT.MODELESS | SWT.BORDER | SWT.TITLE);
+		setBlockOnOpen(false);
+	}
+	
+	/**
+	 * Returns this dialog's parent shell.
+	 * @return the dialog's parent shell
+	 */
+	public Shell getParentShell() {
+		return super.getParentShell();
+	}
+	
+	
+	/**
+	 * Returns <code>true</code> if control can be used.
+	 *
+	 * @param control the control to be checked
+	 * @return <code>true</code> if control can be used
+	 */
+	private boolean okToUse(Control control) {
+		return control != null && !control.isDisposed();
+	}
+	
+	/*
+	 * @see org.eclipse.jface.window.Window#create()
+	 */
+	public void create() {
+		
+		super.create();
+		
+		Shell shell= getShell();
+		shell.addShellListener(fActivationListener);
+		if (fLocation != null)
+			shell.setLocation(fLocation);
+		
+		// set help context
+//		WorkbenchHelp.setHelp(shell, IAbstractTextEditorHelpContextIds.FIND_REPLACE_DIALOG);
+
+		// fill in combo contents
+		fFindField.removeModifyListener(fFindModifyListener);
+		updateCombo(fFindField, fFindHistory);
+		fFindField.addModifyListener(fFindModifyListener);
+//		updateCombo(fReplaceField, fReplaceHistory);
+
+		// get find string
+		initFindStringFromSelection();
+		
+		// set dialog position
+		if (fDialogPositionInit != null)
+			shell.setBounds(fDialogPositionInit);
+		
+		shell.setText(FIND_IASTNAME_LABEL);
+		// shell.setImage(null);
+	}
+
+	/**
+	 * Create the button section of the find/replace dialog.
+	 *
+	 * @param parent the parent composite
+	 * @return the button section
+	 */
+	private Composite createButtonSection(Composite parent) {
+		
+		Composite panel= new Composite(parent, SWT.NULL);		
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 1;
+		panel.setLayout(layout);
+		
+		fFindNextButton= makeButton(panel, FIND_NEXT_LABEL, 102, true, new SelectionAdapter() { //$NON-NLS-1$
+			public void widgetSelected(SelectionEvent e) {
+				if (fTarget instanceof FindIASTNameTarget && searchTextChanged) {
+					((FindIASTNameTarget)fTarget).clearMatchingNames();
+					searchTextChanged = false;
+				}
+				
+				if (isIncrementalSearch() && !isRegExSearchAvailableAndChecked())
+					initIncrementalBaseLocation();
+
+				fNeedsInitialFindBeforeReplace= false;
+				performSearch();
+				updateFindHistory();
+				fFindNextButton.setFocus();
+			}
+		});
+		setGridData(fFindNextButton, GridData.FILL, true, GridData.FILL, false);
+		
+		return panel;
+	}
+	
+	/**
+	 * Creates the options configuration section of the find replace dialog.
+	 *
+	 * @param parent the parent composite
+	 * @return the options configuration section
+	 */
+	private Composite createConfigPanel(Composite parent) {
+
+		Composite panel= new Composite(parent, SWT.NULL);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 1;
+		panel.setLayout(layout);
+
+		Composite directionGroup= createDirectionGroup(panel);
+		setGridData(directionGroup, GridData.FILL, true, GridData.FILL, false);
+
+		Composite optionsGroup= createOptionsGroup(panel);
+		setGridData(optionsGroup, GridData.FILL, true, GridData.FILL, false);
+		GridData data= (GridData) optionsGroup.getLayoutData();
+		data.horizontalSpan= 2;
+		optionsGroup.setLayoutData(data);
+
+		return panel;
+	}
+	
+	/*
+	 * @see org.eclipse.jface.window.Window#createContents(org.eclipse.swt.widgets.Composite)
+	 */
+	protected Control createContents(Composite parent) {
+
+		Composite panel= new Composite(parent, SWT.NULL);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 1;
+		layout.makeColumnsEqualWidth= true;
+		panel.setLayout(layout);
+
+		Composite inputPanel= createInputPanel(panel);
+		setGridData(inputPanel, GridData.FILL, true, GridData.CENTER, false);
+
+		Composite configPanel= createConfigPanel(panel);
+		setGridData(configPanel, GridData.FILL, true, GridData.CENTER, true);
+		
+		Composite buttonPanelB= createButtonSection(panel);
+		setGridData(buttonPanelB, GridData.FILL, true, GridData.CENTER, false);
+		
+		Composite statusBar= createStatusAndCloseButton(panel);
+		setGridData(statusBar, GridData.FILL, true, GridData.CENTER, false);
+		
+		updateButtonState();
+		
+		applyDialogFont(panel);
+		
+		return panel;
+	}
+	
+	/**
+	 * Creates the direction defining part of the options defining section
+	 * of the find replace dialog.
+	 *
+	 * @param parent the parent composite
+	 * @return the direction defining part
+	 */
+	private Composite createDirectionGroup(Composite parent) {
+
+		Composite panel= new Composite(parent, SWT.NONE);
+		GridLayout layout= new GridLayout();
+		layout.marginWidth= 0;
+		layout.marginHeight= 0;
+		panel.setLayout(layout);
+
+		Group group= new Group(panel, SWT.SHADOW_ETCHED_IN);
+		group.setText("Direction"); //$NON-NLS-1$
+		GridLayout groupLayout= new GridLayout();
+		group.setLayout(groupLayout);
+		group.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+		SelectionListener selectionListener= new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				if (isIncrementalSearch() && !isRegExSearchAvailableAndChecked())
+					initIncrementalBaseLocation();
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+		};
+
+		fForwardRadioButton= new Button(group, SWT.RADIO | SWT.LEFT);
+		fForwardRadioButton.setText("Forward"); //$NON-NLS-1$
+		setGridData(fForwardRadioButton, GridData.BEGINNING, false, GridData.CENTER, false);
+		fForwardRadioButton.addSelectionListener(selectionListener);
+
+		Button backwardRadioButton= new Button(group, SWT.RADIO | SWT.LEFT);
+		backwardRadioButton.setText("Backward"); //$NON-NLS-1$
+		setGridData(backwardRadioButton, GridData.BEGINNING, false, GridData.CENTER, false);
+		backwardRadioButton.addSelectionListener(selectionListener);
+
+		backwardRadioButton.setSelection(!fForwardInit);
+		fForwardRadioButton.setSelection(fForwardInit);
+
+		return panel;
+	}
+
+	/**
+	 * Tells the dialog to perform searches only in the scope given by the actually selected lines.
+	 * @param selectedLines <code>true</code> if selected lines should be used
+	 * @since 2.0
+	 */
+	private void useSelectedLines(boolean selectedLines) {
+		if (isIncrementalSearch() && !isRegExSearchAvailableAndChecked())
+			initIncrementalBaseLocation();
+
+		if (fTarget == null || !(fTarget instanceof IFindReplaceTargetExtension))
+			return;
+
+		IFindReplaceTargetExtension extensionTarget= (IFindReplaceTargetExtension) fTarget;
+
+		if (selectedLines) {
+
+			IRegion scope;
+			if (fOldScope == null) {
+				Point lineSelection= extensionTarget.getLineSelection();
+				scope= new Region(lineSelection.x, lineSelection.y);
+			} else {
+				scope= fOldScope;
+				fOldScope= null;
+			}
+
+			int offset= isForwardSearch()
+				? scope.getOffset() 
+				: scope.getOffset() + scope.getLength();					
+
+			extensionTarget.setSelection(offset, 0);					
+			extensionTarget.setScope(scope);
+		} else {
+			fOldScope= extensionTarget.getScope();
+			extensionTarget.setScope(null);			
+		}
+	}
+
+	/**
+	 * Creates the panel where the user specifies the text to search
+	 * for and the optional replacement text.
+	 *
+	 * @param parent the parent composite
+	 * @return the input panel
+	 */
+	private Composite createInputPanel(Composite parent) {
+		Composite panel= new Composite(parent, SWT.NULL);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		panel.setLayout(layout);
+
+		Label findLabel= new Label(panel, SWT.LEFT);
+		findLabel.setText("Find Name:"); //$NON-NLS-1$
+		setGridData(findLabel, GridData.BEGINNING, false, GridData.CENTER, false);
+
+		fFindField= new Combo(panel, SWT.DROP_DOWN | SWT.BORDER);
+		setGridData(fFindField, GridData.FILL, true, GridData.CENTER, false);
+		fFindField.addModifyListener(fFindModifyListener);
+
+		return panel;
+	}
+
+	/**
+	 * Creates the functional options part of the options defining
+	 * section of the find replace dialog.
+	 *
+	 * @param parent the parent composite
+	 * @return the options group
+	 */
+	private Composite createOptionsGroup(Composite parent) {
+
+		Composite panel= new Composite(parent, SWT.NULL);
+		GridLayout layout= new GridLayout();
+		layout.marginWidth= 0;
+		layout.marginHeight= 0;
+		panel.setLayout(layout);
+
+		Group group= new Group(panel, SWT.SHADOW_NONE);
+		group.setText(OPTIONS_LABEL); //$NON-NLS-1$
+		GridLayout groupLayout= new GridLayout();
+		groupLayout.numColumns= 2;
+		groupLayout.makeColumnsEqualWidth= true;		
+		group.setLayout(groupLayout);
+		group.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+		SelectionListener selectionListener= new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				storeSettings();
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+		};
+
+		fCaseCheckBox= new Button(group, SWT.CHECK | SWT.LEFT);
+		fCaseCheckBox.setText(CASE_SENSITIVE_LABEL); //$NON-NLS-1$
+		setGridData(fCaseCheckBox, GridData.BEGINNING, false, GridData.CENTER, false);
+		fCaseCheckBox.setSelection(fCaseInit);
+		fCaseCheckBox.addSelectionListener(selectionListener);
+
+		fWholeWordCheckBox= new Button(group, SWT.CHECK | SWT.LEFT);
+		fWholeWordCheckBox.setText(WHOLE_WORD_LABEL); //$NON-NLS-1$
+		setGridData(fWholeWordCheckBox, GridData.BEGINNING, false, GridData.CENTER, false);
+		fWholeWordCheckBox.setSelection(fWholeWordInit);
+		fWholeWordCheckBox.addSelectionListener(selectionListener);
+
+		fIsRegExCheckBox= new Button(group, SWT.CHECK | SWT.LEFT);
+		fIsRegExCheckBox.setText(REGULAR_EXPRESSIONS_LABEL); //$NON-NLS-1$
+		setGridData(fIsRegExCheckBox, GridData.BEGINNING, false, GridData.CENTER, false);
+		((GridData)fIsRegExCheckBox.getLayoutData()).horizontalSpan= 2;
+		fIsRegExCheckBox.setSelection(fIsRegExInit);
+		fIsRegExCheckBox.addSelectionListener(new SelectionAdapter() {
+			/*
+			 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
+			 */
+			public void widgetSelected(SelectionEvent e) {
+				boolean newState= fIsRegExCheckBox.getSelection();
+				if (fTarget instanceof FindIASTNameTarget)
+					((FindIASTNameTarget)fTarget).clearMatchingNames();
+				
+				updateButtonState();
+				storeSettings();
+			}
+		});
+		fWholeWordCheckBox.setEnabled(!isRegExSearchAvailableAndChecked());
+		fWholeWordCheckBox.addSelectionListener(new SelectionAdapter() {
+			/*
+			 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
+			 */
+			public void widgetSelected(SelectionEvent e) {
+				if (fTarget instanceof FindIASTNameTarget)
+					((FindIASTNameTarget)fTarget).clearMatchingNames();
+				
+				updateButtonState();
+			}
+		});
+		return panel;
+	}
+	
+	/**
+	 * Creates the status and close section of the dialog.
+	 *
+	 * @param parent the parent composite
+	 * @return the status and close button
+	 */
+	private Composite createStatusAndCloseButton(Composite parent) {
+
+		Composite panel= new Composite(parent, SWT.NULL);
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 2;
+		layout.marginWidth= 0;
+		layout.marginHeight= 0;		
+		panel.setLayout(layout);
+
+		fStatusLabel= new Label(panel, SWT.LEFT);
+		setGridData(fStatusLabel, GridData.FILL, true, GridData.CENTER, false);
+
+		String label= "Close"; //$NON-NLS-1$
+		Button closeButton= createButton(panel, 101, label, false);
+		setGridData(closeButton, GridData.END, false, GridData.END, false);
+
+		return panel;
+	}
+
+	/*
+	 * @see Dialog#buttonPressed
+	 */
+	protected void buttonPressed(int buttonID) {
+		if (buttonID == 101)
+			close();
+	}
+	
+	// ------- action invocation ---------------------------------------
+
+	/**
+	 * Returns the position of the specified search string, or <code>-1</code> if the string can
+	 * not be found when searching using the given options.
+	 * 
+	 * @param findString the string to search for
+	 * @param startPosition the position at which to start the search
+	 * @param forwardSearch the direction of the search
+	 * @param caseSensitive	should the search be case sensitive
+	 * @param wrapSearch	should the search wrap to the start/end if arrived at the end/start
+	 * @param wholeWord does the search string represent a complete word
+	 * @param regExSearch if <code>true</code> findString represents a regular expression
+	 * @return the occurrence of the find string following the options or <code>-1</code> if nothing found
+	 * @since 3.0
+	 */
+	private int findIndex(String findString, int startPosition, boolean forwardSearch, boolean caseSensitive, boolean wrapSearch, boolean wholeWord, boolean regExSearch) {
+
+		if (forwardSearch) {
+			if (wrapSearch) {
+				int index= findAndSelect(startPosition, findString, true, caseSensitive, wholeWord, regExSearch);
+				if (index == -1) {
+					if (okToUse(getShell()) && !isIncrementalSearch())
+						getShell().getDisplay().beep();
+					index= findAndSelect(-1, findString, true, caseSensitive, wholeWord, regExSearch);
+				}
+				return index;
+			}
+			return findAndSelect(startPosition, findString, true, caseSensitive, wholeWord, regExSearch);
+		}
+
+		// backward
+		if (wrapSearch) {
+			int index= findAndSelect(startPosition - 1, findString, false, caseSensitive, wholeWord, regExSearch);
+			if (index == -1) {
+				if (okToUse(getShell()) && !isIncrementalSearch())
+					getShell().getDisplay().beep();
+				index= findAndSelect(-1, findString, false, caseSensitive, wholeWord, regExSearch);
+			}
+			return index;
+		}
+		return findAndSelect(startPosition - 1, findString, false, caseSensitive, wholeWord, regExSearch);
+	}
+	
+	/**
+	 * Searches for a string starting at the given offset and using the specified search
+	 * directives. If a string has been found it is selected and its start offset is 
+	 * returned.
+	 *
+	 * @param offset the offset at which searching starts
+	 * @param findString the string which should be found
+	 * @param forwardSearch the direction of the search
+	 * @param caseSensitive <code>true</code> performs a case sensitive search, <code>false</code> an insensitive search
+	 * @param wholeWord if <code>true</code> only occurrences are reported in which the findString stands as a word by itself 
+	 * @param regExSearch if <code>true</code> findString represents a regular expression 
+	 * @return the position of the specified string, or -1 if the string has not been found
+	 * @since 3.0
+	 */
+	private int findAndSelect(int offset, String findString, boolean forwardSearch, boolean caseSensitive, boolean wholeWord, boolean regExSearch) {
+		if (fTarget instanceof IFindReplaceTargetExtension3)
+			return ((IFindReplaceTargetExtension3)fTarget).findAndSelect(offset, findString, forwardSearch, caseSensitive, wholeWord, regExSearch);
+		return fTarget.findAndSelect(offset, findString, forwardSearch, caseSensitive, wholeWord);
+	}
+
+	/**
+	 * Replaces the selection with <code>replaceString</code>. If
+	 * <code>regExReplace</code> is <code>true</code>,
+	 * <code>replaceString</code> is a regex replace pattern which will get
+	 * expanded if the underlying target supports it. Returns the region of the
+	 * inserted text; note that the returned selection covers the expanded
+	 * pattern in case of regex replace.
+	 * 
+	 * @param replaceString the replace string (or a regex pattern)
+	 * @param regExReplace <code>true</code> if <code>replaceString</code>
+	 *        is a pattern
+	 * @return the selection after replacing, i.e. the inserted text
+	 * @since 3.0
+	 */
+	Point replaceSelection(String replaceString, boolean regExReplace) {
+		if (fTarget instanceof IFindReplaceTargetExtension3)
+			((IFindReplaceTargetExtension3)fTarget).replaceSelection(replaceString, regExReplace);
+		else
+			fTarget.replaceSelection(replaceString);
+		
+		return fTarget.getSelection();
+	}
+	
+	/**
+	 * Returns whether the specified search string can be found using the given options.
+	 * 
+	 * @param findString the string to search for
+	 * @param forwardSearch the direction of the search
+	 * @param caseSensitive	should the search be case sensitive
+	 * @param wrapSearch	should the search wrap to the start/end if arrived at the end/start
+	 * @param wholeWord does the search string represent a complete word
+	 * @param incremental is this an incremental search
+	 * @param regExSearch if <code>true</code> findString represents a regular expression 
+	 * @return <code>true</code> if the search string can be found using the given options
+	 * 
+	 * @since 3.0
+	 */
+	private boolean findNext(String findString, boolean forwardSearch, boolean caseSensitive, boolean wrapSearch, boolean wholeWord, boolean incremental, boolean regExSearch) {
+
+		if (fTarget == null)
+			return false;
+
+		Point r= null;
+		if (incremental)
+			r= fIncrementalBaseLocation;
+		else
+			r= fTarget.getSelection();
+
+		int findReplacePosition= r.x;
+		if (forwardSearch && !fNeedsInitialFindBeforeReplace || !forwardSearch && fNeedsInitialFindBeforeReplace)
+			findReplacePosition += r.y;
+
+		fNeedsInitialFindBeforeReplace= false;
+
+		int index= findIndex(findString, findReplacePosition, forwardSearch, caseSensitive, wrapSearch, wholeWord, regExSearch);
+
+		if (index != -1)
+			return true;
+		
+		return false;
+	}
+
+	/**
+	 * Returns the dialog's boundaries.
+	 * @return the dialog's boundaries
+	 */
+	private Rectangle getDialogBoundaries() {
+		if (okToUse(getShell()))
+			return getShell().getBounds();
+		return fDialogPositionInit;
+	}
+	
+	/**
+	 * Returns the dialog's history.
+	 * @return the dialog's history
+	 */
+	private List getFindHistory() {
+		return fFindHistory;
+	}
+
+	// ------- accessors ---------------------------------------
+
+	/**
+	 * Retrieves the string to search for from the appropriate text input field and returns it. 
+	 * @return the search string
+	 */
+	private String getFindString() {
+		if (okToUse(fFindField)) {
+			return fFindField.getText();
+		}
+		return BLANK_STRING; //$NON-NLS-1$
+	}
+	
+	// ------- init / close ---------------------------------------
+
+	/**
+	 * Returns the actual selection of the find replace target.
+	 * @return the selection of the target
+	 */
+	private String getSelectionString() {
+		String selection= fTarget.getSelectionText();
+		if (selection != null && selection.length() > 0) {
+			int[] info= TextUtilities.indexOf(TextUtilities.DELIMITERS, selection, 0);
+			if (info[0] > 0)
+				return selection.substring(0, info[0]);
+			else if (info[0] == -1)
+				return selection;
+		}
+		return null;
+	}
+	
+	/**
+	 * @see org.eclipse.jface.window.Window#close()
+	 */
+	public boolean close() {
+		handleDialogClose();
+		return super.close();
+	}
+	
+	/**
+	 * Removes focus changed listener from browser and stores settings for re-open.
+	 */
+	private void handleDialogClose() {
+
+		// remove listeners
+		if (okToUse(fFindField)) {
+			fFindField.removeModifyListener(fFindModifyListener);
+		}
+		
+		if (fParentShell != null) {
+			fParentShell.removeShellListener(fActivationListener);
+			fParentShell= null;
+		}
+		
+		getShell().removeShellListener(fActivationListener);
+		
+		// store current settings in case of re-open
+		storeSettings();
+
+		if (fTarget != null && fTarget instanceof IFindReplaceTargetExtension)
+			((IFindReplaceTargetExtension) fTarget).endSession();
+
+		// prevent leaks
+		fActiveShell= null;
+		fTarget= null;
+		
+	}
+
+	/**
+	 * Writes the current selection to the dialog settings.
+	 * @since 3.0
+	 */
+	private void writeSelection() {
+		if (fTarget == null)
+			return;
+		String selection= fTarget.getSelectionText();
+		if (selection == null)
+			selection= BLANK_STRING; //$NON-NLS-1$
+
+		IDialogSettings s= getDialogSettings();
+		s.put("selection", selection); //$NON-NLS-1$
+	}
+	
+	/**
+	 * Stores the current state in the dialog settings.
+	 * @since 2.0
+	 */
+	private void storeSettings() {
+		fDialogPositionInit= getDialogBoundaries();
+		fWrapInit= isWrapSearch();
+		fWholeWordInit= isWholeWordSetting();
+		fCaseInit= isCaseSensitiveSearch();
+		fIsRegExInit= isRegExSearch();
+		fIncrementalInit= isIncrementalSearch();
+		fForwardInit= isForwardSearch();
+
+		writeConfiguration();		
+	}
+	
+	/**
+	 * Initializes the string to search for and the appropriate
+	 * text inout field based on the selection found in the
+	 * action's target.
+	 */
+	private void initFindStringFromSelection() {
+		if (fTarget != null && okToUse(fFindField)) {
+			String selection= getSelectionString();
+			fFindField.removeModifyListener(fFindModifyListener);
+			if (selection != null) {
+				fFindField.setText(selection);
+				if (!selection.equals(fTarget.getSelectionText())) {
+					useSelectedLines(true);
+					fGlobalRadioButton.setSelection(false);
+					fSelectedRangeRadioButton.setSelection(true);
+					fUseSelectedLines= true;
+				}
+			} else {
+				if (BLANK_STRING.equals(fFindField.getText())) { //$NON-NLS-1$
+					if (fFindHistory.size() > 0)
+						fFindField.setText((String) fFindHistory.get(0));
+					else
+						fFindField.setText(BLANK_STRING); //$NON-NLS-1$				
+				}
+			}
+			fFindField.setSelection(new Point(0, fFindField.getText().length()));
+			fFindField.addModifyListener(fFindModifyListener);
+		}
+	}
+
+	/**
+	 * Initializes the anchor used as starting point for incremental searching.
+	 * @since 2.0
+	 */
+	private void initIncrementalBaseLocation() {
+		if (fTarget != null && isIncrementalSearch() && !isRegExSearchAvailableAndChecked()) {
+			fIncrementalBaseLocation= fTarget.getSelection();
+		} else {
+			fIncrementalBaseLocation= new Point(0, 0);	
+		}
+	}
+
+	// ------- history ---------------------------------------
+		
+	/**
+	 * Retrieves and returns the option case sensitivity from the appropriate check box.
+	 * @return <code>true</code> if case sensitive
+	 */
+	private boolean isCaseSensitiveSearch() {
+		if (okToUse(fCaseCheckBox)) {
+			return fCaseCheckBox.getSelection();
+		}
+		return fCaseInit;
+	}
+
+	/**
+	 * Retrieves and returns the regEx option from the appropriate check box.
+	 * 
+	 * @return <code>true</code> if case sensitive
+	 * @since 3.0
+	 */
+	private boolean isRegExSearch() {
+		if (okToUse(fIsRegExCheckBox)) {
+			return fIsRegExCheckBox.getSelection();
+		}
+		return fIsRegExInit;
+	}
+
+	/**
+	 * If the target supports regular expressions search retrieves and returns
+	 * regEx option from appropriate check box.
+	 * 
+	 * @return <code>true</code> if regEx is available and checked
+	 * @since 3.0
+	 */
+	private boolean isRegExSearchAvailableAndChecked() {
+		if (okToUse(fIsRegExCheckBox)) {
+			return fIsTargetSupportingRegEx && fIsRegExCheckBox.getSelection();
+		}
+		return fIsRegExInit;
+	}
+
+	/**
+	 * Retrieves and returns the option search direction from the appropriate check box.
+	 * @return <code>true</code> if searching forward
+	 */
+	private boolean isForwardSearch() {
+		if (okToUse(fForwardRadioButton)) {
+			return fForwardRadioButton.getSelection();
+		}
+		return fForwardInit;
+	}
+
+	/**
+	 * Retrieves and returns the option search whole words from the appropriate check box.
+	 * @return <code>true</code> if searching for whole words
+	 */
+	private boolean isWholeWordSetting() {
+		if (okToUse(fWholeWordCheckBox)) {
+			return fWholeWordCheckBox.getSelection();
+		}
+		return fWholeWordInit;
+	}
+
+	/**
+	 * Returns <code>true</code> if searching should be restricted to entire
+	 * words, <code>false</code> if not. This is the case if the respective
+	 * checkbox is turned on, regex is off, and the checkbox is enabled, i.e. 
+	 * the current find string is an entire word.
+	 * 
+	 * @return <code>true</code> if the search is restricted to whole words
+	 */
+	private boolean isWholeWordSearch() {
+		return isWholeWordSetting() && !isRegExSearchAvailableAndChecked() && (okToUse(fWholeWordCheckBox) ? fWholeWordCheckBox.isEnabled() : true);
+	}
+
+	/**
+	 * Retrieves and returns the option wrap search from the appropriate check box.
+	 * @return <code>true</code> if wrapping while searching
+	 */
+	private boolean isWrapSearch() {
+		if (okToUse(fWrapCheckBox)) {
+			return fWrapCheckBox.getSelection();
+		}
+		return fWrapInit;
+	}
+
+	/**
+	 * Retrieves and returns the option incremental search from the appropriate check box.
+	 * @return <code>true</code> if incremental search
+	 * @since 2.0
+	 */
+	private boolean isIncrementalSearch() {
+		if (okToUse(fIncrementalCheckBox)) {
+			return fIncrementalCheckBox.getSelection();
+		}
+		return fIncrementalInit;
+	}
+
+	/**
+	 * Creates a button.
+	 * @param parent the parent control
+	 * @param key the key to lookup the button label
+	 * @param id the button id
+	 * @param dfltButton is this button the default button
+	 * @param listener a button pressed listener
+	 * @return the new button
+	 */
+	private Button makeButton(Composite parent, String label, int id, boolean dfltButton, SelectionListener listener) {
+		Button b= createButton(parent, id, label, dfltButton);
+		b.addSelectionListener(listener);
+		return b;
+	}
+
+	/**
+	 * Returns the status line manager of the active editor or <code>null</code> if there is no such editor.
+	 * @return the status line manager of the active editor
+	 */
+	private IEditorStatusLine getStatusLineManager() {
+		IWorkbenchWindow window= PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		if (window == null)
+			return null;
+
+		IWorkbenchPage page= window.getActivePage();
+		if (page == null)
+			return null;
+			
+		IEditorPart editor= page.getActiveEditor();
+		if (editor == null)
+			return null;
+
+		return (IEditorStatusLine) editor.getAdapter(IEditorStatusLine.class);
+	}
+
+	/**
+	 * Sets the given status message in the status line.
+	 * 
+	 * @param error <code>true</code> if it is an error
+	 * @param message the error message
+	 */
+	private void statusMessage(boolean error, String message) {
+		fStatusLabel.setText(message);
+
+		if (error)
+			fStatusLabel.setForeground(JFaceColors.getErrorText(fStatusLabel.getDisplay()));
+		else
+			fStatusLabel.setForeground(null);
+
+		IEditorStatusLine statusLine= getStatusLineManager();
+		if (statusLine != null)
+			statusLine.setMessage(error, message, null);	
+
+		if (error)
+			getShell().getDisplay().beep();
+	}
+
+	/**
+	 * Sets the given error message in the status line.
+	 * @param message the message
+	 */
+	private void statusError(String message) {
+		statusMessage(true, message);
+	}
+
+	/**
+	 * Sets the given message in the status line.
+	 * @param message the message
+	 */
+	private void statusMessage(String message) {
+		statusMessage(false, message);
+	}
+
+	/**
+	 * Locates the user's findString in the text of the target.
+	 */
+	private void performSearch() {
+		performSearch(isIncrementalSearch() && !isRegExSearchAvailableAndChecked());
+	}
+	
+	/**
+	 * Locates the user's findString in the text of the target.
+	 * 
+	 * @param mustInitIncrementalBaseLocation <code>true</code> if base location must be initialized
+	 * @since 3.0
+	 */
+	private void performSearch(boolean mustInitIncrementalBaseLocation) {
+
+		if (mustInitIncrementalBaseLocation)
+			initIncrementalBaseLocation();
+		
+		String findString= getFindString();
+
+		if (findString != null && findString.length() > 0) {
+
+			try {
+				boolean somethingFound= findNext(findString, isForwardSearch(), isCaseSensitiveSearch(), isWrapSearch(), isWholeWordSearch(), isIncrementalSearch() && !isRegExSearchAvailableAndChecked(), isRegExSearchAvailableAndChecked());
+				if (somethingFound) {
+					statusMessage(BLANK_STRING); //$NON-NLS-1$
+				} else {
+					statusMessage(NAME_NOT_FOUND); //$NON-NLS-1$
+				}
+			} catch (PatternSyntaxException ex) {
+				statusError(ex.getLocalizedMessage());
+			} catch (IllegalStateException ex) {
+				// we don't keep state in this dialog
+			}
+		}
+		writeSelection();
+		updateButtonState();
+	}
+	
+	// ------- UI creation ---------------------------------------
+	
+	/**
+	 * Attaches the given layout specification to the <code>component</code>.
+	 * 
+	 * @param component the component
+	 * @param horizontalAlignment horizontal alignment
+	 * @param grabExcessHorizontalSpace grab excess horizontal space
+	 * @param verticalAlignment vertical alignment
+	 * @param grabExcessVerticalSpace grab excess vertical space
+	 */
+	private void setGridData(Control component, int horizontalAlignment, boolean grabExcessHorizontalSpace, int verticalAlignment, boolean grabExcessVerticalSpace) {
+		GridData gd= new GridData();
+		gd.horizontalAlignment= horizontalAlignment;
+		gd.grabExcessHorizontalSpace= grabExcessHorizontalSpace;
+		gd.verticalAlignment= verticalAlignment;
+		gd.grabExcessVerticalSpace= grabExcessVerticalSpace;
+		component.setLayoutData(gd);
+	}
+
+	/** 
+	 * Updates the enabled state of the buttons.
+	 * 
+	 * @since 3.0
+	 */
+	private void updateButtonState() {
+		if (okToUse(getShell()) && okToUse(fFindNextButton)) {
+			boolean enable= fTarget != null && (fActiveShell == fParentShell || fActiveShell == getShell());
+			String str= getFindString();
+			boolean findString= str != null && str.length() > 0;
+			
+			boolean wholeWord= isWord(str) && !isRegExSearchAvailableAndChecked();
+			fWholeWordCheckBox.setEnabled(wholeWord);
+
+			fFindNextButton.setEnabled(enable && findString);
+		}
+	}
+	
+	/**
+	 * Tests whether each character in the given
+	 * string is a letter.
+	 * 
+	 * @param str
+	 * @return <code>true</code> if the given string is a word
+	 * @since 3.0
+	 */
+	private boolean isWord(String str) {
+		if (str == null || str.length() == 0)
+			return false;
+		
+		for (int i= 0; i < str.length(); i++) {
+			if (!Character.isJavaIdentifierPart(str.charAt(i)))
+				return false;
+		}
+		return true;
+	}
+	
+	/**
+	 * Updates the given combo with the given content.
+	 * @param combo combo to be updated
+	 * @param content to be put into the combo
+	 */
+	private void updateCombo(Combo combo, List content) {
+		combo.removeAll();
+		for (int i= 0; i < content.size(); i++) {
+			combo.add(content.get(i).toString());
+		}
+	}
+
+	// ------- open / reopen ---------------------------------------
+
+	/**
+	 * Called after executed find action to update the history.
+	 */
+	private void updateFindHistory() {
+		if (okToUse(fFindField)) {
+			fFindField.removeModifyListener(fFindModifyListener);
+			updateHistory(fFindField, fFindHistory);
+			fFindField.addModifyListener(fFindModifyListener);
+		}
+	}
+
+	/**
+	 * Updates the combo with the history.
+	 * @param combo to be updated
+	 * @param history to be put into the combo
+	 */
+	private void updateHistory(Combo combo, List history) {
+		String findString= combo.getText();
+		int index= history.indexOf(findString);
+		if (index != 0) {
+			if (index != -1) {
+				history.remove(index);
+			}
+			history.add(0, findString);
+			updateCombo(combo, history);
+			combo.setText(findString);
+		}
+	}
+	
+	/**
+	 * Updates this dialog because of a different target.
+	 * @param target the new target
+	 * @param isTargetEditable <code>true</code> if the new target can be modifed
+	 * @since 2.0
+	 */
+	public void updateTarget(IFindReplaceTarget target, boolean isTargetEditable) {
+		
+		fNeedsInitialFindBeforeReplace= true;
+		
+		if (target != fTarget) {
+			if (fTarget != null && fTarget instanceof IFindReplaceTargetExtension)
+				((IFindReplaceTargetExtension) fTarget).endSession();
+
+			fTarget= target;
+			if (target != null)
+				fIsTargetSupportingRegEx= target instanceof IFindReplaceTargetExtension3;
+
+			if (fTarget != null && fTarget instanceof IFindReplaceTargetExtension) {
+				((IFindReplaceTargetExtension) fTarget).beginSession();
+
+				fGlobalInit= true;
+				fGlobalRadioButton.setSelection(fGlobalInit);
+				fSelectedRangeRadioButton.setSelection(!fGlobalInit);
+				fUseSelectedLines= !fGlobalInit;
+			}
+		}
+
+		if (okToUse(fIsRegExCheckBox))
+			fIsRegExCheckBox.setEnabled(fIsTargetSupportingRegEx);
+	
+		if (okToUse(fWholeWordCheckBox))
+			fWholeWordCheckBox.setEnabled(!isRegExSearchAvailableAndChecked());
+		
+		if (okToUse(fIncrementalCheckBox))
+			fIncrementalCheckBox.setEnabled(!isRegExSearchAvailableAndChecked());
+
+		// see pr 51073
+		fGiveFocusToFindField= true;
+	}
+
+	/** 
+	 * Sets the parent shell of this dialog to be the given shell.
+	 *
+	 * @param shell the new parent shell
+	 */
+	public void setParentShell(Shell shell) {
+		if (shell != fParentShell) {
+			
+			if (fParentShell != null)
+				fParentShell.removeShellListener(fActivationListener);
+							
+			fParentShell= shell;
+			fParentShell.addShellListener(fActivationListener);
+		}
+		
+		fActiveShell= shell;
+	}
+	
+	
+	//--------------- configuration handling --------------
+	
+	/**
+	 * Returns the dialog settings object used to share state
+	 * between several find/replace dialogs.
+	 * 
+	 * @return the dialog settings to be used
+	 */
+	private IDialogSettings getDialogSettings() {
+		IDialogSettings settings= TextEditorPlugin.getDefault().getDialogSettings();
+		fDialogSettings= settings.getSection(getClass().getName());
+		if (fDialogSettings == null)
+			fDialogSettings= settings.addNewSection(getClass().getName());
+		return fDialogSettings;
+	}
+	
+	/**
+	 * Initializes itself from the dialog settings with the same state
+	 * as at the previous invocation.
+	 */
+	private void readConfiguration() {
+		IDialogSettings s= getDialogSettings();
+
+		try {
+			int x= s.getInt("x"); //$NON-NLS-1$
+			int y= s.getInt("y"); //$NON-NLS-1$
+			fLocation= new Point(x, y);
+		} catch (NumberFormatException e) {
+			fLocation= null;
+		}
+			
+		fWrapInit= s.getBoolean("wrap"); //$NON-NLS-1$
+		fCaseInit= s.getBoolean("casesensitive"); //$NON-NLS-1$
+		fWholeWordInit= s.getBoolean("wholeword"); //$NON-NLS-1$
+		fIncrementalInit= s.getBoolean("incremental"); //$NON-NLS-1$
+		fIsRegExInit= s.getBoolean("isRegEx"); //$NON-NLS-1$
+		
+		String[] findHistory= s.getArray("findhistory"); //$NON-NLS-1$
+		if (findHistory != null) {
+			List history= getFindHistory();
+			history.clear();
+			for (int i= 0; i < findHistory.length; i++)
+				history.add(findHistory[i]);
+		}		
+	}
+	
+	/**
+	 * Stores its current configuration in the dialog store.
+	 */
+	private void writeConfiguration() {
+		IDialogSettings s= getDialogSettings();
+
+		Point location= getShell().getLocation();
+		s.put("x", location.x); //$NON-NLS-1$
+		s.put("y", location.y); //$NON-NLS-1$
+		
+		s.put("wrap", fWrapInit); //$NON-NLS-1$
+		s.put("casesensitive", fCaseInit); //$NON-NLS-1$
+		s.put("wholeword", fWholeWordInit); //$NON-NLS-1$
+		s.put("incremental", fIncrementalInit); //$NON-NLS-1$
+		s.put("isRegEx", fIsRegExInit); //$NON-NLS-1$
+		List history= getFindHistory();
+		while (history.size() > 8)
+			history.remove(8);
+		String[] names= new String[history.size()];
+		history.toArray(names);
+		s.put("findhistory", names); //$NON-NLS-1$
+	}
+	
+}
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameTarget.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameTarget.java
new file mode 100644
index 00000000000..09d9af70af1
--- /dev/null
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameTarget.java
@@ -0,0 +1,444 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.ui.tests.DOMAST;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.cdt.core.dom.ast.IASTName;
+import org.eclipse.cdt.core.dom.ast.IASTPreprocessorMacroDefinition;
+import org.eclipse.cdt.core.dom.ast.IASTPreprocessorStatement;
+import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
+import org.eclipse.cdt.core.parser.ParserLanguage;
+import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
+import org.eclipse.cdt.internal.core.dom.parser.c.CVisitor;
+import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor;
+import org.eclipse.jface.text.IFindReplaceTarget;
+import org.eclipse.jface.text.IFindReplaceTargetExtension3;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.TreeItem;
+
+/**
+ * @author dsteffle
+ */
+public class FindIASTNameTarget implements IFindReplaceTarget, IFindReplaceTargetExtension3 {
+
+	IASTTranslationUnit tu = null;
+	TreeParent tuTreeParent = null;
+	ParserLanguage lang = null;
+	TreeViewer viewer = null;
+	TreeObject startingNode = null;
+	IASTName[] matchingNames = null;
+	boolean wasForward = true;
+	int index = 0;
+	
+    static protected class CNameCollector extends CVisitor.CBaseVisitorAction {
+        private static final int REGULAR_NAME_ADD = -1;
+		private static final String BLANK_STRING = ""; //$NON-NLS-1$
+		{
+            processNames = true;
+        }
+        public List nameList = new ArrayList();
+        
+        String findString = null;
+		boolean caseSensitive = true;
+		boolean wholeWord = true;
+		boolean regExSearch = false;
+		
+		public CNameCollector(String findString, boolean caseSensitive, boolean wholeWord, boolean regExSearch) {
+			this.findString = findString;
+			this.caseSensitive = caseSensitive;
+			this.wholeWord = wholeWord;
+			this.regExSearch = regExSearch;
+		}
+
+		public int processName( IASTName name, int offset) {
+        	if (name.toString() == null || name.toString() == BLANK_STRING) return PROCESS_CONTINUE;
+        	String searchString = null;
+        	String match = null;
+        	boolean addName = false;
+        	
+        	if (caseSensitive) {
+        		searchString = findString;
+        		match = name.toString();
+        	} else {
+        		searchString = findString.toUpperCase();
+        		match = name.toString().toUpperCase();
+        	}	
+        	
+           	if (regExSearch) {
+           		if (match.matches(searchString))
+           			addName = true;
+           	} else if (!wholeWord) {
+           		if (match.indexOf(searchString) >= 0)
+           			addName = true;
+           	} else {
+           		if (match.equals(searchString))
+           			addName = true;
+           	}
+           	
+           	if (addName) {
+           		if (offset >= 0)
+           			nameList.add(offset, name);
+           		else
+           			nameList.add( name );
+           	}
+        	
+            return PROCESS_CONTINUE;
+		}
+		
+        public int processName( IASTName name ){
+        	return processName(name, REGULAR_NAME_ADD);
+        }
+        public IASTName getName( int idx ){
+            if( idx < 0 || idx >= nameList.size() )
+                return null;
+            return (IASTName) nameList.get( idx );
+        }
+        public int size() { return nameList.size(); } 
+        
+        private void mergeName(IASTName name) {
+        	if (name instanceof ASTNode) {
+        		int offset = ((ASTNode)name).getOffset();
+        		for( int i=0; i<nameList.size(); i++) {
+        			if (nameList.get(i) instanceof ASTNode && 
+        					((ASTNode)nameList.get(i)).getOffset() > offset) {
+        				processName(name, i);
+        				return;
+        			}
+        		}
+        		// if couldn't find the proper place to put the name, then add default
+        		processName(name);
+        	}
+        }
+        
+        public IASTName[] getNameArray(IASTPreprocessorStatement[] statements) {
+        	// first merge all of the preprocessor names into the array list
+        	for(int i=0; i<statements.length; i++) {
+        		if (statements[i] instanceof IASTPreprocessorMacroDefinition) {
+        			IASTName name = ((IASTPreprocessorMacroDefinition)statements[i]).getName();
+        			if (name != null) {
+        				mergeName(name);
+        			}
+        		}
+        	}
+        	
+        	// convert the array list into an array of IASTNames
+        	IASTName[] namedArray = new IASTName[nameList.size()];
+        	
+        	for(int i=0; i<nameList.size(); i++) {
+        		if (nameList.get(i) instanceof IASTName)
+        			namedArray[i] = (IASTName)nameList.get(i);
+        	}
+        	
+        	return namedArray;
+        }
+    }
+    
+    static protected class CPPNameCollector extends CPPVisitor.CPPBaseVisitorAction {
+        private static final int REGULAR_NAME_ADD = -1;
+		private static final String BLANK_STRING = ""; //$NON-NLS-1$
+		{
+            processNames = true;
+        }
+        public List nameList = new ArrayList();
+        
+        String findString = null;
+		boolean caseSensitive = true;
+		boolean wholeWord = true;
+		boolean regExSearch = false;
+		Pattern p = null;
+		Matcher m = null;
+		
+		public CPPNameCollector(String findString, boolean caseSensitive, boolean wholeWord, boolean regExSearch) {
+			this.findString = findString;
+			this.caseSensitive = caseSensitive;
+			this.wholeWord = wholeWord;
+			this.regExSearch = regExSearch;
+		}
+        
+		public int processName( IASTName name, int index) {
+        	if (name.toString() == null || name.toString() == BLANK_STRING) return PROCESS_CONTINUE;
+        	String searchString = null;
+        	String match = null;
+        	boolean addName = false;
+        	
+        	if (caseSensitive) {
+        		searchString = findString;
+        		match = name.toString();
+        	} else {
+        		searchString = findString.toUpperCase();
+        		match = name.toString().toUpperCase();
+        	}	
+        	
+           	if (regExSearch) {
+           		if (match.matches(searchString))
+           			addName = true;
+           	} else if (!wholeWord) {
+           		if (match.indexOf(searchString) >= 0)
+           			addName = true;
+           	} else {
+           		if (match.equals(searchString))
+           			addName = true;
+           	}
+           	
+           	if (addName) {
+           		if (index >= 0)
+           			nameList.add(index, name);
+           		else
+           			nameList.add( name );
+           	}
+        	
+            return PROCESS_CONTINUE;
+		}
+		
+        public int processName( IASTName name ){
+        	return processName(name, REGULAR_NAME_ADD);
+        }
+        public IASTName getName( int idx ){
+            if( idx < 0 || idx >= nameList.size() )
+                return null;
+            return (IASTName) nameList.get( idx );
+        }
+        public int size() { return nameList.size(); } 
+        
+        private void mergeName(IASTName name) {
+        	if (name instanceof ASTNode) {
+        		int offset = ((ASTNode)name).getOffset();
+        		for( int i=0; i<nameList.size(); i++) {
+        			if (nameList.get(i) instanceof ASTNode && 
+        					((ASTNode)nameList.get(i)).getOffset() > offset) {
+        				processName(name, i);
+        				return;
+        			}
+        		}
+        		// if couldn't find the proper place to put the name, then add default
+        		processName(name);
+        	}
+        }
+        
+        public IASTName[] getNameArray(IASTPreprocessorStatement[] statements) {
+        	// first merge all of the preprocessor names into the array list
+        	for(int i=0; i<statements.length; i++) {
+        		if (statements[i] instanceof IASTPreprocessorMacroDefinition) {
+        			IASTName name = ((IASTPreprocessorMacroDefinition)statements[i]).getName();
+        			if (name != null) {
+        				mergeName(name);
+        			}
+        		}
+        	}
+        	
+        	// convert the array list into an array of IASTNames
+        	IASTName[] namedArray = new IASTName[nameList.size()];
+        	
+        	for(int i=0; i<nameList.size(); i++) {
+        		if (nameList.get(i) instanceof IASTName)
+        			namedArray[i] = (IASTName)nameList.get(i);
+        	}
+        	
+        	return namedArray;
+        }
+    }
+	
+	public FindIASTNameTarget(TreeViewer viewer, ParserLanguage lang) {
+		if (viewer.getContentProvider() instanceof DOMAST.ViewContentProvider) {
+			tu = ((DOMAST.ViewContentProvider)viewer.getContentProvider()).getTU();
+			tuTreeParent = ((DOMAST.ViewContentProvider)viewer.getContentProvider()).getTUTreeParent();
+		}
+		
+		this.viewer = viewer;
+		this.lang = lang;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.IFindReplaceTarget#canPerformFind()
+	 */
+	public boolean canPerformFind() {
+		return true;
+	}
+
+	// recursively search for the next node
+	public IASTName findNextMatchingName(String findString,
+			boolean searchForward, boolean caseSensitive, boolean wholeWord, boolean regExSearch) {
+		
+		if (matchingNames == null && tu != null) {
+			if (lang == ParserLanguage.CPP) {
+				CPPNameCollector col = new CPPNameCollector(findString, caseSensitive, wholeWord, regExSearch);
+				CPPVisitor.visitTranslationUnit(tu, col);
+				matchingNames = col.getNameArray(tu.getAllPreprocessorStatements());
+			} else {
+				CNameCollector col = new CNameCollector(findString, caseSensitive, wholeWord, regExSearch);
+				CVisitor.visitTranslationUnit(tu, col);
+				matchingNames = col.getNameArray(tu.getAllPreprocessorStatements());
+			}
+		}
+	
+		if (searchForward) {
+			if (!wasForward) {
+				wasForward = true;
+				index+=2;
+			}
+			
+			if (index >=0 && index < matchingNames.length && matchingNames[index] != null)
+				return matchingNames[index++];
+		} else {
+			if (wasForward) {
+				wasForward = false;
+				index-=2;
+			}
+			
+			if (index >= 0 && index < matchingNames.length && matchingNames[index] != null)
+				return matchingNames[index--];
+		}
+		
+		return null;
+	}
+		
+	private TreeItem expandTreeToTreeObject(TreeItem[] treeItems, TreeObject treeObj) {
+		for (int i=0; i<treeItems.length; i++) {
+			if (treeItems[i].getData() == treeObj) {
+ 				return treeItems[i];
+ 			}
+ 			
+ 			TreeParent parent = treeObj.getParent();
+ 			
+ 			if (parent == null) return null; 
+
+ 			while (parent != treeItems[i].getData()) {
+ 				parent = parent.getParent();
+ 				if (parent == null) break;
+ 			}
+ 			
+ 			if (parent == treeItems[i].getData()) {
+ 				treeItems[i].setExpanded(true);
+ 				viewer.refresh();
+
+ 				return expandTreeToTreeObject(treeItems[i].getItems(), treeObj);
+ 			}
+ 		}
+ 		
+ 		return null; // nothing found
+	}
+	
+ 	private TreeItem expandTreeToTreeObject(TreeObject treeObj) {
+ 		return expandTreeToTreeObject(viewer.getTree().getItems(), treeObj);
+ 	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.IFindReplaceTarget#findAndSelect(int, java.lang.String, boolean, boolean, boolean)
+	 */
+	public int findAndSelect(int widgetOffset, String findString,
+			boolean searchForward, boolean caseSensitive, boolean wholeWord) {
+		return findAndSelect(widgetOffset, findString, searchForward, caseSensitive, wholeWord, false);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.IFindReplaceTarget#getSelection()
+	 */
+	public Point getSelection() {
+		IStructuredSelection selection = (IStructuredSelection)viewer.getSelection();
+		
+		if (selection.isEmpty()) {
+			if (viewer.getTree().getItems()[0].getData() instanceof TreeObject);
+				startingNode = (TreeObject)viewer.getTree().getItems()[0].getData();
+			
+			return new Point(0, 0);
+		}
+		
+		startingNode = (TreeObject)selection.getFirstElement();
+		return new Point(((ASTNode)((TreeObject)selection.getFirstElement()).getNode()).getOffset(), 0);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.IFindReplaceTarget#getSelectionText()
+	 */
+	public String getSelectionText() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.IFindReplaceTarget#isEditable()
+	 */
+	public boolean isEditable() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.IFindReplaceTarget#replaceSelection(java.lang.String)
+	 */
+	public void replaceSelection(String text) {
+		// TODO Auto-generated method stub
+
+	}
+	
+	public void clearMatchingNames() {
+		matchingNames = null;
+		index = 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.IFindReplaceTargetExtension3#findAndSelect(int, java.lang.String, boolean, boolean, boolean, boolean)
+	 */
+	public int findAndSelect(int offset, String findString, boolean searchForward, boolean caseSensitive, boolean wholeWord, boolean regExSearch) {
+		// find the next name in the list of names
+		IASTName foundName = null;
+		foundName = findNextMatchingName( findString, searchForward, caseSensitive, wholeWord, regExSearch );
+		
+		// get the TreeObject from the AST View's model corresponding to that name
+		TreeObject treeNode = null;
+		TreeItem treeItem = null;
+		treeNode =  tuTreeParent.findTreeObjectForIASTName(foundName);
+
+		if (treeNode != null && treeNode.getParent() != null) {
+			// found a matching TreeObject, so expand the tree to that object
+			treeItem = expandTreeToTreeObject(treeNode); // TODO Devin test this
+		}
+		
+		// loop until the next name within the matchingNames list is found in the tree
+		while ((treeNode == null || treeItem == null) &&  matchingNames.length > 0 &&
+				((searchForward && index < matchingNames.length) ||
+				(!searchForward && index >= 0))) {
+			foundName = findNextMatchingName( findString, searchForward, caseSensitive, wholeWord, regExSearch );
+			treeNode =  tuTreeParent.findTreeObjectForIASTName(foundName);
+			
+			if (treeNode != null && treeNode.getParent() != null) {
+				// found a matching TreeObject, so expand the tree to that object
+				treeItem = expandTreeToTreeObject(treeNode); // TODO Devin test this
+			}
+		}
+		
+		// select the node that was found (and is now displayed)
+		if (treeItem != null) {
+			TreeItem[] items = new TreeItem[1];
+			items[0] = treeItem;
+			treeItem.getParent().setSelection(items);
+				
+			return 0;
+		}
+
+		return -1;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.text.IFindReplaceTargetExtension3#replaceSelection(java.lang.String, boolean)
+	 */
+	public void replaceSelection(String text, boolean regExReplace) {
+		// TODO Auto-generated method stub
+		
+	}
+
+}
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/IPopulateDOMASTAction.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/IPopulateDOMASTAction.java
index 0caff99dcad..b077a16d3b1 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/IPopulateDOMASTAction.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/IPopulateDOMASTAction.java
@@ -10,9 +10,15 @@
  **********************************************************************/
 package org.eclipse.cdt.ui.tests.DOMAST;
 
+import org.eclipse.cdt.core.dom.ast.IASTPreprocessorStatement;
+import org.eclipse.cdt.core.dom.ast.IASTProblem;
+
 /**
  * @author dsteffle
  */
 public interface IPopulateDOMASTAction {
 	public TreeParent getTree();
+	public void mergePreprocessorStatements(IASTPreprocessorStatement[] statements);
+	public void mergePreprocessorProblems(IASTProblem[] problems);
+	public void groupIncludes(IASTPreprocessorStatement[] statements);
 }
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/TreeParent.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/TreeParent.java
index 86110fbe966..4980ec92166 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/TreeParent.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/TreeParent.java
@@ -13,15 +13,15 @@ package org.eclipse.cdt.ui.tests.DOMAST;
 import java.util.ArrayList;
 import java.util.Iterator;
 
+import org.eclipse.cdt.core.dom.ast.IASTName;
 import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIncludeStatement;
 import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
 
 /**
  * @author dsteffle
  */
 public class TreeParent extends TreeObject {
-	private ArrayList children; // TODO might want to use a HashTable/HashMap or wrap one so finding the parent node is faster
+	private ArrayList children;
 
 	public TreeParent(IASTNode node) {
 		super(node);
@@ -168,5 +168,67 @@ public class TreeParent extends TreeObject {
 		
 		return null; // nothing found
 	}
+	
+	/**
+	 * Returns the TreeParent that corresponds to the IASTName.  This is based on string and offset equality.
+	 * 
+	 * @param node
+	 * @return
+	 */
+	public TreeParent findTreeObjectForIASTName(IASTName name) {
+		if (name == null) return null;
+		
+		Iterator itr = children.iterator();
+		while (itr.hasNext()) {
+			Object o = itr.next();
+			if (o != null && o instanceof TreeParent) {
+				if (treeParentHasName((TreeParent)o, name)) return (TreeParent)o;
+			
+				if ( ((TreeParent)o).hasChildren() ){
+					TreeParent tree = findTreeObjectForIASTName( ((TreeParent)o).getChildren(), name );
+					if (tree != null) return tree;
+				}
+			}
+		}
+		
+		return null; // nothing found
+	}
+	
+	/**
+	 * Returns the TreeParent that corresponds to the IASTName.  This is based on string and offset equality.
+	 * 
+	 * @param trees
+	 * @param node
+	 * @return
+	 */
+	private TreeParent findTreeObjectForIASTName(TreeObject[] trees, IASTName name) {
+		for (int i=0; i<trees.length; i++) {
+			
+			if (trees[i] != null && trees[i] instanceof TreeParent) {
+				if (treeParentHasName((TreeParent)trees[i], name)) return (TreeParent)trees[i];
+				
+				if ( ((TreeParent)trees[i]).hasChildren() ){
+					TreeParent tree = findTreeObjectForIASTName( ((TreeParent)trees[i]).getChildren(), name );
+					if (tree != null) return tree;
+				}
+			}
+		}
+		
+		return null; // nothing found
+	}
 
+	private boolean treeParentHasName(TreeParent tp, IASTName name) {
+		if ( tp.getNode() instanceof IASTName && 
+				tp.getNode() instanceof ASTNode &&
+				name instanceof ASTNode) {
+			IASTName treeName = (IASTName)tp.getNode();
+			ASTNode treeNode = (ASTNode)tp.getNode();
+			if (treeName.toString().equals(name.toString()) && treeNode.getOffset() == ((ASTNode)name).getOffset() ) {
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
 }
\ No newline at end of file