diff --git a/core/org.eclipse.cdt.ui.tests/plugin.xml b/core/org.eclipse.cdt.ui.tests/plugin.xml
index a4871db38b2..ea39b4b3d58 100644
--- a/core/org.eclipse.cdt.ui.tests/plugin.xml
+++ b/core/org.eclipse.cdt.ui.tests/plugin.xml
@@ -18,6 +18,7 @@
+
@@ -25,6 +26,10 @@
+
+
+
+
0 && location[0] instanceof IASTFileLocation )
+ fileName = ((IASTFileLocation)location[0]).getFileName(); // TODO Devin this is in two places now, put into one, and fix up the location[0] for things like macros
+ else
+ fileName = BLANK_STRING;
+
+ path = new Path(fileName);
+ file = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(path);
+ start = names[i].getNodeLocations()[0].getNodeOffset();
+ end = names[i].getNodeLocations()[0].getNodeOffset() + names[i].getNodeLocations()[0].getNodeLength();
+
+ collector.acceptMatch( createMatch(file, start, end, names[i], path ) );
+ }
+ } catch (CoreException ce) {}
+ }
+
+ mainSearchPM.done();
+ collector.done();
+
+ return new Status(IStatus.OK, CTestPlugin.getPluginId(), 0, BLANK_STRING, null); //$NON-NLS-1$
+ }
+
+ public IMatch createMatch( Object fileResource, int start, int end, IASTName name, IPath referringElement ) {
+ BasicSearchMatch result = new BasicSearchMatch();
+ if( fileResource instanceof IResource )
+ result.resource = (IResource) fileResource;
+ else if( fileResource instanceof IPath )
+ result.path = (IPath) fileResource;
+
+ result.startOffset = start;
+ result.endOffset = end;
+ result.parentName = BLANK_STRING; //$NON-NLS-1$
+ result.referringElement = referringElement;
+
+ result.name = name.toString();
+
+ result.type = ICElement.C_FIELD; // TODO Devin static for now, want something like BasicSearchResultCollector#setElementInfo
+ result.visibility = ICElement.CPP_PUBLIC; // TODO Devin static for now, want something like BasicSearchResultCollector#setElementInfo
+ result.returnType = BLANK_STRING;
+
+ return result;
+ }
+
+
+ /* (non-Javadoc)
+ * @see org.eclipse.search.ui.ISearchQuery#getLabel()
+ */
+ public String getLabel() {
+ return queryLabel;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.search.ui.ISearchQuery#canRerun()
+ */
+ public boolean canRerun() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.search.ui.ISearchQuery#canRunInBackground()
+ */
+ public boolean canRunInBackground() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.search.ui.ISearchQuery#getSearchResult()
+ */
+ public ISearchResult getSearchResult() {
+ if (_result == null)
+ _result= new CSearchResult(this);
+ return _result;
+ }
+
+}
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/TreeObject.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/TreeObject.java
index 5f8e7f4cc2f..43ecfd0a532 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/TreeObject.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/TreeObject.java
@@ -65,7 +65,7 @@ public class TreeObject implements IAdaptable {
}
public String toString() {
- if( node == null ) return BLANK_FILENAME; //$NON-NLS-1$ //TODO Devin is this the best way???
+ if( node == null ) return BLANK_FILENAME; //$NON-NLS-1$
StringBuffer buffer = new StringBuffer();
Class[] classes = node.getClass().getInterfaces();