]> source.dussan.org Git - aspectj.git/commitdiff
avoid <> for now until build changes made to jump to right java version V1_9_0_RC3
authorAndy Clement <aclement@pivotal.io>
Mon, 5 Feb 2018 19:15:25 +0000 (11:15 -0800)
committerAndy Clement <aclement@pivotal.io>
Mon, 5 Feb 2018 19:15:25 +0000 (11:15 -0800)
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java

index f52422ad5b0d97588bab45cc789a4074614f18ae..062f04fd2a0027ae79b12dc45bb67cc4046d8474 100644 (file)
@@ -95,8 +95,8 @@ public class EclipseFactory {
 
        // We can get clashes if we don't treat raw types differently - we end up looking
        // up a raw and getting the generic type (pr115788)
-       private final Map<UnresolvedType, TypeBinding> typexToBinding = new HashMap<>();
-       private final Map<UnresolvedType, TypeBinding> rawTypeXToBinding = new HashMap<>();
+       private final Map<UnresolvedType, TypeBinding> typexToBinding = new HashMap<UnresolvedType, TypeBinding>();
+       private final Map<UnresolvedType, TypeBinding> rawTypeXToBinding = new HashMap<UnresolvedType, TypeBinding>();
 
        // XXX currently unused
        // private Map/*TypeBinding, ResolvedType*/ bindingToResolvedTypeX = new HashMap();
@@ -361,7 +361,7 @@ public class EclipseFactory {
        /**
         * Some type variables refer to themselves recursively, this enables us to avoid recursion problems.
         */
-       private static Map<TypeVariableBinding,UnresolvedType> typeVariableBindingsInProgress = new HashMap<>();
+       private static Map<TypeVariableBinding,UnresolvedType> typeVariableBindingsInProgress = new HashMap<TypeVariableBinding,UnresolvedType>();
 
        /**
         * Convert from the eclipse form of type variable (TypeVariableBinding) to the AspectJ form (TypeVariable).
@@ -533,7 +533,7 @@ public class EclipseFactory {
         * Before converting the parts of a methodbinding (params, return type) we store the type variables in this structure, then
         * should any component of the method binding refer to them, we grab them from the map.
         */
-       private final Map<String,UnresolvedType> typeVariablesForThisMember = new HashMap<>();
+       private final Map<String,UnresolvedType> typeVariablesForThisMember = new HashMap<String, UnresolvedType>();
 
        /**
         * This is a map from typevariablebindings (eclipsey things) to the names the user originally specified in their ITD. For
@@ -1003,7 +1003,7 @@ public class EclipseFactory {
        // map back to the same type binding - this is important later when Eclipse code is processing
        // a methodbinding trying to come up with possible bindings for the type variables.
        // key is currently the name of the type variable...is that ok?
-       private final Map<String,TypeVariableBinding> typeVariableToTypeBinding = new HashMap<>();
+       private final Map<String,TypeVariableBinding> typeVariableToTypeBinding = new HashMap<String,TypeVariableBinding>();
 
        // /**
        // * Converts from an TypeVariableReference to a TypeVariableBinding. A TypeVariableReference
index 96659fbe3d1d46c85c10e2ca644bdea45f4e2b14..2b3467ea3676be7f8423980d58ea9950a55e65bf 100644 (file)
@@ -157,8 +157,8 @@ public class EclipseScope implements IScope {
                if (importedNames != null)
                        return;
 
-               List<String> importedNamesList = new ArrayList<>();
-               List<String> importedPrefixesList = new ArrayList<>();
+               List<String> importedNamesList = new ArrayList<String>();
+               List<String> importedPrefixesList = new ArrayList<String>();
 
                Scope currentScope = scope;
                // add any enclosing types to this list
index 19bea5bfc4e0b29b75899dea9fd00cdeae92921e..8b4a917f862440628853ad817b53d8cb5ebd62f6 100644 (file)
@@ -39,8 +39,8 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.TypeVariableBinding;
  * The member finder looks after intertype declared members on a type, there is one member finder per type that was hit by an ITD.
  */
 public class InterTypeMemberFinder implements IMemberFinder {
-       private List<FieldBinding> interTypeFields = new ArrayList<>();
-       private List<MethodBinding> interTypeMethods = new ArrayList<>();
+       private List<FieldBinding> interTypeFields = new ArrayList<FieldBinding>();
+       private List<MethodBinding> interTypeMethods = new ArrayList<MethodBinding>();
 
        public SourceTypeBinding sourceTypeBinding;
 
@@ -255,7 +255,7 @@ public class InterTypeMemberFinder implements IMemberFinder {
                MethodBinding[] orig = sourceTypeBinding.methodsBase();
                // if (interTypeMethods.isEmpty()) return orig;
 
-               List<MethodBinding> ret = new ArrayList<>(Arrays.asList(orig));
+               List<MethodBinding> ret = new ArrayList<MethodBinding>(Arrays.asList(orig));
                for (int i = 0, len = interTypeMethods.size(); i < len; i++) {
                        MethodBinding method = interTypeMethods.get(i);
                        ret.add(method);