Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2007-03-14 19:35:29 -0400
committerslewis2007-03-14 19:35:29 -0400
commit7ada93b51584de27b0c50fcb4d7fa6a5f878528c (patch)
treeff4b666c72e4ea1720b8c9c63cec980396fc8082 /incubation
parent5a63698ffcf4dee1a31e698e56b721c0da41ac34 (diff)
downloadorg.eclipse.ecf-7ada93b51584de27b0c50fcb4d7fa6a5f878528c.tar.gz
org.eclipse.ecf-7ada93b51584de27b0c50fcb4d7fa6a5f878528c.tar.xz
org.eclipse.ecf-7ada93b51584de27b0c50fcb4d7fa6a5f878528c.zip
Changes to remove references to Plugin class.
Diffstat (limited to 'incubation')
-rw-r--r--incubation/bundles/org.eclipse.ecf.bulletinboard.commons/META-INF/MANIFEST.MF11
-rw-r--r--incubation/bundles/org.eclipse.ecf.bulletinboard.commons/plugin.properties13
-rw-r--r--incubation/bundles/org.eclipse.ecf.bulletinboard.commons/src/org/eclipse/ecf/internal/bulletinboard/commons/AbstractBulletinBoard.java6
-rw-r--r--incubation/bundles/org.eclipse.ecf.bulletinboard.commons/src/org/eclipse/ecf/internal/bulletinboard/commons/Activator.java44
4 files changed, 68 insertions, 6 deletions
diff --git a/incubation/bundles/org.eclipse.ecf.bulletinboard.commons/META-INF/MANIFEST.MF b/incubation/bundles/org.eclipse.ecf.bulletinboard.commons/META-INF/MANIFEST.MF
index d1b658c4a..cf3211a66 100644
--- a/incubation/bundles/org.eclipse.ecf.bulletinboard.commons/META-INF/MANIFEST.MF
+++ b/incubation/bundles/org.eclipse.ecf.bulletinboard.commons/META-INF/MANIFEST.MF
@@ -1,18 +1,21 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: BBAPI Implementation Commons
+Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.bulletinboard.commons
Bundle-Version: 0.1.0
-Bundle-Vendor: Erkki Lindpere
+Bundle-Vendor: %plugin.provider
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ecf,
org.eclipse.ecf.bulletinboard,
- org.eclipse.core.runtime
+ org.eclipse.equinox.common
Export-Package: org.eclipse.ecf.internal.bulletinboard.commons;x-internal:=true,
org.eclipse.ecf.internal.bulletinboard.commons.parsing;x-internal:=true,
org.eclipse.ecf.internal.bulletinboard.commons.util;x-internal:=true,
org.eclipse.ecf.internal.bulletinboard.commons.webapp;x-internal:=true
Import-Package: org.apache.commons.httpclient,
org.apache.commons.httpclient.methods,
- org.apache.commons.httpclient.methods.multipart
+ org.apache.commons.httpclient.methods.multipart,
+ org.eclipse.core.runtime,
+ org.osgi.framework;version="1.4.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Activator: org.eclipse.ecf.internal.bulletinboard.commons.Activator
diff --git a/incubation/bundles/org.eclipse.ecf.bulletinboard.commons/plugin.properties b/incubation/bundles/org.eclipse.ecf.bulletinboard.commons/plugin.properties
new file mode 100644
index 000000000..dac27cbac
--- /dev/null
+++ b/incubation/bundles/org.eclipse.ecf.bulletinboard.commons/plugin.properties
@@ -0,0 +1,13 @@
+/****************************************************************************
+* Copyright (c) 2004 Composent, Inc. 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:
+* Composent, Inc. - initial API and implementation
+*****************************************************************************/
+plugin.name=BBAPI Implementation Commons
+plugin.provider=Eclipse.org
+
diff --git a/incubation/bundles/org.eclipse.ecf.bulletinboard.commons/src/org/eclipse/ecf/internal/bulletinboard/commons/AbstractBulletinBoard.java b/incubation/bundles/org.eclipse.ecf.bulletinboard.commons/src/org/eclipse/ecf/internal/bulletinboard/commons/AbstractBulletinBoard.java
index 4f9854b5c..d19d3f036 100644
--- a/incubation/bundles/org.eclipse.ecf.bulletinboard.commons/src/org/eclipse/ecf/internal/bulletinboard/commons/AbstractBulletinBoard.java
+++ b/incubation/bundles/org.eclipse.ecf.bulletinboard.commons/src/org/eclipse/ecf/internal/bulletinboard/commons/AbstractBulletinBoard.java
@@ -12,7 +12,7 @@ import java.util.Map;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
-import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.ecf.bulletinboard.BBException;
import org.eclipse.ecf.bulletinboard.IBulletinBoardContainerAdapter;
import org.eclipse.ecf.bulletinboard.IMember;
@@ -94,7 +94,9 @@ public abstract class AbstractBulletinBoard implements
}
public Object getAdapter(Class adapter) {
- return Platform.getAdapterManager().getAdapter(this, adapter);
+ IAdapterManager adapterManager = Activator.getDefault().getAdapterManager();
+ if (adapterManager == null) return null;
+ return adapterManager.getAdapter(this, adapter);
}
public URL getURL() {
diff --git a/incubation/bundles/org.eclipse.ecf.bulletinboard.commons/src/org/eclipse/ecf/internal/bulletinboard/commons/Activator.java b/incubation/bundles/org.eclipse.ecf.bulletinboard.commons/src/org/eclipse/ecf/internal/bulletinboard/commons/Activator.java
new file mode 100644
index 000000000..10e1cc339
--- /dev/null
+++ b/incubation/bundles/org.eclipse.ecf.bulletinboard.commons/src/org/eclipse/ecf/internal/bulletinboard/commons/Activator.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 Erkki Lindpere 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:
+ * Erkki Lindpere - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.ecf.internal.bulletinboard.commons;
+
+import org.eclipse.core.runtime.IAdapterManager;
+import org.eclipse.core.runtime.Platform;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+ public static final String PLUGIN_ID = "";
+
+ static private Activator plugin = null;
+ /* (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ plugin = this;
+ }
+
+ /* (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ }
+
+ public IAdapterManager getAdapterManager() {
+ return Platform.getAdapterManager();
+ }
+
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+}

Back to the top