Add support for switching to recommended perspective

Author: briandealwis

plugins/com.google.cloud.tools.eclipse.appengine.flex/plugin.xml

@@ -35,6 +35,8 @@
             class="com.google.cloud.tools.eclipse.util.service.ServiceContextFactory:com.google.cloud.tools.eclipse.appengine.newproject.flex.AppEngineFlexProjectWizard"
             icon="platform:/plugin/com.google.cloud.tools.eclipse.appengine.ui/icons/gae-16x16.png"
             project="true"
+            finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
+            preferredPerspectives="org.eclipse.jst.j2ee.J2EEPerspective,org.eclipse.wst.web.ui.webDevPerspective"
             category="com.google.cloud.tools.eclipse.appengine.wizards">
          <description>%flexWizardDescription</description>
          <selection class="org.eclipse.core.resources.IResource"/>

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

@@ -20,7 +20,8 @@ Require-Bundle: com.google.cloud.tools.appengine;bundle-version="0.2.6",
  org.eclipse.core.jobs,
  org.eclipse.m2e.core;bundle-version="1.6.2",
  org.eclipse.m2e.core.ui;bundle-version="1.6.2",
- org.eclipse.m2e.maven.runtime
+ org.eclipse.m2e.maven.runtime,
+ org.eclipse.equinox.registry
 Bundle-ActivationPolicy: lazy
 Import-Package: com.google.cloud.tools.eclipse.appengine.facets,
  com.google.cloud.tools.eclipse.appengine.libraries.model,

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

@@ -8,6 +8,8 @@
             class="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"
+            preferredPerspectives="org.eclipse.jst.j2ee.J2EEPerspective,org.eclipse.wst.web.ui.webDevPerspective"
             category="com.google.cloud.tools.eclipse.appengine.wizards">
          <description>%mavenwizard.description</description>
          <selection class="org.eclipse.core.resources.IResource"/>

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

@@ -30,8 +30,10 @@
 import com.google.cloud.tools.eclipse.util.status.StatusUtil;
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
-
 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;
@@ -40,12 +42,15 @@
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
 
-public class MavenArchetypeProjectWizard extends Wizard implements INewWizard {
+public class MavenArchetypeProjectWizard extends Wizard
+    implements INewWizard, IExecutableExtension {
   private MavenAppEngineStandardWizardPage page;
   private MavenAppEngineStandardArchetypeWizardPage archetypePage;
   private File cloudSdkLocation;
   private IWorkbench workbench;
+  private IConfigurationElement configElement;
 
   public MavenArchetypeProjectWizard() {
     setWindowTitle(Messages.getString("WIZARD_TITLE")); //$NON-NLS-1$
@@ -112,8 +117,12 @@ public void run(IProgressMonitor monitor)
       boolean cancelable = true;
       getContainer().run(fork, cancelable, runnable);
 
+      // prompt to switch to preferred perspective
+      BasicNewProjectResourceWizard.updatePerspective(configElement);
+
       // open most important file created by wizard in editor
       IFile file = operation.getMostImportant();
+      BasicNewProjectResourceWizard.selectAndReveal(file, workbench.getActiveWorkbenchWindow());
       WorkbenchUtil.openInEditor(workbench, file);
 
     } catch (InterruptedException ex) {
@@ -136,4 +145,10 @@ public void init(IWorkbench workbench, IStructuredSelection selection) {
     }
   }
 
+  @Override
+  public void setInitializationData(IConfigurationElement config, String propertyName, Object data)
+      throws CoreException {
+    this.configElement = config;
+  }
+
 }

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

@@ -3,12 +3,14 @@
 <plugin>
   <extension point="org.eclipse.ui.newWizards">
      <wizard
-            id="com.google.cloud.tools.eclipse.appengine.newproject.AppEngineStandard"
-            name="%wizard.name"
-            class="com.google.cloud.tools.eclipse.util.service.ServiceContextFactory:com.google.cloud.tools.eclipse.appengine.newproject.standard.AppEngineStandardProjectWizard"
-            icon="platform:/plugin/com.google.cloud.tools.eclipse.appengine.ui/icons/gae-16x16.png"
-            project="true"
-            category="com.google.cloud.tools.eclipse.appengine.wizards">
+           category="com.google.cloud.tools.eclipse.appengine.wizards"
+           icon="platform:/plugin/com.google.cloud.tools.eclipse.appengine.ui/icons/gae-16x16.png"
+           id="com.google.cloud.tools.eclipse.appengine.newproject.AppEngineStandard"
+           name="%wizard.name"
+           class="com.google.cloud.tools.eclipse.util.service.ServiceContextFactory:com.google.cloud.tools.eclipse.appengine.newproject.standard.AppEngineStandardProjectWizard"
+           finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
+           preferredPerspectives="org.eclipse.jst.j2ee.J2EEPerspective,org.eclipse.wst.web.ui.webDevPerspective"
+           project="true">
          <description>%wizard.description</description>
          <selection class="org.eclipse.core.resources.IResource"/>
          <keywordReference id="com.google.cloud.tools.eclipse.appengine.ui.GCPKeyword"/>

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

@@ -26,25 +26,33 @@
 import com.google.cloud.tools.eclipse.sdk.ui.preferences.CloudSdkPrompter;
 import com.google.cloud.tools.eclipse.ui.util.WorkbenchUtil;
 import com.google.cloud.tools.eclipse.usagetracker.AnalyticsEvents;
+import com.google.cloud.tools.eclipse.util.service.ServiceContextFactory;
 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.IAdaptable;
+import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.ide.undo.WorkspaceUndoUtil;
+import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
 
+/** Expected to be created via the {@link ServiceContextFactory}. */
 public abstract class AppEngineProjectWizard extends Wizard implements INewWizard {
 
   private AppEngineWizardPage page = null;
   private AppEngineProjectConfig config = new AppEngineProjectConfig();
   private IWorkbench workbench;
 
+  @Inject
+  protected IConfigurationElement configElement;
+
   public AppEngineProjectWizard() {
     setNeedsProgressMonitor(true);
   }
@@ -107,8 +115,12 @@ public boolean performFinish() {
     try {
       getContainer().run(fork, cancelable, runnable);
 
+      // prompt to switch to preferred perspective
+      BasicNewProjectResourceWizard.updatePerspective(configElement);
+
       // open most important file created by wizard in editor
       IFile file = runnable.getMostImportant();
+      BasicNewProjectResourceWizard.selectAndReveal(file, workbench.getActiveWorkbenchWindow());
       WorkbenchUtil.openInEditor(workbench, file);
     } catch (InterruptedException ex) {
       status = Status.CANCEL_STATUS;

plugins/com.google.cloud.tools.eclipse.integration.appengine/src/com/google/cloud/tools/eclipse/integration/appengine/BaseProjectTest.java

@@ -47,6 +47,9 @@ public static void setUp() throws Exception {
     } catch (WidgetNotFoundException ex) {
       // may receive WNFE: "There is no active view"
     }
+
+    // switch to J2EE to avoid new-project switch-perspective prompts
+    bot.perspectiveById("org.eclipse.jst.j2ee.J2EEPerspective").activate();
   }
 
   @After

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

@@ -1,5 +1,6 @@
 package com.google.cloud.tools.eclipse.util.service;
 
+import com.google.cloud.tools.eclipse.util.status.StatusUtil;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExecutableExtension;
@@ -12,18 +13,18 @@
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 
-import com.google.cloud.tools.eclipse.util.status.StatusUtil;
-
 public class ServiceContextFactory implements IExecutableExtensionFactory, IExecutableExtension {
 
   private Class<?> clazz;
+  private IConfigurationElement configElement;
 
   @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"));
       }
+    configElement = config;
       String className = (String) data;
       String bundleSymbolicName = config.getNamespaceIdentifier();
       Bundle bundle = Platform.getBundle(bundleSymbolicName);
@@ -44,6 +45,12 @@ public void setInitializationData(IConfigurationElement config, String propertyN
   public Object create() throws CoreException {
     BundleContext bundleContext = FrameworkUtil.getBundle(clazz).getBundleContext();
     IEclipseContext serviceContext = EclipseContextFactory.getServiceContext(bundleContext);
-    return ContextInjectionFactory.make(clazz, serviceContext);
+    IEclipseContext staticContext = EclipseContextFactory.create();
+    staticContext.set(IConfigurationElement.class, configElement);
+    try {
+      return ContextInjectionFactory.make(clazz, serviceContext, staticContext);
+    } finally {
+      staticContext.dispose();
+    }
   }
 }