Add Java version selector to new AES project wizard (#2139)

- extracted AppEngineRuntime enum as standalone, move to .appengine.ui
- moved LibrarySelectorGroup to .libraries.ui (and .test) and break cycles

Author: briandealwis

plugins/com.google.cloud.tools.eclipse.appengine.libraries.ui.test/META-INF/MANIFEST.MF

@@ -9,6 +9,9 @@ Bundle-Version: 0.1.0.qualifier
 Fragment-Host: com.google.cloud.tools.eclipse.appengine.libraries.ui
 Import-Package: com.google.cloud.tools.eclipse.appengine.libraries.ui,
  com.google.cloud.tools.eclipse.test.util,
+ com.google.cloud.tools.eclipse.test.util.ui,
+ org.eclipse.swtbot.swt.finder.widgets,
+ org.hamcrest;version="1.1.0",
  org.junit;version="4.12.0",
  org.mockito;provider=google;version="1.10.19",
  org.mockito.invocation;provider=google;version="1.10.19",

…AppEngineLibrariesSelectorGroupTest.java …AppEngineLibrariesSelectorGroupTest.javaplugins/com.google.cloud.tools.eclipse.appengine.ui.test/src/com/google/cloud/tools/eclipse/appengine/ui/AppEngineLibrariesSelectorGroupTest.java renamed to plugins/com.google.cloud.tools.eclipse.appengine.libraries.ui.test/src/com/google/cloud/tools/eclipse/appengine/libraries/ui/AppEngineLibrariesSelectorGroupTest.java plugins/com.google.cloud.tools.eclipse.appengine.ui.test/src/com/google/cloud/tools/eclipse/appengine/ui/AppEngineLibrariesSelectorGroupTest.java renamed to plugins/com.google.cloud.tools.eclipse.appengine.libraries.ui.test/src/com/google/cloud/tools/eclipse/appengine/libraries/ui/AppEngineLibrariesSelectorGroupTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.tools.eclipse.appengine.ui;
+package com.google.cloud.tools.eclipse.appengine.libraries.ui;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;

plugins/com.google.cloud.tools.eclipse.appengine.libraries.ui/META-INF/MANIFEST.MF

@@ -13,14 +13,17 @@ Import-Package: com.google.cloud.tools.eclipse.appengine.libraries,
  com.google.cloud.tools.eclipse.appengine.libraries.model,
  com.google.cloud.tools.eclipse.appengine.ui,
  com.google.cloud.tools.eclipse.util,
+ com.google.common.annotations;version="[20.0.0,21.0.0)",
  com.google.common.base,
  org.eclipse.core.resources,
  org.eclipse.core.runtime;version="3.5.0",
  org.eclipse.jdt.core,
  org.eclipse.jdt.ui.wizards,
  org.eclipse.jface.dialogs,
  org.eclipse.jface.layout,
+ org.eclipse.jface.viewers,
  org.eclipse.jface.wizard,
  org.eclipse.swt,
+ org.eclipse.swt.events,
  org.eclipse.swt.layout,
  org.eclipse.swt.widgets

plugins/com.google.cloud.tools.eclipse.appengine.libraries.ui/src/com/google/cloud/tools/eclipse/appengine/libraries/ui/CloudLibrariesPage.java

@@ -36,7 +36,6 @@
 import com.google.cloud.tools.eclipse.appengine.libraries.BuildPath;
 import com.google.cloud.tools.eclipse.appengine.libraries.model.Library;
 import com.google.cloud.tools.eclipse.appengine.ui.AppEngineImages;
-import com.google.cloud.tools.eclipse.appengine.ui.LibrarySelectorGroup;
 import com.google.cloud.tools.eclipse.util.MavenUtils;
 
 public abstract class CloudLibrariesPage extends WizardPage implements IClasspathContainerPage,

…e/appengine/ui/LibrarySelectorGroup.java …e/libraries/ui/LibrarySelectorGroup.javaplugins/com.google.cloud.tools.eclipse.appengine.ui/src/com/google/cloud/tools/eclipse/appengine/ui/LibrarySelectorGroup.java renamed to plugins/com.google.cloud.tools.eclipse.appengine.libraries.ui/src/com/google/cloud/tools/eclipse/appengine/libraries/ui/LibrarySelectorGroup.java plugins/com.google.cloud.tools.eclipse.appengine.ui/src/com/google/cloud/tools/eclipse/appengine/ui/LibrarySelectorGroup.java renamed to plugins/com.google.cloud.tools.eclipse.appengine.libraries.ui/src/com/google/cloud/tools/eclipse/appengine/libraries/ui/LibrarySelectorGroup.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.tools.eclipse.appengine.ui;
+package com.google.cloud.tools.eclipse.appengine.libraries.ui;
 
 import com.google.cloud.tools.eclipse.appengine.libraries.model.CloudLibraries;
 import com.google.cloud.tools.eclipse.appengine.libraries.model.Library;
@@ -71,7 +71,7 @@ public LibrarySelectorGroup(Composite parentContainer, String groupName) {
 
   private void createContents(Composite parentContainer) {
     Group apiGroup = new Group(parentContainer, SWT.NONE);
-    apiGroup.setText(Messages.getString("appengine.libraries.group"));
+    apiGroup.setText(Messages.getString("appengine.libraries.group")); //$NON-NLS-1$
 
     for (Library library : availableLibraries.values()) {
       Button libraryButton = new Button(apiGroup, SWT.CHECK);

plugins/com.google.cloud.tools.eclipse.appengine.libraries.ui/src/com/google/cloud/tools/eclipse/appengine/libraries/ui/messages.properties

@@ -2,3 +2,5 @@ appengine-title=App Engine Standard Environment Libraries
 appengine-description=Additional jars commonly used in App Engine standard environment applications
 clientapis-title=Google Client APIs for Java
 clientapis-description=Additional jars used by Google Client APIs for Java
+
+appengine.libraries.group=Libraries to add to build path

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

@@ -16,7 +16,8 @@ Require-Bundle: org.eclipse.equinox.common,
 Export-Package: com.google.cloud.tools.eclipse.appengine.libraries,
  com.google.cloud.tools.eclipse.appengine.libraries.model,
  com.google.cloud.tools.eclipse.appengine.libraries.repository
-Import-Package: com.google.cloud.tools.eclipse.util,
+Import-Package: com.google.cloud.tools.eclipse.appengine.ui,
+ com.google.cloud.tools.eclipse.util,
  com.google.cloud.tools.eclipse.util.io,
  com.google.cloud.tools.eclipse.util.service,
  com.google.cloud.tools.eclipse.util.status,

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

@@ -17,6 +17,7 @@
 package com.google.cloud.tools.eclipse.appengine.libraries;
 
 import com.google.cloud.tools.eclipse.appengine.libraries.model.Library;
+import com.google.cloud.tools.eclipse.appengine.ui.AppEngineRuntime;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -30,10 +31,6 @@
  */
 public interface ILibraryClasspathContainerResolverService {
 
-  enum AppEngineRuntime {
-    STANDARD_JAVA_7
-  }
-
   /**
    * Resolves all {@link LibraryClasspathContainer}s found on the classpath of
    * <code>javaProject</code>. Source attachment for the resolved libraries will happen

plugins/com.google.cloud.tools.eclipse.appengine.libraries/src/com/google/cloud/tools/eclipse/appengine/libraries/repository/LibraryClasspathContainerResolverService.java

@@ -25,6 +25,7 @@
 import com.google.cloud.tools.eclipse.appengine.libraries.model.Library;
 import com.google.cloud.tools.eclipse.appengine.libraries.model.LibraryFile;
 import com.google.cloud.tools.eclipse.appengine.libraries.persistence.LibraryClasspathContainerSerializer;
+import com.google.cloud.tools.eclipse.appengine.ui.AppEngineRuntime;
 import com.google.cloud.tools.eclipse.util.status.StatusUtil;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;

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

@@ -56,6 +56,13 @@ public void testServiceName() {
     Assert.assertEquals("foobar", config.getServiceName());
   }
 
+  @Test
+  public void testRuntime() {
+    Assert.assertNull(config.getRuntimeId());
+    config.setRuntimeId("foobar");
+    Assert.assertEquals("foobar", config.getRuntimeId());
+  }
+
   @Test
   public void testEclipseProjectLocationUri() throws URISyntaxException {
     config.setEclipseProjectLocationUri(new URI("file://foo/bar"));