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.
The debuggercore/debuggerjpda modules are missing an implementation for help IDs. This includes the following: Add Breakpoint Dialog - Class Add Breakpoint Dialog - Exception Add Breakpoint Dialog - Method Add Breakpoint Dialog - Thread Add Breakpoint Dialog - Variable Breakpoints View Watches View Threads View Sources View Sessions View Local Variables View Threads Property Sheet Sessions Property Sheet New Watch Dialog Box Class Breakpoint Customizer Exception Breakpoint Property Sheet Line Breakpoint Customizer Method Breakpoint Customizer Thread Breakpoint Customizer Variable Breakpoint Customizer Debugger Console and Process Output Tabs in the Output Window We have fixed it from our end in the debuggercore, debuggercore/viewmodel, and debuggerjpda/ui modules. Here are the diffs: debuggercore: Index: org/netbeans/modules/debugger/ui/actions/AddBreakpointPanel.java =================================================================== RCS file: /cvs/rave/debuggercore/src/org/netbeans/modules/debugger/ui/actions/AddBreakpointPanel.java,v retrieving revision 1.2 diff -u -r1.2 AddBreakpointPanel.java --- org/netbeans/modules/debugger/ui/actions/AddBreakpointPanel.java 12 Nov 2004 08:48:49 -0000 1.2 +++ org/netbeans/modules/debugger/ui/actions/AddBreakpointPanel.java 2 Aug 2005 22:39:02 -0000 @@ -38,7 +38,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"; @@ -229,7 +234,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; } @@ -244,7 +254,27 @@ //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 pkg = "org.netbeans.modules.debugger.jpda.ui.breakpoints."; + if (customizer.getClass().getName().equals(pkg + "ClassBreakpointPanel")) { + helpCtx = new HelpCtx("debug.add.breakpoint.java.class"); + }else if (customizer.getClass().getName().equals(pkg + "ExceptionBreakpointPanel")) { + helpCtx = new HelpCtx("debug.add.breakpoint.java.exception"); + }else if (customizer.getClass().getName().equals(pkg + "MethodBreakpointPanel")) { + helpCtx = new HelpCtx("debug.add.breakpoint.java.method"); + }else if (customizer.getClass().getName().equals(pkg + "ThreadBreakpointPanel")) { + helpCtx = new HelpCtx("debug.add.breakpoint.java.thread"); + }else if (customizer.getClass().getName().equals(pkg + "FieldBreakpointPanel")) { + helpCtx = new HelpCtx("debug.add.breakpoint.java.field"); + }else { + helpCtx = HelpCtx.findHelp (customizer); + } + // </RAVE> pEvent.add (customizer, "Center"); // NOI18N pEvent.getAccessibleContext ().setAccessibleDescription ( Index: org/netbeans/modules/debugger/ui/actions/AddWatchAction.java =================================================================== RCS file: /cvs/rave/debuggercore/src/org/netbeans/modules/debugger/ui/actions/AddWatchAction.java,v retrieving revision 1.3 diff -u -r1.3 AddWatchAction.java --- org/netbeans/modules/debugger/ui/actions/AddWatchAction.java 8 Apr 2005 17:46:06 -0000 1.3 +++ org/netbeans/modules/debugger/ui/actions/AddWatchAction.java 2 Aug 2005 22:39:02 -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: org/netbeans/modules/debugger/ui/views/BreakpointsView.java =================================================================== RCS file: /cvs/rave/debuggercore/src/org/netbeans/modules/debugger/ui/views/BreakpointsView.java,v retrieving revision 1.3 diff -u -r1.3 BreakpointsView.java --- org/netbeans/modules/debugger/ui/views/BreakpointsView.java 23 Feb 2005 17:03:48 -0000 1.3 +++ org/netbeans/modules/debugger/ui/views/BreakpointsView.java 2 Aug 2005 22:39:02 -0000 @@ -24,7 +24,12 @@ import org.openide.windows.TopComponent; -public class BreakpointsView extends TopComponent { +// <RAVE> +// Implement HelpCtx.Provider to be able to specify helpID for the help system +// public class BreakpointsView extends TopComponent { +// ==== +public class BreakpointsView extends TopComponent implements org.openide.util.HelpCtx.Provider { +// </RAVE> private transient JComponent tree; private transient ViewModelListener viewModelListener; @@ -64,6 +69,13 @@ viewModelListener = null; } + // <RAVE> + // Implement getHelpCtx() with the correct help ID + public org.openide.util.HelpCtx getHelpCtx() { + return new org.openide.util.HelpCtx("NetbeansDebuggerBreakpointNode"); + } + // </RAVE> + public int getPersistenceType () { return PERSISTENCE_ALWAYS; } Index: org/netbeans/modules/debugger/ui/views/CallStackView.java =================================================================== RCS file: /cvs/rave/debuggercore/src/org/netbeans/modules/debugger/ui/views/CallStackView.java,v retrieving revision 1.3 diff -u -r1.3 CallStackView.java --- org/netbeans/modules/debugger/ui/views/CallStackView.java 23 Feb 2005 17:03:48 -0000 1.3 +++ org/netbeans/modules/debugger/ui/views/CallStackView.java 2 Aug 2005 22:39:02 -0000 @@ -24,7 +24,12 @@ import org.openide.windows.TopComponent; -public class CallStackView extends TopComponent { +// <RAVE> +// Implement HelpCtx.Provider interface to provide help ids for help system +// public class CallStackView extends TopComponent { +// ==== +public class CallStackView extends TopComponent implements org.openide.util.HelpCtx.Provider { +// </RAVE> private transient JComponent tree; private transient ViewModelListener viewModelListener; @@ -64,6 +69,13 @@ viewModelListener = null; } + // <RAVE> + // Implement getHelpCtx() with the correct help ID + public org.openide.util.HelpCtx getHelpCtx() { + return new org.openide.util.HelpCtx("NetbeansDebuggerCallStackNode"); + } + // </RAVE> + public int getPersistenceType () { return PERSISTENCE_ALWAYS; } Index: org/netbeans/modules/debugger/ui/views/LocalsView.java =================================================================== RCS file: /cvs/rave/debuggercore/src/org/netbeans/modules/debugger/ui/views/LocalsView.java,v retrieving revision 1.3 diff -u -r1.3 LocalsView.java --- org/netbeans/modules/debugger/ui/views/LocalsView.java 23 Feb 2005 17:03:48 -0000 1.3 +++ org/netbeans/modules/debugger/ui/views/LocalsView.java 2 Aug 2005 22:39:02 -0000 @@ -24,7 +24,12 @@ import org.openide.windows.TopComponent; -public class LocalsView extends TopComponent { +// <RAVE> +// Implement HelpCtx.Provider interface to provide help ids for help system +// public class LocalsView extends TopComponent { +// ==== +public class LocalsView extends TopComponent implements org.openide.util.HelpCtx.Provider { +// </RAVE> private transient JComponent tree; private transient ViewModelListener viewModelListener; @@ -64,6 +69,13 @@ viewModelListener = null; } + // <RAVE> + // Implement getHelpCtx() with the correct help ID + public org.openide.util.HelpCtx getHelpCtx() { + return new org.openide.util.HelpCtx("NetbeansDebuggerVariableNode"); + } + // </RAVE> + public int getPersistenceType () { return PERSISTENCE_ALWAYS; } Index: org/netbeans/modules/debugger/ui/views/SessionsView.java =================================================================== RCS file: /cvs/rave/debuggercore/src/org/netbeans/modules/debugger/ui/views/SessionsView.java,v retrieving revision 1.3 diff -u -r1.3 SessionsView.java --- org/netbeans/modules/debugger/ui/views/SessionsView.java 23 Feb 2005 17:03:48 -0000 1.3 +++ org/netbeans/modules/debugger/ui/views/SessionsView.java 2 Aug 2005 22:39:02 -0000 @@ -24,7 +24,14 @@ import org.openide.windows.TopComponent; -public class SessionsView extends TopComponent { +// <RAVE> +// Implement HelpCtx.Provider to provide help for this view and store the +// help ID for the property sheet +// public class SessionsView extends TopComponent { +// ==== +public class SessionsView extends TopComponent implements org.openide.util.HelpCtx.Provider { + private static final String PROPERTIES_HELP_ID = "NetbeansDebuggerSessionsPropertiesSheet"; +// </RAVE> private transient JComponent tree; private transient ViewModelListener viewModelListener; @@ -55,10 +62,21 @@ } if (viewModelListener != null) throw new InternalError (); + + // <RAVE> + // Use the modified constructor that stores the propertiesHelpID + // for nodes in this view + // viewModelListener = new ViewModelListener ( + // "SessionsView", + // tree + // ); + // ==== viewModelListener = new ViewModelListener ( "SessionsView", - tree + tree, + PROPERTIES_HELP_ID ); + // </RAVE> } protected void componentHidden () { @@ -67,6 +85,13 @@ viewModelListener = null; } + // <RAVE> + // Implement getHelpCtx() to provide the help ID for this view + public org.openide.util.HelpCtx getHelpCtx() { + return new org.openide.util.HelpCtx("NetbeansDebuggerSessionNode"); + } + // </RAVE> + public int getPersistenceType () { return PERSISTENCE_ALWAYS; } Index: org/netbeans/modules/debugger/ui/views/ThreadsView.java =================================================================== RCS file: /cvs/rave/debuggercore/src/org/netbeans/modules/debugger/ui/views/ThreadsView.java,v retrieving revision 1.3 diff -u -r1.3 ThreadsView.java --- org/netbeans/modules/debugger/ui/views/ThreadsView.java 23 Feb 2005 17:03:48 -0000 1.3 +++ org/netbeans/modules/debugger/ui/views/ThreadsView.java 2 Aug 2005 22:39:02 -0000 @@ -25,7 +25,14 @@ import org.openide.windows.TopComponent; -public class ThreadsView extends TopComponent { +// <RAVE> +// Implement HelpCtx.Provider to provide help for this view and store the +// help ID for the property sheet +// public class ThreadsView extends TopComponent { +// ==== +public class ThreadsView extends TopComponent implements org.openide.util.HelpCtx.Provider { + private static final String PROPERTIES_HELP_ID = "NetbeansDebuggerThreadsPropertiesSheet"; +// </RAVE> private transient JComponent tree; private transient ViewModelListener viewModelListener; @@ -53,10 +60,21 @@ } if (viewModelListener != null) throw new InternalError (); + + // <RAVE> CR 6207738 - fix debugger help IDs + // Use the modified constructor that stores the propertiesHelpID + // for nodes in this view + // viewModelListener = new ViewModelListener ( + // "ThreadsView", + // tree + // ); + // ==== viewModelListener = new ViewModelListener ( "ThreadsView", - tree + tree, + PROPERTIES_HELP_ID ); + // </RAVE> } protected void componentHidden () { @@ -65,6 +83,13 @@ viewModelListener = null; } + // <RAVE> + // Implement getHelpCtx() to provide the help ID for this view + public org.openide.util.HelpCtx getHelpCtx() { + return new org.openide.util.HelpCtx("NetbeansDebuggerThreadNode"); + } + // </RAVE> + public int getPersistenceType () { return PERSISTENCE_ALWAYS; } Index: org/netbeans/modules/debugger/ui/views/ViewModelListener.java =================================================================== RCS file: /cvs/rave/debuggercore/src/org/netbeans/modules/debugger/ui/views/ViewModelListener.java,v retrieving revision 1.4 diff -u -r1.4 ViewModelListener.java --- org/netbeans/modules/debugger/ui/views/ViewModelListener.java 8 Apr 2005 17:46:10 -0000 1.4 +++ org/netbeans/modules/debugger/ui/views/ViewModelListener.java 2 Aug 2005 22:39:02 -0000 @@ -60,6 +60,26 @@ private String viewType; private JComponent view; + // <RAVE> + // Store the propertiesHelpID to pass to the Model object that is + // used in generating the nodes for the view + private String propertiesHelpID = null; + + ViewModelListener( + String viewType, + JComponent view, + String propertiesHelpID + ) { + this.viewType = viewType; + this.view = view; + this.propertiesHelpID = propertiesHelpID; + DebuggerManager.getDebuggerManager ().addDebuggerListener ( + DebuggerManager.PROP_CURRENT_ENGINE, + this + ); + updateModel (); + } + // </RAVE> ViewModelListener ( String viewType, @@ -128,10 +148,24 @@ s.add (o); } + // <RAVE> + // Store the propertiesHelpID in the tree model to be retrieved later + // by the TreeModelNode objects + // Models.setModelsToView ( + // view, + // Models.createCompoundModel (new ArrayList (l)) + // ); + // ==== + Models.CompoundModel newModel = Models.createCompoundModel (new ArrayList (l)); + if (propertiesHelpID != null) { + newModel.setHelpId(propertiesHelpID); + } + Models.setModelsToView ( view, - Models.createCompoundModel (new ArrayList (l)) + newModel ); + // </RAVE> } Index: org/netbeans/modules/debugger/ui/views/WatchesView.java =================================================================== RCS file: /cvs/rave/debuggercore/src/org/netbeans/modules/debugger/ui/views/WatchesView.java,v retrieving revision 1.3 diff -u -r1.3 WatchesView.java --- org/netbeans/modules/debugger/ui/views/WatchesView.java 23 Feb 2005 17:03:48 -0000 1.3 +++ org/netbeans/modules/debugger/ui/views/WatchesView.java 2 Aug 2005 22:39:02 -0000 @@ -24,7 +24,12 @@ import org.openide.windows.TopComponent; -public class WatchesView extends TopComponent { +// <RAVE> +// Implement HelpCtx.Provider interface to provide help ids for help system +// public class WatchesView extends TopComponent { +// ==== +public class WatchesView extends TopComponent implements org.openide.util.HelpCtx.Provider { +// </RAVE> private transient JComponent tree; private transient ViewModelListener viewModelListener; @@ -64,6 +69,13 @@ viewModelListener = null; } + // <RAVE> + // Implement getHelpCtx() with the correct help ID + public org.openide.util.HelpCtx getHelpCtx() { + return new org.openide.util.HelpCtx("NetbeansDebuggerWatchNode"); + } + // </RAVE> + public int getPersistenceType () { return PERSISTENCE_ALWAYS; } debuggercore/viewmodel: Index: src/org/netbeans/modules/viewmodel/TreeModelNode.java =================================================================== RCS file: /cvs/rave/debuggercore/viewmodel/src/org/netbeans/modules/viewmodel/TreeModelNode.java,v retrieving revision 1.4 diff -u -r1.4 TreeModelNode.java --- src/org/netbeans/modules/viewmodel/TreeModelNode.java 8 Apr 2005 17:46:15 -0000 1.4 +++ src/org/netbeans/modules/viewmodel/TreeModelNode.java 2 Aug 2005 22:41:53 -0000 @@ -78,6 +78,16 @@ this.model = model; this.treeModelRoot = treeModelRoot; this.object = object; + + // <RAVE> + // Use the modified CompoundModel class's field to set the + // propertiesHelpID for properties sheets if the model's helpID + // has been set + if (model.getHelpId() != null) { + this.setValue("propertiesHelpID", model.getHelpId()); + } + // </RAVE> + treeModelRoot.registerNode (object, this); refreshNode (); initProperties (); Index: src/org/netbeans/spi/viewmodel/Models.java =================================================================== RCS file: /cvs/rave/debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/Models.java,v retrieving revision 1.4 diff -u -r1.4 Models.java --- src/org/netbeans/spi/viewmodel/Models.java 8 Apr 2005 17:46:17 -0000 1.4 +++ src/org/netbeans/spi/viewmodel/Models.java 2 Aug 2005 22:41:53 -0000 @@ -1880,6 +1880,20 @@ private ColumnModel[] columnModels; private TableModel tableModel; private TreeExpansionModel treeExpansionModel; + + // <RAVE> + // New field, setter/getter for propertiesHelpID, which is used + // for property sheet help + private String propertiesHelpID = null; + + public void setHelpId(String propertiesHelpID) { + this.propertiesHelpID = propertiesHelpID; + } + + public String getHelpId() { + return propertiesHelpID; + } + // </RAVE> debuggerjpda/ui: Index: src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ClassBreakpointPanel.java =================================================================== RCS file: /cvs/rave/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ClassBreakpointPanel.java,v retrieving revision 1.3 diff -u -r1.3 ClassBreakpointPanel.java --- src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ClassBreakpointPanel.java 23 Feb 2005 17:05:44 -0000 1.3 +++ src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ClassBreakpointPanel.java 2 Aug 2005 22:42:07 -0000 @@ -20,7 +20,12 @@ * * @author Jan Jancura */ -public class ClassBreakpointPanel extends JPanel implements Controller { +// <RAVE> +// Implement HelpCtx.Provider interface to provide help ids for help system +// public class ClassBreakpointPanel extends JPanel implements Controller { +// ==== +public class ClassBreakpointPanel extends JPanel implements Controller, org.openide.util.HelpCtx.Provider { +// </RAVE> private ActionsPanel actionsPanel; private ClassLoadUnloadBreakpoint breakpoint; @@ -89,6 +94,13 @@ actionsPanel = new ActionsPanel (b); pActions.add (actionsPanel, "Center"); } + + // <RAVE> + // Implement getHelpCtx() with the correct helpID + public org.openide.util.HelpCtx getHelpCtx() { + return new org.openide.util.HelpCtx("NetbeansDebuggerBreakpointClassJPDA"); + } + // </RAVE> /** This method is called from within the constructor to * initialize the form. Index: src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ExceptionBreakpointPanel.java =================================================================== RCS file: /cvs/rave/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ExceptionBreakpointPanel.java,v retrieving revision 1.5 diff -u -r1.5 ExceptionBreakpointPanel.java --- src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ExceptionBreakpointPanel.java 8 Apr 2005 17:46:52 -0000 1.5 +++ src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ExceptionBreakpointPanel.java 2 Aug 2005 22:42:07 -0000 @@ -23,7 +23,12 @@ * * @author Jan Jancura */ -public class ExceptionBreakpointPanel extends JPanel implements Controller { +// <RAVE> +// Implement HelpCtx.Provider interface to provide help ids for help system +// public class ExceptionBreakpointPanel extends JPanel implements Controller { +// ==== +public class ExceptionBreakpointPanel extends JPanel implements Controller, org.openide.util.HelpCtx.Provider { +// </RAVE> private ActionsPanel actionsPanel; private ExceptionBreakpoint breakpoint; @@ -102,6 +107,13 @@ pActions.add (actionsPanel, "Center"); } + // <RAVE> + // Implement getHelpCtx() with the correct helpID + public org.openide.util.HelpCtx getHelpCtx() { + return new org.openide.util.HelpCtx("NetbeansDebuggerBreakpointExceptionJPDA"); + } + // </RAVE> + /** This method is called from within the constructor to * initialize the form. * WARNING: Do NOT modify this code. The content of this method is Index: src/org/netbeans/modules/debugger/jpda/ui/breakpoints/FieldBreakpointPanel.java =================================================================== RCS file: /cvs/rave/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/FieldBreakpointPanel.java,v retrieving revision 1.3 diff -u -r1.3 FieldBreakpointPanel.java --- src/org/netbeans/modules/debugger/jpda/ui/breakpoints/FieldBreakpointPanel.java 23 Feb 2005 17:05:44 -0000 1.3 +++ src/org/netbeans/modules/debugger/jpda/ui/breakpoints/FieldBreakpointPanel.java 2 Aug 2005 22:42:07 -0000 @@ -20,7 +20,12 @@ * * @author Jan Jancura */ -public class FieldBreakpointPanel extends JPanel implements Controller { +// <RAVE> +// Implement HelpCtx.Provider interface to provide help ids for help system +// public class FieldBreakpointPanel extends JPanel implements Controller { +// ==== +public class FieldBreakpointPanel extends JPanel implements Controller, org.openide.util.HelpCtx.Provider { +// </RAVE> private ActionsPanel actionsPanel; private FieldBreakpoint breakpoint; @@ -78,6 +83,13 @@ pActions.add (actionsPanel, "Center"); } + // <RAVE> + // Implement getHelpCtx() with the correct helpID + public org.openide.util.HelpCtx getHelpCtx() { + return new org.openide.util.HelpCtx("NetbeansDebuggerBreakpointFieldJPDA"); + } + // </RAVE> + /** This method is called from within the constructor to * initialize the form. * WARNING: Do NOT modify this code. The content of this method is Index: src/org/netbeans/modules/debugger/jpda/ui/breakpoints/LineBreakpointPanel.java =================================================================== RCS file: /cvs/rave/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/LineBreakpointPanel.java,v retrieving revision 1.3 diff -u -r1.3 LineBreakpointPanel.java --- src/org/netbeans/modules/debugger/jpda/ui/breakpoints/LineBreakpointPanel.java 23 Feb 2005 17:05:44 -0000 1.3 +++ src/org/netbeans/modules/debugger/jpda/ui/breakpoints/LineBreakpointPanel.java 2 Aug 2005 22:42:07 -0000 @@ -29,7 +29,12 @@ * * @author Maros Sandor */ -public class LineBreakpointPanel extends JPanel implements Controller { +// <RAVE> +// Implement HelpCtx.Provider interface to provide help ids for help system +// public class LineBreakpointPanel extends JPanel implements Controller { +// +public class LineBreakpointPanel extends JPanel implements Controller, org.openide.util.HelpCtx.Provider { +// </RAVE> private ActionsPanel actionsPanel; private LineBreakpoint breakpoint; @@ -74,6 +79,14 @@ pActions.add (actionsPanel, "Center"); } + // <RAVE> + // Implement getHelpCtx() with the correct helpID + // + public org.openide.util.HelpCtx getHelpCtx() { + return new org.openide.util.HelpCtx("NetbeansDebuggerBreakpointLineJPDA"); + } + // </RAVE> + /** This method is called from within the constructor to * initialize the form. * WARNING: Do NOT modify this code. The content of this method is Index: src/org/netbeans/modules/debugger/jpda/ui/breakpoints/MethodBreakpointPanel.java =================================================================== RCS file: /cvs/rave/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/MethodBreakpointPanel.java,v retrieving revision 1.3 diff -u -r1.3 MethodBreakpointPanel.java --- src/org/netbeans/modules/debugger/jpda/ui/breakpoints/MethodBreakpointPanel.java 23 Feb 2005 17:05:44 -0000 1.3 +++ src/org/netbeans/modules/debugger/jpda/ui/breakpoints/MethodBreakpointPanel.java 2 Aug 2005 22:42:07 -0000 @@ -20,7 +20,12 @@ * * @author Jan Jancura */ -public class MethodBreakpointPanel extends JPanel implements Controller { +// <RAVE> +// Implement HelpCtx.Provider interface to provide help ids for help system +// public class MethodBreakpointPanel extends JPanel implements Controller { +// ==== +public class MethodBreakpointPanel extends JPanel implements Controller, org.openide.util.HelpCtx.Provider { +// </RAVE> private ActionsPanel actionsPanel; private MethodBreakpoint breakpoint; @@ -77,6 +82,13 @@ pActions.add (actionsPanel, "Center"); } + // <RAVE> + // Implement getHelpCtx() with the correct helpID + public org.openide.util.HelpCtx getHelpCtx() { + return new org.openide.util.HelpCtx("NetbeansDebuggerBreakpointMethodJPDA"); + } + // </RAVE> + /** This method is called from within the constructor to * initialize the form. * WARNING: Do NOT modify this code. The content of this method is Index: src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ThreadBreakpointPanel.java =================================================================== RCS file: /cvs/rave/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ThreadBreakpointPanel.java,v retrieving revision 1.3 diff -u -r1.3 ThreadBreakpointPanel.java --- src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ThreadBreakpointPanel.java 23 Feb 2005 17:05:44 -0000 1.3 +++ src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ThreadBreakpointPanel.java 2 Aug 2005 22:42:07 -0000 @@ -19,7 +19,12 @@ * * @author Jan Jancura */ -public class ThreadBreakpointPanel extends JPanel implements Controller { +// <RAVE> CR 6207738 - fix debugger help IDs +// Implement HelpCtx.Provider interface to provide help ids for help system +// public class ThreadBreakpointPanel extends JPanel implements Controller { +// ==== +public class ThreadBreakpointPanel extends JPanel implements Controller, org.openide.util.HelpCtx.Provider { +// </RAVE> private ActionsPanel actionsPanel; private ThreadBreakpoint breakpoint; @@ -66,6 +71,13 @@ pActions.add (actionsPanel, "Center"); } + // <RAVE> + // Implement getHelpCtx() with the correct helpID + public org.openide.util.HelpCtx getHelpCtx() { + return new org.openide.util.HelpCtx("NetbeansDebuggerBreakpointThreadJPDA"); + } + // </RAVE> + /** This method is called from within the constructor to * initialize the form. * WARNING: Do NOT modify this code. The content of this method is Index: src/org/netbeans/modules/debugger/jpda/ui/views/ClassesView.java =================================================================== RCS file: /cvs/rave/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/views/ClassesView.java,v retrieving revision 1.3 diff -u -r1.3 ClassesView.java --- src/org/netbeans/modules/debugger/jpda/ui/views/ClassesView.java 23 Feb 2005 17:05:52 -0000 1.3 +++ src/org/netbeans/modules/debugger/jpda/ui/views/ClassesView.java 2 Aug 2005 22:42:07 -0000 @@ -24,7 +24,12 @@ import org.openide.windows.TopComponent; -public class ClassesView extends TopComponent { +// <RAVE> +// Implement HelpCtx.Provider interface to provide help ids for help system +// public class ClassesView extends TopComponent { +// ==== +public class ClassesView extends TopComponent implements org.openide.util.HelpCtx.Provider { +// </RAVE> private transient JComponent tree; private transient ViewModelListener viewModelListener; @@ -62,6 +67,13 @@ viewModelListener = null; } + // <RAVE> + // Implement getHelpCtx() with the correct helpID + public org.openide.util.HelpCtx getHelpCtx() { + return new org.openide.util.HelpCtx("NetbeansDebuggerClassNode"); + } + // </RAVE> + public int getPersistenceType () { return PERSISTENCE_ALWAYS; } Index: src/org/netbeans/modules/debugger/jpda/ui/views/SourcesView.java =================================================================== RCS file: /cvs/rave/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/views/SourcesView.java,v retrieving revision 1.3 diff -u -r1.3 SourcesView.java --- src/org/netbeans/modules/debugger/jpda/ui/views/SourcesView.java 23 Feb 2005 17:05:52 -0000 1.3 +++ src/org/netbeans/modules/debugger/jpda/ui/views/SourcesView.java 2 Aug 2005 22:42:07 -0000 @@ -21,7 +21,12 @@ import org.openide.util.Utilities; import org.openide.windows.TopComponent; -public class SourcesView extends TopComponent { +// <RAVE> +// Implement HelpCtx.Provider interface to provide help ids for help system +// public class SourcesView extends TopComponent { +// ==== +public class SourcesView extends TopComponent implements org.openide.util.HelpCtx.Provider { +// </RAVE> private transient JComponent tree; private transient ViewModelListener viewModelListener; @@ -59,6 +64,13 @@ viewModelListener = null; } + // <RAVE> + // Implement getHelpCtx() with the correct helpID + public org.openide.util.HelpCtx getHelpCtx() { + return new org.openide.util.HelpCtx("NetbeansDebuggerSourcesNode"); + } + // </RAVE> + public int getPersistenceType () { return PERSISTENCE_ALWAYS; }
Thanks, but please next time attach the patch as an attachment.
John and Patrick, should I really add these help IDs? I've found issue #44548, so I guess the current state might be desired...
I'm not sure whether we want these IDs in NB yet. I'll let you know. Ken Ganfield are working on help pages for these dialogs for Creator, but we haven't made a final decision about whether we will use them in NetBeans.
Changing Target Milestone to TBD until the decission is made... Also adding INCOMPLETE keyword, since I do not know what to do yet...
Switched target milestone back to 4.2 since we decided to go ahead with these changes in NetBeans.
O.K. I will commit the patch...
Oops, this is an API change!!! We'll have to submit this for a fast review...
Created attachment 24055 [details] The help ID change in debuggerjpda/ui module with respect to current trunk.
The patch applied to debuggerjpda/ui: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ClassBreakpointPanel.java,v <-- ClassBreakpointPanel.java new revision: 1.10; previous revision: 1.9 /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ExceptionBreakpointPanel.java,v <-- ExceptionBreakpointPanel.java new revision: 1.12; previous revision: 1.11 /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/FieldBreakpointPanel.java,v <-- FieldBreakpointPanel.java new revision: 1.9; previous revision: 1.8 /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/LineBreakpointPanel.java,v <-- LineBreakpointPanel.java new revision: 1.8; previous revision: 1.7 /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/MethodBreakpointPanel.java,v <-- MethodBreakpointPanel.java new revision: 1.11; previous revision: 1.10 /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ThreadBreakpointPanel.java,v <-- ThreadBreakpointPanel.java new revision: 1.8; previous revision: 1.7 /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/views/ClassesView.java,v <-- ClassesView.java new revision: 1.8; previous revision: 1.7 /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/views/SourcesView.java,v <-- SourcesView.java new revision: 1.8; previous revision: 1.7
The rest of this issue depends on issue #62617 ...
I also change how the help IDs are treated in debuggercore/src/org/netbeans/modules/debugger/ui/actions/AddBreakpointPanel.java It's awkward to have hard-coded help IDs for JPDA debugger there. It does not scale at all...
The patch was not intended to be taken as-is. We tried to localize the changes as much as possible to make any future code merges in those modules easier.
"I also change how the help IDs are treated in debuggercore/src/org/netbeans/modules/debugger/ui/actions/AddBreakpointPanel.java" That's OK with me.
Created attachment 24087 [details] A next set of help ID that can be added without issue #62617.
Some further help IDs added, which are not dependent on the fix of issue #62617: /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/actions/AddBreakpointPanel.java,v <-- AddBreakpointPanel.java new revision: 1.5; previous revision: 1.4 /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/actions/AddWatchAction.java,v <-- AddWatchAction.java new revision: 1.11; previous revision: 1.10 /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ClassBreakpointPanel.java,v <-- ClassBreakpointPanel.java new revision: 1.11; previous revision: 1.10 /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ExceptionBreakpointPanel.java,v <-- ExceptionBreakpointPanel.java new revision: 1.13; previous revision: 1.12 /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/FieldBreakpointPanel.java,v <-- FieldBreakpointPanel.java new revision: 1.10; previous revision: 1.9 /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/MethodBreakpointPanel.java,v <-- MethodBreakpointPanel.java new revision: 1.12; previous revision: 1.11 /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ThreadBreakpointPanel.java,v <-- ThreadBreakpointPanel.java new revision: 1.9; previous revision: 1.8
After issue #62617 is fixed, I've added the remaining help IDs: /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/views/BreakpointsView.java,v <-- BreakpointsView.java new revision: 1.10; previous revision: 1.9 /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/views/CallStackView.java,v <-- CallStackView.java new revision: 1.9; previous revision: 1.8 /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/views/LocalsView.java,v <-- LocalsView.java new revision: 1.9; previous revision: 1.8 /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/views/SessionsView.java,v <-- SessionsView.java new revision: 1.9; previous revision: 1.8 /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/views/ThreadsView.java,v <-- ThreadsView.java new revision: 1.9; previous revision: 1.8 /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/views/ViewModelListener.java,v <-- ViewModelListener.java new revision: 1.12; previous revision: 1.11 /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/views/WatchesView.java,v <-- WatchesView.java new revision: 1.9; previous revision: 1.8
Verified ... and Closing all issues resolved into NetBeans 6.7 and earlier.