# HG changeset patch # User Gordon Prieur # Date 1235008628 28800 # Node ID e689e7351c861bc559b5545af3d01026c3b10a98 # Parent 663c32991f4d75203bb260a9e6ee178f60b89392 A better fix for IZ #157310. In this fix the project property label for a single debugger comes from cnd.makeproject and is (in English) "Debug". If multiple C/C++ debuggers are found then it comes from each debugger. In my test case (with 2 gdb modules) the 1st returns "Gdb Debugger" and the 2nd returns "Gdb2 Debugger". In multi-debugger cases, a Debugger Chooser is shown with a line for each debugger (the chooser has a single property which is a dropdown showing which debugger is active). diff -r 663c32991f4d -r e689e7351c86 cnd.debugger.gdb/src/org/netbeans/modules/cnd/debugger/gdb/profiles/ui/Bundle.properties --- a/cnd.debugger.gdb/src/org/netbeans/modules/cnd/debugger/gdb/profiles/ui/Bundle.properties Wed Feb 18 16:01:12 2009 -0800 +++ b/cnd.debugger.gdb/src/org/netbeans/modules/cnd/debugger/gdb/profiles/ui/Bundle.properties Wed Feb 18 17:57:08 2009 -0800 @@ -39,7 +39,7 @@ #Debug node Debug=Debug -DebugDisplayName=Debug +DebugDisplayName=Gdb Debugger Options=Options diff -r 663c32991f4d -r e689e7351c86 cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/ui/CustomizerNode.java --- a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/ui/CustomizerNode.java Wed Feb 18 16:01:12 2009 -0800 +++ b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/ui/CustomizerNode.java Wed Feb 18 17:57:08 2009 -0800 @@ -86,6 +86,10 @@ return new HelpCtx(""); // NOI18N // See CR 6718766 } + public void setDisplayName(String displayName) { + this.displayName = displayName; + } + public String getDisplayName() { return displayName; } diff -r 663c32991f4d -r e689e7351c86 cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/ui/customizer/Bundle.properties --- a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/ui/customizer/Bundle.properties Wed Feb 18 16:01:12 2009 -0800 +++ b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/ui/customizer/Bundle.properties Wed Feb 18 17:57:08 2009 -0800 @@ -45,6 +45,7 @@ LBL_Config_Debugger=Debuggers LBL_DebuggerChooser=Debugger Chooser HINT_DebuggerChooser=Debugger Chooser +LBL_Single_Debugger=Debug LBL_LIBRARIES=Libraries #LBL_DEPENDENCIES=Dependencies LBL_COMMAND_LINE=Command Line diff -r 663c32991f4d -r e689e7351c86 cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/ui/customizer/MakeCustomizer.java --- a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/ui/customizer/MakeCustomizer.java Wed Feb 18 16:01:12 2009 -0800 +++ b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/ui/customizer/MakeCustomizer.java Wed Feb 18 17:57:08 2009 -0800 @@ -616,6 +616,8 @@ descriptions.add(new DebugCustomizerNode("Debuggers", getString("LBL_Config_Debugger"), l.toArray(cn))); // NOI18N debugNode = true; } else if (l.size() == 1) { + CustomizerNode n = l.get(0); + n.setDisplayName(getString("LBL_Single_Debugger")); // NOI18N descriptions.addAll(l); debugNode = true; } else {