diff options
Diffstat (limited to 'org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ExternalAnnotationSuperimposer.java')
-rw-r--r-- | org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ExternalAnnotationSuperimposer.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ExternalAnnotationSuperimposer.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ExternalAnnotationSuperimposer.java index b1785aa24..f4dfe2034 100644 --- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ExternalAnnotationSuperimposer.java +++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ExternalAnnotationSuperimposer.java @@ -55,7 +55,7 @@ class ExternalAnnotationSuperimposer extends TypeBindingVisitor { } catch (FileNotFoundException e) { // file not found is expected } catch (IOException e) { - typeBinding.scope.problemReporter().abortDueToInternalError(Messages.bind(Messages.abort_externaAnnotationFile, + typeBinding.scope.problemReporter().abortDueToInternalError(Messages.bind(Messages.abort_externaAnnotationFile, new String[] {String.valueOf(typeBinding.readableName()), externalAnnotationPath, e.getMessage()})); } finally { if (zipFile != null) @@ -118,7 +118,7 @@ class ExternalAnnotationSuperimposer extends TypeBindingVisitor { private TypeBinding typeReplacement; private LookupEnvironment environment; private boolean isReplacing; - + ExternalAnnotationSuperimposer(LookupEnvironment environment) { this.environment = environment; } @@ -157,13 +157,13 @@ class ExternalAnnotationSuperimposer extends TypeBindingVisitor { return cl.cast(this.typeReplacement); return type; } - + private TypeBinding goAndSuperimpose(ITypeAnnotationWalker walker, TypeBinding type) { // no reset here if (walker == ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER) return type; this.currentWalker = walker; - + TypeBindingVisitor.visit(this, type); if (this.typeReplacement == null) @@ -173,7 +173,7 @@ class ExternalAnnotationSuperimposer extends TypeBindingVisitor { this.typeReplacement = null; return answer; } - + @Override public boolean visit(ArrayBinding arrayBinding) { ExternalAnnotationSuperimposer memento = snapshot(); @@ -229,7 +229,7 @@ class ExternalAnnotationSuperimposer extends TypeBindingVisitor { return false; } finally { restore(memento); - } + } } @Override public boolean visit(RawTypeBinding rawTypeBinding) { @@ -254,7 +254,7 @@ class ExternalAnnotationSuperimposer extends TypeBindingVisitor { if (bound != null) { bound = goAndSuperimpose(memento.currentWalker.toWildcardBound(), bound); } - IBinaryAnnotation[] binaryAnnotations = memento.currentWalker.getAnnotationsAtCursor(-1, false); + IBinaryAnnotation[] binaryAnnotations = memento.currentWalker.getAnnotationsAtCursor(-1, false); if (this.isReplacing || binaryAnnotations != ITypeAnnotationWalker.NO_ANNOTATIONS) { TypeBinding[] otherBounds = wildcardBinding.otherBounds; if (binaryAnnotations != ITypeAnnotationWalker.NO_ANNOTATIONS) { |