- Revision
- 1289
- Author
- rfscholte
- Date
- 2011-08-09 16:44:18 -0500 (Tue, 09 Aug 2011)
Log Message
JavaField.getType() returns JavaClass instead of Type Add JavaClass.isArray() and JavaClass.getDimensions()
Modified Paths
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaField.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaClass.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaField.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java
Diff
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java (1288 => 1289)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java 2011-08-09 21:30:48 UTC (rev 1288) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaClass.java 2011-08-09 21:44:18 UTC (rev 1289) @@ -94,8 +94,25 @@ { return anAnnotation; } + + /* (non-Javadoc) + * @see com.thoughtworks.qdox.model.JavaClass#isArray() + */ + public boolean isArray() + { + return false; + } + /* (non-Javadoc) + * @see com.thoughtworks.qdox.model.JavaClass#getDimensions() + */ + public int getDimensions() + { + return 0; + } + + /* (non-Javadoc) * @see com.thoughtworks.qdox.model.JavaClass#getSuperClass() */ public Type getSuperClass() { @@ -287,6 +304,11 @@ + getName(); } + public String getGenericFullyQualifiedName() + { + return getFullyQualifiedName(); + } + /* * (non-Javadoc) * @see com.thoughtworks.qdox.model.JavaClass#getCanonicalName()
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaField.java (1288 => 1289)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaField.java 2011-08-09 21:30:48 UTC (rev 1288) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaField.java 2011-08-09 21:44:18 UTC (rev 1289) @@ -49,7 +49,7 @@ * * @return the Type of this field */ - public Type getType() { + public JavaClass getType() { return type; }
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaClass.java (1288 => 1289)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaClass.java 2011-08-09 21:30:48 UTC (rev 1288) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaClass.java 2011-08-09 21:44:18 UTC (rev 1289) @@ -278,6 +278,14 @@ boolean isA( JavaClass javaClass ); /** + * + * @return + */ + int getDimensions(); + + boolean isArray(); + + /** * Gets bean properties without looking in superclasses or interfaces. * * @since 1.3 @@ -447,4 +455,6 @@ */ @Override String toString(); + + String getGenericFullyQualifiedName(); } \ No newline at end of file
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaField.java (1288 => 1289)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaField.java 2011-08-09 21:30:48 UTC (rev 1288) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaField.java 2011-08-09 21:44:18 UTC (rev 1289) @@ -33,7 +33,7 @@ * * @return the type of this field, should never be <code>null</code>. */ - Type getType(); + JavaClass getType(); // Source methods
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java (1288 => 1289)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java 2011-08-09 21:30:48 UTC (rev 1288) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java 2011-08-09 21:44:18 UTC (rev 1289) @@ -662,8 +662,7 @@ assertEquals("foo.Outer$Inner", inner.getFullyQualifiedName()); JavaField field1 = outer.getFieldByName("field1"); - Type type = field1.getType(); - assertEquals("foo.Outer$Inner", type.getJavaClass().getFullyQualifiedName()); + JavaClass type = field1.getType(); assertEquals("foo.Outer$Inner", type.getFullyQualifiedName()); } @@ -886,7 +885,6 @@ builder.getClassByName("p1.A").getNestedClassByName("Inner"); JavaField innerField = builder.getClassByName("p2.B").getFieldByName("innerField"); - assertEquals(innerClass, innerField.getType().getJavaClass() ); assertEquals(innerClass, innerField.getType() ); assertEquals("p1.A$Inner", innerField.getType().getFullyQualifiedName()); }
To unsubscribe from this list please visit:
