Fix for 143153. Modifications to the original for: corrected copyright notice, add the comment item to the pop-up menu, and renamed it from Toggle comment to Comment/Uncomment

4 files changed, 10 insertions, 11 deletions

diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties
index 944bc082d50..4abd3687126 100644
--- a/core/org.eclipse.cdt.ui/plugin.properties
+++ b/core/org.eclipse.cdt.ui/plugin.properties
@@ -24,7 +24,7 @@ perspective.name=C/C++
 viewsCategory.name=&C/C++
 CView.name=C/C++ Projects
 
-ToggleCommentAction.label= Togg&le Comment
+ToggleCommentAction.label= Comment/Uncomment
 
 AddBlockCommentAction.label= Add &Block Comment
 
@@ -86,8 +86,8 @@ ActionDefinition.comment.description= Turn the selected lines into // style comm
 ActionDefinition.uncomment.name= Uncomment
 ActionDefinition.uncomment.description= Uncomment the selected // style comment lines
 
-ActionDefinition.toggleComment.name= Toggle Comment
-ActionDefinition.toggleComment.description= Toggle comment the selected lines
+ActionDefinition.toggleComment.name= Comment/Uncomment
+ActionDefinition.toggleComment.description= Comment/Uncomment the selected lines
 
 ActionDefinition.opendecl.name= Open Declaration
 ActionDefinition.opendecl.description= Open an editor on the selected element's declaration(s)
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
index 11dda9f9e15..2db2b888e2c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
@@ -1105,8 +1105,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IS
 		addGroup(menu, ITextEditorActionConstants.GROUP_EDIT, IContextMenuConstants.GROUP_NEW);
 
 		// Code formatting menu items -- only show in C perspective
-		addAction(menu, ITextEditorActionConstants.GROUP_EDIT, "Comment"); //$NON-NLS-1$
-		addAction(menu, ITextEditorActionConstants.GROUP_EDIT, "Uncomment"); //$NON-NLS-1$
+		addAction(menu, ITextEditorActionConstants.GROUP_EDIT, "ToggleComment"); //$NON-NLS-1$
 		addAction(menu, ITextEditorActionConstants.GROUP_EDIT, "AddBlockComment"); //$NON-NLS-1$
 		addAction(menu, ITextEditorActionConstants.GROUP_EDIT, "RemoveBlockComment"); //$NON-NLS-1$
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties
index 516873a7ce0..5d3c50b0cf2 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties
@@ -136,9 +136,9 @@ Uncomment.label=Uncommen&t
 Uncomment.tooltip=Uncomment the Selected C // comment Lines
 Uncomment.description=Uncomment the selected C // comment lines
 
-ToggleComment.label=Togg&le Comment
-ToggleComment.tooltip=Toggle Comment For the Selected Lines
-ToggleComment.description=Toggle comment for the selected lines
+ToggleComment.label=Comment/Uncomment
+ToggleComment.tooltip=Comment/Uncomment For the Selected Lines
+ToggleComment.description=Comment/Uncomment for the selected lines
 
 AddBlockComment.label=Add &Block Comment
 AddBlockComment.tooltip=Enclose the Selection in a Block Comment
@@ -199,5 +199,5 @@ GotoPrevMember.tooltip=Goes to previous member.
 
 ShowToolTip.label=Show T&ooltip Description
 
-ToggleComment_error_title=Toggle Comment
-ToggleComment_error_message=An error occurred while toggling comments.
+ToggleComment_error_title=Comment/Uncomment
+ToggleComment_error_message=An error occurred while commenting/uncommenting.
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleCommentAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleCommentAction.java
index b9c48ef01d1..08b78706eab 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleCommentAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleCommentAction.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at