- Revision
- 1281
- Author
- rfscholte
- Date
- 2011-08-01 15:32:47 -0500 (Mon, 01 Aug 2011)
Log Message
Fix QDOX-234: Type should implement JavaClass to make it easier to walk through the model
Modified Paths
- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/EvaluatingVisitor.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/_expression_/FieldRef.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationExpressionTest.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsModelTest.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsTest.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/ClassResolutionTest.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaClassTest.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/TypeTest.java
Diff
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/EvaluatingVisitor.java (1280 => 1281)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/EvaluatingVisitor.java 2011-07-31 17:19:53 UTC (rev 1280) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/EvaluatingVisitor.java 2011-08-01 20:32:47 UTC (rev 1281) @@ -440,7 +440,7 @@ public Object visit( TypeRef typeRef ) { - return typeRef.getType().getJavaClass(); + return typeRef.getType(); } public Object visit( AnnotationValueList valueList ) @@ -890,7 +890,7 @@ public Object visit( Cast annotationCast ) { Object value = annotationCast.getValue().accept( this ); - String type = annotationCast.getType().getJavaClass().getFullyQualifiedName(); + String type = annotationCast.getType().getFullyQualifiedName(); Object result; if ( value instanceof Number )
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java (1280 => 1281)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java 2011-07-31 17:19:53 UTC (rev 1280) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java 2011-08-01 20:32:47 UTC (rev 1281) @@ -123,15 +123,17 @@ boolean iAmJavaLangObject = OBJECT_JAVACLASS.equals(this); - if (anEnum) { + if ( anEnum ) + { result = ENUM_JAVACLASS; - } else if (!anInterface && !anAnnotation && (superClass == null) && !iAmJavaLangObject) { + } + else if ( !anInterface && !anAnnotation && ( superClass == null ) && !iAmJavaLangObject ) + { result = OBJECT_JAVACLASS; } - else if(superClass != null) { - result = superClass.getJavaClass(); - } else { - result = null; + else + { + result = superClass; } return result; } @@ -147,13 +149,9 @@ /** * @since 1.3 */ - public List<JavaClass> getImplementedInterfaces() { - List<JavaClass> result = new LinkedList<JavaClass>(); - for ( Type implType : getImplements() ) - { - result.add( implType.getJavaClass() ); - } - return result; + public List<JavaClass> getImplementedInterfaces() + { + return new LinkedList<JavaClass>( getImplements() ); } /* (non-Javadoc) @@ -320,17 +318,23 @@ */ public String resolveType( String typeName ) { - // Maybe it's an inner class? - for ( JavaClass innerClass : getNestedClasses() ) + String result; + JavaClass resolvedClass = getNestedClassByName( typeName ); + if ( resolvedClass != null ) { - if ( innerClass.getName().equals( typeName ) ) - { - return innerClass.getFullyQualifiedName(); - } + result = resolvedClass.getFullyQualifiedName(); } - return getParent().resolveType( typeName ); + else + { + result = getParent().resolveType( typeName ); + } + return result; } + /* + * (non-Javadoc) + * @see com.thoughtworks.qdox.model.JavaClass#resolveCanonicalName(java.lang.String) + */ public String resolveCanonicalName( String name ) { // Maybe it's an inner class? @@ -344,6 +348,10 @@ return getParent().resolveCanonicalName( name ); } + /* + * (non-Javadoc) + * @see com.thoughtworks.qdox.model.JavaClass#resolveFullyQualifiedName(java.lang.String) + */ public String resolveFullyQualifiedName( String name ) { // Maybe it's an inner class?
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java (1280 => 1281)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java 2011-07-31 17:19:53 UTC (rev 1280) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/Type.java 2011-08-01 20:32:47 UTC (rev 1281) @@ -25,8 +25,10 @@ import java.util.List; import java.util.ListIterator; -public class Type implements Serializable { +import com.thoughtworks.qdox.library.ClassLibrary; +public class Type implements JavaClass, Serializable { + public static final Type VOID = new Type("void"); private String name; @@ -34,7 +36,7 @@ private String fullName; private int dimensions; private List<Type> actualArgumentTypes; - + public Type(String fullName, String name, int dimensions, JavaClassParent context) { this.fullName = fullName; this.name = name; @@ -103,7 +105,7 @@ * @return the type of array if it's one, otherwise <code>null</code> */ public JavaClass getComponentType() { - return isArray() ? getJavaClass() : null; + return isArray() ? resolveRealClass() : null; } /** @@ -199,11 +201,13 @@ return result; } - protected boolean isResolved() { - if (fullName == null && context != null) { - fullName = context.resolveType(name); + protected boolean isResolved() + { + if ( fullName == null && context != null ) + { + fullName = context.resolveType( name ); } - return (fullName != null); + return ( fullName != null ); } /** @@ -285,8 +289,8 @@ public int hashCode() { return getFullyQualifiedName().hashCode(); } - - public JavaClass getJavaClass() + + private JavaClass resolveRealClass() { JavaClass result; String qualifiedName = isResolved() ? fullName : name; @@ -300,7 +304,7 @@ result = javaClassParent.getNestedClassByName( qualifiedName ); if ( result == null ) { - result = javaClassParent.getJavaClassLibrary().getJavaClass( qualifiedName, true ); + result = getJavaClassLibrary().getJavaClass( qualifiedName, true ); } } @@ -308,20 +312,28 @@ } /** + * + * @return this + * @deprecated Type already has the JavaClass interface + */ + public JavaClass getJavaClass() + { + return this; + } + + /** * @since 1.3 */ - public boolean isA(Type type) { - if (this == type) { + public boolean isA( Type type ) + { + if ( this == type ) + { return true; - } else { - JavaClass cls = getJavaClass(); - - if (cls != null) { - return cls.isA( type.getJavaClass() ); - } } - // We'we walked up the hierarchy and found nothing. - return false; + else + { + return this.isA( type ); + } } /** @@ -480,4 +492,311 @@ return (variable == null ? getFullyQualifiedName() : variable.getBounds().get(0).getFullyQualifiedName() ); } + //Delegating methods + public JavaSource getSource() + { + return resolveRealClass().getSource(); + } + + public int getLineNumber() + { + return resolveRealClass().getLineNumber(); + } + + public boolean isInterface() + { + return resolveRealClass().isInterface(); + } + + public List<Annotation> getAnnotations() + { + return resolveRealClass().getAnnotations(); + } + + public boolean isEnum() + { + return resolveRealClass().isEnum(); + } + + public String getComment() + { + return resolveRealClass().getComment(); + } + + public List<DocletTag> getTags() + { + return resolveRealClass().getTags(); + } + + public boolean isAnnotation() + { + return resolveRealClass().isAnnotation(); + } + + public List<DocletTag> getTagsByName( String name ) + { + return resolveRealClass().getTagsByName( name ); + } + + public DocletTag getTagByName( String name ) + { + return resolveRealClass().getTagByName( name ); + } + + public Type getSuperClass() + { + return resolveRealClass().getSuperClass(); + } + + public JavaClass getSuperJavaClass() + { + return resolveRealClass().getSuperJavaClass(); + } + + public List<Type> getImplements() + { + return resolveRealClass().getImplements(); + } + + public List<JavaClass> getImplementedInterfaces() + { + return resolveRealClass().getImplementedInterfaces(); + } + + public String getNamedParameter( String tagName, String parameterName ) + { + return resolveRealClass().getNamedParameter( tagName, parameterName ); + } + + public String getCodeBlock() + { + return resolveRealClass().getCodeBlock(); + } + + public List<TypeVariable> getTypeParameters() + { + return resolveRealClass().getTypeParameters(); + } + + public JavaSource getParentSource() + { + return resolveRealClass().getParentSource(); + } + + public JavaPackage getPackage() + { + return resolveRealClass().getPackage(); + } + + public JavaClassParent getParent() + { + return resolveRealClass().getParent(); + } + + public String getPackageName() + { + return resolveRealClass().getPackageName(); + } + + public boolean isInner() + { + return resolveRealClass().isInner(); + } + + public String resolveType( String name ) + { + return resolveRealClass().resolveType( name ); + } + + public String resolveCanonicalName( String name ) + { + return resolveRealClass().resolveCanonicalName( name ); + } + + public String resolveFullyQualifiedName( String name ) + { + return resolveRealClass().resolveFullyQualifiedName( name ); + } + + public String getClassNamePrefix() + { + return resolveRealClass().getClassNamePrefix(); + } + + public Type asType() + { + return resolveRealClass().asType(); + } + + public List<JavaMethod> getMethods() + { + return resolveRealClass().getMethods(); + } + + public List<JavaConstructor> getConstructors() + { + return resolveRealClass().getConstructors(); + } + + public JavaConstructor getConstructor( List<Type> parameterTypes ) + { + return resolveRealClass().getConstructor( parameterTypes ); + } + + public JavaConstructor getConstructor( List<Type> parameterTypes, boolean varArg ) + { + return resolveRealClass().getConstructor( parameterTypes, varArg ); + } + + public List<JavaMethod> getMethods( boolean superclasses ) + { + return resolveRealClass().getMethods( superclasses ); + } + + public JavaMethod getMethodBySignature( String name, List<Type> parameterTypes ) + { + return resolveRealClass().getMethodBySignature( name, parameterTypes ); + } + + public JavaMethod getMethod( String name, List<Type> parameterTypes, boolean varArgs ) + { + return resolveRealClass().getMethod( name, parameterTypes, varArgs ); + } + + public JavaMethod getMethodBySignature( String name, List<Type> parameterTypes, boolean superclasses ) + { + return resolveRealClass().getMethodBySignature( name, parameterTypes, superclasses ); + } + + public JavaMethod getMethodBySignature( String name, List<Type> parameterTypes, boolean superclasses, boolean varArg ) + { + return resolveRealClass().getMethodBySignature( name, parameterTypes, superclasses, varArg ); + } + + public List<JavaMethod> getMethodsBySignature( String name, List<Type> parameterTypes, boolean superclasses ) + { + return resolveRealClass().getMethodsBySignature( name, parameterTypes, superclasses ); + } + + public List<JavaMethod> getMethodsBySignature( String name, List<Type> parameterTypes, boolean superclasses, + boolean varArg ) + { + return resolveRealClass().getMethodsBySignature( name, parameterTypes, superclasses, varArg ); + } + + public List<JavaField> getFields() + { + return resolveRealClass().getFields(); + } + + public JavaField getFieldByName( String name ) + { + return resolveRealClass().getFieldByName( name ); + } + + public List<JavaClass> getClasses() + { + return resolveRealClass().getClasses(); + } + + public List<JavaClass> getNestedClasses() + { + return resolveRealClass().getNestedClasses(); + } + + public JavaClass getNestedClassByName( String name ) + { + return resolveRealClass().getNestedClassByName( name ); + } + + public boolean isA( String fullClassName ) + { + return resolveRealClass().isA( fullClassName ); + } + + public boolean isA( JavaClass javaClass ) + { + return resolveRealClass().isA( javaClass ); + } + + public List<BeanProperty> getBeanProperties() + { + return resolveRealClass().getBeanProperties(); + } + + public List<BeanProperty> getBeanProperties( boolean superclasses ) + { + return resolveRealClass().getBeanProperties( superclasses ); + } + + public BeanProperty getBeanProperty( String propertyName ) + { + return resolveRealClass().getBeanProperty( propertyName ); + } + + public BeanProperty getBeanProperty( String propertyName, boolean superclasses ) + { + return resolveRealClass().getBeanProperty( propertyName, superclasses ); + } + + public List<JavaClass> getDerivedClasses() + { + return resolveRealClass().getDerivedClasses(); + } + + public List<DocletTag> getTagsByName( String name, boolean superclasses ) + { + return resolveRealClass().getTagsByName( name, superclasses ); + } + + public ClassLibrary getJavaClassLibrary() + { + return context.getJavaClassLibrary(); + } + + public String getName() + { + return resolveRealClass().getName(); + } + + public String getCanonicalName() + { + return resolveRealClass().getCanonicalName(); + } + + public List<String> getModifiers() + { + return resolveRealClass().getModifiers(); + } + + public boolean isPublic() + { + return resolveRealClass().isPublic(); + } + + public boolean isProtected() + { + return resolveRealClass().isProtected(); + } + + public boolean isPrivate() + { + return resolveRealClass().isPrivate(); + } + + public boolean isFinal() + { + return resolveRealClass().isFinal(); + } + + public boolean isStatic() + { + return resolveRealClass().isStatic(); + } + + public boolean isAbstract() + { + return resolveRealClass().isAbstract(); + } + }
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/_expression_/FieldRef.java (1280 => 1281)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/_expression_/FieldRef.java 2011-07-31 17:19:53 UTC (rev 1280) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/_expression_/FieldRef.java 2011-08-01 20:32:47 UTC (rev 1281) @@ -141,9 +141,7 @@ String typeName = classParent.resolveType( className ); if( typeName != null ) { - Type type = Type.createUnresolved( typeName, 0, classParent ); - JavaClass javaClass = type.getJavaClass(); - + JavaClass javaClass = Type.createUnresolved( typeName, 0, classParent ); if( javaClass != null ) { fieldIndex = i + 1; field = resolveField( javaClass, i + 1, parts.length - 1 );
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationExpressionTest.java (1280 => 1281)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationExpressionTest.java 2011-07-31 17:19:53 UTC (rev 1280) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationExpressionTest.java 2011-08-01 20:32:47 UTC (rev 1281) @@ -145,6 +145,7 @@ assertEquals( "Annotations", 1, clazz.getAnnotations().size() ); JavaAnnotation annotation = clazz.getAnnotations().get(0); assertEquals( "Annotation name", "Annotation", annotation.getType().getJavaClass().getFullyQualifiedName() ); + assertEquals( "Annotation name", "Annotation", annotation.getType().getFullyQualifiedName() ); assertEquals( "Properties", 1, annotation.getPropertyMap().size() ); AnnotationValue value = annotation.getProperty( "value" );
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsModelTest.java (1280 => 1281)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsModelTest.java 2011-07-31 17:19:53 UTC (rev 1280) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsModelTest.java 2011-08-01 20:32:47 UTC (rev 1281) @@ -33,7 +33,7 @@ assertEquals( "Annotations", 1, clazz.getAnnotations().size() ); JavaAnnotation annotation = clazz.getAnnotations().get(0); assertEquals( "Annotation name", "Annotation", annotation.getType().getJavaClass().getFullyQualifiedName() ); - + assertEquals( "Annotation name", "Annotation", annotation.getType().getFullyQualifiedName() ); return annotation; } @@ -60,6 +60,7 @@ assertEquals( "Annotations", 1, clazz.getAnnotations().size() ); Annotation annotation = clazz.getAnnotations().get(0); assertEquals( "Annotation name", "Annotation", annotation.getType().getJavaClass().getFullyQualifiedName() ); + assertEquals( "Annotation name", "Annotation", annotation.getType().getFullyQualifiedName() ); assertEquals( "Properties", 8, annotation.getNamedParameterMap().size() ); Constant f = (Constant) annotation.getProperty( "f" ); @@ -94,6 +95,7 @@ assertEquals( "Annotations", 1, clazz.getAnnotations().size() ); JavaAnnotation annotation = clazz.getAnnotations().get(0); assertEquals( "Annotation name", "Annotation", annotation.getType().getJavaClass().getFullyQualifiedName() ); + assertEquals( "Annotation name", "Annotation", annotation.getType().getFullyQualifiedName() ); assertEquals( "Properties", 5, annotation.getPropertyMap().size() ); Constant s1 = (Constant) annotation.getProperty( "s1" ); @@ -119,6 +121,7 @@ assertEquals( "Annotations", 1, clazz.getAnnotations().size() ); JavaAnnotation annotation = clazz.getAnnotations().get(0); assertEquals( "Annotation name", "Annotation", annotation.getType().getJavaClass().getFullyQualifiedName() ); + assertEquals( "Annotation name", "Annotation", annotation.getType().getFullyQualifiedName() ); assertEquals( "Properties", 1, annotation.getPropertyMap().size() ); AnnotationValueList list = (AnnotationValueList) annotation.getProperty( "value" ); @@ -137,6 +140,7 @@ assertEquals( "Annotations", 1, clazz.getAnnotations().size() ); JavaAnnotation annotation = clazz.getAnnotations().get(0); assertEquals( "Annotation name", "Annotation", annotation.getType().getJavaClass().getFullyQualifiedName() ); + assertEquals( "Annotation name", "Annotation", annotation.getType().getFullyQualifiedName() ); assertEquals( "Properties", 1, annotation.getPropertyMap().size() ); Add add = (Add) annotation.getProperty( "value" ); @@ -151,6 +155,7 @@ assertEquals( "Annotations", 1, clazz.getAnnotations().size() ); JavaAnnotation annotation = clazz.getAnnotations().get(0); assertEquals( "Annotation name", "Annotation", annotation.getType().getJavaClass().getFullyQualifiedName() ); + assertEquals( "Annotation name", "Annotation", annotation.getType().getFullyQualifiedName() ); assertEquals( "Properties", 1, annotation.getPropertyMap().size() ); Add add = (Add) annotation.getProperty( "value" ); @@ -165,6 +170,7 @@ assertEquals( "Annotations", 1, clazz.getAnnotations().size() ); JavaAnnotation annotation = clazz.getAnnotations().get(0); assertEquals( "Annotation name", "Annotation", annotation.getType().getJavaClass().getFullyQualifiedName() ); + assertEquals( "Annotation name", "Annotation", annotation.getType().getFullyQualifiedName() ); assertEquals( "Properties", 1, annotation.getPropertyMap().size() ); FieldRef value = (FieldRef) annotation.getProperty( "value" ); @@ -180,6 +186,7 @@ assertEquals( "Annotations", 1, clazz.getAnnotations().size() ); JavaAnnotation annotation = clazz.getAnnotations().get(0); assertEquals( "Annotation name", "Annotation", annotation.getType().getJavaClass().getFullyQualifiedName() ); + assertEquals( "Annotation name", "Annotation", annotation.getType().getFullyQualifiedName() ); assertEquals( "Properties", 1, annotation.getPropertyMap().size() ); Object value = annotation.getProperty( "value" ); @@ -194,6 +201,7 @@ assertEquals( "Annotations", 1, clazz.getAnnotations().size() ); JavaAnnotation annotation = clazz.getAnnotations().get(0); assertEquals( "Annotation name", "Annotation", annotation.getType().getJavaClass().getFullyQualifiedName() ); + assertEquals( "Annotation name", "Annotation", annotation.getType().getFullyQualifiedName() ); assertEquals( "Properties", 1, annotation.getPropertyMap().size() ); Object value = annotation.getProperty( "value" );
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsTest.java (1280 => 1281)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsTest.java 2011-07-31 17:19:53 UTC (rev 1280) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsTest.java 2011-08-01 20:32:47 UTC (rev 1281) @@ -197,7 +197,8 @@ JavaClass clazz = builder.getClassByName("Foo"); JavaMethod mth = clazz.getMethods().get(0); assertEquals("Foo", clazz.getName()); - assertEquals("X", mth.getAnnotations().get(0).getType().getJavaClass().getName()); + assertEquals("X", mth.getAnnotations().get(0).getType().getJavaClass().getName()); + assertEquals("X", mth.getAnnotations().get(0).getType().getName()); } // from QDOX-142
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/ClassResolutionTest.java (1280 => 1281)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/ClassResolutionTest.java 2011-07-31 17:19:53 UTC (rev 1280) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/ClassResolutionTest.java 2011-08-01 20:32:47 UTC (rev 1281) @@ -91,6 +91,7 @@ builder.addSource(new StringReader(source)); JavaMethod method = builder.getClassByName("some.pack.Test").getMethods().get(0); JavaParameter parameter = method.getParameters().get(0); - assertEquals("some.pack.Test$Inner$Inner2", parameter.getType().getJavaClass().getFullyQualifiedName()); + assertEquals( "some.pack.Test$Inner$Inner2", parameter.getType().getJavaClass().getFullyQualifiedName() ); + assertEquals( "some.pack.Test$Inner$Inner2", parameter.getFullyQualifiedName() ); } }
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java (1280 => 1281)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java 2011-07-31 17:19:53 UTC (rev 1280) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java 2011-08-01 20:32:47 UTC (rev 1281) @@ -664,6 +664,7 @@ JavaField field1 = outer.getFieldByName("field1"); Type type = field1.getType(); assertEquals("foo.Outer$Inner", type.getJavaClass().getFullyQualifiedName()); + assertEquals("foo.Outer$Inner", type.getFullyQualifiedName()); } public void testJiraQdox16() { @@ -886,6 +887,7 @@ JavaField innerField = builder.getClassByName("p2.B").getFieldByName("innerField"); assertEquals(innerClass, innerField.getType().getJavaClass() ); + assertEquals(innerClass, innerField.getType() ); assertEquals("p1.A$Inner", innerField.getType().getFullyQualifiedName()); } @@ -1300,7 +1302,7 @@ "}"; builder.addSource( new StringReader( source ) ); JavaClass clazz = builder.addSource( new StringReader( source ) ).getClasses().get(0); - JavaClass thing = clazz.getMethods().get(0).getReturns().getJavaClass(); + JavaClass thing = clazz.getMethods().get(0).getReturns(); assertEquals("com.blah.Thing", thing.getFullyQualifiedName()); assertNotNull(thing.getSource()); }
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaClassTest.java (1280 => 1281)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaClassTest.java 2011-07-31 17:19:53 UTC (rev 1280) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaClassTest.java 2011-08-01 20:32:47 UTC (rev 1281) @@ -690,6 +690,7 @@ //should be fixed if we can get rid of the Type-visibility JavaClass clazz = newJavaClass( "a.b.Sample" ); assertEquals( "java.lang.Object", clazz.getSuperClass().getJavaClass().getFullyQualifiedName() ); + assertEquals( "java.lang.Object", clazz.getSuperClass().getFullyQualifiedName() ); } }
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/TypeTest.java (1280 => 1281)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/TypeTest.java 2011-07-31 17:19:53 UTC (rev 1280) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/TypeTest.java 2011-08-01 20:32:47 UTC (rev 1281) @@ -72,8 +72,7 @@ ClassLoaderLibrary library = new ClassLoaderLibrary( null ); library.addDefaultLoader(); JavaSource javaSource = newJavaSource(library); - Type type = newType("java.util.HashSet", 0, javaSource); - JavaClass clazz = type.getJavaClass(); + JavaClass clazz = newType("java.util.HashSet", 0, javaSource); JavaClass superClass = clazz.getSuperJavaClass(); assertEquals("java.util.AbstractSet", superClass.getFullyQualifiedName()); }
To unsubscribe from this list please visit:
