Removed all remaining references to Plugin class and Platform class

3 files changed, 15 insertions, 7 deletions

diff --git a/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF
index cc50441fe..d8c6cc878 100644
--- a/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF
@@ -15,6 +15,7 @@ Export-Package: org.eclipse.ecf.internal.presence;x-internal:=true,
 Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: J2SE-1.3,
  CDC-1.0/Foundation-1.0
-Require-Bundle: org.eclipse.ecf
+Require-Bundle: org.eclipse.equinox.common,
+ org.eclipse.ecf
 Import-Package: org.eclipse.core.runtime,
  org.osgi.framework;version="1.3.0"
diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/internal/presence/PresencePlugin.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/internal/presence/PresencePlugin.java
index 468239206..352502ea4 100644
--- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/internal/presence/PresencePlugin.java
+++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/internal/presence/PresencePlugin.java
@@ -10,13 +10,15 @@
  *****************************************************************************/
 package org.eclipse.ecf.internal.presence;
 
-import org.eclipse.core.runtime.Plugin;
+import org.eclipse.core.runtime.IAdapterManager;
+import org.eclipse.core.runtime.Platform;
+import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
 /**
  * The main plugin class to be used in the desktop.
  */
-public class PresencePlugin extends Plugin {
+public class PresencePlugin implements BundleActivator {
 
 	// The shared instance.
 	private static PresencePlugin plugin;
@@ -33,16 +35,18 @@ public class PresencePlugin extends Plugin {
 	 * This method is called upon plug-in activation
 	 */
 	public void start(BundleContext context) throws Exception {
-		super.start(context);
 	}
 
 	/**
 	 * This method is called when the plug-in is stopped
 	 */
 	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
 		plugin = null;
 	}
+	
+	public IAdapterManager getAdapterManager() {
+		return Platform.getAdapterManager();
+	}
 
 	/**
 	 * Returns the shared instance.
diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/AbstractPresenceContainer.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/AbstractPresenceContainer.java
index c1c490688..c8f471918 100644
--- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/AbstractPresenceContainer.java
+++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/AbstractPresenceContainer.java
@@ -10,7 +10,8 @@
  *****************************************************************************/
 package org.eclipse.ecf.presence;
 
-import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.IAdapterManager;
+import org.eclipse.ecf.internal.presence.PresencePlugin;
 import org.eclipse.ecf.presence.chatroom.IChatRoomManager;
 
 /**
@@ -24,7 +25,9 @@ public abstract class AbstractPresenceContainer implements
 	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
 	 */
 	public Object getAdapter(Class adapter) {
-		return Platform.getAdapterManager().getAdapter(this, adapter);
+		IAdapterManager adapterManager = PresencePlugin.getDefault().getAdapterManager();
+		if (adapterManager == null) return null;
+		return adapterManager.getAdapter(this, adapter);
 	}
 
 	/*