Fixes #1351 - Add functionality to project selector to create new project (#1472)

akerekes · web-flow · commit 7b38726527ac · 2017-03-08T11:40:09.000-05:00
* add button and dialog * extract project creation dialog into its own class * moved create project dialog to deploy.ui, reload project list after dialog closes * revert changes to ProjectSelector * Remove dialog/button, add link to Cloud Console * cleanup * test fix * reorganize layout, fix missing refresh icon on Oxygen, change create project link text * fix SharedImagesTest * fix message and comment * blank line before @return * tweak dialog layout * enable project list refresh button only if an account is selected * font style bit operation into helper method, changed create project link text * use ShellTestResource in FontUtilTest * remove 'bold' from FontUtil.convertFont(), some code cleanup in StandardDeployPreferencesPanel * make FontUtil.hasStyle() safer if more than on style bit is set
diff --git a/build/jacoco/.settings/org.eclipse.core.resources.prefs b/build/jacoco/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/build/jacoco/.settings/org.eclipse.m2e.core.prefs b/build/jacoco/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui.test/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/StandardDeployPreferencesPanelTest.java b/plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui.test/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/StandardDeployPreferencesPanelTest.java
@@ -36,8 +36,10 @@
 import com.google.cloud.tools.eclipse.projectselector.model.GcpProject;
 import com.google.cloud.tools.eclipse.test.util.ui.ShellTestResource;
 import com.google.cloud.tools.login.Account;
+import java.util.ArrayDeque;
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.Queue;
 import org.eclipse.core.databinding.ValidationStatusProvider;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ProjectScope;
@@ -186,13 +188,17 @@ public void testProjectSavedInPreferencesSelected() throws ProjectRepositoryExce
     StandardDeployPreferencesPanel deployPanel =
         new StandardDeployPreferencesPanel(parent, project, loginService, layoutChangedHandler,
                                            true, projectRepository);
-    for (Control control : deployPanel.getChildren()) {
+    Queue<Control> children = new ArrayDeque<>(Arrays.asList(deployPanel.getChildren()));
+    while (!children.isEmpty()) {
+      Control control = children.poll();
       if (control instanceof ProjectSelector) {
         ProjectSelector projectSelector = (ProjectSelector) control;
         IStructuredSelection selection = projectSelector.getViewer().getStructuredSelection();
         assertThat(selection.size(), is(1));
         assertThat(((GcpProject) selection.getFirstElement()).getId(), is("projectId1"));
         return;
+      } else if (control instanceof Composite) {
+        children.addAll(Arrays.asList(((Composite) control).getChildren()));
       }
     };
     fail("Did not find ProjectSelector widget");
diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/META-INF/MANIFEST.MF
@@ -26,6 +26,8 @@ Import-Package: com.google.api.client.auth.oauth2;version="[1.22.0,1.23.0)",
  com.google.cloud.tools.eclipse.ui.util,
  com.google.cloud.tools.eclipse.ui.util.console,
  com.google.cloud.tools.eclipse.ui.util.databinding,
+ com.google.cloud.tools.eclipse.ui.util.event,
+ com.google.cloud.tools.eclipse.ui.util.images,
  com.google.cloud.tools.eclipse.usagetracker,
  com.google.cloud.tools.eclipse.util,
  com.google.cloud.tools.eclipse.util.status,
diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/StandardDeployPreferencesPanel.java b/plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/StandardDeployPreferencesPanel.java
@@ -29,6 +29,9 @@
 import com.google.cloud.tools.eclipse.ui.util.databinding.BucketNameValidator;
 import com.google.cloud.tools.eclipse.ui.util.databinding.ProjectSelectorValidator;
 import com.google.cloud.tools.eclipse.ui.util.databinding.ProjectVersionValidator;
+import com.google.cloud.tools.eclipse.ui.util.event.OpenUriSelectionListener;
+import com.google.cloud.tools.eclipse.ui.util.event.OpenUriSelectionListener.ErrorDialogErrorHandler;
+import com.google.cloud.tools.eclipse.ui.util.images.SharedImages;
 import com.google.cloud.tools.eclipse.util.status.StatusUtil;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
@@ -63,14 +66,16 @@
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.forms.events.ExpansionAdapter;
 import org.eclipse.ui.forms.events.ExpansionEvent;
@@ -81,6 +86,8 @@ public class StandardDeployPreferencesPanel extends DeployPreferencesPanel {
 
   private static final String APPENGINE_VERSIONS_URL =
       "https://console.cloud.google.com/appengine/versions";
+  private static final String CREATE_GCP_PROJECT_WITH_GAE_URL =
+      "https://console.cloud.google.com/projectselector/appengine/create?lang=java";
 
   private static final Logger logger = Logger.getLogger(
       StandardDeployPreferencesPanel.class.getName());
@@ -99,6 +106,8 @@ public class StandardDeployPreferencesPanel extends DeployPreferencesPanel {
 
   private ExpandableComposite expandableComposite;
 
+  private Image refreshIcon;
+
   @VisibleForTesting
   DeployPreferencesModel model;
   private ObservablesManager observables;
@@ -122,6 +131,8 @@ public StandardDeployPreferencesPanel(Composite parent, IProject project,
 
     this.projectRepository = projectRepository;
 
+    refreshIcon = SharedImages.createRefreshIcon(getDisplay());
+
     createCredentialSection(loginService);
 
     createProjectIdSection();
@@ -316,17 +327,45 @@ private void createProjectIdSection() {
     Label projectIdLabel = new Label(this, SWT.LEAD);
     projectIdLabel.setText(Messages.getString("project"));
     projectIdLabel.setToolTipText(Messages.getString("tooltip.project.id"));
-    GridDataFactory.swtDefaults().align(SWT.BEGINNING, SWT.BEGINNING).applyTo(projectIdLabel);
-    projectSelector = new ProjectSelector(this);
-    GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
-      .grab(true, false).hint(400, 150).applyTo(projectSelector);
-    accountSelector.addSelectionListener(new Runnable() {
+    GridDataFactory.swtDefaults().align(SWT.BEGINNING, SWT.BEGINNING).span(1, 3)
+        .applyTo(projectIdLabel);
+
+    Label select = new Label(this, SWT.WRAP);
+    select.setText(Messages.getString("projectselector.selectProject"));
+    GridDataFactory.swtDefaults().align(SWT.FILL, SWT.BEGINNING)
+        .applyTo(select);
+
+    Link createNewProject = new Link(this, SWT.NONE);
+    createNewProject.setText(Messages.getString("projectselector.createproject",
+                                                CREATE_GCP_PROJECT_WITH_GAE_URL));
+    createNewProject.setToolTipText(Messages.getString("projectselector.createproject.tooltip"));
+    FontUtil.convertFontToItalic(createNewProject);
+    createNewProject.addSelectionListener(
+        new OpenUriSelectionListener(new ErrorDialogErrorHandler(getShell())));
+    GridDataFactory.swtDefaults().align(SWT.FILL, SWT.BEGINNING)
+        .applyTo(createNewProject);
+
+    Composite projectSelectorComposite = new Composite(this, SWT.NONE);
+    GridLayoutFactory.fillDefaults().numColumns(2).spacing(0, 0).applyTo(projectSelectorComposite);
+    GridDataFactory.fillDefaults().grab(true, false).applyTo(projectSelectorComposite);
+
+    projectSelector = new ProjectSelector(projectSelectorComposite);
+    GridDataFactory.fillDefaults().grab(true, false).hint(SWT.DEFAULT, 200)
+        .applyTo(projectSelector);
+
+    final Button refreshProjectsButton = new Button(projectSelectorComposite, SWT.NONE);
+    refreshProjectsButton.setImage(refreshIcon);
+    GridDataFactory.swtDefaults().align(SWT.END, SWT.BEGINNING).applyTo(refreshProjectsButton);
+    refreshProjectsButton.addSelectionListener(new SelectionAdapter() {
       @Override
-      public void run() {
-        Credential selectedCredential = accountSelector.getSelectedCredential();
-        projectSelector.setProjects(retrieveProjects(selectedCredential));
+      public void widgetSelected(SelectionEvent event) {
+        refreshProjectsForSelectedCredential();
       }
     });
+
+    accountSelector.addSelectionListener(
+        new RefreshProjectOnAccountSelection(refreshProjectsButton));
+
     projectSelector.addSelectionChangedListener(
         new ProjectSelectorSelectionChangedListener(accountSelector,
                                                     projectRepository,
@@ -371,7 +410,7 @@ private void createAdvancedSection() {
     expandableComposite.setClient(bucketComposite);
     expandableComposite.addExpansionListener(new ExpansionAdapter() {
       @Override
-      public void expansionStateChanged(ExpansionEvent e) {
+      public void expansionStateChanged(ExpansionEvent event) {
         handleExpansionStateChanged();
       }
     });
@@ -407,6 +446,11 @@ private Composite createBucketSection(Composite parent) {
     return bucketComposite;
   }
 
+  private void refreshProjectsForSelectedCredential() {
+    Credential selectedCredential = accountSelector.getSelectedCredential();
+    projectSelector.setProjects(retrieveProjects(selectedCredential));
+  }
+
   private List<GcpProject> retrieveProjects(Credential selectedCredential) {
     try {
       if (selectedCredential == null) {
@@ -425,6 +469,21 @@ private List<GcpProject> retrieveProjects(Credential selectedCredential) {
     }
   }
 
+  public final class RefreshProjectOnAccountSelection implements Runnable {
+
+    private final Button refreshProjectsButton;
+
+    public RefreshProjectOnAccountSelection(Button refreshProjectsButton) {
+      this.refreshProjectsButton = refreshProjectsButton;
+    }
+
+    @Override
+    public void run() {
+      refreshProjectsForSelectedCredential();
+      refreshProjectsButton.setEnabled(accountSelector.getSelectedCredential() != null);
+    }
+  }
+
   private final class ProjectIdToGcpProjectConverter extends Converter {
 
     private ProjectIdToGcpProjectConverter() {
@@ -441,7 +500,7 @@ public Object convert(Object fromObject) {
       try {
         return projectRepository.getProject(accountSelector.getSelectedCredential(),
                                            (String) fromObject);
-      } catch (ProjectRepositoryException e) {
+      } catch (ProjectRepositoryException ex) {
         return null;
       }
     }
@@ -528,6 +587,9 @@ public void dispose() {
     if (observables != null) {
       observables.dispose();
     }
+    if (refreshIcon != null) {
+      refreshIcon.dispose();
+    }
     super.dispose();
   }
 
diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/messages.properties b/plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/messages.properties
@@ -40,6 +40,12 @@ tooltip.stop.previous.version=If checked, stops the previously running version w
  new version that receives all traffic.
 tooltip.staging.bucket=The Google Cloud Storage bucket used to stage files for deployment. \
  If not specified, the application''s default code bucket is used.
+
+#Project selector
+projectselector.selectProject=Select a Google Cloud Platform project
+projectselector.createproject=Create a project in the <a href="{0}">Cloud Console</a>. Then refresh this list.
+projectselector.createproject.tooltip=Opens the Cloud Console in a browser. You will need to refresh the project list \
+after the project is created.
 projectselector.retrieveproject.error.title=Failed to retrieve projects
 projectselector.retrieveproject.error.message=An error occurred while retrieving projects: {0}
 projectselector.retrieveapplication.error.title=Failed to retrieve App Engine application
diff --git a/plugins/com.google.cloud.tools.eclipse.projectselector/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.projectselector/META-INF/MANIFEST.MF
@@ -40,12 +40,9 @@ Import-Package: com.google.api.client.auth.oauth2;version="[1.22.0,1.23.0)",
  org.eclipse.core.databinding.property.value,
  org.eclipse.core.runtime;bundle-symbolic-name="org.eclipse.core.runtime",
  org.eclipse.jface.databinding.viewers,
- org.eclipse.jface.dialogs,
  org.eclipse.jface.layout,
  org.eclipse.jface.viewers,
  org.eclipse.swt,
  org.eclipse.swt.events,
  org.eclipse.swt.layout,
- org.eclipse.swt.widgets,
- org.eclipse.ui,
- org.eclipse.ui.browser;ui.workbench=split
+ org.eclipse.swt.widgets
diff --git a/plugins/com.google.cloud.tools.eclipse.projectselector/src/com/google/cloud/tools/eclipse/projectselector/ProjectSelector.java b/plugins/com.google.cloud.tools.eclipse.projectselector/src/com/google/cloud/tools/eclipse/projectselector/ProjectSelector.java
@@ -25,6 +25,7 @@
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.jface.databinding.viewers.ViewerSupport;
 import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.jface.layout.TableColumnLayout;
 import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.ISelection;
@@ -35,7 +36,6 @@
 import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Link;
 
@@ -47,14 +47,14 @@ public class ProjectSelector extends Composite {
 
   public ProjectSelector(Composite parent) {
     super(parent, SWT.NONE);
-    setLayout(new GridLayout());
+    GridLayoutFactory.fillDefaults().numColumns(2).applyTo(this);
 
     Composite tableComposite = new Composite(this, SWT.NONE);
     TableColumnLayout tableColumnLayout = new TableColumnLayout();
     tableComposite.setLayout(tableColumnLayout);
     GridDataFactory.fillDefaults().grab(true, true).applyTo(tableComposite);
 
-    tableViewer = new TableViewer(tableComposite, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
+    tableViewer = new TableViewer(tableComposite, SWT.SINGLE | SWT.BORDER);
     createColumns(tableColumnLayout);
     tableViewer.getTable().setHeaderVisible(true);
     input = WritableList.withElementType(GcpProject.class);
@@ -68,7 +68,7 @@ public ProjectSelector(Composite parent) {
     statusLink.addSelectionListener(
         new OpenUriSelectionListener(new ErrorDialogErrorHandler(getShell())));
     statusLink.setText("");
-    GridDataFactory.fillDefaults().applyTo(statusLink);
+    GridDataFactory.fillDefaults().span(2, 1).applyTo(statusLink);
   }
 
   private void createColumns(TableColumnLayout tableColumnLayout) {
@@ -89,6 +89,7 @@ public TableViewer getViewer() {
   public void setProjects(List<GcpProject> projects) {
     ISelection selection = tableViewer.getSelection();
     input.clear();
+    clearStatusLink(); // otherwise revealing selection is off sometimes
     if (projects != null) {
       input.addAll(projects);
     }
diff --git a/plugins/com.google.cloud.tools.eclipse.ui.util.test/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.ui.util.test/META-INF/MANIFEST.MF
@@ -11,6 +11,7 @@ Require-Bundle: com.google.guava;bundle-version="[20.0.0,21.0.0)",
  org.hamcrest;bundle-version="1.1.0",
  org.junit;bundle-version="4.12.0"
 Import-Package: com.google.cloud.tools.eclipse.test.util,
+ com.google.cloud.tools.eclipse.test.util.ui,
  org.mockito;provider=google;version="1.10.19",
  org.mockito.runners;provider=google;version="1.10.19",
  org.mockito.stubbing;provider=google;version="1.10.19",
diff --git a/plugins/com.google.cloud.tools.eclipse.ui.util.test/src/com/google/cloud/tools/eclipse/ui/util/FontUtilTest.java b/plugins/com.google.cloud.tools.eclipse.ui.util.test/src/com/google/cloud/tools/eclipse/ui/util/FontUtilTest.java
@@ -20,18 +20,20 @@
 import static org.hamcrest.CoreMatchers.not;
 import static org.junit.Assert.assertThat;
 
+import com.google.cloud.tools.eclipse.test.util.ui.ShellTestResource;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.FontData;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
+import org.junit.Rule;
 import org.junit.Test;
 
 public class FontUtilTest {
 
+  @Rule public ShellTestResource shellTestResource = new ShellTestResource();
+  
   @Test
   public void testConvertFontToBold() {
-    Shell shell = new Shell();
-    Label label = new Label(shell, SWT.NONE);
+    Label label = new Label(shellTestResource.getShell(), SWT.NONE);
     for (FontData fontData : label.getFont().getFontData()) {
       assertThat(fontData.getStyle(), is(not(SWT.BOLD)));
     }
@@ -41,4 +43,15 @@ public void testConvertFontToBold() {
     }
   }
 
+  @Test
+  public void testConvertFontToItalic() {
+    Label label = new Label(shellTestResource.getShell(), SWT.NONE);
+    for (FontData fontData : label.getFont().getFontData()) {
+      assertThat(fontData.getStyle(), is(not(SWT.ITALIC)));
+    }
+    FontUtil.convertFontToItalic(label);
+    for (FontData fontData : label.getFont().getFontData()) {
+      assertThat(fontData.getStyle(), is(SWT.ITALIC));
+    }
+  }
 }
diff --git a/plugins/com.google.cloud.tools.eclipse.ui.util.test/src/com/google/cloud/tools/eclipse/ui/util/images/SharedImagesTest.java b/plugins/com.google.cloud.tools.eclipse.ui.util.test/src/com/google/cloud/tools/eclipse/ui/util/images/SharedImagesTest.java
@@ -0,0 +1,34 @@
+/*
+* Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.tools.eclipse.ui.util.images;
+
+import static org.junit.Assert.assertNotNull;
+
+import com.google.cloud.tools.eclipse.test.util.ui.ShellTestResource;
+import org.junit.Rule;
+import org.junit.Test;
+
+public class SharedImagesTest {
+
+  @Rule public ShellTestResource shell = new ShellTestResource();
+
+  @Test
+  public void testCreateRefreshIcon() {
+    assertNotNull(SharedImages.createRefreshIcon(shell.getDisplay()));
+  }
+
+}
diff --git a/plugins/com.google.cloud.tools.eclipse.ui.util/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.ui.util/META-INF/MANIFEST.MF
@@ -9,7 +9,8 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.ui.workbench,
- org.eclipse.ui
+ org.eclipse.ui,
+ org.eclipse.search
 Import-Package: com.google.cloud.tools.eclipse.ui.util,
  com.google.cloud.tools.eclipse.util,
  com.google.cloud.tools.eclipse.util.status,
@@ -40,4 +41,5 @@ Import-Package: com.google.cloud.tools.eclipse.ui.util,
 Export-Package: com.google.cloud.tools.eclipse.ui.util,
  com.google.cloud.tools.eclipse.ui.util.console,
  com.google.cloud.tools.eclipse.ui.util.databinding,
- com.google.cloud.tools.eclipse.ui.util.event
+ com.google.cloud.tools.eclipse.ui.util.event,
+ com.google.cloud.tools.eclipse.ui.util.images
diff --git a/plugins/com.google.cloud.tools.eclipse.ui.util/src/com/google/cloud/tools/eclipse/ui/util/FontUtil.java b/plugins/com.google.cloud.tools.eclipse.ui.util/src/com/google/cloud/tools/eclipse/ui/util/FontUtil.java
diff --git a/plugins/com.google.cloud.tools.eclipse.ui.util/src/com/google/cloud/tools/eclipse/ui/util/images/SharedImages.java b/plugins/com.google.cloud.tools.eclipse.ui.util/src/com/google/cloud/tools/eclipse/ui/util/images/SharedImages.java

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+eclipse.preferences.version=1`
	`2`	`+encoding/<project>=UTF-8`