+ * This map contains the parsed AnnotationValue for each property and allows + * access to the full parse tree, including typerefs and expressions. + */ + private final Map properties = new LinkedHashMap(); + + /** + * Annotation properties as Parameters + */ + private final Map namedParameters = new LinkedHashMap(); + private AbstractJavaEntity context; public Annotation(Type type, @@ -22,12 +38,30 @@ Map namedParameters, int lineNumber) { - this.type = type; - this.context = context; - this.namedParameters = namedParameters == null ? new HashMap(0) : namedParameters; - this.lineNumber = lineNumber; + this.type = type; + this.context = context; + this.lineNumber = lineNumber; + + if(properties != null) { + for(Iterator i = this.properties.entrySet().iterator(); i.hasNext(); ) { + Entry entry = (Entry) i.next(); + String name = (String) entry.getKey(); + AnnotationValue value = (AnnotationValue) entry.getValue(); + + setProperty(name, value); + } + } } + public Annotation( Type type, int line ) { + this(type, null, null, line); + } + + public void setProperty(String name, AnnotationValue value) { + properties.put( name, value ); + namedParameters.put( name, value.getParameterValue() ); + } + /** * @return the annotation type */ @@ -59,6 +93,26 @@ return lineNumber; } + public Object accept( AnnotationVisitor visitor ) { + return visitor.visitAnnotation( this ); + } + + public Object getParameterValue() { + return this; + } + + public Map getPropertyMap() { + return properties; + } + + public AnnotationValue getProperty(String name) { + return (AnnotationValue) properties.get( name ); + } + + public void setContext( AbstractJavaEntity context ) { + this.context = context; + } + public String toString() { StringBuffer result = new StringBuffer(); result.append('@'); Index: src/java/com/thoughtworks/qdox/model/JavaClassParent.java =================================================================== --- src/java/com/thoughtworks/qdox/model/JavaClassParent.java (revision 483) +++ src/java/com/thoughtworks/qdox/model/JavaClassParent.java (working copy) @@ -17,5 +17,7 @@ public JavaSource getParentSource(); public void addClass(JavaClass cls); + + public JavaClass getNestedClassByName(String name); } Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationPlusSign.java =================================================================== --- src/java/com/thoughtworks/qdox/model/annotation/AnnotationPlusSign.java (revision 0) +++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationPlusSign.java (revision 0) @@ -0,0 +1,20 @@ +package com.thoughtworks.qdox.model.annotation; + +public class AnnotationPlusSign extends AnnotationUnaryOperator { + + public AnnotationPlusSign( AnnotationValue value ) { + super( value ); + } + + public String toString() { + return "+" + getValue().toString(); + } + + public Object accept( AnnotationVisitor visitor ) { + return visitor.visitAnnotationPlusSign( this ); + } + + public Object getParameterValue() { + return "+" + getValue().toString(); + } +} Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationGreaterThan.java =================================================================== --- src/java/com/thoughtworks/qdox/model/annotation/AnnotationGreaterThan.java (revision 0) +++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationGreaterThan.java (revision 0) @@ -0,0 +1,21 @@ +package com.thoughtworks.qdox.model.annotation; + +public class AnnotationGreaterThan extends AnnotationBinaryOperator { + + public AnnotationGreaterThan( AnnotationValue left, AnnotationValue right ) { + super( left, right ); + } + + public String toString() { + return getLeft().toString() + " > " + getRight().toString(); + } + + public Object accept( AnnotationVisitor visitor ) { + return visitor.visitAnnotationGreaterThan( this ); + } + + public Object getParameterValue() { + return getLeft().getParameterValue() + " > " + getRight().getParameterValue(); + } + +} Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationDivide.java =================================================================== --- src/java/com/thoughtworks/qdox/model/annotation/AnnotationDivide.java (revision 0) +++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationDivide.java (revision 0) @@ -0,0 +1,21 @@ +package com.thoughtworks.qdox.model.annotation; + +public class AnnotationDivide extends AnnotationBinaryOperator { + + public AnnotationDivide( AnnotationValue left, AnnotationValue right ) { + super( left, right ); + } + + public String toString() { + return getLeft().toString() + " / " + getRight().toString(); + } + + public Object accept( AnnotationVisitor visitor ) { + return visitor.visitAnnotationDivide( this ); + } + + public Object getParameterValue() { + return getLeft().getParameterValue() + " / " + getRight().getParameterValue(); + } + +} Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationGreaterEquals.java =================================================================== --- src/java/com/thoughtworks/qdox/model/annotation/AnnotationGreaterEquals.java (revision 0) +++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationGreaterEquals.java (revision 0) @@ -0,0 +1,21 @@ +package com.thoughtworks.qdox.model.annotation; + +public class AnnotationGreaterEquals extends AnnotationBinaryOperator { + + public AnnotationGreaterEquals( AnnotationValue left, AnnotationValue right ) { + super( left, right ); + } + + public String toString() { + return getLeft().toString() + " >= " + getRight().toString(); + } + + public Object accept( AnnotationVisitor visitor ) { + return visitor.visitAnnotationGreaterEquals( this ); + } + + public Object getParameterValue() { + return getLeft().getParameterValue() + " >= " + getRight().getParameterValue(); + } + +} Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationRemainder.java =================================================================== --- src/java/com/thoughtworks/qdox/model/annotation/AnnotationRemainder.java (revision 0) +++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationRemainder.java (revision 0) @@ -0,0 +1,21 @@ +package com.thoughtworks.qdox.model.annotation; + +public class AnnotationRemainder extends AnnotationBinaryOperator { + + public AnnotationRemainder( AnnotationValue left, AnnotationValue right ) { + super( left, right ); + } + + public String toString() { + return getLeft().toString() + " * " + getRight().toString(); + } + + public Object accept( AnnotationVisitor visitor ) { + return visitor.visitAnnotationRemainder( this ); + } + + public Object getParameterValue() { + return getLeft().getParameterValue() + " * " + getRight().getParameterValue(); + } + +} Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationUnsignedShiftRight.java =================================================================== --- src/java/com/thoughtworks/qdox/model/annotation/AnnotationUnsignedShiftRight.java (revision 0) +++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationUnsignedShiftRight.java (revision 0) @@ -0,0 +1,21 @@ +package com.thoughtworks.qdox.model.annotation; + +public class AnnotationUnsignedShiftRight extends AnnotationBinaryOperator { + + public AnnotationUnsignedShiftRight( AnnotationValue left, AnnotationValue right ) { + super( left, right ); + } + + public String toString() { + return getLeft().toString() + " >>> " + getRight().toString(); + } + + public Object accept( AnnotationVisitor visitor ) { + return visitor.visitAnnotationUnsignedShiftRight( this ); + } + + public Object getParameterValue() { + return getLeft().getParameterValue() + " >>> " + getRight().getParameterValue(); + } + +} Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationExclusiveOr.java =================================================================== --- src/java/com/thoughtworks/qdox/model/annotation/AnnotationExclusiveOr.java (revision 0) +++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationExclusiveOr.java (revision 0) @@ -0,0 +1,21 @@ +package com.thoughtworks.qdox.model.annotation; + +public class AnnotationExclusiveOr extends AnnotationBinaryOperator { + + public AnnotationExclusiveOr( AnnotationValue left, AnnotationValue right ) { + super( left, right ); + } + + public String toString() { + return getLeft().toString() + " ^ " + getRight().toString(); + } + + public Object accept( AnnotationVisitor visitor ) { + return visitor.visitAnnotationExclusiveOr( this ); + } + + public Object getParameterValue() { + return getLeft().getParameterValue() + " ^ " + getRight().getParameterValue(); + } + +} Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationValueList.java =================================================================== --- src/java/com/thoughtworks/qdox/model/annotation/AnnotationValueList.java (revision 0) +++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationValueList.java (revision 0) @@ -0,0 +1,54 @@ +package com.thoughtworks.qdox.model.annotation; + +import java.util.ArrayList; +import java.util.List; +import java.util.ListIterator; + +public class AnnotationValueList implements AnnotationValue { + + private final List valueList; + + public AnnotationValueList( List valueList ) { + this.valueList = valueList; + } + + public List getValueList() { + return valueList; + } + + public String toString() { + StringBuffer buf = new StringBuffer(); + + buf.append( "{" ); + + int pos = buf.length(); + + for( ListIterator i = valueList.listIterator(); i.hasNext(); ) { + buf.append( i.next().toString() ); + buf.append( ", " ); + } + + if( buf.length() > pos ) { + buf.setLength( buf.length() - 2 ); + } + + buf.append( "}" ); + + return buf.toString(); + } + + public Object accept( AnnotationVisitor visitor ) { + return visitor.visitAnnotationValueList( this ); + } + + public Object getParameterValue() { + List list = new ArrayList(); + + for( ListIterator i = valueList.listIterator(); i.hasNext(); ) { + AnnotationValue value = (AnnotationValue) i.next(); + list.add( value.getParameterValue() ); + } + + return list; + } +} Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationValue.java =================================================================== --- src/java/com/thoughtworks/qdox/model/annotation/AnnotationValue.java (revision 0) +++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationValue.java (revision 0) @@ -0,0 +1,27 @@ +package com.thoughtworks.qdox.model.annotation; + +import com.thoughtworks.qdox.model.Annotation; + +/** + * Interface for all annotation model elements + * + * @author Jochen Kuhnle + */ +public interface AnnotationValue { + + /** + * Accept a visitor for this value. + * + * @param visitor Visitor + * @return Visitor result + */ + public Object accept( AnnotationVisitor visitor ); + + /** + * Get a parameter value for {@link Annotation#getNamedParameter(String)}. + * + * @return Parameter value + */ + public Object getParameterValue(); + +} Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationOr.java =================================================================== --- src/java/com/thoughtworks/qdox/model/annotation/AnnotationOr.java (revision 0) +++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationOr.java (revision 0) @@ -0,0 +1,21 @@ +package com.thoughtworks.qdox.model.annotation; + +public class AnnotationOr extends AnnotationBinaryOperator { + + public AnnotationOr( AnnotationValue left, AnnotationValue right ) { + super( left, right ); + } + + public String toString() { + return getLeft().toString() + " | " + getRight().toString(); + } + + public Object accept( AnnotationVisitor visitor ) { + return visitor.visitAnnotationOr( this ); + } + + public Object getParameterValue() { + return getLeft().getParameterValue() + " | " + getRight().getParameterValue(); + } + +} Index: src/java/com/thoughtworks/qdox/model/annotation/EvaluatingVisitor.java =================================================================== --- src/java/com/thoughtworks/qdox/model/annotation/EvaluatingVisitor.java (revision 0) +++ src/java/com/thoughtworks/qdox/model/annotation/EvaluatingVisitor.java (revision 0) @@ -0,0 +1,740 @@ +package com.thoughtworks.qdox.model.annotation; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.ListIterator; + +import com.thoughtworks.qdox.model.Annotation; +import com.thoughtworks.qdox.model.JavaClass; +import com.thoughtworks.qdox.model.JavaField; + +/** + * Visitor that evaluates annotation expressions. + *
+ * Users of this class must override + * {@link EvaluatingVisitor#getFieldReferenceValue(JavaField)} to return values + * for referenced fields. + * + * @author Jochen Kuhnle + */ +public abstract class EvaluatingVisitor implements AnnotationVisitor { + + public Object getValue( Annotation annotation, String property ) { + Object result = null; + AnnotationValue value = annotation.getProperty( property ); + + if( value != null ) { + result = value.accept( this ); + } + + return result; + } + + public List getListValue( Annotation annotation, String property ) { + Object value = getValue( annotation, property ); + List list = null; + + if( value != null ) { + if( value instanceof List ) { + list = (List) value; + } + else { + list = Collections.singletonList( value ); + } + } + + return list; + } + + /** + * Return the result type of a binary operator + *
+ * Performs binary numeric promotion as specified in the Java Language
+ * Specification, section
+ * 5.6.1
+ */
+ protected static Class resultType( Object left, Object right ) {
+ Class type = void.class;
+
+ if( left instanceof String || right instanceof String ) {
+ type = String.class;
+ }
+ else if( left instanceof Number && right instanceof Number ) {
+ if( left instanceof Double || right instanceof Double ) {
+ type = Double.class;
+ }
+ else if( left instanceof Float || right instanceof Float ) {
+ type = Float.class;
+ }
+ else if( left instanceof Long || right instanceof Long ) {
+ type = Long.class;
+ }
+ else {
+ type = Integer.class;
+ }
+ }
+
+ return type;
+ }
+
+ /**
+ * Return the numeric result type of a binary operator
+ *
+ * Performs binary numeric promotion as specified in the Java Language
+ * Specification, section
+ * 5.6.1
+ */
+ protected static Class numericResultType( Object left, Object right ) {
+ Class type = void.class;
+
+ if( left instanceof Number && right instanceof Number ) {
+ if( left instanceof Long || right instanceof Long ) {
+ type = Long.class;
+ }
+ else if( left instanceof Integer || right instanceof Integer ) {
+ type = Integer.class;
+ }
+ }
+
+ return type;
+ }
+
+ /**
+ * Return the result type of an unary operator
+ *
+ * Performs unary numeric promotion as specified in the Java Language
+ * Specification, section
+ * 5.6.2
+ */
+ protected static Class unaryNumericResultType( Object value ) {
+ Class type = void.class;
+
+ if( value instanceof Byte || value instanceof Short || value instanceof Character || value instanceof Integer ) {
+ type = Integer.class;
+ }
+ else if( value instanceof Long ) {
+ value = Long.class;
+ }
+
+ return type;
+ }
+
+ protected static Class unaryResultType( Object value ) {
+ Class type = unaryNumericResultType( value );
+
+ if( type == void.class ) {
+ if( value instanceof Float ) {
+ value = Float.class;
+ }
+ else if( value instanceof Double ) {
+ value = Double.class;
+ }
+ }
+
+ return type;
+ }
+
+ public Object visitAnnotation( Annotation annotation ) {
+ throw new UnsupportedOperationException( "Illegal annotation value '" + annotation + "'." );
+ }
+
+ public Object visitAnnotationAdd( AnnotationAdd op ) {
+ Object left = op.getLeft().accept( this );
+ Object right = op.getRight().accept( this );
+ Class type = resultType( left, right );
+ Object result;
+
+ if( type == String.class ) {
+ result = left.toString() + right.toString();
+ }
+ else if( type == Double.class ) {
+ result = new Double( ((Number) left).doubleValue() + ((Number) right).doubleValue() );
+ }
+ else if( type == Float.class ) {
+ result = new Float( ((Number) left).floatValue() + ((Number) right).floatValue() );
+ }
+ else if( type == Long.class ) {
+ result = new Long( ((Number) left).longValue() + ((Number) right).longValue() );
+ }
+ else if( type == Integer.class ) {
+ result = new Integer( ((Number) left).intValue() + ((Number) right).intValue() );
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + op + "'." );
+ }
+
+ return result;
+ }
+
+ public Object visitAnnotationConstant( AnnotationConstant constant ) {
+ return constant.getValue();
+ }
+
+ public Object visitAnnotationDivide( AnnotationDivide op ) {
+ Object left = op.getLeft().accept( this );
+ Object right = op.getRight().accept( this );
+ Class type = resultType( left, right );
+ Object result;
+
+ if( type == Double.class ) {
+ result = new Double( ((Number) left).doubleValue() / ((Number) right).doubleValue() );
+ }
+ else if( type == Float.class ) {
+ result = new Float( ((Number) left).floatValue() / ((Number) right).floatValue() );
+ }
+ else if( type == Long.class ) {
+ result = new Long( ((Number) left).longValue() / ((Number) right).longValue() );
+ }
+ else if( type == Integer.class ) {
+ result = new Integer( ((Number) left).intValue() / ((Number) right).intValue() );
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + op + "'." );
+ }
+
+ return result;
+ }
+
+ public Object visitAnnotationFieldRef( AnnotationFieldRef fieldRef ) {
+ JavaField javaField = fieldRef.getField();
+
+ if( javaField == null ) {
+ throw new IllegalArgumentException( "Cannot resolve field reference '" + fieldRef + "'." );
+ }
+
+ if( !javaField.isFinal() || !javaField.isStatic() ) {
+ throw new IllegalArgumentException( "Field reference '" + fieldRef + "' must be static and final." );
+ }
+
+ Object result = getFieldReferenceValue( javaField );
+ return result;
+ }
+
+ protected abstract Object getFieldReferenceValue( JavaField javaField );
+
+ public Object visitAnnotationGreaterThan( AnnotationGreaterThan op ) {
+ Object left = op.getLeft().accept( this );
+ Object right = op.getRight().accept( this );
+ Class type = resultType( left, right );
+ boolean result;
+
+ if( type == Double.class ) {
+ result = ((Number) left).doubleValue() > ((Number) right).doubleValue();
+ }
+ else if( type == Float.class ) {
+ result = ((Number) left).floatValue() > ((Number) right).floatValue();
+ }
+ else if( type == Long.class ) {
+ result = ((Number) left).longValue() > ((Number) right).longValue();
+ }
+ else if( type == Integer.class ) {
+ result = ((Number) left).intValue() > ((Number) right).intValue();
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + op + "'." );
+ }
+
+ return result ? Boolean.TRUE : Boolean.FALSE;
+ }
+
+ public Object visitAnnotationLessThan( AnnotationLessThan op ) {
+ Object left = op.getLeft().accept( this );
+ Object right = op.getRight().accept( this );
+ Class type = resultType( left, right );
+ boolean result;
+
+ if( type == Double.class ) {
+ result = ((Number) left).doubleValue() < ((Number) right).doubleValue();
+ }
+ else if( type == Float.class ) {
+ result = ((Number) left).floatValue() < ((Number) right).floatValue();
+ }
+ else if( type == Long.class ) {
+ result = ((Number) left).longValue() < ((Number) right).longValue();
+ }
+ else if( type == Integer.class ) {
+ result = ((Number) left).intValue() < ((Number) right).intValue();
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + op + "'." );
+ }
+
+ return result ? Boolean.TRUE : Boolean.FALSE;
+ }
+
+ public Object visitAnnotationMultiply( AnnotationMultiply op ) {
+ Object left = op.getLeft().accept( this );
+ Object right = op.getRight().accept( this );
+ Class type = resultType( left, right );
+ Object result;
+
+ if( type == Double.class ) {
+ result = new Double( ((Number) left).doubleValue() * ((Number) right).doubleValue() );
+ }
+ else if( type == Float.class ) {
+ result = new Float( ((Number) left).floatValue() * ((Number) right).floatValue() );
+ }
+ else if( type == Long.class ) {
+ result = new Long( ((Number) left).longValue() * ((Number) right).longValue() );
+ }
+ else if( type == Integer.class ) {
+ result = new Integer( ((Number) left).intValue() * ((Number) right).intValue() );
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + op + "'." );
+ }
+
+ return result;
+ }
+
+ public Object visitAnnotationParenExpression( AnnotationParenExpression parenExpression ) {
+ return parenExpression.getValue().accept( this );
+ }
+
+ public Object visitAnnotationSubtract( AnnotationSubtract op ) {
+ Object left = op.getLeft().accept( this );
+ Object right = op.getRight().accept( this );
+ Class type = resultType( left, right );
+ Object result;
+
+ if( type == Double.class ) {
+ result = new Double( ((Number) left).doubleValue() - ((Number) right).doubleValue() );
+ }
+ else if( type == Float.class ) {
+ result = new Float( ((Number) left).floatValue() - ((Number) right).floatValue() );
+ }
+ else if( type == Long.class ) {
+ result = new Long( ((Number) left).longValue() - ((Number) right).longValue() );
+ }
+ else if( type == Integer.class ) {
+ result = new Integer( ((Number) left).intValue() - ((Number) right).intValue() );
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + op + "'." );
+ }
+
+ return result;
+ }
+
+ public Object visitAnnotationTypeRef( AnnotationTypeRef typeRef ) {
+ JavaClass javaClass = typeRef.getType().getJavaClass();
+ return javaClass;
+ }
+
+ public Object visitAnnotationValueList( AnnotationValueList valueList ) {
+ List list = new ArrayList();
+
+ for( ListIterator i = valueList.getValueList().listIterator(); i.hasNext(); ) {
+ AnnotationValue value = (AnnotationValue) i.next();
+ Object v = value.accept( this );
+ list.add( v );
+ }
+
+ return list;
+ }
+
+ public Object visitAnnotationAnd( AnnotationAnd and ) {
+ Object left = and.getLeft().accept( this );
+ Object right = and.getRight().accept( this );
+ Class type = numericResultType( left, right );
+ Object result;
+
+ if( type == Long.class ) {
+ result = new Long( ((Number) left).longValue() & ((Number) right).longValue() );
+ }
+ else if( type == Integer.class ) {
+ result = new Integer( ((Number) left).intValue() & ((Number) right).intValue() );
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + and + "'." );
+ }
+
+ return result;
+ }
+
+ public Object visitAnnotationGreaterEquals( AnnotationGreaterEquals greaterEquals ) {
+ Object left = greaterEquals.getLeft().accept( this );
+ Object right = greaterEquals.getRight().accept( this );
+ Class type = resultType( left, right );
+ boolean result;
+
+ if( type == Double.class ) {
+ result = ((Number) left).doubleValue() >= ((Number) right).doubleValue();
+ }
+ else if( type == Float.class ) {
+ result = ((Number) left).floatValue() >= ((Number) right).floatValue();
+ }
+ else if( type == Long.class ) {
+ result = ((Number) left).longValue() >= ((Number) right).longValue();
+ }
+ else if( type == Integer.class ) {
+ result = ((Number) left).intValue() >= ((Number) right).intValue();
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + greaterEquals + "'." );
+ }
+
+ return result ? Boolean.TRUE : Boolean.FALSE;
+ }
+
+ public Object visitAnnotationLessEquals( AnnotationLessEquals lessEquals ) {
+ Object left = lessEquals.getLeft().accept( this );
+ Object right = lessEquals.getRight().accept( this );
+ Class type = resultType( left, right );
+ boolean result;
+
+ if( type == Double.class ) {
+ result = ((Number) left).doubleValue() <= ((Number) right).doubleValue();
+ }
+ else if( type == Float.class ) {
+ result = ((Number) left).floatValue() <= ((Number) right).floatValue();
+ }
+ else if( type == Long.class ) {
+ result = ((Number) left).longValue() <= ((Number) right).longValue();
+ }
+ else if( type == Integer.class ) {
+ result = ((Number) left).intValue() <= ((Number) right).intValue();
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + lessEquals + "'." );
+ }
+
+ return result ? Boolean.TRUE : Boolean.FALSE;
+ }
+
+ public Object visitAnnotationLogicalAnd( AnnotationLogicalAnd and ) {
+ Object left = and.getLeft().accept( this );
+ Object right = and.getRight().accept( this );
+ boolean result;
+
+ if( left instanceof Boolean && right instanceof Boolean ) {
+ result = ((Boolean) left).booleanValue() && ((Boolean) right).booleanValue();
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + and + "'." );
+ }
+
+ return result ? Boolean.TRUE : Boolean.FALSE;
+ }
+
+ public Object visitAnnotationLogicalNot( AnnotationLogicalNot not ) {
+ Object value = not.getValue().accept( this );
+ boolean result;
+
+ if( value instanceof Boolean ) {
+ result = !((Boolean) value).booleanValue();
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + not + "'." );
+ }
+
+ return result ? Boolean.TRUE : Boolean.FALSE;
+ }
+
+ public Object visitAnnotationLogicalOr( AnnotationLogicalOr or ) {
+ Object left = or.getLeft().accept( this );
+ Object right = or.getRight().accept( this );
+ boolean result;
+
+ if( left instanceof Boolean && right instanceof Boolean ) {
+ result = ((Boolean) left).booleanValue() || ((Boolean) right).booleanValue();
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + or + "'." );
+ }
+
+ return result ? Boolean.TRUE : Boolean.FALSE;
+ }
+
+ public Object visitAnnotationMinusSign( AnnotationMinusSign sign ) {
+ Object value = sign.getValue().accept( this );
+ Class type = unaryResultType( value );
+ Object result;
+
+ if( type == Integer.class ) {
+ result = new Integer( -((Integer) value).intValue() );
+ }
+ else if( type == Long.class ) {
+ result = new Long( -((Long) value).longValue() );
+ }
+ else if( type == Float.class ) {
+ result = new Float( -((Float) value).floatValue() );
+ }
+ else if( type == Double.class ) {
+ result = new Double( -((Double) value).intValue() );
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + sign + "'." );
+ }
+
+ return result;
+ }
+
+ public Object visitAnnotationNot( AnnotationNot not ) {
+ Object value = not.getValue().accept( this );
+ Object type = unaryNumericResultType( value );
+ Object result;
+
+ if( type == Long.class ) {
+ result = new Long( ~((Long) value).longValue() );
+ }
+ else if( type == Integer.class ) {
+ result = new Integer( ~((Integer) value).intValue() );
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + not + "'." );
+ }
+
+ return result;
+ }
+
+ public Object visitAnnotationOr( AnnotationOr or ) {
+ Object left = or.getLeft().accept( this );
+ Object right = or.getRight().accept( this );
+ Class type = numericResultType( left, right );
+ Object result;
+
+ if( type == Long.class ) {
+ result = new Long( ((Number) left).longValue() | ((Number) right).longValue() );
+ }
+ else if( type == Integer.class ) {
+ result = new Integer( ((Number) left).intValue() | ((Number) right).intValue() );
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + or + "'." );
+ }
+
+ return result;
+ }
+
+ public Object visitAnnotationPlusSign( AnnotationPlusSign sign ) {
+ Object value = sign.getValue().accept( this );
+ Object result;
+
+ if( value instanceof Number ) {
+ result = value;
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + sign + "'." );
+ }
+
+ return result;
+ }
+
+ public Object visitAnnotationRemainder( AnnotationRemainder remainder ) {
+ Object left = remainder.getLeft().accept( this );
+ Object right = remainder.getRight().accept( this );
+ Class type = resultType( left, right );
+ Object result;
+
+ if( type == Double.class ) {
+ result = new Double( ((Number) left).doubleValue() % ((Number) right).doubleValue() );
+ }
+ else if( type == Float.class ) {
+ result = new Float( ((Number) left).floatValue() % ((Number) right).floatValue() );
+ }
+ else if( type == Long.class ) {
+ result = new Long( ((Number) left).longValue() % ((Number) right).longValue() );
+ }
+ else if( type == Integer.class ) {
+ result = new Integer( ((Number) left).intValue() % ((Number) right).intValue() );
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + remainder + "'." );
+ }
+
+ return result;
+ }
+
+ public Object visitAnnotationShiftLeft( AnnotationShiftLeft shiftLeft ) {
+ Object left = shiftLeft.getLeft().accept( this );
+ Object right = shiftLeft.getRight().accept( this );
+ Class type = numericResultType( left, right );
+ Object result;
+
+ if( type == Long.class ) {
+ result = new Long( ((Number) left).longValue() << ((Number) right).longValue() );
+ }
+ else if( type == Integer.class ) {
+ result = new Integer( ((Number) left).intValue() << ((Number) right).intValue() );
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + shiftLeft + "'." );
+ }
+
+ return result;
+ }
+
+ public Object visitAnnotationShiftRight( AnnotationShiftRight shiftRight ) {
+ Object left = shiftRight.getLeft().accept( this );
+ Object right = shiftRight.getRight().accept( this );
+ Class type = numericResultType( left, right );
+ Object result;
+
+ if( type == Long.class ) {
+ result = new Long( ((Number) left).longValue() >> ((Number) right).longValue() );
+ }
+ else if( type == Integer.class ) {
+ result = new Integer( ((Number) left).intValue() >> ((Number) right).intValue() );
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + shiftRight + "'." );
+ }
+
+ return result;
+ }
+
+ public Object visitAnnotationUnsignedShiftRight( AnnotationUnsignedShiftRight shiftRight ) {
+ Object left = shiftRight.getLeft().accept( this );
+ Object right = shiftRight.getRight().accept( this );
+ Class type = numericResultType( left, right );
+ Object result;
+
+ if( type == Long.class ) {
+ result = new Long( ((Number) left).longValue() >>> ((Number) right).longValue() );
+ }
+ else if( type == Integer.class ) {
+ result = new Integer( ((Number) left).intValue() >>> ((Number) right).intValue() );
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + shiftRight + "'." );
+ }
+
+ return result;
+ }
+
+ public Object visitAnnotationEquals( AnnotationEquals annotationEquals ) {
+ Object left = annotationEquals.getLeft().accept( this );
+ Object right = annotationEquals.getRight().accept( this );
+ Class type = resultType( left, right );
+ boolean result;
+
+ if( type == Double.class ) {
+ result = ((Number) left).doubleValue() == ((Number) right).doubleValue();
+ }
+ else if( type == Float.class ) {
+ result = ((Number) left).floatValue() == ((Number) right).floatValue();
+ }
+ else if( type == Long.class ) {
+ result = ((Number) left).longValue() == ((Number) right).longValue();
+ }
+ else if( type == Integer.class ) {
+ result = ((Number) left).intValue() == ((Number) right).intValue();
+ }
+ else {
+ result = (left == right);
+ }
+
+ return result ? Boolean.TRUE : Boolean.FALSE;
+ }
+
+ public Object visitAnnotationExclusiveOr( AnnotationExclusiveOr annotationExclusiveOr ) {
+ Object left = annotationExclusiveOr.getLeft().accept( this );
+ Object right = annotationExclusiveOr.getRight().accept( this );
+ Class type = numericResultType( left, right );
+ Object result;
+
+ if( type == Long.class ) {
+ result = new Long( ((Number) left).longValue() ^ ((Number) right).longValue() );
+ }
+ else if( type == Integer.class ) {
+ result = new Integer( ((Number) left).intValue() ^ ((Number) right).intValue() );
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + annotationExclusiveOr + "'." );
+ }
+
+ return result;
+ }
+
+ public Object visitAnnotationNotEquals( AnnotationNotEquals annotationNotEquals ) {
+ Object left = annotationNotEquals.getLeft().accept( this );
+ Object right = annotationNotEquals.getRight().accept( this );
+ Class type = resultType( left, right );
+ boolean result;
+
+ if( type == Double.class ) {
+ result = ((Number) left).doubleValue() != ((Number) right).doubleValue();
+ }
+ else if( type == Float.class ) {
+ result = ((Number) left).floatValue() != ((Number) right).floatValue();
+ }
+ else if( type == Long.class ) {
+ result = ((Number) left).longValue() != ((Number) right).longValue();
+ }
+ else if( type == Integer.class ) {
+ result = ((Number) left).intValue() != ((Number) right).intValue();
+ }
+ else {
+ result = (left == right);
+ }
+
+ return result ? Boolean.TRUE : Boolean.FALSE;
+ }
+
+ public Object visitAnnotationQuery( AnnotationQuery annotationQuery ) {
+ Object value = annotationQuery.getCondition().accept( this );
+
+ if( value == null || !(value instanceof Boolean) ) {
+ throw new IllegalArgumentException( "Cannot evaluate '" + annotationQuery + "'." );
+ }
+
+ AnnotationValue expression = ((Boolean) value).booleanValue() ? annotationQuery.getTrueExpression()
+ : annotationQuery.getFalseExpression();
+
+ return expression.accept( this );
+ }
+
+ public Object visitAnnotationCast( AnnotationCast annotationCast ) {
+ Object value = annotationCast.getValue().accept( this );
+ String type = annotationCast.getType().getJavaClass().getFullyQualifiedName();
+ Object result;
+
+ if( value instanceof Number ) {
+ Number n = (Number) value;
+
+ if( type.equals( "byte" ) ) {
+ result = new Byte( n.byteValue() );
+ }
+ else if( type.equals( "char" ) ) {
+ result = new Character( (char) n.intValue() );
+ }
+ else if( type.equals( "short" ) ) {
+ result = new Short( n.shortValue() );
+ }
+ else if( type.equals( "int" ) ) {
+ result = new Integer( n.intValue() );
+ }
+ else if( type.equals( "long" ) ) {
+ result = new Long( n.longValue() );
+ }
+ else if( type.equals( "float" ) ) {
+ result = new Float( n.floatValue() );
+ }
+ else if( type.equals( "double" ) ) {
+ result = new Double( n.doubleValue() );
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + annotationCast + "'." );
+ }
+ }
+ else if( value instanceof String ) {
+ if( type.equals( "java.lang.String" ) ) {
+ result = value;
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + annotationCast + "'." );
+ }
+ }
+ else {
+ throw new IllegalArgumentException( "Cannot evaluate '" + annotationCast + "'." );
+ }
+
+ return result;
+ }
+
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationParenExpression.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationParenExpression.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationParenExpression.java (revision 0)
@@ -0,0 +1,27 @@
+package com.thoughtworks.qdox.model.annotation;
+
+public class AnnotationParenExpression implements AnnotationValue {
+
+ private AnnotationValue value;
+
+ public AnnotationParenExpression( AnnotationValue value ) {
+ this.value = value;
+ }
+
+ public AnnotationValue getValue() {
+ return value;
+ }
+
+ public String toString() {
+ return "(" + value.toString() + ")";
+ }
+
+ public Object accept( AnnotationVisitor visitor ) {
+ return visitor.visitAnnotationParenExpression( this );
+ }
+
+ public Object getParameterValue() {
+ return "(" + value.getParameterValue() + ")";
+ }
+
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationSubtract.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationSubtract.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationSubtract.java (revision 0)
@@ -0,0 +1,21 @@
+package com.thoughtworks.qdox.model.annotation;
+
+public class AnnotationSubtract extends AnnotationBinaryOperator {
+
+ public AnnotationSubtract( AnnotationValue left, AnnotationValue right ) {
+ super( left, right );
+ }
+
+ public String toString() {
+ return getLeft().toString() + " - " + getRight().toString();
+ }
+
+ public Object accept( AnnotationVisitor visitor ) {
+ return visitor.visitAnnotationSubtract( this );
+ }
+
+ public Object getParameterValue() {
+ return getLeft().getParameterValue() + " - " + getRight().getParameterValue();
+ }
+
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/RecursiveAnnotationVisitor.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/RecursiveAnnotationVisitor.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/RecursiveAnnotationVisitor.java (revision 0)
@@ -0,0 +1,217 @@
+package com.thoughtworks.qdox.model.annotation;
+
+import java.util.Iterator;
+import java.util.ListIterator;
+
+import com.thoughtworks.qdox.model.Annotation;
+
+public class RecursiveAnnotationVisitor implements AnnotationVisitor {
+
+ public Object visitAnnotation( Annotation annotation ) {
+ for( Iterator i = annotation.getPropertyMap().values().iterator(); i.hasNext(); ) {
+ AnnotationValue value = (AnnotationValue) i.next();
+ value.accept( this );
+ }
+
+ return null;
+ }
+
+ public Object visitAnnotationAdd( AnnotationAdd op ) {
+ op.getLeft().accept( this );
+ op.getRight().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationConstant( AnnotationConstant constant ) {
+ return null;
+ }
+
+ public Object visitAnnotationDivide( AnnotationDivide op ) {
+ op.getLeft().accept( this );
+ op.getRight().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationFieldRef( AnnotationFieldRef fieldRef ) {
+ return null;
+ }
+
+ public Object visitAnnotationGreaterThan( AnnotationGreaterThan op ) {
+ op.getLeft().accept( this );
+ op.getRight().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationLessThan( AnnotationLessThan op ) {
+ op.getLeft().accept( this );
+ op.getRight().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationMultiply( AnnotationMultiply op ) {
+ op.getLeft().accept( this );
+ op.getRight().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationParenExpression( AnnotationParenExpression parenExpression ) {
+ parenExpression.getValue().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationSubtract( AnnotationSubtract op ) {
+ op.getLeft().accept( this );
+ op.getRight().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationTypeRef( AnnotationTypeRef typeRef ) {
+ return null;
+ }
+
+ public Object visitAnnotationValueList( AnnotationValueList valueList ) {
+ for( ListIterator i = valueList.getValueList().listIterator(); i.hasNext(); ) {
+ AnnotationValue value = (AnnotationValue) i.next();
+ value.accept( this );
+ }
+
+ return null;
+ }
+
+ public Object visitAnnotationAnd( AnnotationAnd and ) {
+ and.getLeft().accept( this );
+ and.getRight().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationGreaterEquals( AnnotationGreaterEquals greaterEquals ) {
+ greaterEquals.getLeft().accept( this );
+ greaterEquals.getRight().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationLessEquals( AnnotationLessEquals lessEquals ) {
+ lessEquals.getLeft().accept( this );
+ lessEquals.getRight().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationLogicalAnd( AnnotationLogicalAnd and ) {
+ and.getLeft().accept( this );
+ and.getRight().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationLogicalNot( AnnotationLogicalNot not ) {
+ not.getValue().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationLogicalOr( AnnotationLogicalOr or ) {
+ or.getLeft().accept( this );
+ or.getRight().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationMinusSign( AnnotationMinusSign sign ) {
+ sign.getValue().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationNot( AnnotationNot not ) {
+ not.getValue().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationOr( AnnotationOr or ) {
+ or.getLeft().accept( this );
+ or.getRight().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationPlusSign( AnnotationPlusSign sign ) {
+ sign.getValue().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationRemainder( AnnotationRemainder remainder ) {
+ remainder.getLeft().accept( this );
+ remainder.getRight().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationShiftLeft( AnnotationShiftLeft left ) {
+ left.getLeft().accept( this );
+ left.getRight().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationShiftRight( AnnotationShiftRight right ) {
+ right.getLeft().accept( this );
+ right.getRight().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationUnsignedShiftRight( AnnotationUnsignedShiftRight right ) {
+ right.getLeft().accept( this );
+ right.getRight().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationEquals( AnnotationEquals annotationEquals ) {
+ annotationEquals.getLeft().accept( this );
+ annotationEquals.getRight().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationExclusiveOr( AnnotationExclusiveOr annotationExclusiveOr ) {
+ annotationExclusiveOr.getLeft().accept( this );
+ annotationExclusiveOr.getRight().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationNotEquals( AnnotationNotEquals annotationNotEquals ) {
+ annotationNotEquals.getLeft().accept( this );
+ annotationNotEquals.getRight().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationQuery( AnnotationQuery annotationQuery ) {
+ annotationQuery.getCondition().accept( this );
+ annotationQuery.getTrueExpression().accept( this );
+ annotationQuery.getFalseExpression().accept( this );
+
+ return null;
+ }
+
+ public Object visitAnnotationCast( AnnotationCast annotationCast ) {
+ annotationCast.getValue().accept( this );
+
+ return null;
+ }
+
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationShiftLeft.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationShiftLeft.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationShiftLeft.java (revision 0)
@@ -0,0 +1,21 @@
+package com.thoughtworks.qdox.model.annotation;
+
+public class AnnotationShiftLeft extends AnnotationBinaryOperator {
+
+ public AnnotationShiftLeft( AnnotationValue left, AnnotationValue right ) {
+ super( left, right );
+ }
+
+ public String toString() {
+ return getLeft().toString() + " << " + getRight().toString();
+ }
+
+ public Object accept( AnnotationVisitor visitor ) {
+ return visitor.visitAnnotationShiftLeft( this );
+ }
+
+ public Object getParameterValue() {
+ return getLeft().getParameterValue() + " << " + getRight().getParameterValue();
+ }
+
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationAdd.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationAdd.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationAdd.java (revision 0)
@@ -0,0 +1,21 @@
+package com.thoughtworks.qdox.model.annotation;
+
+public class AnnotationAdd extends AnnotationBinaryOperator {
+
+ public AnnotationAdd( AnnotationValue left, AnnotationValue right ) {
+ super( left, right );
+ }
+
+ public String toString() {
+ return getLeft().toString() + " + " + getRight().toString();
+ }
+
+ public Object accept( AnnotationVisitor visitor ) {
+ return visitor.visitAnnotationAdd( this );
+ }
+
+ public Object getParameterValue() {
+ return getLeft().getParameterValue() + " + " + getRight().getParameterValue();
+ }
+
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationEquals.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationEquals.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationEquals.java (revision 0)
@@ -0,0 +1,21 @@
+package com.thoughtworks.qdox.model.annotation;
+
+public class AnnotationEquals extends AnnotationBinaryOperator {
+
+ public AnnotationEquals( AnnotationValue left, AnnotationValue right ) {
+ super( left, right );
+ }
+
+ public String toString() {
+ return getLeft().toString() + " == " + getRight().toString();
+ }
+
+ public Object accept( AnnotationVisitor visitor ) {
+ return visitor.visitAnnotationEquals( this );
+ }
+
+ public Object getParameterValue() {
+ return getLeft().getParameterValue() + " == " + getRight().getParameterValue();
+ }
+
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationLogicalNot.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationLogicalNot.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationLogicalNot.java (revision 0)
@@ -0,0 +1,20 @@
+package com.thoughtworks.qdox.model.annotation;
+
+public class AnnotationLogicalNot extends AnnotationUnaryOperator {
+
+ public AnnotationLogicalNot( AnnotationValue value ) {
+ super( value );
+ }
+
+ public String toString() {
+ return "!" + getValue().toString();
+ }
+
+ public Object accept( AnnotationVisitor visitor ) {
+ return visitor.visitAnnotationLogicalNot( this );
+ }
+
+ public Object getParameterValue() {
+ return "!" + getValue().toString();
+ }
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationLogicalAnd.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationLogicalAnd.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationLogicalAnd.java (revision 0)
@@ -0,0 +1,21 @@
+package com.thoughtworks.qdox.model.annotation;
+
+public class AnnotationLogicalAnd extends AnnotationBinaryOperator {
+
+ public AnnotationLogicalAnd( AnnotationValue left, AnnotationValue right ) {
+ super( left, right );
+ }
+
+ public String toString() {
+ return getLeft().toString() + " && " + getRight().toString();
+ }
+
+ public Object accept( AnnotationVisitor visitor ) {
+ return visitor.visitAnnotationLogicalAnd( this );
+ }
+
+ public Object getParameterValue() {
+ return getLeft().getParameterValue() + " && " + getRight().getParameterValue();
+ }
+
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationBinaryOperator.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationBinaryOperator.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationBinaryOperator.java (revision 0)
@@ -0,0 +1,22 @@
+package com.thoughtworks.qdox.model.annotation;
+
+public abstract class AnnotationBinaryOperator implements AnnotationValue {
+
+ private AnnotationValue left;
+
+ private AnnotationValue right;
+
+ public AnnotationBinaryOperator( AnnotationValue left, AnnotationValue right ) {
+ this.left = left;
+ this.right = right;
+ }
+
+ public AnnotationValue getLeft() {
+ return left;
+ }
+
+ public AnnotationValue getRight() {
+ return right;
+ }
+
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationNot.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationNot.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationNot.java (revision 0)
@@ -0,0 +1,20 @@
+package com.thoughtworks.qdox.model.annotation;
+
+public class AnnotationNot extends AnnotationUnaryOperator {
+
+ public AnnotationNot( AnnotationValue value ) {
+ super( value );
+ }
+
+ public String toString() {
+ return "~" + getValue().toString();
+ }
+
+ public Object accept( AnnotationVisitor visitor ) {
+ return visitor.visitAnnotationNot( this );
+ }
+
+ public Object getParameterValue() {
+ return "~" + getValue().toString();
+ }
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationAnd.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationAnd.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationAnd.java (revision 0)
@@ -0,0 +1,21 @@
+package com.thoughtworks.qdox.model.annotation;
+
+public class AnnotationAnd extends AnnotationBinaryOperator {
+
+ public AnnotationAnd( AnnotationValue left, AnnotationValue right ) {
+ super( left, right );
+ }
+
+ public String toString() {
+ return getLeft().toString() + " & " + getRight().toString();
+ }
+
+ public Object accept( AnnotationVisitor visitor ) {
+ return visitor.visitAnnotationAnd( this );
+ }
+
+ public Object getParameterValue() {
+ return getLeft().getParameterValue() + " & " + getRight().getParameterValue();
+ }
+
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationQuery.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationQuery.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationQuery.java (revision 0)
@@ -0,0 +1,41 @@
+package com.thoughtworks.qdox.model.annotation;
+
+public class AnnotationQuery implements AnnotationValue {
+
+ private final AnnotationValue condition;
+
+ private final AnnotationValue trueExpression;
+
+ private final AnnotationValue falseExpression;
+
+ public AnnotationQuery( AnnotationValue condition, AnnotationValue trueExpression, AnnotationValue falseExpression ) {
+ this.condition = condition;
+ this.trueExpression = trueExpression;
+ this.falseExpression = falseExpression;
+ }
+
+ public Object accept( AnnotationVisitor visitor ) {
+ return visitor.visitAnnotationQuery( this );
+ }
+
+ public AnnotationValue getCondition() {
+ return this.condition;
+ }
+
+ public AnnotationValue getTrueExpression() {
+ return this.trueExpression;
+ }
+
+ public AnnotationValue getFalseExpression() {
+ return this.falseExpression;
+ }
+
+ public Object getParameterValue() {
+ return condition.getParameterValue().toString() + " ? " + trueExpression.getParameterValue() + " : "
+ + falseExpression.getParameterValue();
+ }
+
+ public String toString() {
+ return condition.toString() + " ? " + trueExpression.toString() + " : " + falseExpression.toString();
+ }
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationUnaryOperator.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationUnaryOperator.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationUnaryOperator.java (revision 0)
@@ -0,0 +1,15 @@
+package com.thoughtworks.qdox.model.annotation;
+
+public abstract class AnnotationUnaryOperator implements AnnotationValue {
+
+ private AnnotationValue value;
+
+ public AnnotationUnaryOperator( AnnotationValue value ) {
+ this.value = value;
+ }
+
+ public AnnotationValue getValue() {
+ return value;
+ }
+
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationLogicalOr.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationLogicalOr.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationLogicalOr.java (revision 0)
@@ -0,0 +1,21 @@
+package com.thoughtworks.qdox.model.annotation;
+
+public class AnnotationLogicalOr extends AnnotationBinaryOperator {
+
+ public AnnotationLogicalOr( AnnotationValue left, AnnotationValue right ) {
+ super( left, right );
+ }
+
+ public String toString() {
+ return getLeft().toString() + " || " + getRight().toString();
+ }
+
+ public Object accept( AnnotationVisitor visitor ) {
+ return visitor.visitAnnotationLogicalOr( this );
+ }
+
+ public Object getParameterValue() {
+ return getLeft().getParameterValue() + " || " + getRight().getParameterValue();
+ }
+
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationShiftRight.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationShiftRight.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationShiftRight.java (revision 0)
@@ -0,0 +1,21 @@
+package com.thoughtworks.qdox.model.annotation;
+
+public class AnnotationShiftRight extends AnnotationBinaryOperator {
+
+ public AnnotationShiftRight( AnnotationValue left, AnnotationValue right ) {
+ super( left, right );
+ }
+
+ public String toString() {
+ return getLeft().toString() + " >> " + getRight().toString();
+ }
+
+ public Object accept( AnnotationVisitor visitor ) {
+ return visitor.visitAnnotationShiftRight( this );
+ }
+
+ public Object getParameterValue() {
+ return getLeft().getParameterValue() + " >> " + getRight().getParameterValue();
+ }
+
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationNotEquals.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationNotEquals.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationNotEquals.java (revision 0)
@@ -0,0 +1,21 @@
+package com.thoughtworks.qdox.model.annotation;
+
+public class AnnotationNotEquals extends AnnotationBinaryOperator {
+
+ public AnnotationNotEquals( AnnotationValue left, AnnotationValue right ) {
+ super( left, right );
+ }
+
+ public String toString() {
+ return getLeft().toString() + " != " + getRight().toString();
+ }
+
+ public Object accept( AnnotationVisitor visitor ) {
+ return visitor.visitAnnotationNotEquals( this );
+ }
+
+ public Object getParameterValue() {
+ return getLeft().getParameterValue() + " != " + getRight().getParameterValue();
+ }
+
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationMinusSign.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationMinusSign.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationMinusSign.java (revision 0)
@@ -0,0 +1,20 @@
+package com.thoughtworks.qdox.model.annotation;
+
+public class AnnotationMinusSign extends AnnotationUnaryOperator {
+
+ public AnnotationMinusSign( AnnotationValue value ) {
+ super( value );
+ }
+
+ public String toString() {
+ return "-" + getValue().toString();
+ }
+
+ public Object accept( AnnotationVisitor visitor ) {
+ return visitor.visitAnnotationMinusSign( this );
+ }
+
+ public Object getParameterValue() {
+ return "-" + getValue().toString();
+ }
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationTypeRef.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationTypeRef.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationTypeRef.java (revision 0)
@@ -0,0 +1,28 @@
+package com.thoughtworks.qdox.model.annotation;
+
+import com.thoughtworks.qdox.model.Type;
+
+public class AnnotationTypeRef implements AnnotationValue {
+
+ private Type type;
+
+ public AnnotationTypeRef( Type type ) {
+ this.type = type;
+ }
+
+ public Type getType() {
+ return type;
+ }
+
+ public String toString() {
+ return type.getValue() + ".class";
+ }
+
+ public Object accept( AnnotationVisitor visitor ) {
+ return visitor.visitAnnotationTypeRef( this );
+ }
+
+ public Object getParameterValue() {
+ return type.getValue() + ".class";
+ }
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationMultiply.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationMultiply.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationMultiply.java (revision 0)
@@ -0,0 +1,21 @@
+package com.thoughtworks.qdox.model.annotation;
+
+public class AnnotationMultiply extends AnnotationBinaryOperator {
+
+ public AnnotationMultiply( AnnotationValue left, AnnotationValue right ) {
+ super( left, right );
+ }
+
+ public String toString() {
+ return getLeft().toString() + " * " + getRight().toString();
+ }
+
+ public Object accept( AnnotationVisitor visitor ) {
+ return visitor.visitAnnotationMultiply( this );
+ }
+
+ public Object getParameterValue() {
+ return getLeft().getParameterValue() + " * " + getRight().getParameterValue();
+ }
+
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationFieldRef.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationFieldRef.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationFieldRef.java (revision 0)
@@ -0,0 +1,137 @@
+package com.thoughtworks.qdox.model.annotation;
+
+import java.util.StringTokenizer;
+
+import com.thoughtworks.qdox.model.AbstractJavaEntity;
+import com.thoughtworks.qdox.model.JavaClass;
+import com.thoughtworks.qdox.model.JavaField;
+import com.thoughtworks.qdox.model.Type;
+
+public class AnnotationFieldRef implements AnnotationValue {
+
+ private final int[] parts;
+
+ private final String name;
+
+ private AbstractJavaEntity context;
+
+ private JavaField field;
+
+ private int fieldIndex = -1;
+
+ public AnnotationFieldRef( String name ) {
+ this.name = name;
+
+ int length = new StringTokenizer( name, "." ).countTokens();
+ this.parts = new int[length + 1];
+ this.parts[0] = -1;
+
+ for( int i = 1; i < length; ++i ) {
+ this.parts[i] = name.indexOf( '.', this.parts[i - 1] + 1 );
+ }
+
+ this.parts[length] = name.length();
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getNamePrefix( int end ) {
+ return name.substring( 0, parts[end + 1] );
+ }
+
+ public String getNamePart( int index ) {
+ return name.substring( parts[index] + 1, parts[index + 1] );
+ }
+
+ public int getPartCount() {
+ return parts.length - 1;
+ }
+
+ public Object accept( AnnotationVisitor visitor ) {
+ return visitor.visitAnnotationFieldRef( this );
+ }
+
+ public Object getParameterValue() {
+ return getName();
+ }
+
+ public String toString() {
+ return getName();
+ }
+
+ public AbstractJavaEntity getContext() {
+ return this.context;
+ }
+
+ public void setContext( AbstractJavaEntity context ) {
+ this.context = context;
+ }
+
+ public String getClassPart() {
+ String result = null;
+
+ if( getField() != null ) {
+ result = name.substring( 0, parts[fieldIndex] );
+ }
+
+ return result;
+ }
+
+ public String getFieldPart() {
+ String result = null;
+
+ if( getField() != null ) {
+ result = name.substring( parts[fieldIndex] + 1 );
+ }
+
+ return result;
+ }
+
+ protected JavaField resolveField( JavaClass javaClass, int start, int end ) {
+ JavaField field = null;
+
+ for( int i = start; i < end; ++i ) {
+ field = javaClass.getFieldByName( getNamePart( i ) );
+
+ if( field == null ) {
+ break;
+ }
+
+ javaClass = field.getType().getJavaClass();
+ }
+
+ return field;
+ }
+
+ public JavaField getField() {
+ if( fieldIndex < 0 ) {
+ if( context.getParent() instanceof JavaClass ) {
+ JavaClass javaClass = (JavaClass) context.getParent();
+ field = resolveField( javaClass, 0, parts.length );
+ fieldIndex = 0;
+ }
+
+ if( field == null ) {
+ for( int i = 0; i < parts.length - 1; ++i ) {
+ String className = getNamePrefix( i );
+ String typeName = context.getParent().resolveType( className );
+
+ if( typeName != null ) {
+ Type type = Type.createUnresolved( typeName, 0, context.getParent() );
+ JavaClass javaClass = type.getJavaClass();
+
+ if( javaClass != null ) {
+ fieldIndex = i + 1;
+ field = resolveField( javaClass, i + 1, parts.length - 1 );
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ return field;
+ }
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationLessThan.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationLessThan.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationLessThan.java (revision 0)
@@ -0,0 +1,21 @@
+package com.thoughtworks.qdox.model.annotation;
+
+public class AnnotationLessThan extends AnnotationBinaryOperator {
+
+ public AnnotationLessThan( AnnotationValue left, AnnotationValue right ) {
+ super( left, right );
+ }
+
+ public String toString() {
+ return getLeft().toString() + " < " + getRight().toString();
+ }
+
+ public Object accept( AnnotationVisitor visitor ) {
+ return visitor.visitAnnotationLessThan( this );
+ }
+
+ public Object getParameterValue() {
+ return getLeft().getParameterValue() + " < " + getRight().getParameterValue();
+ }
+
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationLessEquals.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationLessEquals.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationLessEquals.java (revision 0)
@@ -0,0 +1,21 @@
+package com.thoughtworks.qdox.model.annotation;
+
+public class AnnotationLessEquals extends AnnotationBinaryOperator {
+
+ public AnnotationLessEquals( AnnotationValue left, AnnotationValue right ) {
+ super( left, right );
+ }
+
+ public String toString() {
+ return getLeft().toString() + " <= " + getRight().toString();
+ }
+
+ public Object accept( AnnotationVisitor visitor ) {
+ return visitor.visitAnnotationLessEquals( this );
+ }
+
+ public Object getParameterValue() {
+ return getLeft().getParameterValue() + " <= " + getRight().getParameterValue();
+ }
+
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationConstant.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationConstant.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationConstant.java (revision 0)
@@ -0,0 +1,34 @@
+package com.thoughtworks.qdox.model.annotation;
+
+public class AnnotationConstant implements AnnotationValue {
+
+ private final Object value;
+
+ private final String image;
+
+ public AnnotationConstant( Object value, String image ) {
+ this.value = value;
+ this.image = image;
+ }
+
+ public Object getValue() {
+ return value;
+ }
+
+ public String getImage() {
+ return image;
+ }
+
+ public String toString() {
+ return image;
+ }
+
+ public Object accept( AnnotationVisitor visitor ) {
+ return visitor.visitAnnotationConstant( this );
+ }
+
+ public Object getParameterValue() {
+ return image;
+ }
+
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationCast.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationCast.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationCast.java (revision 0)
@@ -0,0 +1,36 @@
+package com.thoughtworks.qdox.model.annotation;
+
+import com.thoughtworks.qdox.model.Type;
+
+public class AnnotationCast implements AnnotationValue {
+
+ private final Type type;
+
+ private final AnnotationValue value;
+
+ public AnnotationCast( Type type, AnnotationValue value ) {
+ this.type = type;
+ this.value = value;
+ }
+
+ public Type getType() {
+ return this.type;
+ }
+
+ public AnnotationValue getValue() {
+ return this.value;
+ }
+
+ public Object accept( AnnotationVisitor visitor ) {
+ return visitor.visitAnnotationCast( this );
+ }
+
+ public Object getParameterValue() {
+ return "(" + type.getValue() + ") " + value.getParameterValue();
+ }
+
+ public String toString() {
+ return "(" + type.getValue() + ") " + value.toString();
+ }
+
+}
Index: src/java/com/thoughtworks/qdox/model/annotation/AnnotationVisitor.java
===================================================================
--- src/java/com/thoughtworks/qdox/model/annotation/AnnotationVisitor.java (revision 0)
+++ src/java/com/thoughtworks/qdox/model/annotation/AnnotationVisitor.java (revision 0)
@@ -0,0 +1,74 @@
+package com.thoughtworks.qdox.model.annotation;
+
+import com.thoughtworks.qdox.model.Annotation;
+
+/**
+ * Visitor class for the annotation model elements
+ *
+ * @author Jochen Kuhnle
+ */
+public interface AnnotationVisitor {
+
+ public Object visitAnnotationAdd( AnnotationAdd add );
+
+ public Object visitAnnotationSubtract( AnnotationSubtract subtract );
+
+ public Object visitAnnotationMultiply( AnnotationMultiply multiply );
+
+ public Object visitAnnotationDivide( AnnotationDivide divide );
+
+ public Object visitAnnotationGreaterThan( AnnotationGreaterThan greaterThan );
+
+ public Object visitAnnotationLessThan( AnnotationLessThan lessThan );
+
+ public Object visitAnnotation( Annotation annotation );
+
+ public Object visitAnnotationConstant( AnnotationConstant constant );
+
+ public Object visitAnnotationParenExpression( AnnotationParenExpression expression );
+
+ public Object visitAnnotationValueList( AnnotationValueList valueList );
+
+ public Object visitAnnotationTypeRef( AnnotationTypeRef typeRef );
+
+ public Object visitAnnotationFieldRef( AnnotationFieldRef fieldRef );
+
+ public Object visitAnnotationLessEquals( AnnotationLessEquals lessEquals );
+
+ public Object visitAnnotationGreaterEquals( AnnotationGreaterEquals greaterEquals );
+
+ public Object visitAnnotationRemainder( AnnotationRemainder remainder );
+
+ public Object visitAnnotationOr( AnnotationOr or );
+
+ public Object visitAnnotationAnd( AnnotationAnd and );
+
+ public Object visitAnnotationShiftLeft( AnnotationShiftLeft left );
+
+ public Object visitAnnotationShiftRight( AnnotationShiftRight right );
+
+ public Object visitAnnotationNot( AnnotationNot not );
+
+ public Object visitAnnotationLogicalOr( AnnotationLogicalOr or );
+
+ public Object visitAnnotationLogicalAnd( AnnotationLogicalAnd and );
+
+ public Object visitAnnotationLogicalNot( AnnotationLogicalNot not );
+
+ public Object visitAnnotationMinusSign( AnnotationMinusSign sign );
+
+ public Object visitAnnotationPlusSign( AnnotationPlusSign sign );
+
+ public Object visitAnnotationUnsignedShiftRight( AnnotationUnsignedShiftRight right );
+
+ public Object visitAnnotationEquals( AnnotationEquals annotationEquals );
+
+ public Object visitAnnotationNotEquals( AnnotationNotEquals annotationNotEquals );
+
+ public Object visitAnnotationExclusiveOr( AnnotationExclusiveOr annotationExclusiveOr );
+
+ public Object visitAnnotationQuery( AnnotationQuery annotationQuery );
+
+ public Object visitAnnotationCast( AnnotationCast annotationCast );
+
+}
Index: src/java/com/thoughtworks/qdox/parser/Builder.java
===================================================================
--- src/java/com/thoughtworks/qdox/parser/Builder.java (revision 483)
+++ src/java/com/thoughtworks/qdox/parser/Builder.java (working copy)
@@ -1,6 +1,7 @@
package com.thoughtworks.qdox.parser;
-import com.thoughtworks.qdox.parser.structs.AnnoDef;
+import com.thoughtworks.qdox.model.Annotation;
+import com.thoughtworks.qdox.model.Type;
import com.thoughtworks.qdox.parser.structs.ClassDef;
import com.thoughtworks.qdox.parser.structs.FieldDef;
import com.thoughtworks.qdox.parser.structs.MethodDef;
@@ -24,5 +25,7 @@
void addField(FieldDef def);
- void addAnnotation(AnnoDef def);
+ void addAnnotation(Annotation annotation);
+
+ Type createType(String name, int dimensions);
}
Index: src/grammar/parser.y
===================================================================
--- src/grammar/parser.y (revision 483)
+++ src/grammar/parser.y (working copy)
@@ -1,23 +1,47 @@
%{
import com.thoughtworks.qdox.parser.*;
import com.thoughtworks.qdox.parser.structs.*;
+import com.thoughtworks.qdox.model.*;
+import com.thoughtworks.qdox.model.annotation.*;
import java.io.IOException;
import java.util.LinkedList;
+import java.util.ArrayList;
+import java.util.List;
%}
-%token SEMI DOT DOTDOTDOT COMMA STAR EQUALS ANNOSTRING ANNOCHAR SLASH PLUS MINUS
+%token SEMI DOT DOTDOTDOT COMMA STAR PERCENT EQUALS ANNOSTRING ANNOCHAR SLASH PLUS MINUS
%token PACKAGE IMPORT PUBLIC PROTECTED PRIVATE STATIC FINAL ABSTRACT NATIVE STRICTFP SYNCHRONIZED TRANSIENT VOLATILE
%token CLASS INTERFACE ENUM ANNOINTERFACE THROWS EXTENDS IMPLEMENTS SUPER DEFAULT
-%token BRACEOPEN BRACECLOSE SQUAREOPEN SQUARECLOSE PARENOPEN PARENCLOSE LESSTHAN GREATERTHAN AMPERSAND QUERY AT
+%token BRACEOPEN BRACECLOSE SQUAREOPEN SQUARECLOSE PARENOPEN PARENCLOSE
+%token LESSTHAN GREATERTHAN LESSEQUALS GREATEREQUALS
+%token LESSTHAN2 GREATERTHAN2 GREATERTHAN3
+%token EXCLAMATION AMPERSAND2 VERTLINE2 EQUALS2 NOTEQUALS
+%token TILDE AMPERSAND VERTLINE CIRCUMFLEX
+%token VOID
+%token QUERY COLON AT
%token JAVADOCSTART JAVADOCEND JAVADOCEOL
%token CODEBLOCK PARENBLOCK
+%token BYTE SHORT INT LONG CHAR FLOAT DOUBLE BOOLEAN
// strongly typed tokens/types
-%token