[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[ptp-dev] CSearchQueryMessages 1.11.10.2 breaks RemoteSearchQueryAdapter
|
Some constants have been renamed in the latest CSearchQueryMessages in
cdt_6_0 and CDT HEAD (1.11.10.2 for cdt_6_0). These break
RemoteSearchQueryAdapter in rdt.ui.
A patch for RemoteSearchQueryAdapter is attached (3-line fix).
Jeff
### Eclipse Workspace Patch 1.0
#P org.eclipse.ptp.rdt.ui
Index: src/org/eclipse/ptp/internal/rdt/ui/search/RemoteSearchQueryAdapter.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/search/RemoteSearchQueryAdapter.java,v
retrieving revision 1.2
diff -u -r1.2 RemoteSearchQueryAdapter.java
--- src/org/eclipse/ptp/internal/rdt/ui/search/RemoteSearchQueryAdapter.java 7 Aug 2008 18:20:08 -0000 1.2
+++ src/org/eclipse/ptp/internal/rdt/ui/search/RemoteSearchQueryAdapter.java 26 Aug 2009 18:30:33 -0000
@@ -40,7 +40,7 @@
/**
* Adapts RemoteSearchQuery instances so that they may be used with Eclipse's
- * search framework.
+ * search framework.
*/
public class RemoteSearchQueryAdapter implements ISearchQuery {
@@ -55,7 +55,7 @@
fQuery = query;
fResult = new RemoteSearchResult(this);
}
-
+
public boolean canRerun() {
return fQuery.canRerun();
}
@@ -67,11 +67,11 @@
public String getLabel() {
String type;
if ((fQuery.getFlags() & RemoteSearchQuery.FIND_REFERENCES) != 0)
- type = CSearchMessages.PDOMSearch_query_refs_label;
+ type = CSearchMessages.PDOMSearchQuery_refs_label;
else if ((fQuery.getFlags() & RemoteSearchQuery.FIND_DECLARATIONS) != 0)
- type = CSearchMessages.PDOMSearch_query_decls_label;
+ type = CSearchMessages.PDOMSearchQuery_decls_label;
else
- type = CSearchMessages.PDOMSearch_query_defs_label;
+ type = CSearchMessages.PDOMSearchQuery_defs_label;
return type;
}
@@ -81,13 +81,13 @@
public IStatus run(IProgressMonitor monitor) throws OperationCanceledException {
fSubsystem.checkAllProjects(monitor);
-
+
RemoteSearchResult result= (RemoteSearchResult) getSearchResult();
result.removeAll();
-
+
// Send query to remote side for processing
List<RemoteSearchMatch> results = fSubsystem.runQuery(fScope, fQuery, monitor);
-
+
if (results.size() > 0) {
Match[] matches = new Match[results.size()];
int i = 0;
@@ -107,7 +107,7 @@
return new Status(IStatus.OK, "org.eclipse.ptp.rdt.ui", ""); //$NON-NLS-1$ //$NON-NLS-2$
}
}
-
+
public RemoteSearchQuery getQuery() {
return fQuery;
}
