From 14a9f65de9d74ef5c5ae1eb44965f2be5cfbc265 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Fri, 25 Feb 2005 23:02:49 +0000 Subject: [PATCH] 2005-02-25 Alain Magloire Fix PR 86718: Dialog shows twice * src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java * src/org/eclipse/cdt/internal/ui/cview/RefactorActionGroup.java --- core/org.eclipse.cdt.ui/ChangeLog | 5 +++++ .../org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java | 2 ++ .../eclipse/cdt/internal/ui/cview/RefactorActionGroup.java | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 8a82f6629c6..d114ba4abab 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,8 @@ +2005-02-25 Alain Magloire + Fix PR 86718: Dialog shows twice + * src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java + * src/org/eclipse/cdt/internal/ui/cview/RefactorActionGroup.java + 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 diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java index c1ce3e91d6e..bcf407f36a9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java @@ -121,6 +121,8 @@ public class OpenProjectGroup extends CViewActionGroup { if (refreshAction.isEnabled()) { refreshAction.refreshAll(); } + // Swallow the event + event.doit = false; } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/RefactorActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/RefactorActionGroup.java index 3050c431373..041aecf5c3f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/RefactorActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/RefactorActionGroup.java @@ -95,10 +95,14 @@ public class RefactorActionGroup extends CViewActionGroup { if (deleteAction.isEnabled()) { deleteAction.run(); } + // Swallow the event. + event.doit = false; } else if (event.keyCode == SWT.F2 && event.stateMask == 0) { if (renameAction.isEnabled()) { renameAction.run(); } + // Swallow the event. + event.doit = false; } }