- Revision
- 1373
- Author
- rfscholte
- Date
- 2011-10-04 14:25:49 -0500 (Tue, 04 Oct 2011)
Log Message
Some class to interface cleanup
Modified Paths
- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/EvaluatingVisitor.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/_expression_/AnnotationValueList.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/_expression_/AnnotationVisitor.java
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/_expression_/Cast.java
Diff
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/EvaluatingVisitor.java (1372 => 1373)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/EvaluatingVisitor.java 2011-10-03 21:42:27 UTC (rev 1372) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/EvaluatingVisitor.java 2011-10-04 19:25:49 UTC (rev 1373) @@ -23,10 +23,10 @@ import java.util.LinkedList; import java.util.List; -import com.thoughtworks.qdox.model.Annotation; import com.thoughtworks.qdox.model.JavaAnnotation; +import com.thoughtworks.qdox.model.JavaClass; import com.thoughtworks.qdox.model.JavaField; -import com.thoughtworks.qdox.model.Type; +import com.thoughtworks.qdox.model.JavaType; import com.thoughtworks.qdox.model._expression_.Add; import com.thoughtworks.qdox.model._expression_.And; import com.thoughtworks.qdox.model._expression_.AnnotationValue; @@ -213,7 +213,7 @@ return type; } - public Object visit( Annotation annotation ) throws UnsupportedOperationException + public Object visit( JavaAnnotation annotation ) throws UnsupportedOperationException { throw new UnsupportedOperationException( "Illegal annotation value '" + annotation + "'." ); } @@ -891,13 +891,13 @@ public Object visit( Cast annotationCast ) { Object value = annotationCast.getValue().accept( this ); - Type type = annotationCast.getType(); + JavaType type = annotationCast.getType(); Object result; - if ( type.isPrimitive() && value instanceof Number ) + if ( type instanceof JavaClass && ( (JavaClass) type ).isPrimitive() && value instanceof Number ) { Number n = (Number) value; - String typeName = type.getName(); + String typeName = type.getCanonicalName(); if ( typeName.equals( "byte" ) ) {
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/_expression_/AnnotationValueList.java (1372 => 1373)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/_expression_/AnnotationValueList.java 2011-10-03 21:42:27 UTC (rev 1372) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/_expression_/AnnotationValueList.java 2011-10-04 19:25:49 UTC (rev 1373) @@ -19,9 +19,9 @@ * under the License. */ +import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import java.util.ListIterator; public class AnnotationValueList implements AnnotationValue @@ -43,9 +43,9 @@ { StringBuffer buf = new StringBuffer(); - buf.append( "{" ); + buf.append( '{' ); - for ( ListIterator<AnnotationValue> i = valueList.listIterator(); i.hasNext(); ) + for ( Iterator<AnnotationValue> i = valueList.iterator(); i.hasNext(); ) { buf.append( i.next().toString() ); @@ -55,7 +55,7 @@ } } - buf.append( "}" ); + buf.append( '}' ); return buf.toString(); }
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/_expression_/AnnotationVisitor.java (1372 => 1373)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/_expression_/AnnotationVisitor.java 2011-10-03 21:42:27 UTC (rev 1372) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/_expression_/AnnotationVisitor.java 2011-10-04 19:25:49 UTC (rev 1373) @@ -20,7 +20,7 @@ */ -import com.thoughtworks.qdox.model.Annotation; +import com.thoughtworks.qdox.model.JavaAnnotation; /** * Visitor class for the annotation model elements @@ -41,7 +41,7 @@ Object visit( LessThan lessThan ); - Object visit( Annotation annotation ); + Object visit( JavaAnnotation annotation ); Object visit( Constant constant );
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/_expression_/Cast.java (1372 => 1373)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/_expression_/Cast.java 2011-10-03 21:42:27 UTC (rev 1372) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/_expression_/Cast.java 2011-10-04 19:25:49 UTC (rev 1373) @@ -1,5 +1,6 @@ package com.thoughtworks.qdox.model._expression_; +import com.thoughtworks.qdox.model.JavaType; import com.thoughtworks.qdox.model.Type; /* @@ -23,15 +24,15 @@ public class Cast implements AnnotationValue { - private final Type type; + private final JavaType type; private final AnnotationValue value; - public Cast( Type type, AnnotationValue value ) { + public Cast( JavaType type, AnnotationValue value ) { this.type = type; this.value = value; } - public Type getType() { + public JavaType getType() { return this.type; }
To unsubscribe from this list please visit:
