Attachment #24087 for bug #61693

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 61693
Collapse All | Expand All

Lines 34-40 Link Here

(-)debuggercore/src/org/netbeans/modules/debugger/ui/actions/AddBreakpointPanel.java (-3 / +25 lines)
34	*	34	*
35	* @author Jan Jacura	35	* @author Jan Jacura
36	*/	36	*/
37	public class AddBreakpointPanel extends javax.swing.JPanel {	37	// <RAVE>
		38	// Make the class implement HelpCtx.Provider to be able to get Help for it
		39	// public class AddBreakpointPanel extends javax.swing.JPanel {
		40	// ====
		41	public class AddBreakpointPanel extends javax.swing.JPanel implements HelpCtx.Provider {
		42	// </RAVE>
38		43
39	public static final String PROP_TYPE = "type";	44	public static final String PROP_TYPE = "type";
40		45
Lines 225-231 Link Here
225	* Returns <CODE>HelpCtx</CODE> of the selected breakpoint type's customizer.	230	* Returns <CODE>HelpCtx</CODE> of the selected breakpoint type's customizer.
226	* It is used in {@link AddBreakpointAction.AddBreakpointDialogManager}.	231	* It is used in {@link AddBreakpointAction.AddBreakpointDialogManager}.
227	*/	232	*/
228	HelpCtx getHelpCtx() {	233	// <RAVE>
		234	// Make getHelpCtx() method public to correctly implement HelpCtx.Provider
		235	// HelpCtx getHelpCtx() {
		236	// ====
		237	public HelpCtx getHelpCtx() {
		238	// </RAVE>
229	return helpCtx;	239	return helpCtx;
230	}	240	}
231		241
Lines 240-246 Link Here
240	//Set HelpCtx. This method must be called _before_ the customizer	250	//Set HelpCtx. This method must be called _before_ the customizer
241	//is added to some container, otherwise HelpCtx.findHelp(...) would	251	//is added to some container, otherwise HelpCtx.findHelp(...) would
242	//query also the customizer's parents.	252	//query also the customizer's parents.
243	helpCtx = HelpCtx.findHelp (customizer);	253	// <RAVE>
		254	// The help IDs for the customizer panels have to be different from the
		255	// values returned by getHelpCtx() because they provide different help
		256	// in the 'Add Breakpoint' dialog and when invoked in the 'Breakpoints' view
		257	// helpCtx = HelpCtx.findHelp (customizer);
		258	// ====
		259	String hid = (String) customizer.getClientProperty("HelpID_AddBreakpointPanel"); // NOI18N
		260	if (hid != null) {
		261	helpCtx = new HelpCtx(hid);
		262	} else {
		263	helpCtx = HelpCtx.findHelp (customizer);
		264	}
		265	// </RAVE>
244		266
245	pEvent.add (customizer, "Center"); // NOI18N	267	pEvent.add (customizer, "Center"); // NOI18N
246	pEvent.getAccessibleContext ().setAccessibleDescription (	268	pEvent.getAccessibleContext ().setAccessibleDescription (

Lines 82-91 Link Here

(-)debuggercore/src/org/netbeans/modules/debugger/ui/actions/AddWatchAction.java (-1 / +15 lines)
82	WatchPanel wp = new WatchPanel (watchHistory);	82	WatchPanel wp = new WatchPanel (watchHistory);
83	JComponent panel = wp.getPanel ();	83	JComponent panel = wp.getPanel ();
84		84
		85	// <RAVE>
		86	// Add help ID for 'Add Watch' dialog
		87	// org.openide.DialogDescriptor dd = new org.openide.DialogDescriptor (
		88	// panel,
		89	// bundle.getString ("CTL_WatchDialog_Title") // NOI18N
		90	// );
		91	// ====
85	org.openide.DialogDescriptor dd = new org.openide.DialogDescriptor (	92	org.openide.DialogDescriptor dd = new org.openide.DialogDescriptor (
86	panel,	93	panel,
87	bundle.getString ("CTL_WatchDialog_Title") // NOI18N	94	bundle.getString ("CTL_WatchDialog_Title"), // NOI18N
		95	true,
		96	org.openide.DialogDescriptor.OK_CANCEL_OPTION,
		97	null,
		98	org.openide.DialogDescriptor.DEFAULT_ALIGN,
		99	new org.openide.util.HelpCtx("debug.add.watch"),
		100	null
88	);	101	);
		102	// </RAVE>
89	Dialog dialog = DialogDisplayer.getDefault ().createDialog (dd);	103	Dialog dialog = DialogDisplayer.getDefault ().createDialog (dd);
90	dialog.setVisible (true);	104	dialog.setVisible (true);
91	dialog.dispose ();	105	dialog.dispose ();

Lines 98-103 Link Here

(-)debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ClassBreakpointPanel.java (+6 lines)
98		98
99	actionsPanel = new ActionsPanel (b);	99	actionsPanel = new ActionsPanel (b);
100	pActions.add (actionsPanel, "Center");	100	pActions.add (actionsPanel, "Center");
		101	// <RAVE>
		102	// The help IDs for the AddBreakpointPanel panels have to be different from the
		103	// values returned by getHelpCtx() because they provide different help
		104	// in the 'Add Breakpoint' dialog and when invoked in the 'Breakpoints' view
		105	putClientProperty("HelpID_AddBreakpointPanel", "debug.add.breakpoint.java.class"); // NOI18N
		106	// </RAVE>
101	}	107	}
102		108
103	// <RAVE>	109	// <RAVE>

Lines 111-116 Link Here

(-)debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ExceptionBreakpointPanel.java (+6 lines)
111		111
112	actionsPanel = new ActionsPanel (b);	112	actionsPanel = new ActionsPanel (b);
113	pActions.add (actionsPanel, "Center");	113	pActions.add (actionsPanel, "Center");
		114	// <RAVE>
		115	// The help IDs for the AddBreakpointPanel panels have to be different from the
		116	// values returned by getHelpCtx() because they provide different help
		117	// in the 'Add Breakpoint' dialog and when invoked in the 'Breakpoints' view
		118	putClientProperty("HelpID_AddBreakpointPanel", "debug.add.breakpoint.java.exception"); // NOI18N
		119	// </RAVE>
114	}	120	}
115		121
116	// <RAVE>	122	// <RAVE>

Lines 86-91 Link Here

(-)debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/FieldBreakpointPanel.java (+6 lines)
86		86
87	actionsPanel = new ActionsPanel (b);	87	actionsPanel = new ActionsPanel (b);
88	pActions.add (actionsPanel, "Center");	88	pActions.add (actionsPanel, "Center");
		89	// <RAVE>
		90	// The help IDs for the AddBreakpointPanel panels have to be different from the
		91	// values returned by getHelpCtx() because they provide different help
		92	// in the 'Add Breakpoint' dialog and when invoked in the 'Breakpoints' view
		93	putClientProperty("HelpID_AddBreakpointPanel", "debug.add.breakpoint.java.field"); // NOI18N
		94	// </RAVE>
89	}	95	}
90		96
91	// <RAVE>	97	// <RAVE>

Lines 85-90 Link Here

(-)debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/MethodBreakpointPanel.java (+6 lines)
85		85
86	actionsPanel = new ActionsPanel (b);	86	actionsPanel = new ActionsPanel (b);
87	pActions.add (actionsPanel, "Center");	87	pActions.add (actionsPanel, "Center");
		88	// <RAVE>
		89	// The help IDs for the AddBreakpointPanel panels have to be different from the
		90	// values returned by getHelpCtx() because they provide different help
		91	// in the 'Add Breakpoint' dialog and when invoked in the 'Breakpoints' view
		92	putClientProperty("HelpID_AddBreakpointPanel", "debug.add.breakpoint.java.method"); // NOI18N
		93	// </RAVE>
88	}	94	}
89		95
90	// <RAVE>	96	// <RAVE>

Lines 74-79 Link Here

(-)debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ThreadBreakpointPanel.java (+6 lines)
74		74
75	actionsPanel = new ActionsPanel (b);	75	actionsPanel = new ActionsPanel (b);
76	pActions.add (actionsPanel, "Center");	76	pActions.add (actionsPanel, "Center");
		77	// <RAVE>
		78	// The help IDs for the AddBreakpointPanel panels have to be different from the
		79	// values returned by getHelpCtx() because they provide different help
		80	// in the 'Add Breakpoint' dialog and when invoked in the 'Breakpoints' view
		81	putClientProperty("HelpID_AddBreakpointPanel", "debug.add.breakpoint.java.thread"); // NOI18N
		82	// </RAVE>
77	}	83	}
78		84
79	// <RAVE>	85	// <RAVE>

Return to bug 61693