From 031b2ed1aae5d49a3b9a393a3d0dcc01b2bbe34a Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Mon, 5 Feb 2018 11:15:25 -0800 Subject: [PATCH] avoid <> for now until build changes made to jump to right java version --- .../ajdt/internal/compiler/lookup/EclipseFactory.java | 10 +++++----- .../ajdt/internal/compiler/lookup/EclipseScope.java | 4 ++-- .../compiler/lookup/InterTypeMemberFinder.java | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java index f52422ad5..062f04fd2 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java @@ -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 typexToBinding = new HashMap<>(); - private final Map rawTypeXToBinding = new HashMap<>(); + private final Map typexToBinding = new HashMap(); + private final Map rawTypeXToBinding = new HashMap(); // 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 typeVariableBindingsInProgress = new HashMap<>(); + private static Map typeVariableBindingsInProgress = new HashMap(); /** * 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 typeVariablesForThisMember = new HashMap<>(); + private final Map typeVariablesForThisMember = new HashMap(); /** * 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 typeVariableToTypeBinding = new HashMap<>(); + private final Map typeVariableToTypeBinding = new HashMap(); // /** // * Converts from an TypeVariableReference to a TypeVariableBinding. A TypeVariableReference diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java index 96659fbe3..2b3467ea3 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java @@ -157,8 +157,8 @@ public class EclipseScope implements IScope { if (importedNames != null) return; - List importedNamesList = new ArrayList<>(); - List importedPrefixesList = new ArrayList<>(); + List importedNamesList = new ArrayList(); + List importedPrefixesList = new ArrayList(); Scope currentScope = scope; // add any enclosing types to this list diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java index 19bea5bfc..8b4a917f8 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java @@ -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 interTypeFields = new ArrayList<>(); - private List interTypeMethods = new ArrayList<>(); + private List interTypeFields = new ArrayList(); + private List interTypeMethods = new ArrayList(); public SourceTypeBinding sourceTypeBinding; @@ -255,7 +255,7 @@ public class InterTypeMemberFinder implements IMemberFinder { MethodBinding[] orig = sourceTypeBinding.methodsBase(); // if (interTypeMethods.isEmpty()) return orig; - List ret = new ArrayList<>(Arrays.asList(orig)); + List ret = new ArrayList(Arrays.asList(orig)); for (int i = 0, len = interTypeMethods.size(); i < len; i++) { MethodBinding method = interTypeMethods.get(i); ret.add(method); -- 2.39.5