Merge remote-tracking branch 'origin/master' into brandon-update

Conflicts:
	plugins/com.gwtplugins.gwt.eclipse.sdkbundle.gwt28/pom.xml

Author: branflake2267

README.md

@@ -65,6 +65,11 @@ Release update site.
 
 * [http://storage.googleapis.com/gwt-eclipse-plugin/v3/release](http://storage.googleapis.com/gwt-eclipse-plugin/v3/release)
 
+### Production Zip
+Download the repo in a zip file. 
+
+* [http://storage.googleapis.com/gwt-eclipse-plugin/v3/downloads/repo-3.0.0.zip](http://storage.googleapis.com/gwt-eclipse-plugin/v3/downloads/repo-3.0.0.zip)
+
 ### Snapshot
 Unstable update site
 

plugins/com.gwtplugins.gdt.eclipse.core/src/com/google/gdt/eclipse/core/JavaASTUtils.java

@@ -49,6 +49,7 @@
 import org.eclipse.jdt.core.dom.Type;
 import org.eclipse.jdt.core.dom.TypeDeclaration;
 import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
+import org.eclipse.jdt.internal.corext.dom.ASTNodes;
 import org.eclipse.jdt.internal.corext.dom.TypeBindingVisitor;
 import org.eclipse.jdt.internal.ui.text.correction.ASTResolving;
 
@@ -122,6 +123,7 @@ public static boolean containsTypeVariable(Type type) {
     final boolean[] containsTypeVariable = {false};
 
     ASTResolving.visitAllBindings(type, new TypeBindingVisitor() {
+      @Override
       public boolean visit(ITypeBinding visitedBinding) {
         if (visitedBinding.isTypeVariable()) {
           containsTypeVariable[0] = true;
@@ -262,6 +264,15 @@ public static TypeDeclaration findTypeDeclaration(IJavaProject javaProject,
     return null;
   }
 
+  public static ITypeBinding findTypeBinding(IType currentType) throws JavaModelException{
+    final ASTParser parser = ASTParser.newParser(AST.JLS3);
+    parser.setKind(ASTParser.K_COMPILATION_UNIT);
+    parser.setSource(currentType.getCompilationUnit());
+    parser.setResolveBindings(true);
+    CompilationUnit unit = (CompilationUnit) parser.createAST(null);
+    return ASTNodes.getTypeBinding(unit, currentType);
+  }
+
   /**
    * Identical to
    * {@link org.eclipse.jdt.internal.corext.dom.Bindings#findTypeInHierarchy(ITypeBinding, String)}

plugins/com.gwtplugins.gwt.eclipse.core/plugin.xml

@@ -299,7 +299,7 @@
    <extension
          point="org.eclipse.debug.ui.launchConfigurationTabGroups">
       <launchConfigurationTabGroup
-            class="com.google.gwt.eclipse.core.launch.ui.groups.GWTJUnitTabGroup"
+            class="com.google.gwt.eclipse.core.launch.ui.tab_groups.GWTJUnitTabGroup"
             helpContextId="org.eclipse.jdt.junit.junit_tab_group"
             id="com.gwtplugins.gwt.eclipse.core.launch.gwtJUnitTabGroup"
             type="com.gwtplugins.gwt.eclipse.core.launch.gwtJUnit">

plugins/com.gwtplugins.gwt.eclipse.core/src/com/google/gwt/eclipse/core/uibinder/UiBinderUtilities.java

@@ -33,8 +33,11 @@
 import org.eclipse.jdt.core.ITypeHierarchy;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.core.dom.FieldDeclaration;
+import org.eclipse.jdt.core.dom.IMethodBinding;
+import org.eclipse.jdt.core.dom.ITypeBinding;
 import org.eclipse.jdt.core.dom.MethodDeclaration;
 import org.eclipse.jdt.core.dom.Modifier;
+import org.eclipse.jdt.internal.corext.dom.Bindings;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.Region;
 
@@ -409,6 +412,16 @@ public static IType resolveJavaElExpression(IType contextType,
             currentType = fragmentType;
             continue;
           }
+
+          // Final attempt to resolve the type, this resolves the binding
+          // in the case of generics or parameterized types. Fixes issue 373
+          ITypeBinding binding = JavaASTUtils.findTypeBinding(currentType);
+          IMethodBinding methodBinding = Bindings.findMethodInHierarchy(binding,
+              fragment, new ITypeBinding[] {});
+          if(methodBinding.getReturnType() != null) {
+            currentType = fragmentType;
+            continue;
+          }
         }
       } catch (JavaModelException e) {
         // Ignore, and continue the search

plugins/com.gwtplugins.gwt.eclipse.sdkbundle.gwt28/pom.xml

@@ -31,7 +31,7 @@
               <url>https://goo.gl/pZZPXS</url> 
               <unpack>true</unpack>
               <overwrite>true</overwrite>
-              <outputFileName>${basedir}/gwt-2.8.2.zip</outputFileName>
+              <outputFileName>gwt-2.8.2.zip</outputFileName>
               <outputDirectory>${basedir}</outputDirectory>
             </configuration>
           </execution>