Index: debuggercore/src/org/netbeans/modules/debugger/ui/actions/AddBreakpointPanel.java
===================================================================
RCS file: /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/actions/AddBreakpointPanel.java,v
retrieving revision 1.4
diff -u -r1.4 AddBreakpointPanel.java
--- debuggercore/src/org/netbeans/modules/debugger/ui/actions/AddBreakpointPanel.java	15 Jul 2005 09:39:04 -0000	1.4
+++ debuggercore/src/org/netbeans/modules/debugger/ui/actions/AddBreakpointPanel.java	19 Aug 2005 16:06:22 -0000
@@ -34,7 +34,12 @@
 *
 * @author  Jan Jacura
 */
-public class AddBreakpointPanel extends javax.swing.JPanel {
+// <RAVE>
+// Make the class implement HelpCtx.Provider to be able to get Help for it
+// public class AddBreakpointPanel extends javax.swing.JPanel {
+// ====
+public class AddBreakpointPanel extends javax.swing.JPanel implements HelpCtx.Provider {
+// </RAVE>
 
     public static final String PROP_TYPE = "type";
     
@@ -225,7 +230,12 @@
      * Returns <CODE>HelpCtx</CODE> of the selected breakpoint type's customizer.
      * It is used in {@link AddBreakpointAction.AddBreakpointDialogManager}.
      */
-    HelpCtx getHelpCtx() {
+    // <RAVE>
+    // Make getHelpCtx() method public to correctly implement HelpCtx.Provider
+    // HelpCtx getHelpCtx() {
+    // ====
+    public HelpCtx getHelpCtx() {
+    // </RAVE>
         return helpCtx;
     }
 
@@ -240,7 +250,19 @@
         //Set HelpCtx. This method must be called _before_ the customizer
         //is added to some container, otherwise HelpCtx.findHelp(...) would
         //query also the customizer's parents.
-        helpCtx = HelpCtx.findHelp (customizer);
+        // <RAVE>
+        // The help IDs for the customizer panels have to be different from the
+        // values returned by getHelpCtx() because they provide different help
+        // in the 'Add Breakpoint' dialog and when invoked in the 'Breakpoints' view
+        // helpCtx = HelpCtx.findHelp (customizer);
+        // ====
+        String hid = (String) customizer.getClientProperty("HelpID_AddBreakpointPanel"); // NOI18N
+        if (hid != null) {
+            helpCtx = new HelpCtx(hid);
+        } else {
+            helpCtx = HelpCtx.findHelp (customizer);
+        }
+        // </RAVE>
 
         pEvent.add (customizer, "Center"); // NOI18N
         pEvent.getAccessibleContext ().setAccessibleDescription (
Index: debuggercore/src/org/netbeans/modules/debugger/ui/actions/AddWatchAction.java
===================================================================
RCS file: /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/actions/AddWatchAction.java,v
retrieving revision 1.10
diff -u -r1.10 AddWatchAction.java
--- debuggercore/src/org/netbeans/modules/debugger/ui/actions/AddWatchAction.java	11 Mar 2005 10:21:54 -0000	1.10
+++ debuggercore/src/org/netbeans/modules/debugger/ui/actions/AddWatchAction.java	19 Aug 2005 16:06:22 -0000
@@ -82,10 +82,24 @@
         WatchPanel wp = new WatchPanel (watchHistory);
         JComponent panel = wp.getPanel ();
 
+        // <RAVE>
+        // Add help ID for 'Add Watch' dialog
+        // org.openide.DialogDescriptor dd = new org.openide.DialogDescriptor (
+        //      panel,
+        //      bundle.getString ("CTL_WatchDialog_Title") // NOI18N
+        // );
+        // ====
         org.openide.DialogDescriptor dd = new org.openide.DialogDescriptor (
             panel, 
-            bundle.getString ("CTL_WatchDialog_Title") // NOI18N
+            bundle.getString ("CTL_WatchDialog_Title"), // NOI18N
+            true,
+            org.openide.DialogDescriptor.OK_CANCEL_OPTION,
+            null,
+            org.openide.DialogDescriptor.DEFAULT_ALIGN,
+            new org.openide.util.HelpCtx("debug.add.watch"),
+            null
         );
+        // </RAVE>
         Dialog dialog = DialogDisplayer.getDefault ().createDialog (dd);
         dialog.setVisible (true);
         dialog.dispose ();
Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ClassBreakpointPanel.java
===================================================================
RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ClassBreakpointPanel.java,v
retrieving revision 1.10
diff -u -r1.10 ClassBreakpointPanel.java
--- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ClassBreakpointPanel.java	18 Aug 2005 16:42:16 -0000	1.10
+++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ClassBreakpointPanel.java	19 Aug 2005 16:06:22 -0000
@@ -98,6 +98,12 @@
         
         actionsPanel = new ActionsPanel (b);
         pActions.add (actionsPanel, "Center");
+        // <RAVE>
+        // The help IDs for the AddBreakpointPanel panels have to be different from the
+        // values returned by getHelpCtx() because they provide different help
+        // in the 'Add Breakpoint' dialog and when invoked in the 'Breakpoints' view
+        putClientProperty("HelpID_AddBreakpointPanel", "debug.add.breakpoint.java.class"); // NOI18N
+        // </RAVE>
     }
 
     // <RAVE>
Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ExceptionBreakpointPanel.java
===================================================================
RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ExceptionBreakpointPanel.java,v
retrieving revision 1.12
diff -u -r1.12 ExceptionBreakpointPanel.java
--- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ExceptionBreakpointPanel.java	18 Aug 2005 16:42:16 -0000	1.12
+++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ExceptionBreakpointPanel.java	19 Aug 2005 16:06:22 -0000
@@ -111,6 +111,12 @@
         
         actionsPanel = new ActionsPanel (b);
         pActions.add (actionsPanel, "Center");
+        // <RAVE>
+        // The help IDs for the AddBreakpointPanel panels have to be different from the
+        // values returned by getHelpCtx() because they provide different help
+        // in the 'Add Breakpoint' dialog and when invoked in the 'Breakpoints' view
+        putClientProperty("HelpID_AddBreakpointPanel", "debug.add.breakpoint.java.exception"); // NOI18N
+        // </RAVE>
     }
     
     // <RAVE>
Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/FieldBreakpointPanel.java
===================================================================
RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/FieldBreakpointPanel.java,v
retrieving revision 1.9
diff -u -r1.9 FieldBreakpointPanel.java
--- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/FieldBreakpointPanel.java	18 Aug 2005 16:42:17 -0000	1.9
+++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/FieldBreakpointPanel.java	19 Aug 2005 16:06:22 -0000
@@ -86,6 +86,12 @@
         
         actionsPanel = new ActionsPanel (b);
         pActions.add (actionsPanel, "Center");
+        // <RAVE>
+        // The help IDs for the AddBreakpointPanel panels have to be different from the
+        // values returned by getHelpCtx() because they provide different help
+        // in the 'Add Breakpoint' dialog and when invoked in the 'Breakpoints' view
+        putClientProperty("HelpID_AddBreakpointPanel", "debug.add.breakpoint.java.field"); // NOI18N
+        // </RAVE>
     }
     
     // <RAVE>
Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/MethodBreakpointPanel.java
===================================================================
RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/MethodBreakpointPanel.java,v
retrieving revision 1.11
diff -u -r1.11 MethodBreakpointPanel.java
--- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/MethodBreakpointPanel.java	18 Aug 2005 16:42:17 -0000	1.11
+++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/MethodBreakpointPanel.java	19 Aug 2005 16:06:22 -0000
@@ -85,6 +85,12 @@
         
         actionsPanel = new ActionsPanel (b);
         pActions.add (actionsPanel, "Center");
+        // <RAVE>
+        // The help IDs for the AddBreakpointPanel panels have to be different from the
+        // values returned by getHelpCtx() because they provide different help
+        // in the 'Add Breakpoint' dialog and when invoked in the 'Breakpoints' view
+        putClientProperty("HelpID_AddBreakpointPanel", "debug.add.breakpoint.java.method"); // NOI18N
+        // </RAVE>
     }
     
     // <RAVE>
Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ThreadBreakpointPanel.java
===================================================================
RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ThreadBreakpointPanel.java,v
retrieving revision 1.8
diff -u -r1.8 ThreadBreakpointPanel.java
--- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ThreadBreakpointPanel.java	18 Aug 2005 16:42:17 -0000	1.8
+++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ThreadBreakpointPanel.java	19 Aug 2005 16:06:22 -0000
@@ -74,6 +74,12 @@
         
         actionsPanel = new ActionsPanel (b);
         pActions.add (actionsPanel, "Center");
+        // <RAVE>
+        // The help IDs for the AddBreakpointPanel panels have to be different from the
+        // values returned by getHelpCtx() because they provide different help
+        // in the 'Add Breakpoint' dialog and when invoked in the 'Breakpoints' view
+        putClientProperty("HelpID_AddBreakpointPanel", "debug.add.breakpoint.java.thread"); // NOI18N
+        // </RAVE>
     }
     
     // <RAVE>