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

Renamed PDOMSearch* classes to CSearch*.

Browse source
This commit is contained in:
Sergey Prigogin 2012-01-09 18:31:45 -08:00
parent 14d94dafe0
commit a7728f959f
35 changed files with 202 additions and 234 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMSearchTest.java
View file

@ -6,8 +6,8 @@
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* IBM Corporation - initial API and implementation * IBM Corporation - initial API and implementation
* Markus Schorn (Wind River Systems) * Markus Schorn (Wind River Systems)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.pdom.tests; package org.eclipse.cdt.internal.pdom.tests;
@ -41,7 +41,6 @@ import org.eclipse.core.runtime.NullProgressMonitor;
* Test the correctness of C/C++ searches * Test the correctness of C/C++ searches
* *
* @author Vivian Kong * @author Vivian Kong
*
*/ */
public class PDOMSearchTest extends PDOMTestBase { public class PDOMSearchTest extends PDOMTestBase {
final Comparator<IBinding> BINDING_COMPARATOR = new Comparator<IBinding>() { final Comparator<IBinding> BINDING_COMPARATOR = new Comparator<IBinding>() {
@ -72,11 +71,11 @@ public class PDOMSearchTest extends PDOMTestBase {
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
pdom.releaseReadLock(); pdom.releaseReadLock();
} }
/** /**
* Test the members inside namespaces * Test the members inside namespaces
*/ */
public void testNamespaces() throws Exception { public void testNamespaces() throws Exception {
/* Members in the namespace */ /* Members in the namespace */
IBinding[] namespaces = pdom.findBindings(Pattern.compile("namespace1"), false, INDEX_FILTER, NULL_MONITOR); IBinding[] namespaces = pdom.findBindings(Pattern.compile("namespace1"), false, INDEX_FILTER, NULL_MONITOR);
assertEquals(1, namespaces.length); assertEquals(1, namespaces.length);
@ -117,7 +116,6 @@ public class PDOMSearchTest extends PDOMTestBase {
assertEquals(1, defs.length); assertEquals(1, defs.length);
loc = defs[0].getFileLocation(); loc = defs[0].getFileLocation();
assertEquals(offset("Class1.h","namespace namespace1") + 10, loc.getNodeOffset()); //character offset assertEquals(offset("Class1.h","namespace namespace1") + 10, loc.getNodeOffset()); //character offset
} }
public void testClasses() throws Exception { public void testClasses() throws Exception {
@ -223,7 +221,6 @@ public class PDOMSearchTest extends PDOMTestBase {
} }
public void testFunction() throws Exception { public void testFunction() throws Exception {
IBinding[] functions = pdom.findBindings(Pattern.compile("foo2"), false, INDEX_FILTER, NULL_MONITOR); IBinding[] functions = pdom.findBindings(Pattern.compile("foo2"), false, INDEX_FILTER, NULL_MONITOR);
assertEquals(1, functions.length); assertEquals(1, functions.length);
assertTrue(functions[0] instanceof ICPPFunction); assertTrue(functions[0] instanceof ICPPFunction);
@ -233,20 +230,16 @@ public class PDOMSearchTest extends PDOMTestBase {
assertEquals(1, functions.length); assertEquals(1, functions.length);
assertTrue(functions[0] instanceof ICPPFunction); assertTrue(functions[0] instanceof ICPPFunction);
assertEquals("main", getBindingQualifiedName(pdom.getLinkageImpls()[0].adaptBinding(functions[0]))); assertEquals("main", getBindingQualifiedName(pdom.getLinkageImpls()[0].adaptBinding(functions[0])));
} }
public void testMethods() throws Exception { public void testMethods() throws Exception {
IBinding[] methods = pdom.findBindings(Pattern.compile("~Class2"), false, INDEX_FILTER, NULL_MONITOR); IBinding[] methods = pdom.findBindings(Pattern.compile("~Class2"), false, INDEX_FILTER, NULL_MONITOR);
assertEquals(1, methods.length); assertEquals(1, methods.length);
assertTrue(methods[0] instanceof ICPPMethod); assertTrue(methods[0] instanceof ICPPMethod);
assertEquals("Class2::~Class2", getBindingQualifiedName(pdom.getLinkageImpls()[0].adaptBinding(methods[0]))); assertEquals("Class2::~Class2", getBindingQualifiedName(pdom.getLinkageImpls()[0].adaptBinding(methods[0])));
} }
public void testFields() throws Exception { public void testFields() throws Exception {
IBinding[] fields = pdom.findBindings(Pattern.compile("class1x"), false, INDEX_FILTER, NULL_MONITOR); IBinding[] fields = pdom.findBindings(Pattern.compile("class1x"), false, INDEX_FILTER, NULL_MONITOR);
assertEquals(1, fields.length); assertEquals(1, fields.length);
assertTrue(fields[0] instanceof ICPPField); assertTrue(fields[0] instanceof ICPPField);
@ -256,11 +249,9 @@ public class PDOMSearchTest extends PDOMTestBase {
assertEquals(1, fields.length); assertEquals(1, fields.length);
assertTrue(fields[0] instanceof ICPPField); assertTrue(fields[0] instanceof ICPPField);
assertEquals("namespace1::Class1::class1y", getBindingQualifiedName(pdom.getLinkageImpls()[0].adaptBinding(fields[0]))); assertEquals("namespace1::Class1::class1y", getBindingQualifiedName(pdom.getLinkageImpls()[0].adaptBinding(fields[0])));
} }
public void testVariables() throws Exception { public void testVariables() throws Exception {
IBinding[] variables = pdom.findBindings(Pattern.compile("var"), false, INDEX_FILTER, NULL_MONITOR); IBinding[] variables = pdom.findBindings(Pattern.compile("var"), false, INDEX_FILTER, NULL_MONITOR);
assertEquals(1, variables.length); assertEquals(1, variables.length);
assertTrue(variables[0] instanceof ICPPVariable); assertTrue(variables[0] instanceof ICPPVariable);
@ -283,7 +274,6 @@ public class PDOMSearchTest extends PDOMTestBase {
assertEquals(1, defs.length); assertEquals(1, defs.length);
loc = defs[0].getFileLocation(); loc = defs[0].getFileLocation();
assertEquals(offset("main.cpp","int var;") + 4, loc.getNodeOffset()); //character offset assertEquals(offset("main.cpp","int var;") + 4, loc.getNodeOffset()); //character offset
} }
/** /**

52
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/BasicSearchTest.java
View file

@ -51,10 +51,10 @@ import org.eclipse.cdt.core.testplugin.util.TestSourceReader;
import org.eclipse.cdt.ui.testplugin.CTestPlugin; import org.eclipse.cdt.ui.testplugin.CTestPlugin;
import org.eclipse.cdt.ui.tests.BaseUITestCase; import org.eclipse.cdt.ui.tests.BaseUITestCase;
import org.eclipse.cdt.internal.ui.search.PDOMSearchPatternQuery; import org.eclipse.cdt.internal.ui.search.CSearchPatternQuery;
import org.eclipse.cdt.internal.ui.search.PDOMSearchQuery; import org.eclipse.cdt.internal.ui.search.CSearchQuery;
import org.eclipse.cdt.internal.ui.search.PDOMSearchResult; import org.eclipse.cdt.internal.ui.search.CSearchResult;
import org.eclipse.cdt.internal.ui.search.PDOMSearchViewPage; import org.eclipse.cdt.internal.ui.search.CSearchViewPage;
public class BasicSearchTest extends BaseUITestCase { public class BasicSearchTest extends BaseUITestCase {
ICProject fCProject; ICProject fCProject;
@ -109,15 +109,15 @@ public class BasicSearchTest extends BaseUITestCase {
assertTrue(CCorePlugin.getIndexManager().joinIndexer(360000, new NullProgressMonitor())); assertTrue(CCorePlugin.getIndexManager().joinIndexer(360000, new NullProgressMonitor()));
// open a query // open a query
PDOMSearchQuery query= makeProjectQuery("foo"); CSearchQuery query= makeProjectQuery("foo");
PDOMSearchResult result= runQuery(query); CSearchResult result= runQuery(query);
assertEquals(2, result.getElements().length); assertEquals(2, result.getElements().length);
ISearchResultViewPart vp= NewSearchUI.getSearchResultView(); ISearchResultViewPart vp= NewSearchUI.getSearchResultView();
ISearchResultPage page= vp.getActivePage(); ISearchResultPage page= vp.getActivePage();
assertTrue(""+page, page instanceof PDOMSearchViewPage); assertTrue(""+page, page instanceof CSearchViewPage);
PDOMSearchViewPage pdomsvp= (PDOMSearchViewPage) page; CSearchViewPage pdomsvp= (CSearchViewPage) page;
StructuredViewer viewer= pdomsvp.getViewer(); StructuredViewer viewer= pdomsvp.getViewer();
ILabelProvider labpv= (ILabelProvider) viewer.getLabelProvider(); ILabelProvider labpv= (ILabelProvider) viewer.getLabelProvider();
IStructuredContentProvider scp= (IStructuredContentProvider) viewer.getContentProvider(); IStructuredContentProvider scp= (IStructuredContentProvider) viewer.getContentProvider();
@ -152,15 +152,15 @@ public class BasicSearchTest extends BaseUITestCase {
assertTrue(CCorePlugin.getIndexManager().joinIndexer(360000, new NullProgressMonitor())); assertTrue(CCorePlugin.getIndexManager().joinIndexer(360000, new NullProgressMonitor()));
// open a query // open a query
PDOMSearchQuery query= makeProjectQuery("x"); CSearchQuery query= makeProjectQuery("x");
PDOMSearchResult result= runQuery(query); CSearchResult result= runQuery(query);
assertEquals(0, result.getElements().length); assertEquals(0, result.getElements().length);
ISearchResultViewPart vp= NewSearchUI.getSearchResultView(); ISearchResultViewPart vp= NewSearchUI.getSearchResultView();
ISearchResultPage page= vp.getActivePage(); ISearchResultPage page= vp.getActivePage();
assertTrue("" + page, page instanceof PDOMSearchViewPage); assertTrue("" + page, page instanceof CSearchViewPage);
PDOMSearchViewPage pdomsvp= (PDOMSearchViewPage) page; CSearchViewPage pdomsvp= (CSearchViewPage) page;
StructuredViewer viewer= pdomsvp.getViewer(); StructuredViewer viewer= pdomsvp.getViewer();
ILabelProvider labpv= (ILabelProvider) viewer.getLabelProvider(); ILabelProvider labpv= (ILabelProvider) viewer.getLabelProvider();
IStructuredContentProvider scp= (IStructuredContentProvider) viewer.getContentProvider(); IStructuredContentProvider scp= (IStructuredContentProvider) viewer.getContentProvider();
@ -229,8 +229,8 @@ public class BasicSearchTest extends BaseUITestCase {
*/ */
private void coreTestIndexerInProgress(boolean expectComplete) { private void coreTestIndexerInProgress(boolean expectComplete) {
// open a query // open a query
PDOMSearchQuery query= makeProjectQuery("data*"); CSearchQuery query= makeProjectQuery("data*");
PDOMSearchResult result= runQuery(query); CSearchResult result= runQuery(query);
final int maximumHits = INDEXER_IN_PROGRESS_FILE_COUNT * INDEXER_IN_PROGRESS_STRUCT_COUNT; final int maximumHits = INDEXER_IN_PROGRESS_FILE_COUNT * INDEXER_IN_PROGRESS_STRUCT_COUNT;
Object[] elements = result.getElements(); Object[] elements = result.getElements();
@ -241,9 +241,9 @@ public class BasicSearchTest extends BaseUITestCase {
ISearchResultViewPart vp= NewSearchUI.getSearchResultView(); ISearchResultViewPart vp= NewSearchUI.getSearchResultView();
ISearchResultPage page= vp.getActivePage(); ISearchResultPage page= vp.getActivePage();
assertTrue(""+page, page instanceof PDOMSearchViewPage); assertTrue(""+page, page instanceof CSearchViewPage);
PDOMSearchViewPage pdomsvp= (PDOMSearchViewPage) page; CSearchViewPage pdomsvp= (CSearchViewPage) page;
StructuredViewer viewer= pdomsvp.getViewer(); StructuredViewer viewer= pdomsvp.getViewer();
ILabelProvider labpv= (ILabelProvider) viewer.getLabelProvider(); ILabelProvider labpv= (ILabelProvider) viewer.getLabelProvider();
IStructuredContentProvider scp= (IStructuredContentProvider) viewer.getContentProvider(); IStructuredContentProvider scp= (IStructuredContentProvider) viewer.getContentProvider();
@ -281,7 +281,7 @@ public class BasicSearchTest extends BaseUITestCase {
* @param query * @param query
* @return * @return
*/ */
protected PDOMSearchResult runQuery(PDOMSearchQuery query) { protected CSearchResult runQuery(CSearchQuery query) {
final ISearchResult result[]= new ISearchResult[1]; final ISearchResult result[]= new ISearchResult[1];
IQueryListener listener= new IQueryListener() { IQueryListener listener= new IQueryListener() {
@Override @Override
@ -304,9 +304,9 @@ public class BasicSearchTest extends BaseUITestCase {
runnable.run(npm()); runnable.run(npm());
} }
}, query); }, query);
assertTrue(result[0] instanceof PDOMSearchResult); assertTrue(result[0] instanceof CSearchResult);
runEventQueue(500); runEventQueue(500);
return (PDOMSearchResult) result[0]; return (CSearchResult) result[0];
} }
// void foo() {} // void foo() {}
@ -315,7 +315,7 @@ public class BasicSearchTest extends BaseUITestCase {
// foo(); // foo();
// } // }
public void testNewResultsOnSearchAgainA() throws Exception { public void testNewResultsOnSearchAgainA() throws Exception {
PDOMSearchQuery query= makeProjectQuery("foo"); CSearchQuery query= makeProjectQuery("foo");
assertOccurrences(query, 2); assertOccurrences(query, 2);
assertOccurrences(query, 2); assertOccurrences(query, 2);
@ -332,7 +332,7 @@ public class BasicSearchTest extends BaseUITestCase {
// void bar() {foo();foo();foo();} // void bar() {foo();foo();foo();}
public void testNewResultsOnSearchAgainB() throws Exception { public void testNewResultsOnSearchAgainB() throws Exception {
PDOMSearchQuery query= makeProjectQuery("foo"); CSearchQuery query= makeProjectQuery("foo");
assertOccurrences(query, 4); assertOccurrences(query, 4);
assertOccurrences(query, 4); assertOccurrences(query, 4);
@ -355,14 +355,14 @@ public class BasicSearchTest extends BaseUITestCase {
assertOccurrences(query, 3); assertOccurrences(query, 3);
} }
private PDOMSearchQuery makeProjectQuery(String pattern) { private CSearchQuery makeProjectQuery(String pattern) {
String scope1= "Human Readable Description"; String scope1= "Human Readable Description";
return new PDOMSearchPatternQuery(new ICElement[] {fCProject}, scope1, pattern, true, PDOMSearchQuery.FIND_ALL_OCCURRENCES | PDOMSearchPatternQuery.FIND_ALL_TYPES); return new CSearchPatternQuery(new ICElement[] {fCProject}, scope1, pattern, true, CSearchQuery.FIND_ALL_OCCURRENCES | CSearchPatternQuery.FIND_ALL_TYPES);
} }
private void assertOccurrences(PDOMSearchQuery query, int expected) { private void assertOccurrences(CSearchQuery query, int expected) {
query.run(npm()); query.run(npm());
PDOMSearchResult result= (PDOMSearchResult) query.getSearchResult(); CSearchResult result= (CSearchResult) query.getSearchResult();
assertEquals(expected, result.getMatchCount()); assertEquals(expected, result.getMatchCount());
} }
@ -383,7 +383,7 @@ public class BasicSearchTest extends BaseUITestCase {
// f<int>(&a); // f<int>(&a);
// } // }
public void testSearchAndTemplateIDs() throws Exception { public void testSearchAndTemplateIDs() throws Exception {
PDOMSearchQuery query= makeProjectQuery("CT"); CSearchQuery query= makeProjectQuery("CT");
assertOccurrences(query, 5); assertOccurrences(query, 5);
query= makeProjectQuery("f"); query= makeProjectQuery("f");
assertOccurrences(query, 6); assertOccurrences(query, 6);

6
core/org.eclipse.cdt.ui/plugin.xml
View file

@ -3068,7 +3068,7 @@
point="org.eclipse.search.searchPages"> point="org.eclipse.search.searchPages">
<page <page
canSearchEnclosingProjects="true" canSearchEnclosingProjects="true"
class="org.eclipse.cdt.internal.ui.search.PDOMSearchPage" class="org.eclipse.cdt.internal.ui.search.CSearchPage"
extensions="c:90,cpp:90, cxx:90, cc:90,C:90, h:90, hh:90, hpp:90, H:90" extensions="c:90,cpp:90, cxx:90, cc:90,C:90, h:90, hh:90, hpp:90, H:90"
icon="icons/obj16/csearch_obj.gif" icon="icons/obj16/csearch_obj.gif"
id="org.eclipse.cdt.ui.pdomSearchPage" id="org.eclipse.cdt.ui.pdomSearchPage"
@ -3247,9 +3247,9 @@
<extension <extension
point="org.eclipse.search.searchResultViewPages"> point="org.eclipse.search.searchResultViewPages">
<viewPage <viewPage
class="org.eclipse.cdt.internal.ui.search.PDOMSearchViewPage" class="org.eclipse.cdt.internal.ui.search.CSearchViewPage"
id="org.eclipse.cdt.ui.pdomSearchViewPage" id="org.eclipse.cdt.ui.pdomSearchViewPage"
searchResultClass="org.eclipse.cdt.internal.ui.search.PDOMSearchResult"/> searchResultClass="org.eclipse.cdt.internal.ui.search.CSearchResult"/>
</extension> </extension>
<extension <extension

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindDeclarationsAction.java
View file

@ -21,7 +21,7 @@ import org.eclipse.cdt.core.index.IIndexBinding;
import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.internal.ui.search.PDOMSearchQuery; import org.eclipse.cdt.internal.ui.search.CSearchQuery;
/** /**
* @author Doug Schaefer * @author Doug Schaefer
@ -57,7 +57,7 @@ public class FindDeclarationsAction extends IndexAction {
null, null,
cproject, indexView.getLastWriteAccess(cproject), cproject, indexView.getLastWriteAccess(cproject),
(IIndexBinding) binding.fObject, binding.fText, (IIndexBinding) binding.fObject, binding.fText,
PDOMSearchQuery.FIND_DECLARATIONS | PDOMSearchQuery.FIND_DEFINITIONS); CSearchQuery.FIND_DECLARATIONS | CSearchQuery.FIND_DEFINITIONS);
NewSearchUI.activateSearchResultView(); NewSearchUI.activateSearchResultView();
NewSearchUI.runQueryInBackground(query); NewSearchUI.runQueryInBackground(query);

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindReferencesAction.java
View file

@ -12,7 +12,7 @@
package org.eclipse.cdt.internal.ui.indexview; package org.eclipse.cdt.internal.ui.indexview;
import org.eclipse.cdt.internal.ui.search.PDOMSearchQuery; import org.eclipse.cdt.internal.ui.search.CSearchQuery;
import org.eclipse.cdt.core.index.IIndexBinding; import org.eclipse.cdt.core.index.IIndexBinding;
import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ICProject;
@ -56,7 +56,7 @@ public class FindReferencesAction extends IndexAction {
null, null,
cproject, indexView.getLastWriteAccess(cproject), cproject, indexView.getLastWriteAccess(cproject),
(IIndexBinding) binding.fObject, binding.fText, (IIndexBinding) binding.fObject, binding.fText,
PDOMSearchQuery.FIND_REFERENCES); CSearchQuery.FIND_REFERENCES);
NewSearchUI.activateSearchResultView(); NewSearchUI.activateSearchResultView();
NewSearchUI.runQueryInBackground(query); NewSearchUI.runQueryInBackground(query);

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexViewSearchQuery.java
View file

@ -27,14 +27,14 @@ import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.internal.core.CCoreInternals; import org.eclipse.cdt.internal.core.CCoreInternals;
import org.eclipse.cdt.internal.ui.search.PDOMSearchQuery; import org.eclipse.cdt.internal.ui.search.CSearchQuery;
/** /**
* @author Doug Schaefer * @author Doug Schaefer
* *
* This is the search query to be used for searching the PDOM. * This is the search query to be used for searching the PDOM.
*/ */
public class IndexViewSearchQuery extends PDOMSearchQuery { public class IndexViewSearchQuery extends CSearchQuery {
private IIndexBinding fBinding; private IIndexBinding fBinding;
private long fLastWrite; private long fLastWrite;

12
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchElement.java → core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchElement.java
View file

@ -6,8 +6,8 @@
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* QNX - Initial API and implementation * QNX - Initial API and implementation
* Markus Schorn (Wind River Systems) * Markus Schorn (Wind River Systems)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.ui.search; package org.eclipse.cdt.internal.ui.search;
@ -23,11 +23,11 @@ import org.eclipse.cdt.core.index.IIndexFileLocation;
* *
* @author Doug Schaefer * @author Doug Schaefer
*/ */
public class PDOMSearchElement implements IAdaptable { public class CSearchElement implements IAdaptable {
private final IIndexFileLocation location; private final IIndexFileLocation location;
public PDOMSearchElement(IIndexFileLocation loc) { public CSearchElement(IIndexFileLocation loc) {
this.location= loc; this.location= loc;
} }
@ -38,9 +38,9 @@ public class PDOMSearchElement implements IAdaptable {
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (!(obj instanceof PDOMSearchElement)) if (!(obj instanceof CSearchElement))
return false; return false;
PDOMSearchElement other = (PDOMSearchElement)obj; CSearchElement other = (CSearchElement)obj;
return location.equals(other.location); return location.equals(other.location);
} }

8
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchElementQuery.java → core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchElementQuery.java
View file

@ -10,7 +10,6 @@
* Markus Schorn (Wind River Systems) * Markus Schorn (Wind River Systems)
* Sergey Prigogin (Google) * Sergey Prigogin (Google)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.ui.search; package org.eclipse.cdt.internal.ui.search;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
@ -29,12 +28,11 @@ import org.eclipse.cdt.internal.ui.viewsupport.IndexUI;
/** /**
* @author Doug Schaefer * @author Doug Schaefer
*/ */
public class PDOMSearchElementQuery extends PDOMSearchQuery { public class CSearchElementQuery extends CSearchQuery {
private final ISourceReference element;
private ISourceReference element;
private String label; private String label;
public PDOMSearchElementQuery(ICElement[] scope, ISourceReference element, int flags) { public CSearchElementQuery(ICElement[] scope, ISourceReference element, int flags) {
super(scope, flags | IIndex.SEARCH_ACROSS_LANGUAGE_BOUNDARIES); super(scope, flags | IIndex.SEARCH_ACROSS_LANGUAGE_BOUNDARIES);
this.element = element; this.element = element;
this.label= (element instanceof ICElement) ? this.label= (element instanceof ICElement) ?

12
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchLabelProvider.java → core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchLabelProvider.java
View file

@ -50,15 +50,13 @@ import org.eclipse.cdt.internal.ui.viewsupport.ColoringLabelProvider;
* URI - for IIndexFileLocations not resolvable to the local filesystem, under URI_CONTAINER<br> * URI - for IIndexFileLocations not resolvable to the local filesystem, under URI_CONTAINER<br>
* @author Doug Schaefer * @author Doug Schaefer
* @author Ed Swartz * @author Ed Swartz
*
*/ */
public class PDOMSearchLabelProvider extends LabelProvider implements IStyledLabelProvider { public class CSearchLabelProvider extends LabelProvider implements IStyledLabelProvider {
protected final CSearchViewPage fPage;
protected final PDOMSearchViewPage fPage;
private final TypeInfoLabelProvider fTypeInfoLabelProvider; private final TypeInfoLabelProvider fTypeInfoLabelProvider;
private final CUILabelProvider fCElementLabelProvider; private final CUILabelProvider fCElementLabelProvider;
public PDOMSearchLabelProvider(PDOMSearchViewPage page) { public CSearchLabelProvider(CSearchViewPage page) {
fTypeInfoLabelProvider= new TypeInfoLabelProvider(TypeInfoLabelProvider.SHOW_FULLY_QUALIFIED | TypeInfoLabelProvider.SHOW_PARAMETERS); fTypeInfoLabelProvider= new TypeInfoLabelProvider(TypeInfoLabelProvider.SHOW_FULLY_QUALIFIED | TypeInfoLabelProvider.SHOW_PARAMETERS);
fCElementLabelProvider= new CUILabelProvider(0, CElementImageProvider.SMALL_ICONS); fCElementLabelProvider= new CUILabelProvider(0, CElementImageProvider.SMALL_ICONS);
fPage= page; fPage= page;
@ -152,8 +150,8 @@ public class PDOMSearchLabelProvider extends LabelProvider implements IStyledLab
if (element instanceof TranslationUnit) { if (element instanceof TranslationUnit) {
TranslationUnit translationUnit = (TranslationUnit) element; TranslationUnit translationUnit = (TranslationUnit) element;
AbstractTextSearchResult searchResult = fPage.getInput(); AbstractTextSearchResult searchResult = fPage.getInput();
if (searchResult instanceof PDOMSearchResult) { if (searchResult instanceof CSearchResult) {
PDOMSearchResult pdomSearchResult = (PDOMSearchResult)searchResult; CSearchResult pdomSearchResult = (CSearchResult)searchResult;
return pdomSearchResult.computeContainedMatches(searchResult, translationUnit.getFile()).length; return pdomSearchResult.computeContainedMatches(searchResult, translationUnit.getFile()).length;
} }
} }

26
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchListContentProvider.java → core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchListContentProvider.java
View file

@ -6,10 +6,9 @@
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* QNX - Initial API and implementation * QNX - Initial API and implementation
* Ed Swartz (Nokia) * Ed Swartz (Nokia)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.ui.search; package org.eclipse.cdt.internal.ui.search;
import java.util.ArrayList; import java.util.ArrayList;
@ -32,16 +31,13 @@ import org.eclipse.cdt.ui.CUIPlugin;
/** /**
* @author Doug Schaefer * @author Doug Schaefer
*
*/ */
public class PDOMSearchListContentProvider implements public class CSearchListContentProvider implements IStructuredContentProvider, IPDOMSearchContentProvider {
IStructuredContentProvider, IPDOMSearchContentProvider {
private TableViewer viewer; private TableViewer viewer;
private PDOMSearchResult result; private CSearchResult result;
private final PDOMSearchViewPage fPage; private final CSearchViewPage fPage;
PDOMSearchListContentProvider(PDOMSearchViewPage page) { CSearchListContentProvider(CSearchViewPage page) {
fPage= page; fPage= page;
} }
@ -49,15 +45,15 @@ public class PDOMSearchListContentProvider implements
public Object[] getElements(Object inputElement) { public Object[] getElements(Object inputElement) {
Set<String> uncoveredProjects = new HashSet<String>(); Set<String> uncoveredProjects = new HashSet<String>();
PDOMSearchResult result = (PDOMSearchResult) inputElement; CSearchResult result = (CSearchResult) inputElement;
Object[] results = result.getElements(); Object[] results = result.getElements();
List<Object> resultList = new ArrayList<Object>(); List<Object> resultList = new ArrayList<Object>();
// see which projects returned results // see which projects returned results
for (int i = 0; i < results.length; i++) { for (int i = 0; i < results.length; i++) {
if (results[i] instanceof PDOMSearchElement) { if (results[i] instanceof CSearchElement) {
PDOMSearchElement searchElement = (PDOMSearchElement) results[i]; CSearchElement searchElement = (CSearchElement) results[i];
String path = searchElement.getLocation().getFullPath(); String path = searchElement.getLocation().getFullPath();
if (path != null) { if (path != null) {
uncoveredProjects.add(new Path(path).segment(0)); uncoveredProjects.add(new Path(path).segment(0));
@ -74,7 +70,7 @@ public class PDOMSearchListContentProvider implements
} }
// add message for all the projects which have no results // add message for all the projects which have no results
ICProject[] projects = ((PDOMSearchQuery)result.getQuery()).getProjects(); ICProject[] projects = ((CSearchQuery)result.getQuery()).getProjects();
for (int i = 0; i < projects.length; ++i) { for (int i = 0; i < projects.length; ++i) {
ICProject project = projects[i]; ICProject project = projects[i];
boolean foundProject = uncoveredProjects.contains(project.getProject().getName()); boolean foundProject = uncoveredProjects.contains(project.getProject().getName());
@ -113,7 +109,7 @@ public class PDOMSearchListContentProvider implements
@Override @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
this.viewer = (TableViewer)viewer; this.viewer = (TableViewer)viewer;
result = (PDOMSearchResult)newInput; result = (CSearchResult)newInput;
viewer.refresh(); viewer.refresh();
} }

14
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchListLabelProvider.java → core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchListLabelProvider.java
View file

@ -25,12 +25,12 @@ import org.eclipse.cdt.internal.ui.viewsupport.ColoringLabelProvider;
/** /**
* @author Doug Schaefer * @author Doug Schaefer
*/ */
public class PDOMSearchListLabelProvider extends ColoringLabelProvider { public class CSearchListLabelProvider extends ColoringLabelProvider {
private final PDOMSearchViewPage fPage; private final CSearchViewPage fPage;
private final int fColumnIndex; private final int fColumnIndex;
public PDOMSearchListLabelProvider(PDOMSearchViewPage page, int columnIndex) { public CSearchListLabelProvider(CSearchViewPage page, int columnIndex) {
super(new PDOMSearchLabelProvider(page)); super(new CSearchLabelProvider(page));
fPage = page; fPage = page;
fColumnIndex = columnIndex; fColumnIndex = columnIndex;
} }
@ -39,7 +39,7 @@ public class PDOMSearchListLabelProvider extends ColoringLabelProvider {
public void update(ViewerCell cell) { public void update(ViewerCell cell) {
Object element = cell.getElement(); Object element = cell.getElement();
switch (fColumnIndex) { switch (fColumnIndex) {
case PDOMSearchViewPage.LOCATION_COLUMN_INDEX: case CSearchViewPage.LOCATION_COLUMN_INDEX:
if (element instanceof LineSearchElement) { if (element instanceof LineSearchElement) {
LineSearchElement lineElement = (LineSearchElement) element; LineSearchElement lineElement = (LineSearchElement) element;
String location = IndexLocationFactory.getPath(lineElement.getLocation()).toString(); String location = IndexLocationFactory.getPath(lineElement.getLocation()).toString();
@ -48,7 +48,7 @@ public class PDOMSearchListLabelProvider extends ColoringLabelProvider {
cell.setImage(CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_SEARCH_LINE)); cell.setImage(CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_SEARCH_LINE));
} }
break; break;
case PDOMSearchViewPage.DEFINITION_COLUMN_INDEX: case CSearchViewPage.DEFINITION_COLUMN_INDEX:
if (element instanceof LineSearchElement) { if (element instanceof LineSearchElement) {
LineSearchElement lineElement = (LineSearchElement) element; LineSearchElement lineElement = (LineSearchElement) element;
ICElement enclosingElement = lineElement.getMatches()[0].getEnclosingElement(); ICElement enclosingElement = lineElement.getMatches()[0].getEnclosingElement();
@ -60,7 +60,7 @@ public class PDOMSearchListLabelProvider extends ColoringLabelProvider {
} }
} }
break; break;
case PDOMSearchViewPage.MATCH_COLUMN_INDEX: case CSearchViewPage.MATCH_COLUMN_INDEX:
super.update(cell); super.update(cell);
cell.setImage(null); cell.setImage(null);
break; break;

15
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchMatch.java → core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMatch.java
View file

@ -6,8 +6,8 @@
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* QNX - Initial API and implementation * QNX - Initial API and implementation
* Markus Schorn (Wind River Systems) * Markus Schorn (Wind River Systems)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.ui.search; package org.eclipse.cdt.internal.ui.search;
@ -18,25 +18,24 @@ import org.eclipse.cdt.core.index.IIndexFileLocation;
/** /**
* Base class for search matches found by various index searches. * Base class for search matches found by various index searches.
*/ */
public class PDOMSearchMatch extends Match { public class CSearchMatch extends Match {
private boolean fIsPolymorphicCall; private boolean fIsPolymorphicCall;
public PDOMSearchMatch(PDOMSearchElement elem, int offset, int length) { public CSearchMatch(CSearchElement elem, int offset, int length) {
super(elem, offset, length); super(elem, offset, length);
} }
IIndexFileLocation getLocation() { IIndexFileLocation getLocation() {
return ((PDOMSearchElement)getElement()).getLocation(); return ((CSearchElement)getElement()).getLocation();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj == this) if (obj == this)
return true; return true;
if (!(obj instanceof PDOMSearchMatch)) if (!(obj instanceof CSearchMatch))
return false; return false;
PDOMSearchMatch other = (PDOMSearchMatch)obj; CSearchMatch other = (CSearchMatch)obj;
return getElement().equals(other.getElement()) return getElement().equals(other.getElement())
&& getOffset() == other.getOffset() && getOffset() == other.getOffset()
&& getLength() == other.getLength(); && getLength() == other.getLength();

77
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchPage.java → core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java
View file

@ -6,10 +6,9 @@
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Doug Schaefer (QNX) - Initial API and implementation * Doug Schaefer (QNX) - Initial API and implementation
* Markus Schorn (Wind River Systems) * Markus Schorn (Wind River Systems)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.ui.search; package org.eclipse.cdt.internal.ui.search;
import java.util.HashSet; import java.util.HashSet;
@ -72,10 +71,8 @@ import org.eclipse.cdt.internal.ui.util.RowLayouter;
/** /**
* @author Doug Schaefer * @author Doug Schaefer
*
*/ */
public class PDOMSearchPage extends DialogPage implements ISearchPage { public class CSearchPage extends DialogPage implements ISearchPage {
public static final String EXTENSION_ID = CUIPlugin.PLUGIN_ID + ".pdomSearchPage"; //$NON-NLS-1$ public static final String EXTENSION_ID = CUIPlugin.PLUGIN_ID + ".pdomSearchPage"; //$NON-NLS-1$
//Dialog store id constants //Dialog store id constants
@ -106,18 +103,18 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
// These must be in the same order as the Text // These must be in the same order as the Text
private static final Integer[] searchForData = { private static final Integer[] searchForData = {
new Integer(PDOMSearchPatternQuery.FIND_CLASS_STRUCT), new Integer(CSearchPatternQuery.FIND_CLASS_STRUCT),
new Integer(PDOMSearchPatternQuery.FIND_FUNCTION), new Integer(CSearchPatternQuery.FIND_FUNCTION),
new Integer(PDOMSearchPatternQuery.FIND_VARIABLE), new Integer(CSearchPatternQuery.FIND_VARIABLE),
new Integer(PDOMSearchPatternQuery.FIND_UNION), new Integer(CSearchPatternQuery.FIND_UNION),
new Integer(PDOMSearchPatternQuery.FIND_METHOD), new Integer(CSearchPatternQuery.FIND_METHOD),
new Integer(PDOMSearchPatternQuery.FIND_FIELD), new Integer(CSearchPatternQuery.FIND_FIELD),
new Integer(PDOMSearchPatternQuery.FIND_ENUM), new Integer(CSearchPatternQuery.FIND_ENUM),
new Integer(PDOMSearchPatternQuery.FIND_ENUMERATOR), new Integer(CSearchPatternQuery.FIND_ENUMERATOR),
new Integer(PDOMSearchPatternQuery.FIND_NAMESPACE), new Integer(CSearchPatternQuery.FIND_NAMESPACE),
new Integer(PDOMSearchPatternQuery.FIND_TYPEDEF), new Integer(CSearchPatternQuery.FIND_TYPEDEF),
new Integer(PDOMSearchPatternQuery.FIND_MACRO), new Integer(CSearchPatternQuery.FIND_MACRO),
new Integer(PDOMSearchPatternQuery.FIND_ALL_TYPES) new Integer(CSearchPatternQuery.FIND_ALL_TYPES)
}; };
// the index of FIND_ALL_TYPES // the index of FIND_ALL_TYPES
@ -132,10 +129,10 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
// Must be in the same order as the text // Must be in the same order as the text
private static Integer[] limitToData = { private static Integer[] limitToData = {
new Integer(PDOMSearchQuery.FIND_DECLARATIONS), new Integer(CSearchQuery.FIND_DECLARATIONS),
new Integer(PDOMSearchQuery.FIND_DEFINITIONS), new Integer(CSearchQuery.FIND_DEFINITIONS),
new Integer(PDOMSearchQuery.FIND_REFERENCES), new Integer(CSearchQuery.FIND_REFERENCES),
new Integer(PDOMSearchQuery.FIND_ALL_OCCURRENCES), new Integer(CSearchQuery.FIND_ALL_OCCURRENCES),
}; };
// The index of FIND_ALL_OCCURANCES // The index of FIND_ALL_OCCURANCES
@ -189,7 +186,7 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
// Get search flags // Get search flags
int searchFlags = 0; int searchFlags = 0;
if (searchForButtons[searchAllButtonIndex].getSelection()) { if (searchForButtons[searchAllButtonIndex].getSelection()) {
searchFlags |= PDOMSearchPatternQuery.FIND_ALL_TYPES; searchFlags |= CSearchPatternQuery.FIND_ALL_TYPES;
} else { } else {
for (int i = 0; i < searchForButtons.length; ++i) { for (int i = 0; i < searchForButtons.length; ++i) {
if (searchForButtons[i].getSelection()) if (searchForButtons[i].getSelection())
@ -277,7 +274,7 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
null : elements.toArray(new ICElement[elements.size()]); null : elements.toArray(new ICElement[elements.size()]);
try { try {
PDOMSearchPatternQuery job = new PDOMSearchPatternQuery(scope, scopeDescription, patternStr, CSearchPatternQuery job = new CSearchPatternQuery(scope, scopeDescription, patternStr,
isCaseSensitive, searchFlags); isCaseSensitive, searchFlags);
NewSearchUI.activateSearchResultView(); NewSearchUI.activateSearchResultView();
@ -664,7 +661,7 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
IDialogSettings settings = getDialogSettings(); IDialogSettings settings = getDialogSettings();
int searchFlags = PDOMSearchPatternQuery.FIND_ALL_TYPES | PDOMSearchQuery.FIND_ALL_OCCURRENCES; int searchFlags = CSearchPatternQuery.FIND_ALL_TYPES | CSearchQuery.FIND_ALL_OCCURRENCES;
try { try {
searchFlags = settings.getInt(STORE_SEARCH_FLAGS); searchFlags = settings.getInt(STORE_SEARCH_FLAGS);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
@ -686,45 +683,45 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
ICElement element = (ICElement)obj; ICElement element = (ICElement)obj;
patternCombo.setText(element.getElementName()); patternCombo.setText(element.getElementName());
// Clear the type flags so we can set them correctly for what we have selected // Clear the type flags so we can set them correctly for what we have selected
searchFlags = searchFlags & ~PDOMSearchPatternQuery.FIND_ALL_TYPES; searchFlags = searchFlags & ~CSearchPatternQuery.FIND_ALL_TYPES;
switch (element.getElementType()) { switch (element.getElementType()) {
case ICElement.C_CLASS: case ICElement.C_CLASS:
case ICElement.C_STRUCT: case ICElement.C_STRUCT:
searchFlags |= PDOMSearchPatternQuery.FIND_CLASS_STRUCT; searchFlags |= CSearchPatternQuery.FIND_CLASS_STRUCT;
break; break;
case ICElement.C_FUNCTION: case ICElement.C_FUNCTION:
searchFlags |= PDOMSearchPatternQuery.FIND_FUNCTION; searchFlags |= CSearchPatternQuery.FIND_FUNCTION;
break; break;
case ICElement.C_VARIABLE: case ICElement.C_VARIABLE:
searchFlags |= PDOMSearchPatternQuery.FIND_VARIABLE; searchFlags |= CSearchPatternQuery.FIND_VARIABLE;
break; break;
case ICElement.C_UNION: case ICElement.C_UNION:
searchFlags |= PDOMSearchPatternQuery.FIND_UNION; searchFlags |= CSearchPatternQuery.FIND_UNION;
break; break;
case ICElement.C_METHOD: case ICElement.C_METHOD:
searchFlags |= PDOMSearchPatternQuery.FIND_METHOD; searchFlags |= CSearchPatternQuery.FIND_METHOD;
break; break;
case ICElement.C_FIELD: case ICElement.C_FIELD:
searchFlags |= PDOMSearchPatternQuery.FIND_FIELD; searchFlags |= CSearchPatternQuery.FIND_FIELD;
break; break;
case ICElement.C_ENUMERATION: case ICElement.C_ENUMERATION:
searchFlags |= PDOMSearchPatternQuery.FIND_ENUM; searchFlags |= CSearchPatternQuery.FIND_ENUM;
break; break;
case ICElement.C_ENUMERATOR: case ICElement.C_ENUMERATOR:
searchFlags |= PDOMSearchPatternQuery.FIND_ENUMERATOR; searchFlags |= CSearchPatternQuery.FIND_ENUMERATOR;
break; break;
case ICElement.C_NAMESPACE: case ICElement.C_NAMESPACE:
searchFlags |= PDOMSearchPatternQuery.FIND_NAMESPACE; searchFlags |= CSearchPatternQuery.FIND_NAMESPACE;
break; break;
case ICElement.C_TYPEDEF: case ICElement.C_TYPEDEF:
searchFlags |= PDOMSearchPatternQuery.FIND_TYPEDEF; searchFlags |= CSearchPatternQuery.FIND_TYPEDEF;
break; break;
case ICElement.C_MACRO: case ICElement.C_MACRO:
searchFlags |= PDOMSearchPatternQuery.FIND_MACRO; searchFlags |= CSearchPatternQuery.FIND_MACRO;
break; break;
default: default:
// Not sure, set to all // Not sure, set to all
searchFlags |= PDOMSearchPatternQuery.FIND_ALL_TYPES; searchFlags |= CSearchPatternQuery.FIND_ALL_TYPES;
patternCombo.setText(""); //$NON-NLS-1$ patternCombo.setText(""); //$NON-NLS-1$
} }
} }
@ -740,7 +737,7 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
caseSensitiveButton.setSelection(settings.getBoolean(STORE_CASE_SENSITIVE)); caseSensitiveButton.setSelection(settings.getBoolean(STORE_CASE_SENSITIVE));
if ((searchFlags & PDOMSearchPatternQuery.FIND_ALL_TYPES) == PDOMSearchPatternQuery.FIND_ALL_TYPES) { if ((searchFlags & CSearchPatternQuery.FIND_ALL_TYPES) == CSearchPatternQuery.FIND_ALL_TYPES) {
searchForButtons[searchAllButtonIndex].setSelection(true); searchForButtons[searchAllButtonIndex].setSelection(true);
for (int i = 0; i < searchForButtons.length; ++i) { for (int i = 0; i < searchForButtons.length; ++i) {
if (i != searchAllButtonIndex) { if (i != searchAllButtonIndex) {
@ -758,7 +755,7 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
} }
} }
if ((searchFlags & PDOMSearchQuery.FIND_ALL_OCCURRENCES) == PDOMSearchQuery.FIND_ALL_OCCURRENCES) { if ((searchFlags & CSearchQuery.FIND_ALL_OCCURRENCES) == CSearchQuery.FIND_ALL_OCCURRENCES) {
limitToButtons[limitToAllButtonIndex].setSelection(true); limitToButtons[limitToAllButtonIndex].setSelection(true);
for (int i = 0; i < limitToButtons.length; ++i) { for (int i = 0; i < limitToButtons.length; ++i) {
if (i != limitToAllButtonIndex) { if (i != limitToAllButtonIndex) {

20
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchPatternQuery.java → core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPatternQuery.java
View file

@ -40,12 +40,10 @@ import org.eclipse.cdt.core.index.IIndexBinding;
import org.eclipse.cdt.core.index.IndexFilter; import org.eclipse.cdt.core.index.IndexFilter;
import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICElement;
/** /**
* @author Doug Schaefer * @author Doug Schaefer
*/ */
public class PDOMSearchPatternQuery extends PDOMSearchQuery { public class CSearchPatternQuery extends CSearchQuery {
// First bit after the FINDs in PDOMSearchQuery. // First bit after the FINDs in PDOMSearchQuery.
public static final int FIND_CLASS_STRUCT = 0x10; public static final int FIND_CLASS_STRUCT = 0x10;
public static final int FIND_FUNCTION = 0x20; public static final int FIND_FUNCTION = 0x20;
@ -58,16 +56,16 @@ public class PDOMSearchPatternQuery extends PDOMSearchQuery {
public static final int FIND_NAMESPACE = 0x4000; public static final int FIND_NAMESPACE = 0x4000;
public static final int FIND_TYPEDEF = 0x10000; public static final int FIND_TYPEDEF = 0x10000;
public static final int FIND_MACRO = 0x20000; public static final int FIND_MACRO = 0x20000;
public static final int FIND_ALL_TYPES public static final int FIND_ALL_TYPES =
= FIND_CLASS_STRUCT | FIND_FUNCTION | FIND_VARIABLE FIND_CLASS_STRUCT | FIND_FUNCTION | FIND_VARIABLE |
| FIND_UNION | FIND_METHOD | FIND_FIELD | FIND_ENUM FIND_UNION | FIND_METHOD | FIND_FIELD | FIND_ENUM |
| FIND_ENUMERATOR | FIND_NAMESPACE | FIND_TYPEDEF | FIND_MACRO; FIND_ENUMERATOR | FIND_NAMESPACE | FIND_TYPEDEF | FIND_MACRO;
private String scopeDesc; private final String scopeDesc;
private String patternStr; private final String patternStr;
private Pattern[] pattern; private final Pattern[] pattern;
public PDOMSearchPatternQuery( public CSearchPatternQuery(
ICElement[] scope, ICElement[] scope,
String scopeDesc, String scopeDesc,
String patternStr, String patternStr,

14
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchQuery.java → core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchQuery.java
View file

@ -74,7 +74,7 @@ import org.eclipse.cdt.internal.ui.util.Messages;
import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels;
import org.eclipse.cdt.internal.ui.viewsupport.IndexUI; import org.eclipse.cdt.internal.ui.viewsupport.IndexUI;
public abstract class PDOMSearchQuery implements ISearchQuery { public abstract class CSearchQuery implements ISearchQuery {
public static final int FIND_DECLARATIONS = IIndex.FIND_DECLARATIONS; public static final int FIND_DECLARATIONS = IIndex.FIND_DECLARATIONS;
public static final int FIND_DEFINITIONS = IIndex.FIND_DEFINITIONS; public static final int FIND_DEFINITIONS = IIndex.FIND_DEFINITIONS;
public static final int FIND_REFERENCES = IIndex.FIND_REFERENCES; public static final int FIND_REFERENCES = IIndex.FIND_REFERENCES;
@ -86,15 +86,15 @@ public abstract class PDOMSearchQuery implements ISearchQuery {
CElementLabels.ALL_FULLY_QUALIFIED | CElementLabels.ALL_FULLY_QUALIFIED |
CElementLabels.TEMPLATE_ARGUMENTS; CElementLabels.TEMPLATE_ARGUMENTS;
protected PDOMSearchResult result; protected CSearchResult result;
protected int flags; protected int flags;
protected ICElement[] scope; protected ICElement[] scope;
protected ICProject[] projects; protected ICProject[] projects;
private Set<String> fullPathFilter; private Set<String> fullPathFilter;
protected PDOMSearchQuery(ICElement[] scope, int flags) { protected CSearchQuery(ICElement[] scope, int flags) {
result = new PDOMSearchResult(this); result = new CSearchResult(this);
this.flags = flags; this.flags = flags;
this.scope = scope; this.scope = scope;
@ -319,7 +319,7 @@ public abstract class PDOMSearchQuery implements ISearchQuery {
for (Match lineMatch : searchElement.getMatches()) { for (Match lineMatch : searchElement.getMatches()) {
int offset = lineMatch.getOffset(); int offset = lineMatch.getOffset();
int length = lineMatch.getLength(); int length = lineMatch.getLength();
PDOMSearchMatch match = new PDOMSearchMatch(searchElement, offset, length); CSearchMatch match = new CSearchMatch(searchElement, offset, length);
if (lineMatch.isPolymorphicCall()) if (lineMatch.isPolymorphicCall())
match.setIsPolymorphicCall(); match.setIsPolymorphicCall();
result.addMatch(match); result.addMatch(match);
@ -470,7 +470,7 @@ public abstract class PDOMSearchQuery implements ISearchQuery {
for (Match lineMatch : searchElement.getMatches()) { for (Match lineMatch : searchElement.getMatches()) {
int offset = lineMatch.getOffset(); int offset = lineMatch.getOffset();
int length = lineMatch.getLength(); int length = lineMatch.getLength();
PDOMSearchMatch match = new PDOMSearchMatch(searchElement, offset, length); CSearchMatch match = new CSearchMatch(searchElement, offset, length);
result.addMatch(match); result.addMatch(match);
} }
} }
@ -487,7 +487,7 @@ public abstract class PDOMSearchQuery implements ISearchQuery {
@Override @Override
public final IStatus run(IProgressMonitor monitor) throws OperationCanceledException { public final IStatus run(IProgressMonitor monitor) throws OperationCanceledException {
PDOMSearchResult result= (PDOMSearchResult) getSearchResult(); CSearchResult result= (CSearchResult) getSearchResult();
result.removeAll(); result.removeAll();
result.setIndexerBusy(!CCorePlugin.getIndexManager().isIndexerIdle()); result.setIndexerBusy(!CCorePlugin.getIndexManager().isIndexerIdle());

18
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchResult.java → core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResult.java
View file

@ -46,15 +46,15 @@ import org.eclipse.cdt.internal.ui.util.ExternalEditorInput;
/** /**
* @author Doug Schaefer * @author Doug Schaefer
*/ */
public class PDOMSearchResult extends AbstractTextSearchResult implements IEditorMatchAdapter, IFileMatchAdapter { public class CSearchResult extends AbstractTextSearchResult implements IEditorMatchAdapter, IFileMatchAdapter {
private static final String KEY_SHOW_POLYMORPHIC_CALLS = "ShowPolymorphicCalls"; //$NON-NLS-1$ private static final String KEY_SHOW_POLYMORPHIC_CALLS = "ShowPolymorphicCalls"; //$NON-NLS-1$
final static MatchFilter[] ALL_FILTERS = new MatchFilter[] {HidePolymorphicCalls.FILTER}; final static MatchFilter[] ALL_FILTERS = new MatchFilter[] {HidePolymorphicCalls.FILTER};
final static MatchFilter[] NO_FILTERS = {}; final static MatchFilter[] NO_FILTERS = {};
private PDOMSearchQuery query; private CSearchQuery query;
private boolean indexerBusy; private boolean indexerBusy;
public PDOMSearchResult(PDOMSearchQuery query) { public CSearchResult(CSearchQuery query) {
super(); super();
this.query = query; this.query = query;
} }
@ -102,9 +102,9 @@ public class PDOMSearchResult extends AbstractTextSearchResult implements IEdito
@Override @Override
public boolean isShownInEditor(Match match, IEditorPart editor) { public boolean isShownInEditor(Match match, IEditorPart editor) {
final String fileName= getFileName(editor); final String fileName= getFileName(editor);
if (fileName != null && match instanceof PDOMSearchMatch) { if (fileName != null && match instanceof CSearchMatch) {
final IPath filePath= new Path(fileName); final IPath filePath= new Path(fileName);
return filePath.equals(IndexLocationFactory.getAbsolutePath(((PDOMSearchMatch)match).getLocation())); return filePath.equals(IndexLocationFactory.getAbsolutePath(((CSearchMatch)match).getLocation()));
} }
return false; return false;
} }
@ -114,10 +114,10 @@ public class PDOMSearchResult extends AbstractTextSearchResult implements IEdito
List<Match> list = new ArrayList<Match>(); List<Match> list = new ArrayList<Match>();
Object[] elements = result.getElements(); Object[] elements = result.getElements();
for (int i = 0; i < elements.length; ++i) { for (int i = 0; i < elements.length; ++i) {
if (pfilename.equals(IndexLocationFactory.getAbsolutePath(((PDOMSearchElement)elements[i]).getLocation()))) { if (pfilename.equals(IndexLocationFactory.getAbsolutePath(((CSearchElement)elements[i]).getLocation()))) {
Match[] matches = result.getMatches(elements[i]); Match[] matches = result.getMatches(elements[i]);
for (int j = 0; j < matches.length; ++j) { for (int j = 0; j < matches.length; ++j) {
if (matches[j] instanceof PDOMSearchMatch) { if (matches[j] instanceof CSearchMatch) {
list.add(matches[j]); list.add(matches[j]);
} }
} }
@ -159,8 +159,8 @@ public class PDOMSearchResult extends AbstractTextSearchResult implements IEdito
return ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(location.getFullPath())); return ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(location.getFullPath()));
} }
} catch(CoreException ce) { /* fall-through to return null */ } } catch(CoreException ce) { /* fall-through to return null */ }
} else if (element instanceof PDOMSearchElement) { } else if (element instanceof CSearchElement) {
PDOMSearchElement searchElement = (PDOMSearchElement)element; CSearchElement searchElement = (CSearchElement)element;
IIndexFileLocation location = searchElement.getLocation(); IIndexFileLocation location = searchElement.getLocation();
if(location.getFullPath()!=null) { if(location.getFullPath()!=null) {
return ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(location.getFullPath())); return ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(location.getFullPath()));

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTextSelectionQuery.java → core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchTextSelectionQuery.java
View file

@ -38,12 +38,12 @@ import org.eclipse.cdt.internal.ui.editor.ASTProvider;
/** /**
* Query for searching the index based on a text selection. * Query for searching the index based on a text selection.
*/ */
public class PDOMSearchTextSelectionQuery extends PDOMSearchQuery { public class CSearchTextSelectionQuery extends CSearchQuery {
private ITranslationUnit tu; private ITranslationUnit tu;
private ITextSelection selection; private ITextSelection selection;
private String label; private String label;
public PDOMSearchTextSelectionQuery(ICElement[] scope, ITranslationUnit tu, ITextSelection selection, int flags) { public CSearchTextSelectionQuery(ICElement[] scope, ITranslationUnit tu, ITextSelection selection, int flags) {
super(scope, flags | IIndex.SEARCH_ACROSS_LANGUAGE_BOUNDARIES); super(scope, flags | IIndex.SEARCH_ACROSS_LANGUAGE_BOUNDARIES);
this.tu = tu; this.tu = tu;
this.selection = selection; this.selection = selection;

30
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTreeContentProvider.java → core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchTreeContentProvider.java
View file

@ -6,9 +6,9 @@
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* QNX - Initial API and implementation * QNX - Initial API and implementation
* Markus Schorn (Wind River Systems) * Markus Schorn (Wind River Systems)
* Ed Swartz (Nokia) * Ed Swartz (Nokia)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.ui.search; package org.eclipse.cdt.internal.ui.search;
@ -42,16 +42,14 @@ import org.eclipse.cdt.internal.core.resources.ResourceLookup;
/** /**
* @author Doug Schaefer * @author Doug Schaefer
*
*/ */
public class PDOMSearchTreeContentProvider implements ITreeContentProvider, IPDOMSearchContentProvider { public class CSearchTreeContentProvider implements ITreeContentProvider, IPDOMSearchContentProvider {
private TreeViewer viewer; private TreeViewer viewer;
private PDOMSearchResult result; private CSearchResult result;
private Map<Object, Set<Object>> tree = new HashMap<Object, Set<Object>>(); private final Map<Object, Set<Object>> tree = new HashMap<Object, Set<Object>>();
private final PDOMSearchViewPage fPage; private final CSearchViewPage fPage;
PDOMSearchTreeContentProvider(PDOMSearchViewPage page) { CSearchTreeContentProvider(CSearchViewPage page) {
fPage= page; fPage= page;
} }
@ -92,7 +90,7 @@ public class PDOMSearchTreeContentProvider implements ITreeContentProvider, IPDO
@Override @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
this.viewer = (TreeViewer)viewer; this.viewer = (TreeViewer)viewer;
this.result = (PDOMSearchResult) newInput; this.result = (CSearchResult) newInput;
initialize(result); initialize(result);
viewer.refresh(); viewer.refresh();
} }
@ -128,7 +126,7 @@ public class PDOMSearchTreeContentProvider implements ITreeContentProvider, IPDO
return children.add(child); return children.add(child);
} }
private void insertSearchElement(PDOMSearchElement element) { private void insertSearchElement(CSearchElement element) {
IIndexFileLocation location= element.getLocation(); IIndexFileLocation location= element.getLocation();
IFile[] files; IFile[] files;
if(location.getFullPath()!=null) { if(location.getFullPath()!=null) {
@ -181,7 +179,7 @@ public class PDOMSearchTreeContentProvider implements ITreeContentProvider, IPDO
public void elementsChanged(Object[] elements) { public void elementsChanged(Object[] elements) {
if (elements != null) { if (elements != null) {
for (int i = 0; i < elements.length; ++i) { for (int i = 0; i < elements.length; ++i) {
PDOMSearchElement element = (PDOMSearchElement)elements[i]; CSearchElement element = (CSearchElement)elements[i];
if (fPage.getDisplayedMatchCount(element) > 0) { if (fPage.getDisplayedMatchCount(element) > 0) {
insertSearchElement(element); insertSearchElement(element);
} else { } else {
@ -219,7 +217,7 @@ public class PDOMSearchTreeContentProvider implements ITreeContentProvider, IPDO
initialize(result); initialize(result);
} }
private void initialize(final PDOMSearchResult result) { private void initialize(final CSearchResult result) {
this.result = result; this.result = result;
tree.clear(); tree.clear();
if (result != null) { if (result != null) {
@ -230,13 +228,13 @@ public class PDOMSearchTreeContentProvider implements ITreeContentProvider, IPDO
Object[] elements = result.getElements(); Object[] elements = result.getElements();
for (int i = 0; i < elements.length; ++i) { for (int i = 0; i < elements.length; ++i) {
final PDOMSearchElement element = (PDOMSearchElement)elements[i]; final CSearchElement element = (CSearchElement)elements[i];
if (fPage.getDisplayedMatchCount(element) > 0) if (fPage.getDisplayedMatchCount(element) > 0)
insertSearchElement(element); insertSearchElement(element);
} }
// add all the projects which have no results // add all the projects which have no results
ICProject[] projects = ((PDOMSearchQuery)result.getQuery()).getProjects(); ICProject[] projects = ((CSearchQuery)result.getQuery()).getProjects();
for (int i = 0; i < projects.length; ++i) { for (int i = 0; i < projects.length; ++i) {
ICProject project = projects[i]; ICProject project = projects[i];
Object projectResults = tree.get(project); Object projectResults = tree.get(project);

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTreeLabelProvider.java → core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchTreeLabelProvider.java
View file

@ -21,9 +21,9 @@ import org.eclipse.cdt.internal.core.model.TranslationUnit;
import org.eclipse.cdt.internal.ui.util.Messages; import org.eclipse.cdt.internal.ui.util.Messages;
public class PDOMSearchTreeLabelProvider extends PDOMSearchLabelProvider { public class CSearchTreeLabelProvider extends CSearchLabelProvider {
public PDOMSearchTreeLabelProvider(PDOMSearchViewPage page) { public CSearchTreeLabelProvider(CSearchViewPage page) {
super(page); super(page);
} }

8
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchUnresolvedIncludesQuery.java → core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchUnresolvedIncludesQuery.java
View file

@ -6,7 +6,7 @@
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Markus Schorn - initial API and implementation * Markus Schorn - initial API and implementation
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.ui.search; package org.eclipse.cdt.internal.ui.search;
@ -28,9 +28,9 @@ import org.eclipse.cdt.internal.ui.util.Messages;
* Query for searching unresolved includes in projects. * Query for searching unresolved includes in projects.
* Could be extended to search resources selections. * Could be extended to search resources selections.
*/ */
public class PDOMSearchUnresolvedIncludesQuery extends PDOMSearchQuery { public class CSearchUnresolvedIncludesQuery extends CSearchQuery {
public PDOMSearchUnresolvedIncludesQuery(ICElement[] scope) { public CSearchUnresolvedIncludesQuery(ICElement[] scope) {
super(scope, 0); super(scope, 0);
} }
@ -40,7 +40,7 @@ public class PDOMSearchUnresolvedIncludesQuery extends PDOMSearchQuery {
for (IIndexFile file : index.getAllFiles()) { for (IIndexFile file : index.getAllFiles()) {
for (IIndexInclude include : file.getIncludes()) { for (IIndexInclude include : file.getIncludes()) {
if (include.isActive() && !include.isResolved()) { if (include.isActive() && !include.isResolved()) {
result.addMatch(new PDOMSearchMatch(new ProblemSearchElement( result.addMatch(new CSearchMatch(new ProblemSearchElement(
IProblem.PREPROCESSOR_INCLUSION_NOT_FOUND, include.getFullName(), IProblem.PREPROCESSOR_INCLUSION_NOT_FOUND, include.getFullName(),
include.getIncludedByLocation()), include.getIncludedByLocation()),
include.getNameOffset(), include.getNameLength())); include.getNameOffset(), include.getNameLength()));

34
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchViewPage.java → core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchViewPage.java
View file

@ -51,7 +51,7 @@ import org.eclipse.cdt.internal.ui.viewsupport.ColoringLabelProvider;
/** /**
* Implementation of the search view page for index based searches. * Implementation of the search view page for index based searches.
*/ */
public class PDOMSearchViewPage extends AbstractTextSearchViewPage { public class CSearchViewPage extends AbstractTextSearchViewPage {
public static final int LOCATION_COLUMN_INDEX = 0; public static final int LOCATION_COLUMN_INDEX = 0;
public static final int DEFINITION_COLUMN_INDEX = 1; public static final int DEFINITION_COLUMN_INDEX = 1;
public static final int MATCH_COLUMN_INDEX = 2; public static final int MATCH_COLUMN_INDEX = 2;
@ -70,7 +70,7 @@ public class PDOMSearchViewPage extends AbstractTextSearchViewPage {
private IPDOMSearchContentProvider contentProvider; private IPDOMSearchContentProvider contentProvider;
private boolean fShowEnclosingDefinitions; private boolean fShowEnclosingDefinitions;
private ShowEnclosingDefinitionsAction fShowEnclosingDefinitionsAction; private ShowEnclosingDefinitionsAction fShowEnclosingDefinitionsAction;
private int[] fColumnWidths = { 300, 150, 300 }; private final int[] fColumnWidths = { 300, 150, 300 };
private class ShowEnclosingDefinitionsAction extends Action { private class ShowEnclosingDefinitionsAction extends Action {
public ShowEnclosingDefinitionsAction() { public ShowEnclosingDefinitionsAction() {
@ -84,11 +84,11 @@ public class PDOMSearchViewPage extends AbstractTextSearchViewPage {
} }
} }
public PDOMSearchViewPage(int supportedLayouts) { public CSearchViewPage(int supportedLayouts) {
super(supportedLayouts); super(supportedLayouts);
} }
public PDOMSearchViewPage() { public CSearchViewPage() {
super(); super();
} }
@ -196,9 +196,6 @@ public class PDOMSearchViewPage extends AbstractTextSearchViewPage {
* *
*/ */
private class SearchViewerComparator extends ViewerComparator { private class SearchViewerComparator extends ViewerComparator {
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
*/
@Override @Override
public int compare(Viewer viewer, Object e1, Object e2) { public int compare(Viewer viewer, Object e1, Object e2) {
if (e1 instanceof LineSearchElement && e2 instanceof LineSearchElement) { if (e1 instanceof LineSearchElement && e2 instanceof LineSearchElement) {
@ -216,9 +213,6 @@ public class PDOMSearchViewPage extends AbstractTextSearchViewPage {
return super.compare(viewer, e1, e2); return super.compare(viewer, e1, e2);
} }
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ViewerComparator#category(java.lang.Object)
*/
@Override @Override
public int category(Object element) { public int category(Object element) {
// place status messages first // place status messages first
@ -260,10 +254,10 @@ public class PDOMSearchViewPage extends AbstractTextSearchViewPage {
@Override @Override
protected void configureTreeViewer(TreeViewer viewer) { protected void configureTreeViewer(TreeViewer viewer) {
contentProvider = new PDOMSearchTreeContentProvider(this); contentProvider = new CSearchTreeContentProvider(this);
viewer.setComparator(new SearchViewerComparator()); viewer.setComparator(new SearchViewerComparator());
viewer.setContentProvider((PDOMSearchTreeContentProvider)contentProvider); viewer.setContentProvider((CSearchTreeContentProvider)contentProvider);
PDOMSearchTreeLabelProvider innerLabelProvider = new PDOMSearchTreeLabelProvider(this); CSearchTreeLabelProvider innerLabelProvider = new CSearchTreeLabelProvider(this);
ColoringLabelProvider labelProvider = new ColoringLabelProvider(innerLabelProvider); ColoringLabelProvider labelProvider = new ColoringLabelProvider(innerLabelProvider);
viewer.setLabelProvider(labelProvider); viewer.setLabelProvider(labelProvider);
} }
@ -271,9 +265,9 @@ public class PDOMSearchViewPage extends AbstractTextSearchViewPage {
@Override @Override
protected void configureTableViewer(TableViewer viewer) { protected void configureTableViewer(TableViewer viewer) {
createColumns(viewer); createColumns(viewer);
contentProvider = new PDOMSearchListContentProvider(this); contentProvider = new CSearchListContentProvider(this);
viewer.setComparator(new SearchViewerComparator()); viewer.setComparator(new SearchViewerComparator());
viewer.setContentProvider((PDOMSearchListContentProvider)contentProvider); viewer.setContentProvider((CSearchListContentProvider)contentProvider);
} }
@Override @Override
@ -303,7 +297,7 @@ public class PDOMSearchViewPage extends AbstractTextSearchViewPage {
private void createColumns(TableViewer viewer) { private void createColumns(TableViewer viewer) {
for (int i = 0; i < fColumnLabels.length; i++) { for (int i = 0; i < fColumnLabels.length; i++) {
TableViewerColumn viewerColumn = new TableViewerColumn(viewer, SWT.NONE); TableViewerColumn viewerColumn = new TableViewerColumn(viewer, SWT.NONE);
viewerColumn.setLabelProvider(new PDOMSearchListLabelProvider(this, i)); viewerColumn.setLabelProvider(new CSearchListLabelProvider(this, i));
TableColumn tableColumn = viewerColumn.getColumn(); TableColumn tableColumn = viewerColumn.getColumn();
tableColumn.setText(fColumnLabels[i]); tableColumn.setText(fColumnLabels[i]);
tableColumn.setWidth(fColumnWidths[i]); tableColumn.setWidth(fColumnWidths[i]);
@ -321,16 +315,16 @@ public class PDOMSearchViewPage extends AbstractTextSearchViewPage {
@Override @Override
protected void showMatch(Match match, int currentOffset, int currentLength, boolean activate) throws PartInitException { protected void showMatch(Match match, int currentOffset, int currentLength, boolean activate) throws PartInitException {
if (!(match instanceof PDOMSearchMatch)) if (!(match instanceof CSearchMatch))
return; return;
try { try {
Object element= ((PDOMSearchMatch)match).getElement(); Object element= ((CSearchMatch) match).getElement();
IIndexFileLocation ifl= ((PDOMSearchElement)element).getLocation(); IIndexFileLocation ifl= ((CSearchElement) element).getLocation();
IPath path = IndexLocationFactory.getPath(ifl); IPath path = IndexLocationFactory.getPath(ifl);
IEditorPart editor = EditorUtility.openInEditor(path, null, activate); IEditorPart editor = EditorUtility.openInEditor(path, null, activate);
if (editor instanceof ITextEditor) { if (editor instanceof ITextEditor) {
ITextEditor textEditor = (ITextEditor)editor; ITextEditor textEditor = (ITextEditor) editor;
textEditor.selectAndReveal(currentOffset, currentLength); textEditor.selectAndReveal(currentOffset, currentLength);
} }
} catch (CoreException e) { } catch (CoreException e) {

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/HidePolymorphicCalls.java
View file

@ -19,7 +19,7 @@ public class HidePolymorphicCalls extends MatchFilter {
@Override @Override
public boolean filters(Match match) { public boolean filters(Match match) {
return match instanceof PDOMSearchMatch && ((PDOMSearchMatch) match).isPolymorphicCall(); return match instanceof CSearchMatch && ((CSearchMatch) match).isPolymorphicCall();
} }
@Override @Override

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/IPDOMSearchContentProvider.java
View file

@ -41,7 +41,7 @@ public interface IPDOMSearchContentProvider {
* TODO: it would be better if IIndexManager told us which projects specifically * TODO: it would be better if IIndexManager told us which projects specifically
* were being indexed at the time, so we could annotate per-project whose results are suspicious * were being indexed at the time, so we could annotate per-project whose results are suspicious
* (which may be none at all for a given search). * (which may be none at all for a given search).
* See the handling of {@link PDOMSearchResult#wasIndexerBusy()}. * See the handling of {@link CSearchResult#wasIndexerBusy()}.
*/ */
static IStatus INCOMPLETE_RESULTS_NODE = static IStatus INCOMPLETE_RESULTS_NODE =
new Status(IStatus.WARNING, CUIPlugin.PLUGIN_ID, new Status(IStatus.WARNING, CUIPlugin.PLUGIN_ID,

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LineSearchElement.java
View file

@ -31,7 +31,7 @@ import org.eclipse.cdt.internal.core.parser.scanner.InternalFileContent;
/** /**
* Element representing a line with one ore more matches. * Element representing a line with one ore more matches.
*/ */
public class LineSearchElement extends PDOMSearchElement { public class LineSearchElement extends CSearchElement {
public static final class Match { public static final class Match {
private final int fOffset; private final int fOffset;
private final int fLength; private final int fLength;

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/OpenCSearchPageAction.java
View file

@ -44,7 +44,7 @@ public class OpenCSearchPageAction implements IWorkbenchWindowActionDelegate {
beep(); beep();
return; return;
} }
NewSearchUI.openSearchDialog(fWindow, PDOMSearchPage.EXTENSION_ID); NewSearchUI.openSearchDialog(fWindow, CSearchPage.EXTENSION_ID);
} }
@Override @Override

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/ProblemSearchElement.java
View file

@ -15,7 +15,7 @@ import org.eclipse.cdt.core.index.IIndexFileLocation;
/** /**
* Represents a problem in a search. * Represents a problem in a search.
*/ */
public class ProblemSearchElement extends PDOMSearchElement { public class ProblemSearchElement extends CSearchElement {
private final int fProblemID; private final int fProblemID;
private final String fDetail; private final String fDetail;

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/TypeInfoSearchElement.java
View file

@ -23,7 +23,7 @@ import org.eclipse.cdt.internal.core.browser.ASTTypeInfo;
/** /**
* Represents a a c/c++-entity in a search. * Represents a a c/c++-entity in a search.
*/ */
public class TypeInfoSearchElement extends PDOMSearchElement { public class TypeInfoSearchElement extends CSearchElement {
private final ITypeInfo typeInfo; private final ITypeInfo typeInfo;
public TypeInfoSearchElement(IIndex index, IIndexName name, IIndexBinding binding) throws CoreException { public TypeInfoSearchElement(IIndex index, IIndexName name, IIndexBinding binding) throws CoreException {

14
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindAction.java
View file

@ -27,9 +27,9 @@ import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.internal.ui.editor.CEditor;
import org.eclipse.cdt.internal.ui.search.CSearchMessages; import org.eclipse.cdt.internal.ui.search.CSearchMessages;
import org.eclipse.cdt.internal.ui.search.PDOMSearchElementQuery; import org.eclipse.cdt.internal.ui.search.CSearchElementQuery;
import org.eclipse.cdt.internal.ui.search.PDOMSearchQuery; import org.eclipse.cdt.internal.ui.search.CSearchQuery;
import org.eclipse.cdt.internal.ui.search.PDOMSearchTextSelectionQuery; import org.eclipse.cdt.internal.ui.search.CSearchTextSelectionQuery;
import org.eclipse.cdt.internal.ui.text.CWordFinder; import org.eclipse.cdt.internal.ui.text.CWordFinder;
@ -76,12 +76,12 @@ public abstract class FindAction extends SelectionParseAction {
NewSearchUI.runQueryInBackground(searchJob); NewSearchUI.runQueryInBackground(searchJob);
} }
protected PDOMSearchQuery createQuery(ISourceReference object) { protected CSearchQuery createQuery(ISourceReference object) {
return new PDOMSearchElementQuery(getScope(), object, getLimitTo()); return new CSearchElementQuery(getScope(), object, getLimitTo());
} }
protected PDOMSearchQuery createQuery(ICElement element, ITextSelection selNode) { protected CSearchQuery createQuery(ICElement element, ITextSelection selNode) {
return new PDOMSearchTextSelectionQuery(getScope(), return new CSearchTextSelectionQuery(getScope(),
(ITranslationUnit) element, selNode, getLimitTo()); (ITranslationUnit) element, selNode, getLimitTo());
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsAction.java
View file

@ -14,7 +14,7 @@ package org.eclipse.cdt.internal.ui.search.actions;
import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.internal.ui.editor.CEditor;
import org.eclipse.cdt.internal.ui.search.CSearchMessages; import org.eclipse.cdt.internal.ui.search.CSearchMessages;
import org.eclipse.cdt.internal.ui.search.PDOMSearchQuery; import org.eclipse.cdt.internal.ui.search.CSearchQuery;
import org.eclipse.ui.IWorkbenchSite; import org.eclipse.ui.IWorkbenchSite;
@ -56,6 +56,6 @@ public class FindDeclarationsAction extends FindAction {
@Override @Override
protected int getLimitTo() { protected int getLimitTo() {
return PDOMSearchQuery.FIND_DECLARATIONS_DEFINITIONS; return CSearchQuery.FIND_DECLARATIONS_DEFINITIONS;
} }
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsInWorkingSetAction.java
View file

@ -16,7 +16,7 @@ import org.eclipse.ui.IWorkingSet;
import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.internal.ui.editor.CEditor;
import org.eclipse.cdt.internal.ui.search.CSearchMessages; import org.eclipse.cdt.internal.ui.search.CSearchMessages;
import org.eclipse.cdt.internal.ui.search.PDOMSearchQuery; import org.eclipse.cdt.internal.ui.search.CSearchQuery;
public class FindDeclarationsInWorkingSetAction extends FindInWorkingSetAction { public class FindDeclarationsInWorkingSetAction extends FindInWorkingSetAction {
@ -36,6 +36,6 @@ public class FindDeclarationsInWorkingSetAction extends FindInWorkingSetAction {
@Override @Override
protected int getLimitTo() { protected int getLimitTo() {
return PDOMSearchQuery.FIND_DECLARATIONS_DEFINITIONS; return CSearchQuery.FIND_DECLARATIONS_DEFINITIONS;
} }
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsProjectAction.java
View file

@ -15,7 +15,7 @@ import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.internal.ui.editor.CEditor;
import org.eclipse.cdt.internal.ui.search.CSearchMessages; import org.eclipse.cdt.internal.ui.search.CSearchMessages;
import org.eclipse.cdt.internal.ui.search.PDOMSearchQuery; import org.eclipse.cdt.internal.ui.search.CSearchQuery;
import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResource;
import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
@ -73,7 +73,7 @@ public class FindDeclarationsProjectAction extends FindAction {
@Override @Override
protected int getLimitTo() { protected int getLimitTo() {
return PDOMSearchQuery.FIND_DECLARATIONS_DEFINITIONS; return CSearchQuery.FIND_DECLARATIONS_DEFINITIONS;
} }
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsAction.java
View file

@ -13,7 +13,7 @@ package org.eclipse.cdt.internal.ui.search.actions;
import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.internal.ui.editor.CEditor;
import org.eclipse.cdt.internal.ui.search.CSearchMessages; import org.eclipse.cdt.internal.ui.search.CSearchMessages;
import org.eclipse.cdt.internal.ui.search.PDOMSearchQuery; import org.eclipse.cdt.internal.ui.search.CSearchQuery;
import org.eclipse.ui.IWorkbenchSite; import org.eclipse.ui.IWorkbenchSite;
public class FindRefsAction extends FindAction { public class FindRefsAction extends FindAction {
@ -54,6 +54,6 @@ public class FindRefsAction extends FindAction {
@Override @Override
protected int getLimitTo() { protected int getLimitTo() {
return PDOMSearchQuery.FIND_REFERENCES; return CSearchQuery.FIND_REFERENCES;
} }
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsInWorkingSetAction.java
View file

@ -16,7 +16,7 @@ import org.eclipse.ui.IWorkingSet;
import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.internal.ui.editor.CEditor;
import org.eclipse.cdt.internal.ui.search.CSearchMessages; import org.eclipse.cdt.internal.ui.search.CSearchMessages;
import org.eclipse.cdt.internal.ui.search.PDOMSearchQuery; import org.eclipse.cdt.internal.ui.search.CSearchQuery;
public class FindRefsInWorkingSetAction extends FindInWorkingSetAction { public class FindRefsInWorkingSetAction extends FindInWorkingSetAction {
@ -36,6 +36,6 @@ public class FindRefsInWorkingSetAction extends FindInWorkingSetAction {
@Override @Override
protected int getLimitTo() { protected int getLimitTo() {
return PDOMSearchQuery.FIND_REFERENCES; return CSearchQuery.FIND_REFERENCES;
} }
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsProjectAction.java
View file

@ -15,7 +15,7 @@ import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.internal.ui.editor.CEditor;
import org.eclipse.cdt.internal.ui.search.CSearchMessages; import org.eclipse.cdt.internal.ui.search.CSearchMessages;
import org.eclipse.cdt.internal.ui.search.PDOMSearchQuery; import org.eclipse.cdt.internal.ui.search.CSearchQuery;
import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResource;
import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
@ -73,7 +73,7 @@ public class FindRefsProjectAction extends FindAction {
@Override @Override
protected int getLimitTo() { protected int getLimitTo() {
return PDOMSearchQuery.FIND_REFERENCES; return CSearchQuery.FIND_REFERENCES;
} }
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindUnresolvedIncludesProjectAction.java
View file

@ -27,7 +27,7 @@ import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.internal.ui.actions.SelectionConverter; import org.eclipse.cdt.internal.ui.actions.SelectionConverter;
import org.eclipse.cdt.internal.ui.search.CSearchMessages; import org.eclipse.cdt.internal.ui.search.CSearchMessages;
import org.eclipse.cdt.internal.ui.search.PDOMSearchUnresolvedIncludesQuery; import org.eclipse.cdt.internal.ui.search.CSearchUnresolvedIncludesQuery;
import org.eclipse.cdt.internal.ui.util.StatusLineHandler; import org.eclipse.cdt.internal.ui.util.StatusLineHandler;
/** /**
@ -57,7 +57,7 @@ public class FindUnresolvedIncludesProjectAction implements IObjectActionDelegat
return; return;
} }
ISearchQuery searchJob= new PDOMSearchUnresolvedIncludesQuery(projects.toArray(new ICProject[projects.size()])); ISearchQuery searchJob= new CSearchUnresolvedIncludesQuery(projects.toArray(new ICProject[projects.size()]));
StatusLineHandler.clearStatusLine(fSite); StatusLineHandler.clearStatusLine(fSite);
NewSearchUI.activateSearchResultView(); NewSearchUI.activateSearchResultView();