From: aclement <aclement>
Date: Mon, 2 Nov 2009 16:42:16 +0000 (+0000)
Subject: formatted
X-Git-Tag: V1_6_7~177
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fff77228eb2ae9b22aef5bdf9254ed188d963546;p=aspectj.git

formatted
---

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
index 09bfa4db6..a7f48724e 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
@@ -124,7 +124,6 @@ public class AjLookupEnvironment extends LookupEnvironment implements AnonymousC
 	}
 
 	// ??? duplicates some of super's code
-	@Override
 	public void completeTypeBindings() {
 		AsmManager.setCompletingTypeBindings(true);
 		ContextToken completeTypeBindingsToken = CompilationAndWeavingContext.enteringPhase(
@@ -572,8 +571,8 @@ public class AjLookupEnvironment extends LookupEnvironment implements AnonymousC
 		}
 	}
 
-	private void weaveInterTypeDeclarations(SourceTypeBinding sourceType, Collection typeMungers, Collection declareParents,
-			Collection declareAnnotationOnTypes, boolean skipInners) {
+	private void weaveInterTypeDeclarations(SourceTypeBinding sourceType, Collection typeMungers, Collection declareParents, 
+	Collection declareAnnotationOnTypes, boolean skipInners) {
 
 		ContextToken tok = CompilationAndWeavingContext.enteringPhase(CompilationAndWeavingContext.WEAVING_INTERTYPE_DECLARATIONS,
 				sourceType.sourceName);
@@ -678,7 +677,7 @@ public class AjLookupEnvironment extends LookupEnvironment implements AnonymousC
 			}
 			decpToRepeat.removeAll(forRemoval);
 
-			forRemoval = new ArrayList();
+			forRemoval.clear();
 			for (Iterator i = declareAnnotationOnTypes.iterator(); i.hasNext();) {
 				DeclareAnnotation deca = (DeclareAnnotation) i.next();
 				boolean didSomething = doDeclareAnnotations(deca, sourceType, false);
@@ -705,8 +704,6 @@ public class AjLookupEnvironment extends LookupEnvironment implements AnonymousC
 		onType.checkInterTypeMungers();
 		for (Iterator i = onType.getInterTypeMungers().iterator(); i.hasNext();) {
 			EclipseTypeMunger munger = (EclipseTypeMunger) i.next();
-			// System.out.println("applying: " + munger + " to " + new
-			// String(sourceType.sourceName));
 			munger.munge(sourceType, onType);
 		}