Address review comments

Author: briandealwis

plugins/com.google.cloud.tools.eclipse.appengine.newproject.maven/META-INF/MANIFEST.MF

@@ -30,6 +30,7 @@ Import-Package: com.google.cloud.tools.eclipse.appengine.facets,
  com.google.cloud.tools.eclipse.ui.util,
  com.google.cloud.tools.eclipse.usagetracker,
  com.google.cloud.tools.eclipse.util,
+ com.google.cloud.tools.eclipse.util.service,
  com.google.cloud.tools.eclipse.util.status,
  org.apache.maven.archetype.catalog;provider=m2e,
  org.apache.maven.artifact;provider=m2e,

plugins/com.google.cloud.tools.eclipse.appengine.newproject.maven/plugin.xml

@@ -5,7 +5,7 @@
       <wizard
             id="com.google.cloud.tools.eclipse.appengine.newproject.MavenAppEngineStandard"
             name="%mavenwizard.name"
-            class="com.google.cloud.tools.eclipse.appengine.newproject.maven.MavenArchetypeProjectWizard"
+            class="com.google.cloud.tools.eclipse.util.service.ServiceContextFactory:com.google.cloud.tools.eclipse.appengine.newproject.maven.MavenArchetypeProjectWizard"
             icon="platform:/plugin/com.google.cloud.tools.eclipse.appengine.ui/icons/gae-16x16.png"
             project="true"
             finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"

plugins/com.google.cloud.tools.eclipse.appengine.newproject.maven/src/com/google/cloud/tools/eclipse/appengine/newproject/maven/MavenArchetypeProjectWizard.java

@@ -30,10 +30,9 @@
 import com.google.cloud.tools.eclipse.util.status.StatusUtil;
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
+import javax.inject.Inject;
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -44,12 +43,19 @@
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
 
+/**
+ * Creates a new Maven-based App Engine Standard project using an archetype.
+ * <p>
+ * Expected to be created via the {@link ServiceContextFactory}.
+ */
 public class MavenArchetypeProjectWizard extends Wizard
-    implements INewWizard, IExecutableExtension {
+    implements INewWizard {
   private MavenAppEngineStandardWizardPage page;
   private MavenAppEngineStandardArchetypeWizardPage archetypePage;
   private File cloudSdkLocation;
   private IWorkbench workbench;
+
+  @Inject
   private IConfigurationElement configElement;
 
   public MavenArchetypeProjectWizard() {
@@ -144,11 +150,4 @@ public void init(IWorkbench workbench, IStructuredSelection selection) {
       // if the user doesn't provide the Cloud SDK then we'll error in performFinish() too
     }
   }
-
-  @Override
-  public void setInitializationData(IConfigurationElement config, String propertyName, Object data)
-      throws CoreException {
-    this.configElement = config;
-  }
-
 }

plugins/com.google.cloud.tools.eclipse.appengine.newproject/src/com/google/cloud/tools/eclipse/appengine/newproject/AppEngineProjectWizard.java

@@ -43,7 +43,11 @@
 import org.eclipse.ui.ide.undo.WorkspaceUndoUtil;
 import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
 
-/** Expected to be created via the {@link ServiceContextFactory}. */
+/**
+ * Base class for App Engine projection creation.
+ * <p>
+ * Expected to be created via the {@link ServiceContextFactory}.
+ */
 public abstract class AppEngineProjectWizard extends Wizard implements INewWizard {
 
   private AppEngineWizardPage page = null;

plugins/com.google.cloud.tools.eclipse.util/src/com/google/cloud/tools/eclipse/util/service/ServiceContextFactory.java

@@ -21,24 +21,22 @@ public class ServiceContextFactory implements IExecutableExtensionFactory, IExec
   @Override
   public void setInitializationData(IConfigurationElement config, String propertyName, Object data)
       throws CoreException {
-      if (data == null || !(data instanceof String)) {
-        throw new CoreException(StatusUtil.error(getClass(), "Data must be a class name"));
-      }
+    if (data == null || !(data instanceof String)) {
+      throw new CoreException(StatusUtil.error(getClass(), "Data must be a class name"));
+    }
     configElement = config;
-      String className = (String) data;
-      String bundleSymbolicName = config.getNamespaceIdentifier();
-      Bundle bundle = Platform.getBundle(bundleSymbolicName);
-      if (bundle == null) {
-        throw new CoreException(StatusUtil.error(this, "Missing bundle " + bundleSymbolicName));
-      }
-      try {
-        clazz = bundle.loadClass(className);
-      } catch (ClassNotFoundException ex) {
-        throw new CoreException(StatusUtil.error(this,
-                                                 "Could not load class " + className
-                                                 + " from bundle " + bundle.getSymbolicName(),
-                                                 ex));
-      }
+    String className = (String) data;
+    String bundleSymbolicName = config.getNamespaceIdentifier();
+    Bundle bundle = Platform.getBundle(bundleSymbolicName);
+    if (bundle == null) {
+      throw new CoreException(StatusUtil.error(this, "Missing bundle " + bundleSymbolicName));
+    }
+    try {
+      clazz = bundle.loadClass(className);
+    } catch (ClassNotFoundException ex) {
+      throw new CoreException(StatusUtil.error(this,
+          "Could not load class " + className + " from bundle " + bundle.getSymbolicName(), ex));
+    }
   }
 
   @Override