Clean-up some warnings
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java
index acdc1b5..916382a 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java
@@ -9110,7 +9110,7 @@
 			int length = method.parameters.length;
   :giro */
 			int length = method.getSourceParamLength();
-			int offset = method.parameters.length - length;
+			int parameterOffset = method.parameters.length - length;
 // SH}
 			char[][] parameterPackageNames = new char[length][];
 			char[][] parameterTypeNames = new char[length][];
@@ -9119,7 +9119,7 @@
 /* orig:
 				for (int i = 0; i < length; i++) {
   :giro */
-				for (int i = offset; i < length; i++) {
+				for (int i = parameterOffset; i < length; i++) {
 // SH}
 					TypeBinding type = method.original().parameters[i];
 					parameterPackageNames[i] = type.qualifiedPackageName();
@@ -9129,7 +9129,7 @@
 /* orig:
 			char[][] parameterNames = findMethodParameterNames(method,parameterTypeNames);
   :giro */
-			char[][] parameterNames = findMethodParameterNames(method,offset,parameterTypeNames);
+			char[][] parameterNames = findMethodParameterNames(method,parameterOffset,parameterTypeNames);
 // SH}
 
 			char[] completion = CharOperation.NO_CHAR;
@@ -10484,10 +10484,10 @@
 	
 	private char[][] findMethodParameterNames(MethodBinding method, char[][] parameterTypeNames){
 //{ObjectTeams: added arg offset:
-		return findMethodParameterNames(method, /*offset*/0, parameterTypeNames);
+		return findMethodParameterNames(method, /*parameterOffset*/0, parameterTypeNames);
 	}
 
-	private char[][] findMethodParameterNames(MethodBinding method, int offset, char[][] parameterTypeNames){
+	private char[][] findMethodParameterNames(MethodBinding method, int parameterOffset, char[][] parameterTypeNames){
 // SH}
 		TypeBinding erasure =  method.declaringClass.erasure();
 		if(!(erasure instanceof ReferenceBinding)) return null;
@@ -10518,7 +10518,7 @@
 /* orig:
 							parameterNames[i] = arguments[i].name;
   :giro */
-							parameterNames[i] = stripOTPrefix(arguments[i+offset].name);
+							parameterNames[i] = stripOTPrefix(arguments[i+parameterOffset].name);
 // carp+SH}
 						}
 					}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionParser.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionParser.java
index a1804ae..79f6922 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionParser.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionParser.java
@@ -1482,11 +1482,11 @@
 @Override
 protected char[] getIdentifier() {
 	int assistIdentifierPtr = indexOfAssistIdentifier();
-	char[] name= super.getIdentifier();
+	char[] identifier= super.getIdentifier();
 	if (assistIdentifierPtr >= 0) {
-		this.currentIdentifier = name;
+		this.currentIdentifier = identifier;
 	}
-	return name;
+	return identifier;
 }
 // SH}
 public void initializeScanner(){
@@ -1721,12 +1721,12 @@
 	}
 	/* create specialized node */
 	@Override
-	protected FieldAccessSpec newFieldAccessSpec(char[] ident, long poss, TypeReference type, int modifiers)
+	protected FieldAccessSpec newFieldAccessSpec(char[] ident, long poss, TypeReference type, int accessorModifiers)
 	{
 		/* no need to take action if not inside assist identifiers */
 		if (assistIdentifier() != ident)
-			return super.newFieldAccessSpec(ident, poss, type, modifiers);
-		FieldAccessSpec spec = new SelectionOnFieldAccessSpec(ident, type, poss, modifiers);
+			return super.newFieldAccessSpec(ident, poss, type, accessorModifiers);
+		FieldAccessSpec spec = new SelectionOnFieldAccessSpec(ident, type, poss, accessorModifiers);
 		this.assistNode = spec;
 		return spec;
 	}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/JavadocMessageSend.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/JavadocMessageSend.java
index ec65a8e..7b144aa 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/JavadocMessageSend.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/JavadocMessageSend.java
@@ -110,7 +110,7 @@
 		AnchorMapping.removeCurrentMapping(anchorMapping);
 	  }
 	  // only on normal exit of the previous block:
-	  afterMethodLookup(scope, anchorMapping, argumentTypes, this.binding.returnType);
+	  afterMethodLookup(scope, anchorMapping, this.argumentTypes, this.binding.returnType);
 // jwl}
 		if (!this.binding.isValidBinding()) {
 			// Try method in enclosing types
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/FieldInfo.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/FieldInfo.java
index b97bb09..bc567bb 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/FieldInfo.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/FieldInfo.java
@@ -430,8 +430,8 @@
 			char[] attributeName,
 			FieldInfo info,
 			int readOffset,
-			int structOffset,
-			int[] constantPoolOffsets)
+			int aStructOffset,
+			int[] someConstantPoolOffsets)
 	{
         if (CharOperation.equals(attributeName, IOTConstants.MODIFIERS_NAME))
         {
@@ -441,12 +441,12 @@
         else if (CharOperation.equals(attributeName, IOTConstants.FIELD_TYPE_ANCHOR))
         {
             this.fieldAttributes.add(SingleValueAttribute.readFieldTypeAnchor(
-            		info, readOffset, structOffset, constantPoolOffsets));
+            		info, readOffset, aStructOffset, someConstantPoolOffsets));
         }
         else if (CharOperation.equals(attributeName, IOTConstants.ANCHOR_USAGE_RANKS))
         {
             this.fieldAttributes.add(new AnchorUsageRanksAttribute(
-            		info, readOffset, structOffset, constantPoolOffsets));
+            		info, readOffset, aStructOffset, someConstantPoolOffsets));
         }
 	}
 	public void evaluateOTAttributes(FieldBinding fieldBinding) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/MethodInfo.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/MethodInfo.java
index b47a87f..4e2724d 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/MethodInfo.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/MethodInfo.java
@@ -548,15 +548,15 @@
      * @param attributeName
      * @param info         method info to which attribute applies.
      * @param readOffset
-     * @param structOffset (subtract when indexing via constantPoolOffsets)
-     * @param constantPoolOffsets
+     * @param aStructOffset (subtract when indexing via constantPoolOffsets)
+     * @param someConstantPoolOffsets
      */
     void readOTAttribute(
             char[]     attributeName,
             MethodInfo info,
             int        readOffset,
-            int        structOffset,
-            int[]      constantPoolOffsets)
+            int        aStructOffset,
+            int[]      someConstantPoolOffsets)
     {
     	if (CharOperation.equals(attributeName, AttributeNamesConstants.CodeName))
     		return; // optimization only.
@@ -581,11 +581,11 @@
         }
         else if (CharOperation.equals(attributeName, TYPE_ANCHOR_LIST))
         {
-            this.methodAttributes.add(new AnchorListAttribute(info, readOffset, structOffset, constantPoolOffsets));
+            this.methodAttributes.add(new AnchorListAttribute(info, readOffset, aStructOffset, someConstantPoolOffsets));
         }
         else if (CharOperation.equals(attributeName, COPY_INHERITANCE_SOURCE_NAME))
         {
-            this.methodAttributes.add(CopyInheritanceSourceAttribute.readcopyInherSrc(info, readOffset, structOffset, constantPoolOffsets));
+            this.methodAttributes.add(CopyInheritanceSourceAttribute.readcopyInherSrc(info, readOffset, aStructOffset, someConstantPoolOffsets));
         }
     }
 
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
index 4ba4815..549f674 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
@@ -2088,11 +2088,11 @@
 			}
 		}
 		if ((optionValue = optionsMap.get(OPTION_Decapsulation)) != null) {
-			this.decapsulation = (String)optionValue;
+			this.decapsulation = optionValue;
 		}
 		if ((optionValue = optionsMap.get(OPTION_WeavingScheme)) != null) {
 			try {
-				this.weavingScheme = WeavingScheme.valueOf((String)optionValue);
+				this.weavingScheme = WeavingScheme.valueOf(optionValue);
 			} catch (IllegalArgumentException iae) {
 				// ignore illegal value
 			}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java
index c6f6837..430496b 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java
@@ -922,13 +922,13 @@
         		}
         		@Override
         		public Object[] getEmulationPath(ReferenceBinding targetEnclosingType, boolean onlyExactMatch, boolean denyEnclosingArgInConstructorCall) {
-        			Scope parent = this.parent;
+        			Scope parentSave = this.parent;
         			try {
         				this.parent = ClassScope.this;
         				return super.getEmulationPath(targetEnclosingType, onlyExactMatch,
         					denyEnclosingArgInConstructorCall);
         			} finally {
-        				this.parent = parent;
+        				this.parent = parentSave;
         			}
         		}
         	};
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodBinding.java
index cde20e6..12067e0 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodBinding.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodBinding.java
@@ -1022,11 +1022,11 @@
 		sig.append(this.parameters[i].genericTypeSignature());
 	}
   :giro */
-	TypeBinding[] parameters = retrenchCallin
+	TypeBinding[] visibleParameters = retrenchCallin
 								? getSourceParameters()
 								: this.parameters;
-	for (int i = 0, length = parameters.length; i < length; i++) {
-		sig.append(parameters[i].genericTypeSignature());
+	for (int i = 0, length = visibleParameters.length; i < length; i++) {
+		sig.append(visibleParameters[i].genericTypeSignature());
 	}
 // SH}
 	sig.append(')');
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java
index bb9e35f..c652428 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java
@@ -3176,7 +3176,7 @@
 }
 public void removeMethod(MethodBinding method) {
 	int length = this.methods.length;
-	MethodBinding[] methods = new MethodBinding[length - 1];
+	MethodBinding[] newMethods = new MethodBinding[length - 1];
 	int pos = -1;
 	if (this.methods != null) {
 	    for (int i = 0; i < this.methods.length; i++) {
@@ -3187,12 +3187,12 @@
 		}
 	}
 	if (pos >= 0) {
-	    System.arraycopy(this.methods, 0, methods, 0, pos);
+	    System.arraycopy(this.methods, 0, newMethods, 0, pos);
 	    System.arraycopy(
 	        this.methods, pos + 1,
-	        methods,      pos,
+	        newMethods,      pos,
 	        length - (pos + 1));
-	    this.methods = methods;
+	    this.methods = newMethods;
 	}
 }
 
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/bytecode/AnchorUsageRanksAttribute.java b/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/bytecode/AnchorUsageRanksAttribute.java
index 1d28020..aa9e0a9 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/bytecode/AnchorUsageRanksAttribute.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/bytecode/AnchorUsageRanksAttribute.java
@@ -97,10 +97,10 @@
 
 	/** Retrieve the array of ranks as read from bytecode. */
 	public int[] getRanks() {
-		int[] ranks = new int[this._count];
+		int[] newRanks = new int[this._count];
 		for (int i=0; i<this._count; i++)
-			ranks[i] = this.ranks.get(i);
-		return ranks;
+			newRanks[i] = this.ranks.get(i);
+		return newRanks;
 	}
 
 	String toString(int i) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/bytecode/ConstantPoolObjectReader.java b/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/bytecode/ConstantPoolObjectReader.java
index 68e9851..3666a28 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/bytecode/ConstantPoolObjectReader.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/bytecode/ConstantPoolObjectReader.java
@@ -32,8 +32,8 @@
 import org.eclipse.jdt.core.compiler.CharOperation;
 import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
 import org.eclipse.jdt.internal.compiler.classfmt.ClassFileStruct;
-import org.eclipse.jdt.internal.compiler.classfmt.TypeAnnotationWalker;
 import org.eclipse.jdt.internal.compiler.codegen.ConstantPool;
+import org.eclipse.jdt.internal.compiler.env.ITypeAnnotationWalker;
 import org.eclipse.jdt.internal.compiler.impl.Constant;
 import org.eclipse.jdt.internal.compiler.lookup.ArrayBinding;
 import org.eclipse.jdt.internal.compiler.lookup.BinaryTypeBinding;
@@ -151,10 +151,10 @@
         char[] typeName = getUtf8(ref);
         if (useGenerics)
         	return this._environment.getTypeFromTypeSignature(
-        				new SignatureWrapper(typeName), Binding.NO_TYPE_VARIABLES, this._srcModel.getBinding(), null, TypeAnnotationWalker.EMPTY_ANNOTATION_WALKER); // no missing type info available
+        				new SignatureWrapper(typeName), Binding.NO_TYPE_VARIABLES, this._srcModel.getBinding(), null, ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER); // no missing type info available
         else
         	return this._environment.getTypeFromSignature(
-        				typeName, 0, typeName.length-1, false/*GENERIC*/, this._srcModel.getBinding(), null, TypeAnnotationWalker.EMPTY_ANNOTATION_WALKER); // no missing type info available
+        				typeName, 0, typeName.length-1, false/*GENERIC*/, this._srcModel.getBinding(), null, ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER); // no missing type info available
     }
 
 	private int getInteger(int index){
@@ -212,7 +212,7 @@
 
 		// follows: decoding of array, leaf component type needs 'L' for reference bindings:
 		TypeBinding typeBinding = this._environment.getTypeFromSignature(name_str, 0, -1, false, this._srcModel.getBinding(),
-																			null, TypeAnnotationWalker.EMPTY_ANNOTATION_WALKER);
+																			null, ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER);
 		if (!typeBinding.leafComponentType().isBaseType()) {
 			ReferenceBinding referenceBinding = (ReferenceBinding)typeBinding.leafComponentType();
 			if (referenceBinding instanceof UnresolvedReferenceBinding) {
@@ -555,7 +555,7 @@
 
 				if (i >= startIndex)   // skip the synthetic arg if necessary
 					parameters[i - startIndex] = this._environment.getTypeFromSignature(methodSignature, index, end, false/*GENERIC*/, this._srcModel.getBinding(),
-																						null, TypeAnnotationWalker.EMPTY_ANNOTATION_WALKER); // no missing type info available
+																						null, ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER); // no missing type info available
 				index = end + 1;
 			}
 		}
@@ -563,7 +563,7 @@
 				methodModifiers,
 				methodSelector,
 				this._environment.getTypeFromSignature(methodSignature, index + 1, -1, false/*GENERIC*/, this._srcModel.getBinding(),   // index is currently pointing at the ')'
-														null, TypeAnnotationWalker.EMPTY_ANNOTATION_WALKER),
+														null, ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER),
 				parameters,
 				Binding.NO_EXCEPTIONS,
 				declaringClass);
@@ -687,9 +687,9 @@
 			}
 			if (separatorPosMethod > 0 && separatorPosDescriptor > 0) {
 				TypeBinding type1 = this._environment.getTypeFromSignature(signature, 1, separatorPosMethod, false/*GENERIC*/, this._srcModel.getBinding(),
-																			null, TypeAnnotationWalker.EMPTY_ANNOTATION_WALKER);
+																			null, ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER);
 				TypeBinding type2 = this._environment.getTypeFromSignature(descriptor, 1, separatorPosDescriptor, false/*GENERIC*/, this._srcModel.getBinding(),
-																			null, TypeAnnotationWalker.EMPTY_ANNOTATION_WALKER);
+																			null, ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER);
 				if (!type1.isTeam() || !type2.isTeam())
 					return false;
 				if (!type1.isCompatibleWith(type2))
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/lookup/CallinCalloutBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/lookup/CallinCalloutBinding.java
index af980fe..8f86a69 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/lookup/CallinCalloutBinding.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/lookup/CallinCalloutBinding.java
@@ -297,11 +297,11 @@
 
 	/** Answer the name of this callin qualified with the declaring class's name. */
 	public char[] getQualifiedName() {
-		char[] name = this.name;
-		if (name[0] == '<')
-			return name; // synthetic name is already unique.
+		char[] theName = this.name;
+		if (theName[0] == '<')
+			return theName; // synthetic name is already unique.
 		ReferenceBinding currentType = this._declaringRoleClass;
-		return CharOperation.concat(name, currentType.readableName(), '$');
+		return CharOperation.concat(theName, currentType.readableName(), '$');
 	}
 	/**
 	 * Answer the name of the role that introduced this callin mapping 
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/mappings/MethodMappingImplementor.java b/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/mappings/MethodMappingImplementor.java
index 297ca25..1566b93 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/mappings/MethodMappingImplementor.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/mappings/MethodMappingImplementor.java
@@ -99,7 +99,7 @@
 	 * @param sourceMethodSpec <ul>
 	 * 			<li>look here for param-positions (see AbstractMethodMappingDeclaration.positions)
 	 * 			<li>and check the need of lifting.</ul>
-	 * @param isFieldAccess
+	 * @param baseFieldSpec
 	 * 			if we don't call a method but access a field
 	 * 			which is emulated by a static base method.
 	 * @param hasResultArgument
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/MethodMappingElement.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/MethodMappingElement.java
index dfbb9be..7ac2491 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/MethodMappingElement.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/MethodMappingElement.java
@@ -82,7 +82,7 @@
 	 *
 	 * @return the property descriptor
 	 */
-	static final SimplePropertyDescriptor internalSignaturePropertyFactory(Class nodeClass) {
+	static final SimplePropertyDescriptor internalSignaturePropertyFactory(Class<?> nodeClass) {
 		return new SimplePropertyDescriptor(nodeClass, "signature", boolean.class, MANDATORY); //$NON-NLS-1$
 	}
 
@@ -92,7 +92,7 @@
 	 *
 	 * @return the property descriptor
 	 */
-	static final ChildPropertyDescriptor internalNamePropertyFactory(Class nodeClass) {
+	static final ChildPropertyDescriptor internalNamePropertyFactory(Class<?> nodeClass) {
 		return new ChildPropertyDescriptor(nodeClass, "name", SimpleName.class, MANDATORY, NO_CYCLE_RISK); //$NON-NLS-1$
 	}
 
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ParameterMapping.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ParameterMapping.java
index bc6044b..2a4e5a8 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ParameterMapping.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ParameterMapping.java
@@ -41,6 +41,7 @@
  *
  * @author ike
  */
+@SuppressWarnings("rawtypes")
 public class ParameterMapping extends Expression
 {
 	/**
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ParameterizedType.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ParameterizedType.java
index b770069..5cf63ff 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ParameterizedType.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ParameterizedType.java
@@ -266,9 +266,9 @@
 	}
 	public String[] getAnchorPath() {
 		if (this.typeArguments.listSize() > 0) {
-			Type type = (Type)this.typeArguments.get(0);
-			if (type.getNodeType() == ASTNode.TYPE_ANCHOR)
-				return ((TypeAnchor)type).getPath().getFullyQualifiedName().split("."); //$NON-NLS-1$
+			Type typeArgument = (Type)this.typeArguments.get(0);
+			if (typeArgument.getNodeType() == ASTNode.TYPE_ANCHOR)
+				return ((TypeAnchor)typeArgument).getPath().getFullyQualifiedName().split("."); //$NON-NLS-1$
 		}
 		return new String[0];
 	}
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/RoleTypeDeclaration.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/RoleTypeDeclaration.java
index 23b116f..bce56b5 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/RoleTypeDeclaration.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/RoleTypeDeclaration.java
@@ -283,7 +283,6 @@
      * {@link StructuralPropertyDescriptor})
      * @since 3.0
      */
-    @SuppressWarnings("rawtypes")
 	public static List propertyDescriptors(int apiLevel)
     {
         if (apiLevel == AST.JLS2_INTERNAL)
@@ -347,7 +346,6 @@
      * Method declared on ASTNode.
      * @since 3.0
      */
-    @SuppressWarnings("rawtypes")
 	final List internalStructuralPropertiesForType(int apiLevel)
     {
         return propertyDescriptors(apiLevel);
@@ -528,7 +526,6 @@
     /* (omit javadoc for this method)
      * Method declared on ASTNode.
      */
-    @SuppressWarnings("rawtypes")
 	final List internalGetChildListProperty(ChildListPropertyDescriptor property)
     {
         if (property == MODIFIERS2_PROPERTY)
@@ -619,7 +616,6 @@
     /* (omit javadoc for this method)
      * Method declared on ASTNode.
      */
-    @SuppressWarnings("unchecked")
 	ASTNode clone0(AST target)
     {
         RoleTypeDeclaration result = new RoleTypeDeclaration(target);
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TSuperConstructorInvocation.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TSuperConstructorInvocation.java
index 3bc6883..c66ac32 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TSuperConstructorInvocation.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TSuperConstructorInvocation.java
@@ -112,19 +112,16 @@
      * @return the live list of argument expressions
      *    (element type: <code>Expression</code>)
      */
-    @SuppressWarnings("rawtypes")
 	public List getArguments()
     {
         return this.arguments;
     }
 
-    @SuppressWarnings("rawtypes")
 	final List internalStructuralPropertiesForType(int apiLevel)
     {
         return propertyDescriptors(apiLevel);
     }
 
-    @SuppressWarnings("rawtypes")
 	final List internalGetChildListProperty(ChildListPropertyDescriptor property)
     {
         if (property == ARGUMENTS_PROPERTY)
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TSuperMessageSend.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TSuperMessageSend.java
index 8c17d07..b319302 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TSuperMessageSend.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TSuperMessageSend.java
@@ -137,7 +137,6 @@
 		return ARGUMENTS_PROPERTY;
 	}
 
-	@SuppressWarnings("rawtypes")
 	final List internalStructuralPropertiesForType(int apiLevel)
 	{
 		return propertyDescriptors(apiLevel);
@@ -174,7 +173,6 @@
         return super.internalGetSetChildProperty(property, get, child);
     }
 
-    @SuppressWarnings("rawtypes")
 	final List internalGetChildListProperty(ChildListPropertyDescriptor property)
     {
         if (property == ARGUMENTS_PROPERTY)
@@ -255,7 +253,6 @@
      * @return the live list of argument expressions
      *    (element type: <code>Expression</code>)
      */
-    @SuppressWarnings("rawtypes")
 	public List getArguments()
     {
         return this.arguments;
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TypeAnchor.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TypeAnchor.java
index c83dc6d..0c7dfd5 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TypeAnchor.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TypeAnchor.java
@@ -91,7 +91,6 @@
 		super(ast);
 	}
 
-	@SuppressWarnings("rawtypes")
 	@Override
 	final List internalStructuralPropertiesForType(int apiLevel)
 	{
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/WithinStatement.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/WithinStatement.java
index 7a02188..8063cd5 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/WithinStatement.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/WithinStatement.java
@@ -115,7 +115,6 @@
         super(ast);
     }
 
-    @SuppressWarnings("rawtypes")
 	List internalStructuralPropertiesForType(int apiLevel)
     {
         return propertyDescriptors(apiLevel);
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/NaiveASTFlattener.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/NaiveASTFlattener.java
index ec61e16..1bf80f5 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/NaiveASTFlattener.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/NaiveASTFlattener.java
@@ -2343,9 +2343,9 @@
 		}
 		this.buffer.append(" ");//$NON-NLS-1$
 		if (node.getAST().apiLevel() == JLS2) {
-			if (this.getSuperclass(node) != null) {
+			if (getSuperclass(node) != null) {
 				this.buffer.append("extends ");//$NON-NLS-1$
-				this.getSuperclass(node).accept(this);
+				getSuperclass(node).accept(this);
 				this.buffer.append(" ");//$NON-NLS-1$
 			}
 			if (!this.superInterfaces(node).isEmpty()) {
diff --git a/org.eclipse.jdt.core/model/org/eclipse/objectteams/otdt/internal/core/OTJavaElement.java b/org.eclipse.jdt.core/model/org/eclipse/objectteams/otdt/internal/core/OTJavaElement.java
index 191e3fa..6c4226f 100644
--- a/org.eclipse.jdt.core/model/org/eclipse/objectteams/otdt/internal/core/OTJavaElement.java
+++ b/org.eclipse.jdt.core/model/org/eclipse/objectteams/otdt/internal/core/OTJavaElement.java
@@ -267,10 +267,10 @@
         return this.correspondingJavaElem.isStructureKnown();
     }
     
-	@Override @SuppressWarnings("rawtypes")
-    public Object getAdapter(Class adapter)
+    @Override
+    public <T> T getAdapter(Class<T> adapter)
     {
-    	Object result = super.getAdapter(adapter);
+    	T result = super.getAdapter(adapter);
     	if (result == null)
     		result = this.correspondingJavaElem.getAdapter(adapter);
     	
diff --git a/org.eclipse.jdt.core/model/org/eclipse/objectteams/otdt/internal/core/OTType.java b/org.eclipse.jdt.core/model/org/eclipse/objectteams/otdt/internal/core/OTType.java
index e8be804..361cea9 100644
--- a/org.eclipse.jdt.core/model/org/eclipse/objectteams/otdt/internal/core/OTType.java
+++ b/org.eclipse.jdt.core/model/org/eclipse/objectteams/otdt/internal/core/OTType.java
@@ -99,10 +99,10 @@
 	 */
 	public IResource getCorrespondingResource() throws JavaModelException
 	{
-		IJavaElement parent = getCorrespondingJavaElement().getParent();
-		if (parent instanceof ICompilationUnit)
+		IJavaElement javaParent = getCorrespondingJavaElement().getParent();
+		if (javaParent instanceof ICompilationUnit)
 		{
-			return ((ICompilationUnit)parent).getCorrespondingResource();
+			return ((ICompilationUnit)javaParent).getCorrespondingResource();
 		}
 		
 		return null;
diff --git a/org.eclipse.jdt.core/model/org/eclipse/objectteams/otdt/internal/core/PhantomType.java b/org.eclipse.jdt.core/model/org/eclipse/objectteams/otdt/internal/core/PhantomType.java
index 9b3a8bc..0405060 100644
--- a/org.eclipse.jdt.core/model/org/eclipse/objectteams/otdt/internal/core/PhantomType.java
+++ b/org.eclipse.jdt.core/model/org/eclipse/objectteams/otdt/internal/core/PhantomType.java
@@ -871,8 +871,7 @@
     /* (non-Javadoc)

      * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)

      */

-    @SuppressWarnings("rawtypes")
-	public Object getAdapter(Class adapter)

+	public <T> T getAdapter(Class<T> adapter)

     {

         return this._realType.getAdapter(adapter);

     }

diff --git a/org.eclipse.jdt.core/model/org/eclipse/objectteams/otdt/internal/core/builder/OTJIncrementalImageBuilder.java b/org.eclipse.jdt.core/model/org/eclipse/objectteams/otdt/internal/core/builder/OTJIncrementalImageBuilder.java
index 4275343..1a61ee3 100644
--- a/org.eclipse.jdt.core/model/org/eclipse/objectteams/otdt/internal/core/builder/OTJIncrementalImageBuilder.java
+++ b/org.eclipse.jdt.core/model/org/eclipse/objectteams/otdt/internal/core/builder/OTJIncrementalImageBuilder.java
@@ -39,7 +39,6 @@
 	 * For each affected source file, guess whether it could be a role
 	 * file and include its team in the compilation process.
 	 */
-	@SuppressWarnings("unchecked") // accessing super field with raw type
 	protected void addAffectedSourceFiles() {
 		super.addAffectedSourceFiles();
 		if (this.sourceFiles != null) {
@@ -66,7 +65,6 @@
 	}
 	
 	/** Add a file to sourceFiles if it's not already contained. */
-	@SuppressWarnings("unchecked") // accessing super field with raw type
 	void checkAddFile (SourceFile teamFile) {
 		// could use a hashtable, but probably this list won't grow too long.
 		if (!this.sourceFiles.contains(teamFile))
diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/FieldLocator.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/FieldLocator.java
index 42f691e..810ed83 100644
--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/FieldLocator.java
+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/FieldLocator.java
@@ -264,8 +264,8 @@
         FieldAccessSpec fieldSpec = (FieldAccessSpec)reference;
         int offset = fieldSpec.sourceStart;
         int length = fieldSpec.sourceEnd - offset + 1;
-        SearchMatch match = locator.newFieldReferenceMatch(element, null, elementBinding, accuracy, offset, length, fieldSpec);
-        locator.report(match);
+        SearchMatch newMatch = locator.newFieldReferenceMatch(element, null, elementBinding, accuracy, offset, length, fieldSpec);
+        locator.report(newMatch);
     }
 //gbr+km}
 }
diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MethodLocator.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MethodLocator.java
index 19bddb9..f64d7f2 100644
--- a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MethodLocator.java
+++ b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MethodLocator.java
@@ -609,9 +609,9 @@
 		{
 		    MethodSpec methodSpec= (MethodSpec)reference;
 		    int offset = methodSpec.sourceStart ;
-			SearchMatch match = locator.newMethodReferenceMatch(element, elementBinding, accuracy, offset, 
+			SearchMatch newMatch = locator.newMethodReferenceMatch(element, elementBinding, accuracy, offset, 
 					methodSpec.declarationSourceEnd - offset + 1, false/*not constructor*/, false/*not synthetic*/, reference);
-			locator.report(match);
+			locator.report(newMatch);
 //jsv}	
 		} else {
 			if (reference instanceof SingleMemberAnnotation) {