diff options
author | Michael Rennie | 2013-05-16 17:13:55 +0000 |
---|---|---|
committer | Curtis Windatt | 2013-05-16 17:13:55 +0000 |
commit | 37b4c72b389e73c8dba177a00eb2419f13c13ca5 (patch) | |
tree | e62887f2a35e82b8ed4fe114a3bb46d629fa113d | |
parent | 65020c1280249413d14515f373ca9e359921b478 (diff) | |
download | eclipse.platform.debug-37b4c72b389e73c8dba177a00eb2419f13c13ca5.tar.gz eclipse.platform.debug-37b4c72b389e73c8dba177a00eb2419f13c13ca5.tar.xz eclipse.platform.debug-37b4c72b389e73c8dba177a00eb2419f13c13ca5.zip |
Bug 401055 - Conflicting handlers for org.eclipse.debug.ui.commands.eofR4_3_2R4_3_1R4_3M20140221-1700M20140212-0800M20140206-1000M20140205-0800M20140129-0800M20140124-1600M20140122-1000M20140117-0910M20140117-0130M20140116-2210M20140116-1730M20140116-0900M20140116-0200M20140115-1810M20140115-0800M20140108-1810M20140108-0800M20140101-1810M20140101-1800M20140101-0800M20131225-0800M20131218-0800M20131204-0800M20131127-1300M20131127-0800M20131120-0800M20131113-0800M20131106-0800M20131023-0800M20131016-0800M20131009-1400M20131007-0045M20131002-0800M20130911-1000M20130905-0705M20130904-1700M20130904-0800M20130829-1300M20130828-0800M20130821-0800M20130814-0800M20130807-1400M20130807-1000M20130731-0800M20130724-0800M20130717-0800M20130710-0800M20130703-0800I20130625-0800I20130618-0800I20130605-2000I20130604-2000I20130603-2000I20130602-2000I20130601-1500I20130531-2000I20130530-1430I20130529-2000I20130528-2000I20130528-1200I20130527-2000I20130527-0800I20130526-2000I20130526-0500I20130525-1500I20130523-1400I20130522-2000I20130521-2000I20130520-2000I20130519-2000I20130518-1500I20130516-2200I20130516-1800I20130516-1600
-rw-r--r-- | org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java index e61655643..6fa8fdc03 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2013 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 @@ -237,10 +237,12 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I public void activated() { // add EOF submissions IPageSite site = fPage.getSite(); - IHandlerService handlerService = (IHandlerService)site.getService(IHandlerService.class); - IContextService contextService = (IContextService)site.getService(IContextService.class); - fActivatedContext = contextService.activateContext(fContextId); - fActivatedHandler = handlerService.activateHandler("org.eclipse.debug.ui.commands.eof", fEOFHandler); //$NON-NLS-1$ + if(fActivatedContext == null && fActivatedHandler == null) { + IHandlerService handlerService = (IHandlerService)site.getService(IHandlerService.class); + IContextService contextService = (IContextService)site.getService(IContextService.class); + fActivatedContext = contextService.activateContext(fContextId); + fActivatedHandler = handlerService.activateHandler("org.eclipse.debug.ui.commands.eof", fEOFHandler); //$NON-NLS-1$ + } } /* (non-Javadoc) @@ -253,6 +255,8 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I IContextService contextService = (IContextService)site.getService(IContextService.class); handlerService.deactivateHandler(fActivatedHandler); contextService.deactivateContext(fActivatedContext); + fActivatedContext = null; + fActivatedHandler = null; } /* (non-Javadoc) |