- Revision
- 1355
- Author
- rfscholte
- Date
- 2011-10-02 10:52:25 -0500 (Sun, 02 Oct 2011)
Log Message
One huge step closer to make resolve-mechanism only use interfaces.
Modified Paths
- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/TypeAssembler.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/AbstractBaseMethod.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaMethod.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaConstructor.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethod.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethodDelegate.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaType.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java
Diff
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/TypeAssembler.java (1354 => 1355)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/TypeAssembler.java 2011-10-02 15:36:55 UTC (rev 1354) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/TypeAssembler.java 2011-10-02 15:52:25 UTC (rev 1355) @@ -4,6 +4,7 @@ import java.util.List; import com.thoughtworks.qdox.model.JavaClassParent; +import com.thoughtworks.qdox.model.JavaType; import com.thoughtworks.qdox.model.Type; import com.thoughtworks.qdox.model.WildcardType; import com.thoughtworks.qdox.parser.structs.TypeDef; @@ -40,16 +41,17 @@ } else { - result = Type.createUnresolved( typeDef.getName(), typeDef.getDimensions() + dimensions, context ); + Type typeResult = Type.createUnresolved( typeDef.getName(), typeDef.getDimensions() + dimensions, context ); if ( typeDef.getActualArgumentTypes() != null && !typeDef.getActualArgumentTypes().isEmpty() ) { - List<Type> actualArgumentTypes = new LinkedList<Type>(); + List<JavaType> actualArgumentTypes = new LinkedList<JavaType>(); for ( TypeDef actualArgType : typeDef.getActualArgumentTypes() ) { actualArgumentTypes.add( TypeAssembler.createUnresolved( actualArgType, context ) ); } - result.setActualArgumentTypes( actualArgumentTypes ); + typeResult.setActualArgumentTypes( actualArgumentTypes ); } + result = typeResult; } return result; }
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/AbstractBaseMethod.java (1354 => 1355)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/AbstractBaseMethod.java 2011-10-02 15:36:55 UTC (rev 1354) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/AbstractBaseMethod.java 2011-10-02 15:52:25 UTC (rev 1355) @@ -110,14 +110,14 @@ return result; } - public List<Type> getParameterTypes() + public List<JavaType> getParameterTypes() { return getParameterTypes( false ); } - public List<Type> getParameterTypes( boolean resolve ) + public List<JavaType> getParameterTypes( boolean resolve ) { - List<Type> result = new LinkedList<Type>(); + List<JavaType> result = new LinkedList<JavaType>(); for (JavaParameter parameter : this.getParameters()) { result.add( parameter.getType() ); }
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaMethod.java (1354 => 1355)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaMethod.java 2011-10-02 15:36:55 UTC (rev 1354) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaMethod.java 2011-10-02 15:52:25 UTC (rev 1355) @@ -386,7 +386,7 @@ /* (non-Javadoc) * @see com.thoughtworks.qdox.model.JavaMethod#getReturnType() */ - public JavaClass getReturnType() { + public JavaType getReturnType() { return getReturnType( false ); }
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaConstructor.java (1354 => 1355)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaConstructor.java 2011-10-02 15:36:55 UTC (rev 1354) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaConstructor.java 2011-10-02 15:52:25 UTC (rev 1355) @@ -53,7 +53,7 @@ * * @return a list of JavaParameters, never <code>null</code> */ - List<Type> getParameterTypes(); + List<JavaType> getParameterTypes(); /** * Equivalent of {@link java.lang.reflect.Constructor#getExceptionTypes()}
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethod.java (1354 => 1355)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethod.java 2011-10-02 15:36:55 UTC (rev 1354) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethod.java 2011-10-02 15:52:25 UTC (rev 1355) @@ -143,7 +143,7 @@ * @return the return type * @since 1.12 */ - JavaClass getReturnType(); + JavaType getReturnType(); /** * If a class inherits this method from a generic class or interface, you can use this method to get the resolved return type @@ -152,14 +152,14 @@ * @return the return type * @since 1.12 */ - Type getReturnType( boolean resolve ); + JavaType getReturnType( boolean resolve ); /** * * @return the parameter types * @since 1.12 */ - List<Type> getParameterTypes(); + List<JavaType> getParameterTypes(); /** * If a class inherits this method from a generic class or interface, you can use this method to get the resolved parameter types @@ -168,7 +168,7 @@ * @return the parameter types * @since 1.12 */ - List<Type> getParameterTypes( boolean resolve ); + List<JavaType> getParameterTypes( boolean resolve ); JavaClass getParentClass();
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethodDelegate.java (1354 => 1355)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethodDelegate.java 2011-10-02 15:36:55 UTC (rev 1354) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethodDelegate.java 2011-10-02 15:52:25 UTC (rev 1355) @@ -41,9 +41,9 @@ this.originalMethod = originalMethod; } - public Type getReturnType( boolean resolve ) + public JavaType getReturnType( boolean resolve ) { - Type result = originalMethod.getReturnType( resolve ); + JavaType result = originalMethod.getReturnType( resolve ); if (result != null) { result = Type.resolve( result, originalMethod.getParentClass(), callingClass ); @@ -58,12 +58,12 @@ return result; } - public List<Type> getParameterTypes( boolean resolve ) + public List<JavaType> getParameterTypes( boolean resolve ) { - List<Type> result = new LinkedList<Type>(); - for (Type type: originalMethod.getParameterTypes( resolve ) ) + List<JavaType> result = new LinkedList<JavaType>(); + for (JavaType type: originalMethod.getParameterTypes( resolve ) ) { - Type curType = Type.resolve( type, originalMethod.getParentClass(), callingClass ); + JavaType curType = Type.resolve( type, originalMethod.getParentClass(), callingClass ); //According to java-specs, if it could be resolved the upper boundary, so Object, should be returned if ( !resolve && !type.getFullyQualifiedName().equals( curType.getFullyQualifiedName() ) ) { @@ -301,12 +301,12 @@ return originalMethod.toString(); } - public Type getReturnType() + public JavaType getReturnType() { return getReturnType( false ); } - public List<Type> getParameterTypes() + public List<JavaType> getParameterTypes() { return getParameterTypes( false ); }
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaType.java (1354 => 1355)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaType.java 2011-10-02 15:36:55 UTC (rev 1354) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaType.java 2011-10-02 15:52:25 UTC (rev 1355) @@ -14,5 +14,5 @@ String getGenericValue(); - List<Type> getActualTypeArguments(); + List<JavaType> getActualTypeArguments(); } \ No newline at end of file
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java (1354 => 1355)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java 2011-10-02 15:36:55 UTC (rev 1354) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java 2011-10-02 15:52:25 UTC (rev 1355) @@ -35,7 +35,7 @@ private JavaClassParent context; private String fullName; private int dimensions; - private List<Type> actualArgumentTypes = Collections.emptyList(); + private List<JavaType> actualArgumentTypes = Collections.emptyList(); public Type(String fullName, String name, int dimensions, JavaClassParent context) { this.fullName = fullName; @@ -149,7 +149,7 @@ if ( !actualArgumentTypes.isEmpty() ) { result.append( "<" ); - for ( Iterator<Type> iter = actualArgumentTypes.iterator(); iter.hasNext(); ) + for ( Iterator<JavaType> iter = actualArgumentTypes.iterator(); iter.hasNext(); ) { result.append( iter.next().getGenericValue() ); if ( iter.hasNext() ) @@ -169,7 +169,7 @@ protected static <D extends JavaGenericDeclaration> String getGenericValue( JavaType base, List<TypeVariable<D>> typeVariableList ) { StringBuffer result = new StringBuffer( getResolvedValue( base, typeVariableList ) ); - for ( Iterator<Type> iter = base.getActualTypeArguments().iterator(); iter.hasNext(); ) + for ( Iterator<JavaType> iter = base.getActualTypeArguments().iterator(); iter.hasNext(); ) { result.append( Type.resolve( base, typeVariableList ) ); if ( iter.hasNext() ) @@ -240,12 +240,12 @@ * * @return the actualTypeArguments or null */ - public List<Type> getActualTypeArguments() + public List<JavaType> getActualTypeArguments() { return actualArgumentTypes; } - public void setActualArgumentTypes( List<Type> actualArgumentTypes ) + public void setActualArgumentTypes( List<JavaType> actualArgumentTypes ) { this.actualArgumentTypes = actualArgumentTypes; } @@ -419,9 +419,9 @@ * @param callingClass * @return */ - protected static Type resolve( Type base, JavaClass declaringClass, JavaClass callingClass ) + protected static JavaType resolve( JavaType base, JavaClass declaringClass, JavaClass callingClass ) { - Type result = base; + JavaType result = base; int typeIndex = getTypeVariableIndex( declaringClass, base.getFullyQualifiedName() ); @@ -449,16 +449,17 @@ if ( !base.getActualTypeArguments().isEmpty() ) { - result = - new Type( base.getFullyQualifiedName(), base.getValue(), base.getDimensions(), - base.getJavaClassParent() ); + Type typeResult = + new Type( base.getFullyQualifiedName(), base.getValue(), ((Type)base).getDimensions(), + ((Type)base).getJavaClassParent() ); - List<Type> actualTypes = new LinkedList<Type>(); - for ( Type actualArgType : base.getActualTypeArguments() ) + List<JavaType> actualTypes = new LinkedList<JavaType>(); + for ( JavaType actualArgType : base.getActualTypeArguments() ) { actualTypes.add( resolve( actualArgType, declaringClass, callingClass ) ); } - result.setActualArgumentTypes( actualTypes ); + typeResult.setActualArgumentTypes( actualTypes ); + result = typeResult; } return result; } @@ -487,7 +488,7 @@ if ( !actualArgumentTypes.isEmpty() ) { result.append( "<" ); - for ( Iterator<Type> iter = actualArgumentTypes.iterator(); iter.hasNext(); ) + for ( Iterator<JavaType> iter = actualArgumentTypes.iterator(); iter.hasNext(); ) { result.append( iter.next().getGenericFullyQualifiedName() ); if ( iter.hasNext() ) @@ -512,7 +513,7 @@ if ( !base.getActualTypeArguments().isEmpty() ) { result.append( "<" ); - for ( Iterator<Type> iter = base.getActualTypeArguments().iterator(); iter.hasNext(); ) + for ( Iterator<JavaType> iter = base.getActualTypeArguments().iterator(); iter.hasNext(); ) { result.append( getGenericValue( iter.next(), typeParameters) ); if ( iter.hasNext() ) @@ -540,7 +541,7 @@ if ( !base.getActualTypeArguments().isEmpty() ) { result.append( "<" ); - for ( Iterator<Type> iter = base.getActualTypeArguments().iterator(); iter.hasNext(); ) + for ( Iterator<JavaType> iter = base.getActualTypeArguments().iterator(); iter.hasNext(); ) { result.append( getResolvedFullyQualifiedName( iter.next(), typeParameters) ); if ( iter.hasNext() )
To unsubscribe from this list please visit:
