From 3eed310ca2c12e4b65ad1c182b70cc46f51384bc Mon Sep 17 00:00:00 2001 From: Pawel Piech Date: Wed, 29 Aug 2012 10:55:08 -0700 Subject: [PATCH] Bug 388338 - [breakpoints] event breakpoints broken for DSF --- .../cdt/debug/core/CDebugCorePlugin.java | 4 ++ .../internal/core/DebugModelProvider.java | 47 +++++++++++++++++++ .../META-INF/MANIFEST.MF | 4 +- debug/org.eclipse.cdt.gdb.ui/plugin.xml | 2 +- .../gdb/internal/ui/GdbAdapterFactory.java | 2 +- 5 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DebugModelProvider.java diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugCorePlugin.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugCorePlugin.java index 5c90343ef9f..5daf89d8597 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugCorePlugin.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugCorePlugin.java @@ -21,12 +21,14 @@ import java.util.List; import org.eclipse.cdt.debug.core.breakpointactions.BreakpointActionManager; import org.eclipse.cdt.debug.core.command.CCommandAdapterFactory; import org.eclipse.cdt.debug.core.disassembly.IDisassemblyContextService; +import org.eclipse.cdt.debug.core.model.ICDebugElement; import org.eclipse.cdt.debug.core.model.IRestart; import org.eclipse.cdt.debug.core.sourcelookup.AbsolutePathSourceContainer; import org.eclipse.cdt.debug.core.sourcelookup.CProjectSourceContainer; import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation; import org.eclipse.cdt.debug.core.sourcelookup.ProgramRelativePathSourceContainer; import org.eclipse.cdt.debug.internal.core.DebugConfiguration; +import org.eclipse.cdt.debug.internal.core.DebugModelProvider; import org.eclipse.cdt.debug.internal.core.ICDebugInternalConstants; import org.eclipse.cdt.debug.internal.core.ListenerList; import org.eclipse.cdt.debug.internal.core.SessionManager; @@ -348,6 +350,8 @@ public class CDebugCorePlugin extends Plugin { createDisassemblyContextService(); setSessionManager(new SessionManager()); setDefaultLaunchDelegates(); + + Platform.getAdapterManager().registerAdapters(new DebugModelProvider(), ICDebugElement.class); } /* (non-Javadoc) diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DebugModelProvider.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DebugModelProvider.java new file mode 100644 index 00000000000..3b571eeb2f9 --- /dev/null +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DebugModelProvider.java @@ -0,0 +1,47 @@ +/******************************************************************************* + * Copyright (c) 2012 Wind River Systems 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Wind River Systems - initial API and implementation + *******************************************************************************/ +package org.eclipse.cdt.debug.internal.core; + +import org.eclipse.cdt.debug.core.CDIDebugModel; +import org.eclipse.cdt.debug.core.model.ICDebugElement; +import org.eclipse.core.runtime.IAdapterFactory; +import org.eclipse.debug.core.model.IDebugModelProvider; + +/** + * Debug model provider returns additional model ID to use with + * GDB event breakpoints. + */ +@SuppressWarnings("rawtypes") +public class DebugModelProvider implements IDebugModelProvider, IAdapterFactory { + + private final static Class[] ADAPTER_LIST = new Class[] { IDebugModelProvider.class }; + private final static String GDB_MODEL_ID = "org.eclipse.cdt.gdb"; //$NON-NLS-1$ + private final static String[] MODEL_IDS = new String[] { CDIDebugModel.getPluginIdentifier(), GDB_MODEL_ID }; + + @Override + public String[] getModelIdentifiers() { + return MODEL_IDS; + } + + @Override + public Object getAdapter(Object adaptableObject, Class adapterType) { + if ( adaptableObject instanceof ICDebugElement && IDebugModelProvider.class.equals(adapterType) ) { + return this; + } + return null; + } + + @Override + public Class[] getAdapterList() { + return ADAPTER_LIST; + } + +} diff --git a/debug/org.eclipse.cdt.gdb.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.gdb.ui/META-INF/MANIFEST.MF index eccc85bfba2..01a940244d9 100644 --- a/debug/org.eclipse.cdt.gdb.ui/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.gdb.ui/META-INF/MANIFEST.MF @@ -6,7 +6,9 @@ Bundle-Version: 7.0.0.qualifier Bundle-Activator: org.eclipse.cdt.gdb.ui.internal.Activator Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0", org.eclipse.ui;bundle-version="3.6.0", - org.eclipse.cdt.debug.ui;bundle-version="7.0.0" + org.eclipse.cdt.debug.ui;bundle-version="7.0.0", + org.eclipse.debug.core;bundle-version="3.8.0", + org.eclipse.cdt.debug.core;bundle-version="7.3.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %providerName diff --git a/debug/org.eclipse.cdt.gdb.ui/plugin.xml b/debug/org.eclipse.cdt.gdb.ui/plugin.xml index 95d3dfa6762..4775cdfbf57 100644 --- a/debug/org.eclipse.cdt.gdb.ui/plugin.xml +++ b/debug/org.eclipse.cdt.gdb.ui/plugin.xml @@ -3,7 +3,7 @@