Added option to show the Library selector group in the Create New App Engine wizard. (#1584)

* Added option to show the Library selector group in the Create New App
Engine wizard. Standard shows the library selector group and flex does
not

* Made getSelectedLibraries return ean emply collection when the library
selector is not created.

* Minor chnage per PR comment

Author: nbashirbello

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

@@ -21,6 +21,7 @@
 import com.google.cloud.tools.eclipse.appengine.ui.AppEngineLibrariesSelectorGroup;
 import java.io.File;
 import java.util.Collection;
+import java.util.HashSet;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.layout.GridDataFactory;
@@ -42,10 +43,12 @@ public abstract class AppEngineWizardPage extends WizardNewProjectCreationPage {
   private Text javaPackageField;
   private AppEngineLibrariesSelectorGroup appEngineLibrariesSelectorGroup;
   private Text serviceNameField;
+  private final boolean showLibrariesSelectorGroup;
 
-  public AppEngineWizardPage() {
+  public AppEngineWizardPage(boolean showLibrariesSelectorGroup) {
     super("basicNewProjectPage"); //$NON-NLS-1$
     setImageDescriptor(AppEngineImages.appEngine(64));
+    this.showLibrariesSelectorGroup = showLibrariesSelectorGroup;
   }
 
   public abstract void sendAnalyticsPing(Shell parentShell);
@@ -64,7 +67,9 @@ public void createControl(Composite parent) {
     createCustomFields(container, pageValidator);
 
     // Manage APIs
-    appEngineLibrariesSelectorGroup = new AppEngineLibrariesSelectorGroup(container);
+    if (showLibrariesSelectorGroup) {
+      appEngineLibrariesSelectorGroup = new AppEngineLibrariesSelectorGroup(container);
+    }
 
     setPageComplete(validatePage());
     // Show enter project name on opening
@@ -154,12 +159,18 @@ public String getPackageName() {
   }
 
   public Collection<Library> getSelectedLibraries() {
-    return appEngineLibrariesSelectorGroup.getSelectedLibraries();
+    if (appEngineLibrariesSelectorGroup == null) {
+      return new HashSet<Library>();
+    } else {
+      return appEngineLibrariesSelectorGroup.getSelectedLibraries();
+    }
   }
 
   @Override
   public void dispose() {
-    appEngineLibrariesSelectorGroup.dispose();
+    if (appEngineLibrariesSelectorGroup != null) {
+      appEngineLibrariesSelectorGroup.dispose();
+    }
     super.dispose();
   }
 

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

@@ -24,6 +24,7 @@
 
 public class AppEngineFlexWizardPage extends AppEngineWizardPage {
   public AppEngineFlexWizardPage() {
+    super(false);
     setTitle(Messages.getString("app.engine.flex.project")); //$NON-NLS-1$
     setDescription(Messages.getString("create.app.engine.flex.project")); //$NON-NLS-1$
   }

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

@@ -26,6 +26,7 @@
 
 public class AppEngineStandardWizardPage extends AppEngineWizardPage {
   public AppEngineStandardWizardPage() {
+    super(true);
     setTitle(Messages.getString("app.engine.standard.project")); //$NON-NLS-1$
     setDescription(Messages.getString("create.app.engine.standard.project")); //$NON-NLS-1$
   }