// 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();
/**
* 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).
* 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
// 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
* 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;
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);