Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ActionGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ActionGrammar.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ActionGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ActionGrammar.java Mon Apr 11 23:42:11 2005 @@ -26,7 +26,7 @@ import org.apache.beehive.netui.compiler.typesystem.declaration.*; import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment; import org.apache.beehive.netui.compiler.typesystem.type.DeclaredType; -import org.apache.beehive.netui.compiler.typesystem.type.TypeMirror; +import org.apache.beehive.netui.compiler.typesystem.type.TypeInstance; public class ActionGrammar @@ -61,13 +61,13 @@ return null; } - protected boolean onBeginCheck( AnnotationMirror annotation, AnnotationMirror[] parentAnnotations, + protected boolean onBeginCheck( AnnotationInstance annotation, AnnotationInstance[] parentAnnotations, MemberDeclaration classMember ) { // // First check the form bean type. // - TypeMirror argType = getFormBeanType( annotation, classMember ); + TypeInstance argType = getFormBeanType( annotation, classMember ); TypeDeclaration argTypeDecl = null; if ( ! ( argType instanceof DeclaredType ) ) @@ -81,8 +81,9 @@ else { argTypeDecl = CompilerUtils.getDeclaration( ( DeclaredType ) argType ); + boolean isClass = argTypeDecl instanceof ClassDeclaration; - if ( argTypeDecl instanceof ClassDeclaration && ! CompilerUtils.hasDefaultConstructor( argTypeDecl ) ) + if ( isClass && ! CompilerUtils.hasDefaultConstructor( argTypeDecl ) ) { getDiagnostics().addError( annotation, "error.action-form-bean-no-default-constructor", argTypeDecl.getQualifiedName() ); @@ -94,7 +95,7 @@ argTypeDecl.getQualifiedName() ); } - if ( argTypeDecl.getDeclaringType() != null && ! argTypeDecl.hasModifier( Modifier.STATIC ) ) + if ( isClass && argTypeDecl.getDeclaringType() != null && ! argTypeDecl.hasModifier( Modifier.STATIC ) ) { getDiagnostics().addError( annotation, "error.action-form-bean-not-static", argTypeDecl.getQualifiedName() ); @@ -128,7 +129,7 @@ // Check to make sure the 'useFormBean' attribute (reference to a member variable) matches the form declared as // an argument to the action method. // - TypeMirror useFormBeanType = getUseFormBeanType( annotation, classMember ); + TypeInstance useFormBeanType = getUseFormBeanType( annotation, classMember ); if ( useFormBeanType != null && useFormBeanType instanceof DeclaredType ) { @@ -149,7 +150,7 @@ return true; } - protected String getActionName( AnnotationMirror annotation, MemberDeclaration classMember ) + protected String getActionName( AnnotationInstance annotation, MemberDeclaration classMember ) { assert classMember instanceof MethodDeclaration : classMember.getClass().getName(); return classMember.getSimpleName(); @@ -164,11 +165,11 @@ for ( int i = 0; i < methods.length; i++ ) { MethodDeclaration method = methods[i]; - AnnotationMirror[] annotations = method.getAnnotationMirrors(); + AnnotationInstance[] annotations = method.getAnnotationInstances(); for ( int j = 0; j < annotations.length; j++ ) { - AnnotationMirror ann = annotations[j]; + AnnotationInstance ann = annotations[j]; String annotationName = CompilerUtils.getDeclaration( ann.getAnnotationType() ).getQualifiedName(); int pos = annotationName.indexOf( ANNOTATION_QUALIFIER ); @@ -185,7 +186,7 @@ return false; } - protected static TypeMirror getUseFormBeanType( AnnotationMirror annotation, MemberDeclaration classMember ) + protected static TypeInstance getUseFormBeanType( AnnotationInstance annotation, MemberDeclaration classMember ) { String formBeanFieldName = CompilerUtils.getString( annotation, USE_FORM_BEAN_ATTR, true ); @@ -203,7 +204,7 @@ return null; } - protected TypeMirror getFormBeanType( AnnotationMirror annotation, MemberDeclaration classMember ) + protected TypeInstance getFormBeanType( AnnotationInstance annotation, MemberDeclaration classMember ) { assert classMember instanceof MethodDeclaration : classMember.getClass().getName(); MethodDeclaration method = ( MethodDeclaration ) classMember; @@ -226,7 +227,7 @@ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue member, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { // @@ -234,7 +235,7 @@ // if ( ( ( Boolean ) member.getValue() ).booleanValue() ) { - AnnotationMirror parentAnnotation = parentAnnotations[ parentAnnotations.length - 1 ]; + AnnotationInstance parentAnnotation = parentAnnotations[ parentAnnotations.length - 1 ]; if ( CompilerUtils.getAnnotation( parentAnnotation, VALIDATION_ERROR_FORWARD_ATTR, true ) == null ) { @@ -270,7 +271,7 @@ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue value, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { FieldDeclaration memberField = @@ -283,7 +284,7 @@ // If this action is marked 'readOnly', print a warning about the 'useFormBean' attribute implicitly // modifying member data. // - AnnotationMirror parentAnnotation = parentAnnotations[parentAnnotations.length - 1]; + AnnotationInstance parentAnnotation = parentAnnotations[parentAnnotations.length - 1]; if ( CompilerUtils.getBoolean( parentAnnotation, READONLY_ATTR, false ).booleanValue() ) { addWarning( value, "warning.use-form-bean-on-readonly-action", READONLY_ATTR, USE_FORM_BEAN_ATTR,
Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java Mon Apr 11 23:42:11 2005 @@ -21,7 +21,7 @@ import org.apache.beehive.netui.compiler.CompilerUtils; import org.apache.beehive.netui.compiler.Diagnostics; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment; @@ -66,7 +66,7 @@ } - protected boolean onBeginCheck( AnnotationMirror annotation, AnnotationMirror[] parentAnnotations, + protected boolean onBeginCheck( AnnotationInstance annotation, AnnotationInstance[] parentAnnotations, MemberDeclaration classMember ) { // @@ -75,7 +75,7 @@ // If none of these are true, output a warning. // assert parentAnnotations.length > 0; - AnnotationMirror immediateParent = parentAnnotations[parentAnnotations.length - 1]; + AnnotationInstance immediateParent = parentAnnotations[parentAnnotations.length - 1]; if ( CompilerUtils.getString( immediateParent, DISPLAY_NAME_ATTR, true ) == null && CompilerUtils.getString( annotation, MESSAGE_KEY_ATTR, true ) == null @@ -91,7 +91,7 @@ for ( Iterator ii = messageArgs.iterator(); ii.hasNext(); ) { - AnnotationMirror messageArg = ( AnnotationMirror ) ii.next(); + AnnotationInstance messageArg = ( AnnotationInstance ) ii.next(); Integer position = CompilerUtils.getInteger( messageArg, POSITION_ATTR, true ); if ( ( position == null && firstArg ) || ( position != null && position.intValue() == 0 ) ) Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BundleNameType.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BundleNameType.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BundleNameType.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BundleNameType.java Mon Apr 11 23:42:11 2005 @@ -20,7 +20,7 @@ import org.apache.beehive.netui.compiler.AnnotationMemberType; import org.apache.beehive.netui.compiler.AnnotationGrammar; import org.apache.beehive.netui.compiler.CompilerUtils; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; import org.apache.beehive.netui.compiler.typesystem.declaration.ClassDeclaration; @@ -38,7 +38,7 @@ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue value, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { // @@ -48,14 +48,14 @@ if ( bundle != null && !bundlesSupported( parentAnnotations, classMember ) ) { - AnnotationMirror annotation = parentAnnotations[ parentAnnotations.length - 1 ]; + AnnotationInstance annotation = parentAnnotations[ parentAnnotations.length - 1 ]; addError( value, "error.validation-bundle-support", BUNDLE_NAME_ATTR, annotation ); } return null; } - protected static boolean bundlesSupported( AnnotationMirror[] parentAnnotations, MemberDeclaration classMember ) + protected static boolean bundlesSupported( AnnotationInstance[] parentAnnotations, MemberDeclaration classMember ) { // // Find the validator version attribute from the controller. @@ -65,7 +65,7 @@ // Otherwise, get the controller class declaration then the // attribute. // - AnnotationMirror ann = parentAnnotations[0]; + AnnotationInstance ann = parentAnnotations[0]; String validatorVersion = null; if ( CompilerUtils.isJpfAnnotation( ann, CONTROLLER_TAG_NAME ) ) Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/CatchGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/CatchGrammar.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/CatchGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/CatchGrammar.java Mon Apr 11 23:42:11 2005 @@ -23,7 +23,7 @@ import org.apache.beehive.netui.compiler.FlowControllerInfo; import org.apache.beehive.netui.compiler.JpfLanguageConstants; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.MethodDeclaration; @@ -31,7 +31,7 @@ import org.apache.beehive.netui.compiler.typesystem.declaration.TypeDeclaration; import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment; import org.apache.beehive.netui.compiler.typesystem.type.DeclaredType; -import org.apache.beehive.netui.compiler.typesystem.type.TypeMirror; +import org.apache.beehive.netui.compiler.typesystem.type.TypeInstance; import java.util.Collection; import java.util.Map; @@ -76,7 +76,7 @@ * @param checkResults map of member-name (String) -> result-from-checking (Object) * @return a result (any Object) that will be passed back to the parent checker. May be null</code>. */ - protected Object onEndCheck( AnnotationMirror annotation, AnnotationMirror[] parentAnnotations, + protected Object onEndCheck( AnnotationInstance annotation, AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, Map checkResults ) { MethodDeclaration handlerMethod = ( MethodDeclaration ) checkResults.get( METHOD_ATTR ); @@ -101,7 +101,7 @@ // if ( parameters.length > 0 ) { - TypeMirror handledExceptionType = parameters[0].getType(); + TypeInstance handledExceptionType = parameters[0].getType(); if ( ! CompilerUtils.isAssignableFrom( handledExceptionType, CompilerUtils.getDeclaration( exceptionType ) ) ) { @@ -125,7 +125,7 @@ * Derived classes can plug in here to do additional checks. */ protected void checkMethod( MethodDeclaration methodBeingChecked, AnnotationValue value, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember ) + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember ) { // // Make sure the current entity (class or action method) doesn't have two @jpf:catch annotations @@ -142,7 +142,7 @@ for ( Iterator ii = catches.iterator(); ii.hasNext(); ) { - AnnotationMirror catchAnnotation = ( AnnotationMirror ) ii.next(); + AnnotationInstance catchAnnotation = ( AnnotationInstance ) ii.next(); // // Find the method referred to in this annotation. If we can't find it, do nothing -- this // will get caught elsewhere in the checking. @@ -165,7 +165,7 @@ for ( Iterator i2 = otherForwards.iterator(); i2.hasNext(); ) { - AnnotationMirror otherForward = ( AnnotationMirror ) i2.next(); + AnnotationInstance otherForward = ( AnnotationInstance ) i2.next(); String otherForwardName = CompilerUtils.getString( otherForward, NAME_ATTR, true ); String otherForwardPath = CompilerUtils.getString( otherForward, PATH_ATTR, true ); String otherFwdNavigateTo = @@ -178,7 +178,7 @@ for ( Iterator i3 = forwards.iterator(); i3.hasNext(); ) { - AnnotationMirror forward = ( AnnotationMirror ) i3.next(); + AnnotationInstance forward = ( AnnotationInstance ) i3.next(); String forwardName = CompilerUtils.getString( forward, NAME_ATTR, true ); String forwardPath = CompilerUtils.getString( forward, PATH_ATTR, true ); String fwdNavigateTo = CompilerUtils.getEnumFieldName( forward, NAVIGATE_TO_ATTR, true ); Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/DelegatingType.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/DelegatingType.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/DelegatingType.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/DelegatingType.java Mon Apr 11 23:42:11 2005 @@ -22,7 +22,7 @@ import org.apache.beehive.netui.compiler.AnnotationGrammar; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; public class DelegatingType @@ -39,7 +39,7 @@ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue member, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { return _baseType.onCheck( valueDecl, member, parentAnnotations, classMember, annotationArrayIndex ); Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/EnumType.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/EnumType.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/EnumType.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/EnumType.java Mon Apr 11 23:42:11 2005 @@ -21,7 +21,7 @@ import org.apache.beehive.netui.compiler.CompilerUtils; import org.apache.beehive.netui.compiler.AnnotationGrammar; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration; @@ -80,7 +80,7 @@ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue member, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { // Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ExceptionHandlerGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ExceptionHandlerGrammar.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ExceptionHandlerGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ExceptionHandlerGrammar.java Mon Apr 11 23:42:11 2005 @@ -22,7 +22,7 @@ import org.apache.beehive.netui.compiler.Diagnostics; import org.apache.beehive.netui.compiler.FlowControllerInfo; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.MethodDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.Modifier; @@ -42,7 +42,7 @@ addMemberArrayGrammar( FORWARDS_ATTR, new ExceptionHandlerForwardGrammar( fcInfo ) ); } - protected boolean onBeginCheck( AnnotationMirror annotation, AnnotationMirror[] parentAnnotations, + protected boolean onBeginCheck( AnnotationInstance annotation, AnnotationInstance[] parentAnnotations, MemberDeclaration classMember ) { if ( classMember.hasModifier( Modifier.ABSTRACT ) ) Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ExternalPathOrActionType.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ExternalPathOrActionType.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ExternalPathOrActionType.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ExternalPathOrActionType.java Mon Apr 11 23:42:11 2005 @@ -22,7 +22,7 @@ import org.apache.beehive.netui.compiler.CompilerUtils; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; public class ExternalPathOrActionType extends WebappPathOrActionType @@ -35,10 +35,10 @@ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue value, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { - AnnotationMirror parentAnnotation = parentAnnotations[ parentAnnotations.length - 1 ]; + AnnotationInstance parentAnnotation = parentAnnotations[ parentAnnotations.length - 1 ]; // if we have an external redirect just bail if ( CompilerUtils.getBoolean( parentAnnotation, EXTERNAL_REDIRECT_ATTR, false ).booleanValue() ) Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java Mon Apr 11 23:42:11 2005 @@ -22,7 +22,7 @@ import org.apache.beehive.netui.compiler.Diagnostics; import org.apache.beehive.netui.compiler.FlowControllerInfo; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; @@ -30,7 +30,7 @@ import org.apache.beehive.netui.compiler.typesystem.declaration.TypeDeclaration; import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment; import org.apache.beehive.netui.compiler.typesystem.type.DeclaredType; -import org.apache.beehive.netui.compiler.typesystem.type.TypeMirror; +import org.apache.beehive.netui.compiler.typesystem.type.TypeInstance; import java.util.ArrayList; import java.util.Collection; @@ -116,7 +116,7 @@ } protected void onCheckMember( AnnotationTypeElementDeclaration memberDecl, AnnotationValue value, - AnnotationMirror annotation, AnnotationMirror[] parentAnnotations, + AnnotationInstance annotation, AnnotationInstance[] parentAnnotations, MemberDeclaration classMember ) { String valueName = memberDecl.getSimpleName(); @@ -150,7 +150,7 @@ if ( isReturnAction ) { TypeDeclaration outerType = CompilerUtils.getOuterClass( classMember ); - TypeMirror formBeanType = + TypeInstance formBeanType = getFlowControllerInfo().addReturnAction( ( String ) value.getValue(), annotation, outerType ); if ( formBeanType != null && ! ( formBeanType instanceof DeclaredType ) ) @@ -169,10 +169,10 @@ } public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue member, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { - AnnotationMirror parentAnnotation = parentAnnotations[ parentAnnotations.length - 1 ]; + AnnotationInstance parentAnnotation = parentAnnotations[ parentAnnotations.length - 1 ]; String navigateToVal = CompilerUtils.getEnumFieldName( parentAnnotation, NAVIGATE_TO_ATTR, true ); if ( ! NAVIGATE_TO_PREVIOUS_ACTION_STR.equals( navigateToVal ) ) @@ -200,7 +200,7 @@ } /** - * @return a List of AnnotationMirror + * @return a List of AnnotationInstance */ protected List getAdditionalAnnotationsToCheck( MemberDeclaration classMember ) { @@ -238,7 +238,7 @@ { for ( Iterator ii = catches.iterator(); ii.hasNext(); ) { - AnnotationMirror catchAnnotation = ( AnnotationMirror ) ii.next(); + AnnotationInstance catchAnnotation = ( AnnotationInstance ) ii.next(); String methodName = CompilerUtils.getString( catchAnnotation, METHOD_ATTR, false ); if ( methodName.length() > 0 ) @@ -248,7 +248,7 @@ for ( int i = 0; i < allMethods.length; i++ ) { MethodDeclaration method = allMethods[i]; - AnnotationMirror exHandlerAnnotation = + AnnotationInstance exHandlerAnnotation = CompilerUtils.getAnnotation( method, EXCEPTION_HANDLER_TAG_NAME ); if ( exHandlerAnnotation != null && method.getSimpleName().equals( methodName ) ) @@ -258,7 +258,7 @@ for ( Iterator i3 = forwardAnnotations.iterator(); i3.hasNext(); ) { - AnnotationMirror forwardAnnotation = ( AnnotationMirror ) i3.next(); + AnnotationInstance forwardAnnotation = ( AnnotationInstance ) i3.next(); additionalEntities.add( forwardAnnotation ); } } Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ForwardToExternalPathType.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ForwardToExternalPathType.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ForwardToExternalPathType.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ForwardToExternalPathType.java Mon Apr 11 23:42:11 2005 @@ -20,7 +20,7 @@ import org.apache.beehive.netui.compiler.AnnotationGrammar; import org.apache.beehive.netui.compiler.AnnotationMemberType; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; @@ -38,7 +38,7 @@ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue value, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { String stringValue = ( String ) value.getValue(); Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/JavaIdentifierType.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/JavaIdentifierType.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/JavaIdentifierType.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/JavaIdentifierType.java Mon Apr 11 23:42:11 2005 @@ -19,7 +19,7 @@ import org.apache.beehive.netui.compiler.AnnotationGrammar; import org.apache.beehive.netui.compiler.AnnotationMemberType; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; @@ -37,7 +37,7 @@ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue value, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { String val = ( String ) value.getValue(); @@ -58,7 +58,7 @@ if ( ! Character.isJavaIdentifierPart( val.charAt( i ) ) && ! isValid( c ) ) { - Object[] args = new Object[]{ Character.valueOf( c ) }; + Object[] args = new Object[]{ new Character( c ) }; addError( value, "error.invalid-java-identifier-part", args ); } } Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/LocaleRulesGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/LocaleRulesGrammar.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/LocaleRulesGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/LocaleRulesGrammar.java Mon Apr 11 23:42:11 2005 @@ -22,7 +22,7 @@ import org.apache.beehive.netui.compiler.Diagnostics; import org.apache.beehive.netui.compiler.JpfLanguageConstants; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; @@ -75,10 +75,10 @@ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue member, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { - AnnotationMirror parentAnnotation = parentAnnotations[ parentAnnotations.length - 1 ]; + AnnotationInstance parentAnnotation = parentAnnotations[ parentAnnotations.length - 1 ]; String language = CompilerUtils.getString( parentAnnotation, LANGUAGE_ATTR, true ); if ( ( ( Boolean ) member.getValue() ).booleanValue() ) Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MemberFieldType.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MemberFieldType.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MemberFieldType.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MemberFieldType.java Mon Apr 11 23:42:11 2005 @@ -21,11 +21,11 @@ import org.apache.beehive.netui.compiler.CompilerUtils; import org.apache.beehive.netui.compiler.AnnotationGrammar; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.FieldDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration; -import org.apache.beehive.netui.compiler.typesystem.type.TypeMirror; +import org.apache.beehive.netui.compiler.typesystem.type.TypeInstance; import java.util.Collection; import java.util.Iterator; @@ -46,7 +46,7 @@ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue member, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { String fieldName = ( String ) member.getValue(); @@ -58,7 +58,7 @@ FieldDeclaration field = ( FieldDeclaration ) ii.next(); if ( field.getSimpleName().equals( fieldName ) ) { - TypeMirror fieldType = CompilerUtils.getGenericBoundsType( field.getType() ); + TypeInstance fieldType = CompilerUtils.getGenericBoundsType( field.getType() ); if ( _requiredSuperclassName != null && ! CompilerUtils.isAssignableFrom( _requiredSuperclassName, fieldType, getEnv() ) ) Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MemberMethodType.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MemberMethodType.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MemberMethodType.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MemberMethodType.java Mon Apr 11 23:42:11 2005 @@ -20,7 +20,7 @@ import org.apache.beehive.netui.compiler.AnnotationGrammar; import org.apache.beehive.netui.compiler.AnnotationMemberType; import org.apache.beehive.netui.compiler.CompilerUtils; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; @@ -43,7 +43,7 @@ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue value, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { // @@ -96,7 +96,7 @@ /** * Derived classes can plug in here to do additional checks. */ - protected void checkMethod( MethodDeclaration method, AnnotationValue member, AnnotationMirror[] parentAnnotations, + protected void checkMethod( MethodDeclaration method, AnnotationValue member, AnnotationInstance[] parentAnnotations, MemberDeclaration classMember ) { } Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MessageBundleGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MessageBundleGrammar.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MessageBundleGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MessageBundleGrammar.java Mon Apr 11 23:42:11 2005 @@ -22,7 +22,7 @@ import org.apache.beehive.netui.compiler.CompilerUtils; import org.apache.beehive.netui.compiler.FlowControllerInfo; import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; import java.util.Map; @@ -52,7 +52,7 @@ return REQUIRED_ATTRS; } - protected Object onEndCheck( AnnotationMirror annotation, AnnotationMirror[] parentAnnotations, + protected Object onEndCheck( AnnotationInstance annotation, AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, Map checkResults ) { String bundlePath = CompilerUtils.getString( annotation, BUNDLE_PATH_ATTR, false ); @@ -60,13 +60,13 @@ if ( bundleName.length() == 0 ) { - AnnotationMirror immediateParent = parentAnnotations[parentAnnotations.length - 1]; + AnnotationInstance immediateParent = parentAnnotations[parentAnnotations.length - 1]; List peerAnnotations = CompilerUtils.getAnnotationArray( immediateParent, MESSAGE_BUNDLES_ATTR, false ); for ( Iterator ii = peerAnnotations.iterator(); ii.hasNext(); ) { - AnnotationMirror peerAnnotation = ( AnnotationMirror ) ii.next(); + AnnotationInstance peerAnnotation = ( AnnotationInstance ) ii.next(); if ( ! CompilerUtils.annotationsAreEqual( annotation, peerAnnotation, false, getEnv() ) && CompilerUtils.getString( peerAnnotation, BUNDLE_NAME_ATTR, false ).length() == 0 ) { Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MessageKeyType.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MessageKeyType.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MessageKeyType.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/MessageKeyType.java Mon Apr 11 23:42:11 2005 @@ -20,7 +20,7 @@ import org.apache.beehive.netui.compiler.AnnotationMemberType; import org.apache.beehive.netui.compiler.AnnotationGrammar; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration; @@ -36,7 +36,7 @@ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue member, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { if ( ( ( String ) member.getValue() ).length() == 0 ) @@ -59,7 +59,7 @@ for ( java.util.Iterator ii = validationMessages.iterator(); ii.hasNext(); ) { - AnnotationMirror validationMessage = ( AnnotationMirror ) ii.next(); + AnnotationInstance validationMessage = ( AnnotationInstance ) ii.next(); String msgKey = CompilerUtils.getString( validationMessage, KEY_ATTR, true ); assert msgKey != null; if ( value.equals( msgKey ) ) return null; // ok, we found it. Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/RaiseActionGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/RaiseActionGrammar.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/RaiseActionGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/RaiseActionGrammar.java Mon Apr 11 23:42:11 2005 @@ -22,7 +22,7 @@ import org.apache.beehive.netui.compiler.Diagnostics; import org.apache.beehive.netui.compiler.FlowControllerInfo; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; import org.apache.beehive.netui.compiler.typesystem.declaration.ClassDeclaration; @@ -57,7 +57,7 @@ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue member, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { String action = ( String ) member.getValue(); Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/RolesAllowedType.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/RolesAllowedType.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/RolesAllowedType.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/RolesAllowedType.java Mon Apr 11 23:42:11 2005 @@ -22,7 +22,7 @@ import org.apache.beehive.netui.compiler.CompilerUtils; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; @@ -39,10 +39,10 @@ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue member, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { - AnnotationMirror parentAnnotation = parentAnnotations[ parentAnnotations.length - 1 ]; + AnnotationInstance parentAnnotation = parentAnnotations[ parentAnnotations.length - 1 ]; Boolean loginRequired = CompilerUtils.getBoolean( parentAnnotation, LOGIN_REQUIRED_ATTR, true ); if ( loginRequired != null && ! loginRequired.booleanValue() ) Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SharedFlowRefGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SharedFlowRefGrammar.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SharedFlowRefGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SharedFlowRefGrammar.java Mon Apr 11 23:42:11 2005 @@ -22,7 +22,7 @@ import org.apache.beehive.netui.compiler.RuntimeVersionChecker; import org.apache.beehive.netui.compiler.CompilerUtils; import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.TypeDeclaration; @@ -39,7 +39,7 @@ addMemberType( TYPE_ATTR, new TypeNameType( SHARED_FLOW_BASE_CLASS, false, null, this ) ); } - protected boolean onBeginCheck( AnnotationMirror annotation, AnnotationMirror[] parentAnnotations, + protected boolean onBeginCheck( AnnotationInstance annotation, AnnotationInstance[] parentAnnotations, MemberDeclaration classMember ) { assert classMember instanceof TypeDeclaration : classMember.getClass().getName(); // enforced in Jpf.java Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java Mon Apr 11 23:42:11 2005 @@ -22,13 +22,13 @@ import org.apache.beehive.netui.compiler.Diagnostics; import org.apache.beehive.netui.compiler.FlowControllerInfo; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.TypeDeclaration; import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment; -import org.apache.beehive.netui.compiler.typesystem.type.TypeMirror; +import org.apache.beehive.netui.compiler.typesystem.type.TypeInstance; import java.util.Collection; import java.util.Iterator; @@ -72,7 +72,7 @@ return MUTUALLY_EXCLUSIVE_ATTRS; } - protected boolean onBeginCheck( AnnotationMirror annotation, AnnotationMirror[] parentAnnotations, + protected boolean onBeginCheck( AnnotationInstance annotation, AnnotationInstance[] parentAnnotations, MemberDeclaration classMember ) { String name = CompilerUtils.getString( annotation, NAME_ATTR, false ); @@ -92,12 +92,12 @@ return super.onBeginCheck( annotation, parentAnnotations, classMember ); } - protected String getActionName( AnnotationMirror annotation, MemberDeclaration classMember ) + protected String getActionName( AnnotationInstance annotation, MemberDeclaration classMember ) { return CompilerUtils.getString( annotation, NAME_ATTR, false ); } - protected TypeMirror getFormBeanType( AnnotationMirror annotation, MemberDeclaration classMember ) + protected TypeInstance getFormBeanType( AnnotationInstance annotation, MemberDeclaration classMember ) { // for a SimpleAction, the form bean type is wholly defined by the useFormBean attribute. return getUseFormBeanType( annotation, classMember ); @@ -148,7 +148,7 @@ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue member, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { Collection forwards = @@ -157,7 +157,7 @@ for ( Iterator ii = forwards.iterator(); ii.hasNext(); ) { - AnnotationMirror forwardAnn = ( AnnotationMirror ) ii.next(); + AnnotationInstance forwardAnn = ( AnnotationInstance ) ii.next(); if ( forwardName.equals( CompilerUtils.getString( forwardAnn, NAME_ATTR, true ) ) ) return null; } Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/TilesDefinitionsConfigsType.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/TilesDefinitionsConfigsType.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/TilesDefinitionsConfigsType.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/TilesDefinitionsConfigsType.java Mon Apr 11 23:42:11 2005 @@ -19,7 +19,7 @@ import org.apache.beehive.netui.compiler.AnnotationGrammar; import org.apache.beehive.netui.compiler.FlowControllerInfo; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; @@ -37,7 +37,7 @@ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue value, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { List values = ( List ) value.getValue(); Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/TypeNameType.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/TypeNameType.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/TypeNameType.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/TypeNameType.java Mon Apr 11 23:42:11 2005 @@ -22,7 +22,7 @@ import org.apache.beehive.netui.compiler.AnnotationGrammar; import org.apache.beehive.netui.compiler.JpfLanguageConstants; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration; import org.apache.beehive.netui.compiler.typesystem.type.ArrayType; @@ -50,7 +50,7 @@ */ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue value, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { Object val = value.getValue(); Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/UniqueValueType.java Mon Apr 11 23:42:11 2005 @@ -20,7 +20,7 @@ import org.apache.beehive.netui.compiler.AnnotationGrammar; import org.apache.beehive.netui.compiler.AnnotationMemberType; import org.apache.beehive.netui.compiler.CompilerUtils; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; @@ -53,7 +53,7 @@ */ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue value, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { String val = value.getValue().toString(); @@ -65,7 +65,7 @@ } if ( parentAnnotations.length < 2 ) return null; // invalid parents -- will be caught elsewhere - AnnotationMirror parentElement = parentAnnotations[ parentAnnotations.length - 2 ]; + AnnotationInstance parentElement = parentAnnotations[ parentAnnotations.length - 2 ]; List memberGroup = CompilerUtils.getAnnotationArray( parentElement, _memberGroupName, true ); // @@ -74,7 +74,7 @@ if ( memberGroup != null ) { String valueName = valueDecl.getSimpleName(); - AnnotationMirror parentAnnotation = parentAnnotations[ parentAnnotations.length - 1 ]; + AnnotationInstance parentAnnotation = parentAnnotations[ parentAnnotations.length - 1 ]; checkForDuplicates( value, valueName, parentAnnotation, classMember, memberGroup, false, annotationArrayIndex ); // @@ -90,7 +90,7 @@ // Check for duplicates *within* within the list of additional annotations. for ( int i = 0; i < additionalAnnsToCheck.size(); ++i ) { - AnnotationMirror ann = ( AnnotationMirror ) additionalAnnsToCheck.get( i ); + AnnotationInstance ann = ( AnnotationInstance ) additionalAnnsToCheck.get( i ); AnnotationValue valueToCheck = CompilerUtils.getAnnotationValue( ann, valueName, true ); checkForDuplicates( valueToCheck, valueName, ann, classMember, additionalAnnsToCheck, true, -1 ); } @@ -102,7 +102,7 @@ /** * Plugin point for derived class -- if there should be no duplicates across another entity too. - * @return a List of AnnotationMirror + * @return a List of AnnotationInstance */ protected List getAdditionalAnnotationsToCheck( MemberDeclaration classMember ) { @@ -114,7 +114,7 @@ return null; } - protected void checkForDuplicates( AnnotationValue member, String memberName, AnnotationMirror parentAnnotation, + protected void checkForDuplicates( AnnotationValue member, String memberName, AnnotationInstance parentAnnotation, MemberDeclaration classMember, List annotationsToCheck, boolean includeEntityInMsg, int annotationArrayIndex ) { @@ -122,7 +122,7 @@ for ( int i = 0; i < annotationsToCheck.size(); ++i ) { - AnnotationMirror annotation = ( AnnotationMirror ) annotationsToCheck.get( i ); + AnnotationInstance annotation = ( AnnotationInstance ) annotationsToCheck.get( i ); if ( ( annotationArrayIndex != -1 && annotationArrayIndex != i ) || ! CompilerUtils.annotationsAreEqual( annotation, parentAnnotation, allowExactDuplicates(), getEnv() ) ) Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidActionType.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidActionType.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidActionType.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidActionType.java Mon Apr 11 23:42:11 2005 @@ -21,7 +21,7 @@ import org.apache.beehive.netui.compiler.FlowControllerInfo; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; public class ValidActionType @@ -34,7 +34,7 @@ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue value, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { String stringValue = ( String ) value.getValue(); Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidatablePropertyGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidatablePropertyGrammar.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidatablePropertyGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidatablePropertyGrammar.java Mon Apr 11 23:42:11 2005 @@ -18,7 +18,7 @@ package org.apache.beehive.netui.compiler.grammar; import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; import org.apache.beehive.netui.compiler.AnnotationMemberType; @@ -57,7 +57,7 @@ return MUTUALLY_EXCLUSIVE_ATTRS; } - protected boolean onBeginCheck( AnnotationMirror annotation, AnnotationMirror[] parentAnnotations, + protected boolean onBeginCheck( AnnotationInstance annotation, AnnotationInstance[] parentAnnotations, MemberDeclaration classMember ) { if ( parentAnnotations == null ) return true; @@ -68,7 +68,7 @@ // for ( int i = parentAnnotations.length - 1; i >= 0; --i ) { - AnnotationMirror ann = parentAnnotations[i]; + AnnotationInstance ann = parentAnnotations[i]; if ( CompilerUtils.isJpfAnnotation( ann, ACTION_TAG_NAME ) || CompilerUtils.isJpfAnnotation( ann, SIMPLE_ACTION_TAG_NAME ) ) Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateRangeGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateRangeGrammar.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateRangeGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateRangeGrammar.java Mon Apr 11 23:42:11 2005 @@ -23,7 +23,7 @@ import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; @@ -78,13 +78,13 @@ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue member, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { double d = ( ( Double ) member.getValue() ).doubleValue(); - if ( d < -Float.MAX_VALUE ) addError( member, "error.min-float", Double.valueOf( -Float.MAX_VALUE ) ); - else if ( d > Float.MAX_VALUE ) addError( member, "error.max-float", Double.valueOf( Float.MAX_VALUE ) ); + if ( d < -Float.MAX_VALUE ) addError( member, "error.min-float", new Double( -Float.MAX_VALUE ) ); + else if ( d > Float.MAX_VALUE ) addError( member, "error.max-float", new Double( Float.MAX_VALUE ) ); return null; } Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateRequiredGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateRequiredGrammar.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateRequiredGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateRequiredGrammar.java Mon Apr 11 23:42:11 2005 @@ -18,10 +18,10 @@ package org.apache.beehive.netui.compiler.grammar; import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.MethodDeclaration; -import org.apache.beehive.netui.compiler.typesystem.type.TypeMirror; +import org.apache.beehive.netui.compiler.typesystem.type.TypeInstance; import org.apache.beehive.netui.compiler.typesystem.type.PrimitiveType; import org.apache.beehive.netui.compiler.Diagnostics; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; @@ -35,7 +35,7 @@ super( env, diags, rvc ); } - protected boolean onBeginCheck( AnnotationMirror annotation, AnnotationMirror[] parentAnnotations, + protected boolean onBeginCheck( AnnotationInstance annotation, AnnotationInstance[] parentAnnotations, MemberDeclaration classMember ) { // @@ -44,7 +44,7 @@ // if ( classMember instanceof MethodDeclaration ) { - TypeMirror returnType = ( ( MethodDeclaration ) classMember ).getReturnType(); + TypeInstance returnType = ( ( MethodDeclaration ) classMember ).getReturnType(); if ( returnType instanceof PrimitiveType ) { Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateTypeGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateTypeGrammar.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateTypeGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidateTypeGrammar.java Mon Apr 11 23:42:11 2005 @@ -20,14 +20,14 @@ import org.apache.beehive.netui.compiler.AnnotationMemberType; import org.apache.beehive.netui.compiler.Diagnostics; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.MethodDeclaration; import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment; import org.apache.beehive.netui.compiler.typesystem.type.PrimitiveType; -import org.apache.beehive.netui.compiler.typesystem.type.TypeMirror; +import org.apache.beehive.netui.compiler.typesystem.type.TypeInstance; public class ValidateTypeGrammar @@ -51,7 +51,7 @@ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue value, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { Object val = value.getValue(); @@ -77,7 +77,7 @@ // Add a warning if this annotation is on a property getter of the same type, in which case the // validation rule will never fail. // - TypeMirror returnType = ( ( MethodDeclaration ) classMember ).getReturnType(); + TypeInstance returnType = ( ( MethodDeclaration ) classMember ).getReturnType(); if ( returnType instanceof PrimitiveType ) { Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidationMessageArgsGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidationMessageArgsGrammar.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidationMessageArgsGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ValidationMessageArgsGrammar.java Mon Apr 11 23:42:11 2005 @@ -22,7 +22,7 @@ import org.apache.beehive.netui.compiler.Diagnostics; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; import org.apache.beehive.netui.compiler.typesystem.env.AnnotationProcessorEnvironment; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; import java.util.Map; @@ -76,7 +76,7 @@ } - protected Object onEndCheck( AnnotationMirror annotation, AnnotationMirror[] parentAnnotations, + protected Object onEndCheck( AnnotationInstance annotation, AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, Map checkResults ) { Integer position = CompilerUtils.getInteger( annotation, POSITION_ATTR, true ); @@ -91,7 +91,7 @@ else if ( position.intValue() < 0 || position.intValue() > 3 ) { addError( annotation, "error.integer-attribute-not-in-range", POSITION_ATTR, - Integer.valueOf( 0 ), Integer.valueOf( 3 ) ); + new Integer( 0 ), new Integer( 3 ) ); } return null; Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java Mon Apr 11 23:42:11 2005 @@ -22,7 +22,7 @@ import org.apache.beehive.netui.compiler.AnnotationGrammar; import org.apache.beehive.netui.compiler.MergedControllerAnnotation; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.TypeDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration; @@ -45,7 +45,7 @@ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue value, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { String stringValue = ( String ) value.getValue(); @@ -113,7 +113,7 @@ } } - public static boolean actionExists( String actionName, TypeDeclaration type, AnnotationMirror annotationToIgnore, + public static boolean actionExists( String actionName, TypeDeclaration type, AnnotationInstance annotationToIgnore, AnnotationProcessorEnvironment env, FlowControllerInfo fcInfo, boolean checkInheritedActions ) { @@ -158,7 +158,7 @@ { for ( Iterator ii = simpleActionAnnotations.iterator(); ii.hasNext(); ) { - AnnotationMirror ann = ( AnnotationMirror ) ii.next(); + AnnotationInstance ann = ( AnnotationInstance ) ii.next(); String name = CompilerUtils.getString( ann, NAME_ATTR, false ); if ( actionName.equals( name ) Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathType.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathType.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathType.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathType.java Mon Apr 11 23:42:11 2005 @@ -22,7 +22,7 @@ import org.apache.beehive.netui.compiler.CompilerUtils; import org.apache.beehive.netui.compiler.FlowControllerInfo; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.TypeDeclaration; @@ -63,7 +63,7 @@ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue value, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { String filePath = ( String ) value.getValue(); Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WritableFieldType.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WritableFieldType.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WritableFieldType.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WritableFieldType.java Mon Apr 11 23:42:11 2005 @@ -20,7 +20,7 @@ import org.apache.beehive.netui.compiler.AnnotationGrammar; import org.apache.beehive.netui.compiler.CompilerUtils; import org.apache.beehive.netui.compiler.JpfLanguageConstants; -import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationMirror; +import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationInstance; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationTypeElementDeclaration; import org.apache.beehive.netui.compiler.typesystem.declaration.AnnotationValue; import org.apache.beehive.netui.compiler.typesystem.declaration.MemberDeclaration; @@ -42,7 +42,7 @@ public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue value, - AnnotationMirror[] parentAnnotations, MemberDeclaration classMember, + AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, int annotationArrayIndex ) { // Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/model/ActionModel.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/model/ActionModel.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/model/ActionModel.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/model/ActionModel.java Mon Apr 11 23:42:11 2005 @@ -510,7 +510,7 @@ private static String getMapString( Map map ) { - StringBuilder retVal = new StringBuilder(); + StringBuffer retVal = new StringBuffer(); for ( Iterator i = map.entrySet().iterator(); i.hasNext(); ) { Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/model/StrutsApp.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/model/StrutsApp.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/model/StrutsApp.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/model/StrutsApp.java Mon Apr 11 23:42:11 2005 @@ -219,20 +219,26 @@ return ( FormBeanModel ) _formBeans.get( formBeanName ); } - public FormBeanModel getFormBeanByActualType( String actualTypeName, boolean usesPageFlowScopedFormBean ) + /** + * Returns a list of [EMAIL PROTECTED] FormBeanModel}. + */ + public List getFormBeansByActualType( String actualTypeName, Boolean usesPageFlowScopedBean ) { + ArrayList beans = null; + for ( Iterator i = _formBeans.values().iterator(); i.hasNext(); ) { FormBeanModel formBean = ( FormBeanModel ) i.next(); if ( formBean != null && formBean.getActualType().equals( actualTypeName ) - && usesPageFlowScopedFormBean == formBean.isPageFlowScoped() ) + && ( usesPageFlowScopedBean == null || usesPageFlowScopedBean.booleanValue() == formBean.isPageFlowScoped() ) ) { - return formBean; + if ( beans == null ) beans = new ArrayList(); + beans.add( formBean ); } } - return null; + return beans; } /** @@ -251,7 +257,7 @@ _formBeans.remove( formBean.getName() ); } - public static File getWebappRootFromJpf( File jpf ) + public static File getWebappRootFromSourceFile( File jpf ) throws NoWebInfDirectoryException { File webappRoot = null; @@ -727,7 +733,7 @@ if ( _sharedFlows != null ) { - StringBuilder str = new StringBuilder(); + StringBuffer str = new StringBuffer(); boolean first = true; for ( java.util.Iterator ii = _sharedFlows.entrySet().iterator(); ii.hasNext(); ) @@ -806,7 +812,7 @@ SetPropertyDocument.SetProperty pathnamesProperty = plugInElementToEdit.addNewSetProperty(); pathnamesProperty.setProperty( VALIDATOR_PATHNAMES_PROPERTY ); - StringBuilder pathNames = new StringBuilder(); + StringBuffer pathNames = new StringBuffer(); pathNames.append( NETUI_VALIDATOR_RULES_URI ); pathNames.append( ',' ).append( STRUTS_VALIDATOR_RULES_URI ); @@ -883,7 +889,7 @@ { SetPropertyDocument.SetProperty pathnamesProperty = plugInElementToEdit.addNewSetProperty(); pathnamesProperty.setProperty( TILES_DEFINITIONS_CONFIG_PROPERTY ); - StringBuilder pathNames = new StringBuilder(); + StringBuffer pathNames = new StringBuffer(); boolean firstOne = true; for ( java.util.Iterator ii = _tilesDefinitionsConfigs.iterator(); ii.hasNext(); ) @@ -926,7 +932,7 @@ public static String getOutputFileURI( String filePrefix, String containingPackage, boolean isSharedFlow ) { - StringBuilder fileName = new StringBuilder( STRUTSCONFIG_OUTPUT_DIR ); + StringBuffer fileName = new StringBuffer( STRUTSCONFIG_OUTPUT_DIR ); fileName.append( '/' ).append( filePrefix ); if ( containingPackage != null && containingPackage.length() > 0 ) fileName.append( STRUTS_CONFIG_SEPARATOR ); if ( isSharedFlow ) fileName.append( STRUTS_CONFIG_SEPARATOR ); Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/model/validation/ValidatableField.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/model/validation/ValidatableField.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/model/validation/ValidatableField.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/model/validation/ValidatableField.java Mon Apr 11 23:42:11 2005 @@ -26,6 +26,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Collections; public class ValidatableField { @@ -52,7 +53,7 @@ assert rule != null; String name = rule.getRuleName(); - for ( java.util.Iterator ii = _rules.iterator(); ii.hasNext(); ) + for ( Iterator ii = _rules.iterator(); ii.hasNext(); ) { ValidatorRule existingRule = ( ValidatorRule ) ii.next(); if ( existingRule.getRuleName().equals( name ) ) @@ -83,7 +84,7 @@ void mergeDependsList( FieldDocument.Field fieldElement ) { String depends = fieldElement.getDepends(); - StringBuilder updatedDepends = new StringBuilder(); + StringBuffer updatedDepends = new StringBuffer(); if ( depends != null ) { @@ -94,15 +95,20 @@ depends = ""; } - for ( java.util.Iterator ii = _rules.iterator(); ii.hasNext(); ) + ArrayList rules = new ArrayList(); + for ( Iterator i = _rules.iterator(); i.hasNext(); ) { - ValidatorRule rule = ( ValidatorRule ) ii.next(); + ValidatorRule rule = ( ValidatorRule ) i.next(); String name = rule.getRuleName(); - if ( depends.indexOf( name ) == -1 ) - { - if ( updatedDepends.length() > 0 ) updatedDepends.append( ',' ); - updatedDepends.append( name ); - } + + if ( depends.indexOf( name ) == -1 ) rules.add( name ); + } + Collections.sort( rules ); + + for ( Iterator i = rules.iterator(); i.hasNext(); ) + { + if ( updatedDepends.length() > 0 ) updatedDepends.append( ',' ); + updatedDepends.append( ( String ) i.next() ); } if ( updatedDepends.length() != 0 ) @@ -120,7 +126,7 @@ // // Add the display name as the default first argument (can be overridden by individual rules). // - String displayName = null; + String displayName; boolean displayNameIsResource = false; if ( _displayName != null ) @@ -146,7 +152,7 @@ // 2) a set of elements, // 3) a set of elements. // - for ( java.util.Iterator ii = _rules.iterator(); ii.hasNext(); ) + for ( Iterator ii = _rules.iterator(); ii.hasNext(); ) { ValidatorRule rule = ( ValidatorRule ) ii.next(); //
