diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index dca78bdbc8d..8201904ebdf 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-25 Alain Magloire
+	Fix PR 94735: return an empty object.
+	* src/org/eclipse/cdt/debug/internal/ui/CBreapointWorkbencAdapterFactory.java
+
 2005-06-22 Mikhail Khodjaiants
 	Bug 96563: "Go to file" is ghosted on breakpoints (outside projects?).
 	* CDebugModelPresentation.java
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointWorkbenchAdapterFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointWorkbenchAdapterFactory.java
index ea9492bda35..c53e3238c59 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointWorkbenchAdapterFactory.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CBreakpointWorkbenchAdapterFactory.java
@@ -16,6 +16,7 @@ import org.eclipse.cdt.debug.core.model.ICWatchpoint;
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.model.IWorkbenchAdapter;
+import org.eclipse.ui.model.WorkbenchAdapter;
 
 /**
  * Adapter factory for C/C++ breakpoints.
@@ -29,16 +30,7 @@ public class CBreakpointWorkbenchAdapterFactory implements IAdapterFactory {
 		if ( adapterType != IWorkbenchAdapter.class || !(adaptableObject instanceof ICBreakpoint) ) {
 			return null;
 		}
-		return new IWorkbenchAdapter() {
-
-			public Object[] getChildren( Object o ) {
-				return null;
-			}
-
-			public ImageDescriptor getImageDescriptor( Object object ) {
-				return null;
-			}
-
+		return new WorkbenchAdapter() {
 			public String getLabel( Object o ) {
 				// for now
 				if ( (o instanceof ICLineBreakpoint) ) {
@@ -47,11 +39,7 @@ public class CBreakpointWorkbenchAdapterFactory implements IAdapterFactory {
 				if ( (o instanceof ICWatchpoint) ) {
 					return CDebugUIMessages.getString( "CBreakpointWorkbenchAdapterFactory.1" ); //$NON-NLS-1$
 				}
-				return null; 
-			}
-
-			public Object getParent( Object o ) {
-				return null;
+				return super.getLabel(o); 
 			}
 		};
 	}