Merge with HEAD

Author: briandealwis

build/jacoco/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

build/jacoco/.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

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");

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,

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();
   }
 

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

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

@@ -79,7 +79,7 @@
         point="org.eclipse.ui.menus">
      <menuContribution
            allPopups="false"
-           locationURI="menu:com.google.cloud.tools.eclipse.appengine.actions.new">
+           locationURI="menu:com.google.cloud.tools.eclipse.appengine.actions.new?after=com.google.cloud.tools.eclipse.appengine.flexible">
         <command
               commandId="org.eclipse.ui.newWizard"
               style="push">

plugins/com.google.cloud.tools.eclipse.appengine.libraries.test/src/com/google/cloud/tools/eclipse/appengine/libraries/AppEngineLibrariesInPluginXmlTest.java

@@ -76,7 +76,7 @@ public void testAppEngineApiLibraryConfig() throws URISyntaxException {
     assertThat(mavenCoordinates.getRepository(), is("central"));
     assertThat(mavenCoordinates.getGroupId(), is("com.google.appengine"));
     assertThat(mavenCoordinates.getArtifactId(), is("appengine-api-1.0-sdk"));
-    assertThat(mavenCoordinates.getVersion(), is("LATEST"));
+    assertThat(mavenCoordinates.getVersion(), is("1.9.50"));
     assertThat(mavenCoordinates.getType(), is("jar"));
     assertNull(mavenCoordinates.getClassifier());
 
@@ -118,7 +118,7 @@ public void testEndpointsLibraryConfig() throws URISyntaxException {
     assertThat(mavenCoordinates.getRepository(), is("central"));
     assertThat(mavenCoordinates.getGroupId(), is("com.google.appengine"));
     assertThat(mavenCoordinates.getArtifactId(), is("appengine-endpoints"));
-    assertThat(mavenCoordinates.getVersion(), is("LATEST"));
+    assertThat(mavenCoordinates.getVersion(), is("1.9.50"));
     assertThat(mavenCoordinates.getType(), is("jar"));
     assertNull(mavenCoordinates.getClassifier());
     assertThat(libraryFile.getJavadocUri(), 
@@ -153,7 +153,7 @@ public void testObjectifyLibraryConfig() throws URISyntaxException {
     assertThat(objectifyMavenCoordinates.getRepository(), is("central"));
     assertThat(objectifyMavenCoordinates.getGroupId(), is("com.googlecode.objectify"));
     assertThat(objectifyMavenCoordinates.getArtifactId(), is("objectify"));
-    assertThat(objectifyMavenCoordinates.getVersion(), is("5.1.14"));
+    assertThat(objectifyMavenCoordinates.getVersion(), is("5.1.15"));
     assertThat(objectifyMavenCoordinates.getType(), is("jar"));
     assertNull(objectifyMavenCoordinates.getClassifier());
 
@@ -230,23 +230,37 @@ public void testJspApiLibraryConfig() throws URISyntaxException {
     assertNotNull(jspApiLibrary.getLibraryDependencies());
     assertTrue(jspApiLibrary.getLibraryDependencies().isEmpty());
 
-    assertThat(jspApiLibrary.getLibraryFiles().size(), is(1));
-    LibraryFile libraryFile = jspApiLibrary.getLibraryFiles().get(0);
-    assertThat(libraryFile.getJavadocUri(), is(new URI(
+    assertThat(jspApiLibrary.getLibraryFiles().size(), is(2));
+    LibraryFile jspApi = jspApiLibrary.getLibraryFiles().get(0);
+    assertThat(jspApi.getJavadocUri(), is(new URI(
         "http://docs.oracle.com/cd/E17802_01/products/products/jsp/2.1/docs/jsp-2_1-pfd2/")));
-    assertNull(libraryFile.getSourceUri());
+    assertNull(jspApi.getSourceUri());
 
-    assertNotNull(libraryFile.getMavenCoordinates());
-    MavenCoordinates mavenCoordinates = libraryFile.getMavenCoordinates();
+    assertNotNull(jspApi.getMavenCoordinates());
+    MavenCoordinates mavenCoordinates = jspApi.getMavenCoordinates();
     assertThat(mavenCoordinates.getRepository(), is("central"));
     assertThat(mavenCoordinates.getGroupId(), is("javax.servlet.jsp"));
     assertThat(mavenCoordinates.getArtifactId(), is("jsp-api"));
     assertThat(mavenCoordinates.getVersion(), is("2.1"));
     assertThat(mavenCoordinates.getType(), is("jar"));
     assertNull(mavenCoordinates.getClassifier());
 
-    assertNotNull(libraryFile.getFilters());
-    assertTrue(libraryFile.getFilters().isEmpty());
+    assertTrue(jspApi.getFilters().isEmpty());
+    
+    LibraryFile jstlApi = jspApiLibrary.getLibraryFiles().get(1);
+    assertThat(jstlApi.getJavadocUri(), is(new URI("https://jstl.java.net/")));
+    assertNull(jstlApi.getSourceUri());
+
+    assertNotNull(jstlApi.getMavenCoordinates());
+    MavenCoordinates jstlCoordinates = jstlApi.getMavenCoordinates();
+    assertThat(jstlCoordinates.getRepository(), is("central"));
+    assertThat(jstlCoordinates.getGroupId(), is("javax.servlet"));
+    assertThat(jstlCoordinates.getArtifactId(), is("jstl"));
+    assertThat(jstlCoordinates.getVersion(), is("1.2"));
+    assertThat(jstlCoordinates.getType(), is("jar"));
+    assertNull(jstlCoordinates.getClassifier());
+
+    assertTrue(jstlApi.getFilters().isEmpty());
   }
 
 }

plugins/com.google.cloud.tools.eclipse.appengine.libraries.test/src/com/google/cloud/tools/eclipse/appengine/libraries/PomTest.java

@@ -124,8 +124,6 @@ public void testAddDependencies()
     Assert.assertEquals("com.example.group3", groupId3.getTextContent());
     Element artifactId3 = getOnlyChild(child3, "artifactId");
     Assert.assertEquals("artifact3", artifactId3.getTextContent());
-    Element version3 = getOnlyChild(child3, "version");
-    Assert.assertEquals("LATEST", version3.getTextContent());
 
     // now make sure the comment didn't move to the end
     // https://bugs.openjdk.java.net/browse/JDK-8146163