import eclipse 3.1 M4 compiler

[org.ibex.tool.git] / src / org / eclipse / jdt / internal / compiler / ast / JavadocArgumentExpression.java

diff --git a/src/org/eclipse/jdt/internal/compiler/ast/JavadocArgumentExpression.java b/src/org/eclipse/jdt/internal/compiler/ast/JavadocArgumentExpression.java
index 57be26e..d55372a 100644 (file)
--- a/src/org/eclipse/jdt/internal/compiler/ast/JavadocArgumentExpression.java
+++ b/src/org/eclipse/jdt/internal/compiler/ast/JavadocArgumentExpression.java
@@ -35,27 +35,23 @@ public class JavadocArgumentExpression extends Expression {
         */
        private TypeBinding internalResolveType(Scope scope) {
                this.constant = NotAConstant;
-               if (this.resolvedType != null) { // is a shared type reference which was already resolved
-                       if (!this.resolvedType.isValidBinding()) {
-                               return null; // already reported error
-                       }
-               }
-               else {
-                       if (this.argument != null) {
-                               TypeReference typeRef = this.argument.type;
-                               if (typeRef != null) {
-                                       this.resolvedType = typeRef.getTypeBinding(scope);
-                                       typeRef.resolvedType = this.resolvedType;
-                                       if (!this.resolvedType.isValidBinding()) {
-                                               scope.problemReporter().javadocInvalidType(typeRef, this.resolvedType, scope.getDeclarationModifiers());
-                                               return null;
-                                       }
-                                       if (isTypeUseDeprecated(this.resolvedType, scope)) {
-                                               scope.problemReporter().javadocDeprecatedType(this.resolvedType, typeRef, scope.getDeclarationModifiers());
-                                               return null;
-                                       }
-                                       return this.resolvedType;
+               if (this.resolvedType != null) // is a shared type reference which was already resolved
+                       return this.resolvedType.isValidBinding() ? this.resolvedType : null; // already reported error
+
+               if (this.argument != null) {
+                       TypeReference typeRef = this.argument.type;
+                       if (typeRef != null) {
+                               this.resolvedType = typeRef.getTypeBinding(scope);
+                               typeRef.resolvedType = this.resolvedType;
+                               if (!this.resolvedType.isValidBinding()) {
+                                       scope.problemReporter().javadocInvalidType(typeRef, this.resolvedType, scope.getDeclarationModifiers());
+                                       return null;
+                               }
+                               if (isTypeUseDeprecated(this.resolvedType, scope)) {
+                                       scope.problemReporter().javadocDeprecatedType(this.resolvedType, typeRef, scope.getDeclarationModifiers());
+                                       return null;
                                }
+                               return this.resolvedType = scope.convertToRawType(this.resolvedType);
                        }
                }
                return null;