You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/09/16 23:25:46 UTC
svn commit: r289654 - in /beehive/trunk/netui/src:
pageflow/org/apache/beehive/netui/pageflow/handler/
pageflow/org/apache/beehive/netui/pageflow/interceptor/action/
util/org/apache/beehive/netui/util/config/bean/
Author: ekoneil
Date: Fri Sep 16 14:25:39 2005
New Revision: 289654
URL: http://svn.apache.org/viewcvs?rev=289654&view=rev
Log:
Fix some of the config JavaBean method names to reflect the plurality of the types that they return.
In some cases, arrays were being returned from methods that seemed to imply they only returned a single item.
Also change a "paegflow" reference to "PageFlow".
Thanks to Krista Baker who has been diligently looking over these APIs. :)
BB: self
Test: NetUI DRT pass
Modified:
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptorContext.java
beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/PageFlowHandlersConfig.java
beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/PerActionInterceptorConfig.java
beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/PerPageFlowActionInterceptorConfig.java
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java?rev=289654&r1=289653&r2=289654&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/handler/Handlers.java Fri Sep 16 14:25:39 2005
@@ -108,23 +108,23 @@
defaultActionForwardHandler, ActionForwardHandler.class, servletContext );
_exceptionsHandler = ( ExceptionsHandler )
- adaptHandler( handlers != null ? handlers.getExceptionsHandler() : null, defaultExceptionsHandler,
+ adaptHandler( handlers != null ? handlers.getExceptionsHandlers() : null, defaultExceptionsHandler,
ExceptionsHandler.class, servletContext );
_forwardRedirectHandler = ( ForwardRedirectHandler )
- adaptHandler( handlers != null ? handlers.getForwardRedirectHandler() : null,
+ adaptHandler( handlers != null ? handlers.getForwardRedirectHandlers() : null,
defaultForwardRedirectHandler, ForwardRedirectHandler.class, servletContext );
_loginHandler = ( LoginHandler )
- adaptHandler( handlers != null ? handlers.getLoginHandler() : null, defaultLoginHandler,
+ adaptHandler( handlers != null ? handlers.getLoginHandlers() : null, defaultLoginHandler,
LoginHandler.class, servletContext );
_storageHandler = ( StorageHandler )
- adaptHandler( handlers != null ? handlers.getStorageHandler() : null, defaultStorageHandler,
+ adaptHandler( handlers != null ? handlers.getStorageHandlers() : null, defaultStorageHandler,
StorageHandler.class, servletContext );
_reloadableClassHandler = ( ReloadableClassHandler )
- adaptHandler( handlers != null ? handlers.getReloadableClassHandler() : null,
+ adaptHandler( handlers != null ? handlers.getReloadableClassHandlers() : null,
defaultReloadableClassHandler, ReloadableClassHandler.class, servletContext );
}
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptorContext.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptorContext.java?rev=289654&r1=289653&r2=289654&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptorContext.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptorContext.java Fri Sep 16 14:25:39 2005
@@ -196,7 +196,7 @@
{
PerPageFlowActionInterceptorConfig ppfi = perPageFlowInterceptorsConfig[i];
- if ( ppfi != null && pageFlowURI.equals( ppfi.getPageflowUri() ) )
+ if ( ppfi != null && pageFlowURI.equals( ppfi.getPageFlowUri() ) )
{
//
// This is a matching page flow -- add per-pageflow interceptors.
@@ -220,9 +220,9 @@
//
// This is a matching action -- add per-action interceptors.
//
- addInterceptors( perActionConfig.getActionInterceptor(), interceptorsList,
+ addInterceptors( perActionConfig.getActionInterceptors(), interceptorsList,
ActionInterceptor.class );
- addSimpleInterceptors( perActionConfig.getSimpleActionInterceptor(),
+ addSimpleInterceptors( perActionConfig.getSimpleActionInterceptors(),
interceptorsList );
}
}
Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/PageFlowHandlersConfig.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/PageFlowHandlersConfig.java?rev=289654&r1=289653&r2=289654&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/PageFlowHandlersConfig.java (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/PageFlowHandlersConfig.java Fri Sep 16 14:25:39 2005
@@ -47,23 +47,23 @@
return _actionForwardHandlers;
}
- public HandlerConfig[] getExceptionsHandler() {
+ public HandlerConfig[] getExceptionsHandlers() {
return _exceptionsHandler;
}
- public HandlerConfig[] getForwardRedirectHandler() {
+ public HandlerConfig[] getForwardRedirectHandlers() {
return _forwardRedirectHandler;
}
- public HandlerConfig[] getLoginHandler() {
+ public HandlerConfig[] getLoginHandlers() {
return _loginHandler;
}
- public HandlerConfig[] getStorageHandler() {
+ public HandlerConfig[] getStorageHandlers() {
return _storageHandler;
}
- public HandlerConfig[] getReloadableClassHandler() {
+ public HandlerConfig[] getReloadableClassHandlers() {
return _reloadableClassHandler;
}
}
Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/PerActionInterceptorConfig.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/PerActionInterceptorConfig.java?rev=289654&r1=289653&r2=289654&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/PerActionInterceptorConfig.java (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/PerActionInterceptorConfig.java Fri Sep 16 14:25:39 2005
@@ -38,11 +38,11 @@
return _actionName;
}
- public SimpleActionInterceptorConfig[] getSimpleActionInterceptor() {
+ public SimpleActionInterceptorConfig[] getSimpleActionInterceptors() {
return _simpleActionInterceptor;
}
- public InterceptorConfig[] getActionInterceptor() {
+ public InterceptorConfig[] getActionInterceptors() {
return _actionInterceptor;
}
}
Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/PerPageFlowActionInterceptorConfig.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/PerPageFlowActionInterceptorConfig.java?rev=289654&r1=289653&r2=289654&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/PerPageFlowActionInterceptorConfig.java (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/bean/PerPageFlowActionInterceptorConfig.java Fri Sep 16 14:25:39 2005
@@ -37,7 +37,7 @@
_perActionInterceptors = perActionInterceptors;
}
- public String getPageflowUri() {
+ public String getPageFlowUri() {
return _pageflowUri;
}