Bug 485220: [Architecture] Provide a more modular architecture

https://bugs.eclipse.org/bugs/show_bug.cgi?id=485220

Clean up simple stragglers: UI dependencies only for AbstractUIPlugin.

4 files changed, 11 insertions, 47 deletions

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF
index f033a3b5864..d412c467722 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF
@@ -8,8 +8,7 @@ Export-Package: org.eclipse.papyrus.infra.services.edit,
  org.eclipse.papyrus.infra.services.edit.messages,

  org.eclipse.papyrus.infra.services.edit.service,

  org.eclipse.papyrus.infra.services.edit.utils

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

+Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.emf;bundle-version="2.6.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/Activator.java
index 0b0a13cbbc0..ab2490b5b69 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/Activator.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/Activator.java
@@ -1,6 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.

  *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

@@ -9,19 +8,20 @@
  *

  * Contributors:

  *

- *		Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

+ *   Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

+ *   Christian W. Damus - bug 485220

  *

  *****************************************************************************/

 package org.eclipse.papyrus.infra.services.edit;

 

+import org.eclipse.core.runtime.Plugin;

 import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

 

 /**

  * The activator class controls the plug-in life cycle

  */

-public class Activator extends AbstractUIPlugin {

+public class Activator extends Plugin {

 

 	/** Plug-in ID */

 	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.edit"; //$NON-NLS-1$

@@ -36,11 +36,6 @@ public class Activator extends AbstractUIPlugin {
 	/** Logging helper */

 	public static LogHelper log;

 

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

 	@Override

 	public void start(BundleContext context) throws Exception {

 		super.start(context);

@@ -48,11 +43,6 @@ public class Activator extends AbstractUIPlugin {
 		log = new LogHelper(plugin);

 	}

 

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

 	@Override

 	public void stop(BundleContext context) throws Exception {

 		plugin = null;

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/META-INF/MANIFEST.MF
index fcac521b825..6b2e54794d8 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/META-INF/MANIFEST.MF
@@ -1,8 +1,7 @@
 Manifest-Version: 1.0

 Export-Package: org.eclipse.papyrus.infra.services.viewersearch,

  org.eclipse.papyrus.infra.services.viewersearch.impl

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

+Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

  org.eclipse.emf.ecore;bundle-version="2.9.0"

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/Activator.java
index 8d55d1771af..304f52c236f 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/Activator.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/src/org/eclipse/papyrus/infra/services/viewersearch/Activator.java
@@ -1,6 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.

  *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

@@ -9,18 +8,19 @@
  *

  * Contributors:

  *  CEA LIST - Initial API and implementation

+ *  Christian W. Damus - bug 485220

  *

  *****************************************************************************/

 package org.eclipse.papyrus.infra.services.viewersearch;

 

+import org.eclipse.core.runtime.Plugin;

 import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

 

 /**

  * The Class Activator.

  */

-public class Activator extends AbstractUIPlugin {

+public class Activator extends Plugin {

 

 	/** The context. */

 	private static BundleContext context;

@@ -41,36 +41,12 @@ public class Activator extends AbstractUIPlugin {
 		return context;

 	}

 

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)

-	 */

-	/**

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 *

-	 * @param bundleContext

-	 * @throws Exception

-	 */

-

 	@Override

 	public void start(BundleContext bundleContext) throws Exception {

 		Activator.context = bundleContext;

 		log = new LogHelper(this);

 	}

 

-	/*

-	 * (non-Javadoc)

-	 *

-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)

-	 */

-	/**

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 *

-	 * @param bundleContext

-	 * @throws Exception

-	 */

-

 	@Override

 	public void stop(BundleContext bundleContext) throws Exception {

 		Activator.context = null;