Author: rich
Date: Fri Apr 22 18:33:20 2005
New Revision: 164312
URL: http://svn.apache.org/viewcvs?rev=164312&view=rev
Log:
Fixes for:
- http://issues.apache.org/jira/browse/BEEHIVE-347 : Setting attribute
popup="false" on supported tags creates popup javascript anyway
- http://issues.apache.org/jira/browse/BEEHIVE-549 : Misleading warnings
about missing annotation processors in Page Flow build
tests: bvt in netui (WinXP)
BB: self (linux)
Modified:
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/JpfLanguageConstants.java
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/DefaultValidatorRuleFactory.java
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/declaration/DeclarationImpl.java
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/PageFlowAnnotationProcessorFactory.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java
Modified:
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/JpfLanguageConstants.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/JpfLanguageConstants.java?rev=164312&r1=164311&r2=164312&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/JpfLanguageConstants.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/JpfLanguageConstants.java
Fri Apr 22 18:33:20 2005
@@ -59,7 +59,7 @@
public static final String VALIDATE_DATE_TAG_NAME = "ValidateDate";
public static final String VALIDATE_TYPE_TAG_NAME = "ValidateType";
public static final String VALIDATE_VALID_WHEN_TAG_NAME =
"ValidateValidWhen";
- public static final String VALIDATE_CUSTOM_TAG_NAME = "ValidateCustomRule";
+ public static final String VALIDATE_CUSTOM_RULE_TAG_NAME =
"ValidateCustomRule";
public static final String MESSAGE_ARG_TAG_NAME = "MessageArg";
public static final String VALIDATE_CUSTOM_VARIABLE_TAG_NAME =
"ValidateCustomVariable";
Modified:
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/DefaultValidatorRuleFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/DefaultValidatorRuleFactory.java?rev=164312&r1=164311&r2=164312&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/DefaultValidatorRuleFactory.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/DefaultValidatorRuleFactory.java
Fri Apr 22 18:33:20 2005
@@ -121,7 +121,7 @@
rule = new ValidatorRule( RULENAME_VALID_WHEN );
rule.setVar( VARNAME_VALID_WHEN, CompilerUtils.getString(
ruleAnnotation, CONDITION_ATTR, true ) );
}
- else if ( annName.equals( VALIDATE_CUSTOM_TAG_NAME ) )
+ else if ( annName.equals( VALIDATE_CUSTOM_RULE_TAG_NAME ) )
{
String ruleName = CompilerUtils.getString( ruleAnnotation,
RULE_ATTR, false );
rule = new ValidatorRule( ruleName );
Modified:
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/declaration/DeclarationImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/declaration/DeclarationImpl.java?rev=164312&r1=164311&r2=164312&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/declaration/DeclarationImpl.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler-xdoclet/org/apache/beehive/netui/compiler/xdoclet/typesystem/impl/declaration/DeclarationImpl.java
Fri Apr 22 18:33:20 2005
@@ -83,7 +83,7 @@
MEMBER_ARRAY_ANNOTATIONS.put( ANNOTATION_INTERFACE_PREFIX +
CONDITIONAL_FORWARD_TAG_NAME, CONDITIONAL_FORWARDS_ATTR );
MEMBER_ARRAY_ANNOTATIONS.put( ANNOTATION_INTERFACE_PREFIX +
MESSAGE_BUNDLE_TAG_NAME, MESSAGE_BUNDLES_ATTR );
MEMBER_ARRAY_ANNOTATIONS.put( ANNOTATION_INTERFACE_PREFIX +
MESSAGE_ARG_TAG_NAME, MESSAGE_ARGS_ATTR );
- MEMBER_ARRAY_ANNOTATIONS.put( ANNOTATION_INTERFACE_PREFIX +
VALIDATE_CUSTOM_TAG_NAME, VALIDATE_CUSTOM_ATTR );
+ MEMBER_ARRAY_ANNOTATIONS.put( ANNOTATION_INTERFACE_PREFIX +
VALIDATE_CUSTOM_RULE_TAG_NAME, VALIDATE_CUSTOM_ATTR );
MEMBER_ARRAY_ANNOTATIONS.put( ANNOTATION_INTERFACE_PREFIX +
VALIDATE_CUSTOM_VARIABLE_TAG_NAME, VARIABLES_ATTR );
MEMBER_ARRAY_ANNOTATIONS.put( ANNOTATION_INTERFACE_PREFIX +
VALIDATION_LOCALE_RULES_TAG_NAME, LOCALE_RULES_ATTR );
MEMBER_ARRAY_ANNOTATIONS.put( ANNOTATION_INTERFACE_PREFIX +
VALIDATABLE_PROPERTY_TAG_NAME, VALIDATABLE_PROPERTIES_ATTR );
Modified:
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/PageFlowAnnotationProcessorFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/PageFlowAnnotationProcessorFactory.java?rev=164312&r1=164311&r2=164312&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/PageFlowAnnotationProcessorFactory.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/PageFlowAnnotationProcessorFactory.java
Fri Apr 22 18:33:20 2005
@@ -40,16 +40,38 @@
static
{
- PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER + CONTROLLER_TAG_NAME );
PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER + ACTION_TAG_NAME );
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
ACTION_OUTPUT_TAG_NAME );
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER + CATCH_TAG_NAME );
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
CONDITIONAL_FORWARD_TAG_NAME );
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER + CONTROLLER_TAG_NAME );
PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
EXCEPTION_HANDLER_TAG_NAME );
- PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
SIMPLE_ACTION_TAG_NAME );
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER + FORM_BEAN_TAG_NAME );
PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER + FORWARD_TAG_NAME );
-
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER + MESSAGE_ARG_TAG_NAME
);
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
MESSAGE_BUNDLE_TAG_NAME );
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
SIMPLE_ACTION_TAG_NAME );
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
VALIDATABLE_BEAN_TAG_NAME );
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
VALIDATABLE_PROPERTY_TAG_NAME );
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
VALIDATE_CREDIT_CARD_TAG_NAME );
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
VALIDATE_CUSTOM_RULE_TAG_NAME );
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
VALIDATE_CUSTOM_VARIABLE_TAG_NAME );
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
VALIDATE_DATE_TAG_NAME );
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
VALIDATE_EMAIL_TAG_NAME );
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
VALIDATE_MASK_TAG_NAME );
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
VALIDATE_MAX_LENGTH_TAG_NAME );
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
VALIDATE_MIN_LENGTH_TAG_NAME );
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
VALIDATE_RANGE_TAG_NAME );
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
VALIDATE_REQUIRED_TAG_NAME );
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
VALIDATE_TYPE_TAG_NAME );
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
VALIDATE_VALID_WHEN_TAG_NAME );
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
VALIDATION_LOCALE_RULES_TAG_NAME );
+ PAGEFLOW_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
VIEW_PROPERTIES_TAG_NAME );
+
+ FACES_BACKING_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
COMMAND_HANDLER_TAG_NAME );
FACES_BACKING_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
FACES_BACKING_TAG_NAME );
- FACES_BACKING_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
RAISE_ACTION_TAG_NAME );
FACES_BACKING_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
PAGE_FLOW_FIELD_TAG_NAME );
- FACES_BACKING_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
COMMAND_HANDLER_TAG_NAME );
+ FACES_BACKING_ANNOTATIONS.add( ANNOTATION_QUALIFIER +
RAISE_ACTION_TAG_NAME );
SUPPORTED_ANNOTATION_TYPES.addAll( PAGEFLOW_ANNOTATIONS );
SUPPORTED_ANNOTATION_TYPES.addAll( FACES_BACKING_ANNOTATIONS );
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java?rev=164312&r1=164311&r2=164312&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
Fri Apr 22 18:33:20 2005
@@ -879,7 +879,7 @@
* @param messageArg an argument to the message
*/
public static void addActionError( ServletRequest request, String
propertyName, String messageKey,
- String messageArg )
+ Object messageArg )
{
Object[] messageArgs = new Object[]{ messageArg };
InternalUtils.addActionError( propertyName, new ActionMessage(
messageKey, messageArgs ), request );
@@ -895,7 +895,7 @@
* @param messageArg2 the second argument to the message
*/
public static void addActionError( ServletRequest request, String
propertyName, String messageKey,
- String messageArg1, String messageArg2 )
+ Object messageArg1, Object messageArg2 )
{
Object[] messageArgs = new Object[]{ messageArg1, messageArg2 };
InternalUtils.addActionError( propertyName, new ActionMessage(
messageKey, messageArgs ), request );
@@ -912,7 +912,7 @@
* @param messageArg3 the third argument to the message
*/
public static void addActionError( ServletRequest request, String
propertyName, String messageKey,
- String messageArg1, String messageArg2,
String messageArg3 )
+ Object messageArg1, Object messageArg2,
Object messageArg3 )
{
Object[] messageArgs = new Object[]{ messageArg1, messageArg2,
messageArg3 };
InternalUtils.addActionError( propertyName, new ActionMessage(
messageKey, messageArgs ), request );
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java?rev=164312&r1=164311&r2=164312&view=diff
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java
Fri Apr 22 18:33:20 2005
@@ -207,7 +207,7 @@
*/
public void setPopup(boolean popup)
{
- _popupSupport = new PopupSupport();
+ _popupSupport = (popup ? new PopupSupport() : null);
}
/**
