Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/CatchGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/CatchGrammar.java?view=diff&r1=154964&r2=154965 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/CatchGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/CatchGrammar.java Tue Feb 22 22:03:16 2005 @@ -22,7 +22,7 @@ import org.apache.beehive.netui.compiler.AnnotationMemberType; import org.apache.beehive.netui.compiler.CompilerUtils; import org.apache.beehive.netui.compiler.FlowControllerInfo; -import org.apache.beehive.netui.compiler.Diagnostics; +import org.apache.beehive.controls.runtime.generator.apt.Diagnostics; import com.sun.mirror.apt.AnnotationProcessorEnvironment; import com.sun.mirror.declaration.MethodDeclaration; import com.sun.mirror.declaration.MemberDeclaration;
Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/CommandHandlerGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/CommandHandlerGrammar.java?view=diff&r1=154964&r2=154965 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/CommandHandlerGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/CommandHandlerGrammar.java Tue Feb 22 22:03:16 2005 @@ -18,7 +18,7 @@ package org.apache.beehive.netui.compiler.grammar; import org.apache.beehive.netui.compiler.AnnotationGrammar; -import org.apache.beehive.netui.compiler.Diagnostics; +import org.apache.beehive.controls.runtime.generator.apt.Diagnostics; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; import org.apache.beehive.netui.compiler.FlowControllerInfo; import com.sun.mirror.apt.AnnotationProcessorEnvironment; Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ControllerGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ControllerGrammar.java?view=diff&r1=154964&r2=154965 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ControllerGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ControllerGrammar.java Tue Feb 22 22:03:16 2005 @@ -20,7 +20,7 @@ import org.apache.beehive.netui.compiler.RuntimeVersionChecker; import org.apache.beehive.netui.compiler.AnnotationMemberType; import org.apache.beehive.netui.compiler.FlowControllerInfo; -import org.apache.beehive.netui.compiler.Diagnostics; +import org.apache.beehive.controls.runtime.generator.apt.Diagnostics; import org.apache.beehive.netui.compiler.model.schema.struts11.StrutsConfigDocument; import org.apache.beehive.netui.compiler.model.schema.validator11.FormValidationDocument; import com.sun.mirror.apt.AnnotationProcessorEnvironment; Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ExceptionHandlerGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ExceptionHandlerGrammar.java?view=diff&r1=154964&r2=154965 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ExceptionHandlerGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ExceptionHandlerGrammar.java Tue Feb 22 22:03:16 2005 @@ -21,7 +21,7 @@ import org.apache.beehive.netui.compiler.AnnotationMemberType; import org.apache.beehive.netui.compiler.CompilerUtils; import org.apache.beehive.netui.compiler.FlowControllerInfo; -import org.apache.beehive.netui.compiler.Diagnostics; +import org.apache.beehive.controls.runtime.generator.apt.Diagnostics; import com.sun.mirror.apt.AnnotationProcessorEnvironment; import com.sun.mirror.declaration.AnnotationMirror; import com.sun.mirror.declaration.MemberDeclaration; Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java?view=diff&r1=154964&r2=154965 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java Tue Feb 22 22:03:16 2005 @@ -21,7 +21,7 @@ import org.apache.beehive.netui.compiler.AnnotationMemberType; import org.apache.beehive.netui.compiler.CompilerUtils; import org.apache.beehive.netui.compiler.FlowControllerInfo; -import org.apache.beehive.netui.compiler.Diagnostics; +import org.apache.beehive.controls.runtime.generator.apt.Diagnostics; import com.sun.mirror.apt.AnnotationProcessorEnvironment; import com.sun.mirror.declaration.MemberDeclaration; import com.sun.mirror.declaration.AnnotationMirror; Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/LocaleRulesGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/LocaleRulesGrammar.java?view=diff&r1=154964&r2=154965 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/LocaleRulesGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/LocaleRulesGrammar.java Tue Feb 22 22:03:16 2005 @@ -19,7 +19,7 @@ import org.apache.beehive.netui.compiler.AnnotationGrammar; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; -import org.apache.beehive.netui.compiler.Diagnostics; +import org.apache.beehive.controls.runtime.generator.apt.Diagnostics; import org.apache.beehive.netui.compiler.AnnotationMemberType; import org.apache.beehive.netui.compiler.CompilerUtils; import com.sun.mirror.apt.AnnotationProcessorEnvironment; Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MessageBundleGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MessageBundleGrammar.java?view=diff&r1=154964&r2=154965 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MessageBundleGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/MessageBundleGrammar.java Tue Feb 22 22:03:16 2005 @@ -18,7 +18,7 @@ package org.apache.beehive.netui.compiler.grammar; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; -import org.apache.beehive.netui.compiler.Diagnostics; +import org.apache.beehive.controls.runtime.generator.apt.Diagnostics; import org.apache.beehive.netui.compiler.CompilerUtils; import org.apache.beehive.netui.compiler.FlowControllerInfo; import com.sun.mirror.apt.AnnotationProcessorEnvironment; Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/RaiseActionGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/RaiseActionGrammar.java?view=diff&r1=154964&r2=154965 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/RaiseActionGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/RaiseActionGrammar.java Tue Feb 22 22:03:16 2005 @@ -18,7 +18,7 @@ package org.apache.beehive.netui.compiler.grammar; import org.apache.beehive.netui.compiler.AnnotationGrammar; -import org.apache.beehive.netui.compiler.Diagnostics; +import org.apache.beehive.controls.runtime.generator.apt.Diagnostics; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; import org.apache.beehive.netui.compiler.AnnotationMemberType; import org.apache.beehive.netui.compiler.CompilerUtils; Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/SharedFlowRefGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/SharedFlowRefGrammar.java?view=diff&r1=154964&r2=154965 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/SharedFlowRefGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/SharedFlowRefGrammar.java Tue Feb 22 22:03:16 2005 @@ -18,7 +18,7 @@ package org.apache.beehive.netui.compiler.grammar; import org.apache.beehive.netui.compiler.AnnotationGrammar; -import org.apache.beehive.netui.compiler.Diagnostics; +import org.apache.beehive.controls.runtime.generator.apt.Diagnostics; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; import org.apache.beehive.netui.compiler.CompilerUtils; import org.apache.beehive.netui.compiler.JpfLanguageConstants; Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java?view=diff&r1=154964&r2=154965 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java Tue Feb 22 22:03:16 2005 @@ -21,7 +21,7 @@ import org.apache.beehive.netui.compiler.AnnotationMemberType; import org.apache.beehive.netui.compiler.FlowControllerInfo; import org.apache.beehive.netui.compiler.CompilerUtils; -import org.apache.beehive.netui.compiler.Diagnostics; +import org.apache.beehive.controls.runtime.generator.apt.Diagnostics; import com.sun.mirror.apt.AnnotationProcessorEnvironment; import com.sun.mirror.declaration.AnnotationMirror; import com.sun.mirror.declaration.MemberDeclaration; Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidatableBeanGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidatableBeanGrammar.java?view=diff&r1=154964&r2=154965 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidatableBeanGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidatableBeanGrammar.java Tue Feb 22 22:03:16 2005 @@ -19,7 +19,7 @@ import org.apache.beehive.netui.compiler.AnnotationGrammar; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; -import org.apache.beehive.netui.compiler.Diagnostics; +import org.apache.beehive.controls.runtime.generator.apt.Diagnostics; import com.sun.mirror.apt.AnnotationProcessorEnvironment; import static org.apache.beehive.netui.compiler.JpfLanguageConstants.VERSION_9_0_STRING; Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidatablePropertyGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidatablePropertyGrammar.java?view=diff&r1=154964&r2=154965 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidatablePropertyGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidatablePropertyGrammar.java Tue Feb 22 22:03:16 2005 @@ -22,7 +22,7 @@ import com.sun.mirror.declaration.MemberDeclaration; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; import org.apache.beehive.netui.compiler.AnnotationMemberType; -import org.apache.beehive.netui.compiler.Diagnostics; +import org.apache.beehive.controls.runtime.generator.apt.Diagnostics; import org.apache.beehive.netui.compiler.CompilerUtils; import static org.apache.beehive.netui.compiler.JpfLanguageConstants.*; Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateCustomGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateCustomGrammar.java?view=diff&r1=154964&r2=154965 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateCustomGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateCustomGrammar.java Tue Feb 22 22:03:16 2005 @@ -20,7 +20,7 @@ import static org.apache.beehive.netui.compiler.JpfLanguageConstants.MESSAGE_ATTR; import static org.apache.beehive.netui.compiler.JpfLanguageConstants.MESSAGE_KEY_ATTR; import com.sun.mirror.apt.AnnotationProcessorEnvironment; -import org.apache.beehive.netui.compiler.Diagnostics; +import org.apache.beehive.controls.runtime.generator.apt.Diagnostics; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; public class ValidateCustomGrammar Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateRangeGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateRangeGrammar.java?view=diff&r1=154964&r2=154965 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateRangeGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateRangeGrammar.java Tue Feb 22 22:03:16 2005 @@ -18,7 +18,7 @@ package org.apache.beehive.netui.compiler.grammar; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; -import org.apache.beehive.netui.compiler.Diagnostics; +import org.apache.beehive.controls.runtime.generator.apt.Diagnostics; import org.apache.beehive.netui.compiler.AnnotationMemberType; import com.sun.mirror.apt.AnnotationProcessorEnvironment; import com.sun.mirror.declaration.AnnotationTypeElementDeclaration; Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateRequiredGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateRequiredGrammar.java?view=diff&r1=154964&r2=154965 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateRequiredGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateRequiredGrammar.java Tue Feb 22 22:03:16 2005 @@ -23,7 +23,7 @@ import com.sun.mirror.declaration.MethodDeclaration; import com.sun.mirror.type.TypeMirror; import com.sun.mirror.type.PrimitiveType; -import org.apache.beehive.netui.compiler.Diagnostics; +import org.apache.beehive.controls.runtime.generator.apt.Diagnostics; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; import static org.apache.beehive.netui.compiler.JpfLanguageConstants.VALIDATE_REQUIRED_TAG_NAME; Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateTypeGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateTypeGrammar.java?view=diff&r1=154964&r2=154965 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateTypeGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateTypeGrammar.java Tue Feb 22 22:03:16 2005 @@ -28,7 +28,7 @@ import com.sun.mirror.type.PrimitiveType; import com.sun.mirror.type.TypeMirror; import org.apache.beehive.netui.compiler.AnnotationMemberType; -import org.apache.beehive.netui.compiler.Diagnostics; +import org.apache.beehive.controls.runtime.generator.apt.Diagnostics; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; import org.apache.beehive.netui.compiler.CompilerUtils; Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateValidWhenGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateValidWhenGrammar.java?view=diff&r1=154964&r2=154965 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateValidWhenGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidateValidWhenGrammar.java Tue Feb 22 22:03:16 2005 @@ -18,7 +18,7 @@ package org.apache.beehive.netui.compiler.grammar; import com.sun.mirror.apt.AnnotationProcessorEnvironment; -import org.apache.beehive.netui.compiler.Diagnostics; +import org.apache.beehive.controls.runtime.generator.apt.Diagnostics; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; import static org.apache.beehive.netui.compiler.JpfLanguageConstants.MESSAGE_ATTR; Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidationMessageArgsGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidationMessageArgsGrammar.java?view=diff&r1=154964&r2=154965 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidationMessageArgsGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidationMessageArgsGrammar.java Tue Feb 22 22:03:16 2005 @@ -19,7 +19,7 @@ import org.apache.beehive.netui.compiler.AnnotationGrammar; import org.apache.beehive.netui.compiler.CompilerUtils; -import org.apache.beehive.netui.compiler.Diagnostics; +import org.apache.beehive.controls.runtime.generator.apt.Diagnostics; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; import com.sun.mirror.apt.AnnotationProcessorEnvironment; import com.sun.mirror.declaration.AnnotationMirror; Modified: incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidationRulesContainerGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidationRulesContainerGrammar.java?view=diff&r1=154964&r2=154965 ============================================================================== --- incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidationRulesContainerGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ValidationRulesContainerGrammar.java Tue Feb 22 22:03:16 2005 @@ -18,7 +18,7 @@ package org.apache.beehive.netui.compiler.grammar; import org.apache.beehive.netui.compiler.AnnotationGrammar; -import org.apache.beehive.netui.compiler.Diagnostics; +import org.apache.beehive.controls.runtime.generator.apt.Diagnostics; import org.apache.beehive.netui.compiler.RuntimeVersionChecker; import org.apache.beehive.netui.compiler.AnnotationMemberType; import com.sun.mirror.apt.AnnotationProcessorEnvironment; Modified: incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java?view=diff&r1=154964&r2=154965 ============================================================================== --- incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java (original) +++ incubator/beehive/trunk/netui/src/scoping/org/apache/beehive/netui/pageflow/scoping/internal/ScopedRequestImpl.java Tue Feb 22 22:03:16 2005 @@ -320,9 +320,8 @@ { if ( ScopedAttributeContainer.isInScope( scopedParamName, _listenScopes.get( j ) ) ) { - map.put( ScopedAttributeContainer.removeScope( scopedParamName, - _listenScopes.get( j ) ), - entry.getValue() ); + map.put( ScopedAttributeContainer.removeScope( scopedParamName, _listenScopes.get( j ) ), + entry.getValue() ); } } }
