From d46532a2d90a76c2f63ebd0f4936bc9c77f40097 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Tue, 18 May 2004 17:34:49 +0000 Subject: [PATCH] 2004-05-18 Alain Magloire Remove warnings and compatibility plugin to be full Eclipse-3.0 compliant. --- debug/org.eclipse.cdt.debug.mi.core/ChangeLog | 5 +++++ .../cdt/debug/mi/core/cdi/MemoryManager.java | 2 +- .../mi/core/cdi/event/DisconnectedEvent.java | 2 +- debug/org.eclipse.cdt.debug.mi.core/plugin.xml | 2 +- .../eclipse/cdt/debug/mi/core/IMIConstants.java | 2 +- .../org/eclipse/cdt/debug/mi/core/MIPlugin.java | 17 ++++++++--------- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog index ccc6bb60089..d7ba1da3876 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog @@ -1,3 +1,8 @@ +2004-05-18 Alain Magloire + + Remove dependencies on the compatibility plugin + and move to be more Eclipse-3.0 compliant. + 2004-05-07 Alain Magloire PR 57127. Pass the stream verbatim even if it has spaces. diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java index a070aa70182..d0994bdbbcc 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java @@ -168,7 +168,7 @@ public class MemoryManager extends Manager implements ICDIMemoryManager { * @see org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager#getBlocks() */ public ICDIMemoryBlock[] getMemoryBlocks() throws CDIException { - return (ICDIMemoryBlock[])listMemoryBlocks(); + return listMemoryBlocks(); } /** diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/DisconnectedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/DisconnectedEvent.java index 63226c9ab25..1884852ce98 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/DisconnectedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/DisconnectedEvent.java @@ -11,7 +11,7 @@ public class DisconnectedEvent implements ICDIDisconnectedEvent { ICDIObject source; public DisconnectedEvent(Session session) { - source = (ICDIObject)session.getCurrentTarget(); + source = session.getCurrentTarget(); } /** diff --git a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml index 34bedf6f199..dca57ef3636 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml +++ b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml @@ -17,7 +17,7 @@ - + diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/IMIConstants.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/IMIConstants.java index 46c559832d0..0d3a66479d9 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/IMIConstants.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/IMIConstants.java @@ -16,7 +16,7 @@ public interface IMIConstants /** * MI plug-in identifier (value "org.eclipse.cdt.debug.mi"). */ - public static final String PLUGIN_ID = MIPlugin.getDefault().getDescriptor().getUniqueIdentifier(); + public static final String PLUGIN_ID = MIPlugin.getUniqueIdentifier(); /** * Preference key for default MI request timeout value. diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java index 586d6812c9f..f308051ed31 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java @@ -24,10 +24,9 @@ import org.eclipse.cdt.debug.mi.core.command.MITargetSelect; import org.eclipse.cdt.debug.mi.core.output.MIInfo; import org.eclipse.cdt.utils.pty.PTY; import org.eclipse.cdt.utils.spawner.ProcessFactory; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPluginDescriptor; import org.eclipse.core.runtime.Plugin; import org.eclipse.core.runtime.Preferences; +import org.osgi.framework.BundleContext; /** * GDB/MI Plugin. @@ -61,8 +60,8 @@ public class MIPlugin extends Plugin { * The constructor * @see org.eclipse.core.runtime.Plugin#Plugin(IPluginDescriptor) */ - public MIPlugin(IPluginDescriptor descriptor) { - super(descriptor); + public MIPlugin() { + super(); plugin = this; } @@ -306,7 +305,7 @@ public class MIPlugin extends Plugin { // match the plugin id defined in plugin.xml return PLUGIN_ID; } - return getDefault().getDescriptor().getUniqueIdentifier(); + return getDefault().getBundle().getSymbolicName(); } public void debugLog(String message) { @@ -406,8 +405,8 @@ public class MIPlugin extends Plugin { /* (non-Javadoc) * @see org.eclipse.core.runtime.Plugin#startup() */ - public void startup() throws CoreException { - super.startup(); + public void start(BundleContext context) throws Exception { + super.start(context); } /* (non-Javadoc) @@ -421,9 +420,9 @@ public class MIPlugin extends Plugin { /* (non-Javadoc) * @see org.eclipse.core.runtime.Plugin#shutdown() */ - public void shutdown() throws CoreException { + public void stop(BundleContext context) throws Exception { savePluginPreferences(); - super.shutdown(); + super.stop(context); } }