From b9dc18ad86912996c043a2b3517131210ecedacb Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Fri, 25 Feb 2005 22:23:34 +0000 Subject: [PATCH] 2005-02-25 Alain Magloire Fix for PR 45666: Adding Block comment mneu in the CEditor "/* */" * src/org/eclipse/cdt/internal/ui/actions/RemoveBlockCommentAction.java * src/org/eclipse/cdt/internal/ui/editor/CEditor.java * NEWS --- core/org.eclipse.cdt.ui/ChangeLog | 6 ++++++ core/org.eclipse.cdt.ui/NEWS | 2 ++ .../cdt/internal/ui/actions/RemoveBlockCommentAction.java | 2 +- .../src/org/eclipse/cdt/internal/ui/editor/CEditor.java | 8 ++++---- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index c42142148a5..8a82f6629c6 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,9 @@ +2005-02-25 Alain Magloire + Fix for PR 45666: Adding Block comment mneu in the CEditor "/* */" + * src/org/eclipse/cdt/internal/ui/actions/RemoveBlockCommentAction.java + * src/org/eclipse/cdt/internal/ui/editor/CEditor.java + * NEWS + 2005-02-25 Alain Magloire Fix PR 86647: remove the hyperlink preference page in the CEditor preference Use the Text Editors diff --git a/core/org.eclipse.cdt.ui/NEWS b/core/org.eclipse.cdt.ui/NEWS index 5fb0a89cf72..0e09028f3e5 100644 --- a/core/org.eclipse.cdt.ui/NEWS +++ b/core/org.eclipse.cdt.ui/NEWS @@ -1,5 +1,7 @@ Release CDT-3.0 + * Block Comment style(/* */) added in the CEditor context menu. + * All the CEditor text preference settings are now common with the text editors. To access use Window --> Preferences --> General --> Editors --> Text Editors diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/RemoveBlockCommentAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/RemoveBlockCommentAction.java index 5733327285e..587fe418a59 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/RemoveBlockCommentAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/RemoveBlockCommentAction.java @@ -81,7 +81,7 @@ public class RemoveBlockCommentAction extends BlockCommentAction { * @see org.eclipse.jdt.internal.ui.actions.AddBlockCommentAction#validSelection(org.eclipse.jface.text.ITextSelection) */ protected boolean isValidSelection(ITextSelection selection) { - return selection != null && !selection.isEmpty(); + return selection != null && !selection.isEmpty() && selection.getLength() > 0; } 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 b23014efe3d..9b9693a15ba 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 @@ -693,11 +693,11 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IS action.setActionDefinitionId(ICEditorActionDefinitionIds.OPEN_OUTLINE); setAction("OpenOutline", action); //$NON-NLS-1$*/ - action = new GoToNextPreviousMemberAction(CEditorMessages.getResourceBundle(), "GotoNextMemeber.", this, true); + action = new GoToNextPreviousMemberAction(CEditorMessages.getResourceBundle(), "GotoNextMember.", this, true); action.setActionDefinitionId(ICEditorActionDefinitionIds.GOTO_NEXT_MEMBER); setAction("GotoNextMember", action); //$NON-NLS-1$*/ - action = new GoToNextPreviousMemberAction(CEditorMessages.getResourceBundle(), "GotoPrevMemeber.", this, false); + action = new GoToNextPreviousMemberAction(CEditorMessages.getResourceBundle(), "GotoPrevMember.", this, false); action.setActionDefinitionId(ICEditorActionDefinitionIds.GOTO_PREVIOUS_MEMBER); setAction("GotoPrevMember", action); //$NON-NLS-1$*/ @@ -719,8 +719,8 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IS // 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$ - // @@@ disabled for now until we get it to do something... - //addAction(menu, ITextEditorActionConstants.GROUP_EDIT, "Format"); //$NON-NLS-1$ + addAction(menu, ITextEditorActionConstants.GROUP_EDIT, "AddBlockComment"); //$NON-NLS-1$ + addAction(menu, ITextEditorActionConstants.GROUP_EDIT, "RemoveBlockComment"); //$NON-NLS-1$ addAction(menu, ITextEditorActionConstants.GROUP_FIND, "OpenDeclarations"); //$NON-NLS-1$