diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 06df251fd5c..e480de07264 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,6 @@
+2004-05-18 Bogdan Gheorghe
+	Got rid of deprecated methods in CSearchResultPage and MouseClickListener.
+	
 2004-05-18 Alain Magloire
 
 	Fix PR 61498
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/MouseClickListener.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/MouseClickListener.java
index 236acb9314d..15ab2b8ba4f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/MouseClickListener.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/MouseClickListener.java
@@ -15,7 +15,7 @@ import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.ITextViewerExtension2;
-import org.eclipse.jface.text.ITextViewerExtension3;
+import org.eclipse.jface.text.ITextViewerExtension5;
 import org.eclipse.jface.text.Position;
 import org.eclipse.jface.text.Region;
 import org.eclipse.jface.text.source.ISourceViewer;
@@ -126,8 +126,8 @@ IPropertyChangeListener{
 				viewer.invalidateTextPresentation();
 
 			// remove underline				
-			if (viewer instanceof ITextViewerExtension3) {
-				ITextViewerExtension3 extension= (ITextViewerExtension3) viewer;
+			if (viewer instanceof ITextViewerExtension5) {
+				ITextViewerExtension5 extension= (ITextViewerExtension5) viewer;
 				offset= extension.modelOffset2WidgetOffset(offset);
 			} else {
 				offset -= viewer.getVisibleRegion().getOffset();
@@ -487,8 +487,8 @@ IPropertyChangeListener{
 			Point relativePosition= text.toControl(absolutePosition);
 			
 			int widgetOffset= text.getOffsetAtLocation(relativePosition);
-			if (viewer instanceof ITextViewerExtension3) {
-				ITextViewerExtension3 extension= (ITextViewerExtension3) viewer;
+			if (viewer instanceof ITextViewerExtension5) {
+				ITextViewerExtension5 extension= (ITextViewerExtension5) viewer;
 				return extension.widgetOffset2ModelOffset(widgetOffset);
 			} else {
 				return widgetOffset + viewer.getVisibleRegion().getOffset();
@@ -514,8 +514,8 @@ IPropertyChangeListener{
 		int offset= 0;
 		int length= 0;
 		
-		if (viewer instanceof ITextViewerExtension3) {
-			ITextViewerExtension3 extension= (ITextViewerExtension3) viewer;
+		if (viewer instanceof ITextViewerExtension5) {
+			ITextViewerExtension5 extension= (ITextViewerExtension5) viewer;
 			IRegion widgetRange= extension.modelRange2WidgetRange(region);
 			if (widgetRange == null)
 				return;
@@ -577,9 +577,9 @@ IPropertyChangeListener{
 		int offset= 0;
 		int length= 0;
 
-		if (viewer instanceof ITextViewerExtension3) {
+		if (viewer instanceof ITextViewerExtension5) {
 			
-			ITextViewerExtension3 extension= (ITextViewerExtension3) viewer;
+			ITextViewerExtension5 extension= (ITextViewerExtension5) viewer;
 			IRegion widgetRange= extension.modelRange2WidgetRange(new Region(offset, length));
 			if (widgetRange == null)
 				return;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultPage.java
index 33b231a90af..035a1b60839 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultPage.java
@@ -86,11 +86,7 @@ public class CSearchResultPage extends AbstractTextSearchViewPage {
 		}
 	}
 
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#showMatch(org.eclipse.search.ui.text.Match, int, int)
-	 */
-	protected void showMatch(Match match, int currentOffset, int currentLength)
+	protected void showMatch(Match match, int currentOffset, int currentLength, boolean activateEditor)
 			throws PartInitException {
 		// TODO Auto-generated method stub
 		IEditorPart editor= null;