/*******************************************************************************
 * Copyright (c) 2009, 2010 Ricardo Gladwell and Hugo Josefson
 * 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
 *******************************************************************************/

package me.gladwell.eclipse.m2e.android;

import java.util.ArrayList;
import java.util.List;

import org.eclipse.core.runtime.Plugin;
import org.eclipse.m2e.core.project.configurator.AbstractProjectConfigurator;
import org.eclipse.m2e.jdt.IJavaProjectConfigurator;
import org.osgi.framework.BundleContext;

import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Module;

/**
 * The activator class controls the plug-in life cycle
 */
public class AndroidMavenPlugin extends Plugin {

	// The plug-in ID
	public static final String PLUGIN_ID = "me.gladwell.eclipse.m2e.android";

	// The shared instance
	private static AndroidMavenPlugin plugin;

	private Injector injector;

	private List<Module> modules;

	/**
	 * The constructor
	 */
	public AndroidMavenPlugin() {
	}

	/**
	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
	 */
	public void start(BundleContext context) throws Exception {
		super.start(context);
		plugin = this;
		modules = new ArrayList<Module>();
		registerModule(new PluginModule());
	}

	/**
	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
	 */
	public void stop(BundleContext context) throws Exception {
		plugin = null;
		super.stop(context);
	}

	/**
	 * Returns the shared instance
	 *
	 * @return the shared instance
	 */
	public static AndroidMavenPlugin getDefault() {
		return plugin;
	}

	public void registerModule(Module module) {
		modules.add(module);
	}

	public Injector getInjector() {
		if(injector == null) {
			injector = Guice.createInjector(modules);
		}
		return injector;
	}

}

@@ -618,141 +618,8 @@
 n;%0D%0A
-import org.eclipse.m2e.core.project.configurator.AbstractProjectConfigurator;%0D%0Aimport org.eclipse.m2e.jdt.IJavaProjectConfigurator;%0D%0A
 impo

Tidy imports