Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultActionForwardHandler.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultActionForwardHandler.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultActionForwardHandler.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultActionForwardHandler.java Mon Apr 11 23:42:11 2005 @@ -32,8 +32,6 @@ import org.apache.beehive.netui.util.logging.Logger; import org.apache.beehive.netui.script.common.ImplicitObjectUtil; -import static org.apache.beehive.netui.pageflow.PageFlowConstants.AUTO_VIEW_RENDER_FORWARD_NAME; -import static org.apache.beehive.netui.pageflow.PageFlowConstants.ACTION_EXTENSION; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -75,9 +73,9 @@ // There is a special forward ("auto"), which signals us to render using a registered ViewRenderer. // This is used as part of popup window support. // - if ( fwd != null && AUTO_VIEW_RENDER_FORWARD_NAME.equals( fwd.getName() ) ) + if ( fwd != null && PageFlowConstants.AUTO_VIEW_RENDER_FORWARD_NAME.equals( fwd.getName() ) ) { - return getRegisteredHandler().doAutoViewRender( context, mapping, form ); + return getRegisteredActionForwardHandler().doAutoViewRender( context, mapping, form ); } if ( fwd != null && fwd instanceof Forward ) @@ -139,7 +137,7 @@ } fwd = - getRegisteredHandler().doReturnToPage( context, prevPageInfo, curJpf, form, actionName, pageFlowFwd ); + getRegisteredActionForwardHandler().doReturnToPage( context, prevPageInfo, curJpf, form, actionName, pageFlowFwd ); if ( prevPageInfo != null ) { @@ -155,7 +153,7 @@ else if ( pageFlowFwd.isReturnToAction() ) { isSpecialForward = true; - fwd = getRegisteredHandler().doReturnToAction( context, actionName, pageFlowFwd ); + fwd = getRegisteredActionForwardHandler().doReturnToAction( context, actionName, pageFlowFwd ); } // @@ -164,7 +162,7 @@ if ( pageFlowFwd.isNestedReturn() ) { isSpecialForward = true; - fwd = getRegisteredHandler().doNestingReturn( context, pageFlowFwd, mapping, form ); + fwd = getRegisteredActionForwardHandler().doNestingReturn( context, pageFlowFwd, mapping, form ); } // @@ -239,8 +237,8 @@ } else { - _log.error( "Auto-render forward " + AUTO_VIEW_RENDER_FORWARD_NAME + " used, but no ViewRenderer " - + "was registered -- not doing any forward or redirect." ); + _log.error( "Auto-render forward " + PageFlowConstants.AUTO_VIEW_RENDER_FORWARD_NAME + + " used, but no ViewRenderer " + "was registered -- not doing any forward or redirect." ); } return null; @@ -446,7 +444,7 @@ if ( _log.isWarnEnabled() ) { - StringBuilder msg = new StringBuilder( "Tried to pop from empty PageFlow stack." ); + StringBuffer msg = new StringBuffer( "Tried to pop from empty PageFlow stack." ); msg.append( " Current page flow is " ); msg.append( curJpf != null ? curJpf.getClass().getName() : null ); _log.warn( msg.append( '.' ).toString() ); @@ -482,8 +480,9 @@ if ( interceptor != null ) { - return getRegisteredHandler().handleInterceptorReturn( context, poppedPageFlow, pushedPageFlowWrapper, - returnAction, mapping, form, interceptor ); + return getRegisteredActionForwardHandler().handleInterceptorReturn( context, poppedPageFlow, + pushedPageFlowWrapper, returnAction, + mapping, form, interceptor ); } // @@ -496,8 +495,8 @@ _log.debug( "Action on popped PageFlowController is " + returnAction ); } - StringBuilder returnActionPath = new StringBuilder( poppedPageFlow.getModulePath() ); - returnActionPath.append( '/' ).append( returnAction ).append( ACTION_EXTENSION ); + StringBuffer returnActionPath = new StringBuffer( poppedPageFlow.getModulePath() ); + returnActionPath.append( '/' ).append( returnAction ).append( PageFlowConstants.ACTION_EXTENSION ); // // Store the returned form in the request. @@ -549,7 +548,7 @@ if ( _log.isDebugEnabled() ) { - StringBuilder message = new StringBuilder(); + StringBuffer message = new StringBuffer(); message.append( "Interceptor " ); message.append( interceptor.getClass().getName() ); message.append( " after nested page flow: " ); @@ -591,7 +590,7 @@ return pushedPageFlowWrapper.getInterceptedForward(); } - public ActionForwardHandler getRegisteredHandler() + public ActionForwardHandler getRegisteredActionForwardHandler() { return ( ActionForwardHandler ) super.getRegisteredHandler(); }
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java Mon Apr 11 23:42:11 2005 @@ -53,7 +53,6 @@ import org.apache.beehive.netui.pageflow.ExpressionMessage; import org.apache.beehive.netui.pageflow.handler.ExceptionsHandler; import org.apache.beehive.netui.pageflow.handler.FlowControllerHandlerContext; -import org.apache.beehive.netui.pageflow.handler.Handlers; import org.apache.beehive.netui.util.Bundle; import org.apache.beehive.netui.util.cache.ClassLevelCache; import org.apache.beehive.netui.util.logging.Logger; @@ -162,11 +161,11 @@ if ( _log.isErrorEnabled() ) { - StringBuilder msg = new StringBuilder( "Throwable " ).append( exClass.getName() ); + StringBuffer msg = new StringBuffer( "Throwable " ).append( exClass.getName() ); _log.error( msg.append( " unhandled by the current page flow (and any shared flow)" ).toString(), ex ); } - if ( ! getRegisteredHandler().eatUnhandledException( context, ex ) ) + if ( ! getRegisteredExceptionsHandler().eatUnhandledException( context, ex ) ) { if ( ex instanceof ServletException ) throw ( ServletException ) ex; if ( ex instanceof IOException ) throw ( IOException ) ex; @@ -235,11 +234,12 @@ { if ( originalFlowController instanceof PageFlowController ) { - Collection< SharedFlowController > sharedFlows = + Collection/*< SharedFlowController >*/ sharedFlows = ( ( PageFlowController ) originalFlowController ).getSharedFlows().values(); - for ( SharedFlowController sf : sharedFlows ) + for ( java.util.Iterator ii = sharedFlows.iterator(); ii.hasNext(); ) { + SharedFlowController sf = ( SharedFlowController ) ii.next(); ModuleConfig mc = sf.getModuleConfig(); ExceptionConfig ec = getExceptionConfig( exClass, mc ); @@ -336,7 +336,7 @@ if ( message != null ) { - error = new ExpressionMessage( message, ex.getMessage() ); + error = new ExpressionMessage( message, new Object[]{ ex.getMessage() } ); try { @@ -389,8 +389,8 @@ err = Bundle.getString( "PageFlow_MissingExceptionHandler", methodName ); } - InternalUtils.sendError( "PageFlow_Custom_Error", null, request, response, getServletContext(), - flowController.getDisplayName(), err ); + InternalUtils.sendError( "PageFlow_Custom_Error", null, request, response, + new Object[]{ flowController.getDisplayName(), err } ); return null; } } @@ -529,7 +529,7 @@ { if ( _log.isErrorEnabled() ) { - StringBuilder msg = new StringBuilder( "Could not find exception handler method " ); + StringBuffer msg = new StringBuffer( "Could not find exception handler method " ); msg.append( methodName ).append( " for " ).append( exClass.getName() ).append( '.' ); _log.error( msg.toString() ); } @@ -539,7 +539,7 @@ return null; } - public ExceptionsHandler getRegisteredHandler() + public ExceptionsHandler getRegisteredExceptionsHandler() { return ( ExceptionsHandler ) super.getRegisteredHandler(); } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultForwardRedirectHandler.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultForwardRedirectHandler.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultForwardRedirectHandler.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultForwardRedirectHandler.java Mon Apr 11 23:42:11 2005 @@ -76,7 +76,8 @@ { InternalUtils.sendDevTimeError( "PageFlow_Forward_Overflow", null, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, request, response, - getServletContext(), forwardOverflowCount, uri ); + getServletContext(), + new Object[]{ new Integer( forwardOverflowCount ), uri } ); return; } @@ -88,9 +89,10 @@ int nestingOverflowCount = settings.getNestingOverflowCount(); if ( pfStack != null && pfStack.size() > nestingOverflowCount ) { + Object[] args = new Object[]{ new Integer( pfStack.size() ), new Integer( nestingOverflowCount ) }; InternalUtils.sendDevTimeError( "PageFlow_Nesting_Overflow", null, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, request, response, - getServletContext(), pfStack.size(), nestingOverflowCount ); + getServletContext(), args ); return; } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultReloadableClassHandler.java Mon Apr 11 23:42:11 2005 @@ -30,7 +30,7 @@ import javax.servlet.ServletContext; import java.util.Enumeration; import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; +import org.apache.beehive.netui.util.internal.concurrent.InternalConcurrentHashMap; import java.io.File; import org.apache.struts.action.ActionServlet; @@ -77,16 +77,16 @@ public Object newInstance( String className ) throws ClassNotFoundException, InstantiationException, IllegalAccessException { - return getRegisteredHandler().loadClass( className ).newInstance(); + return getRegisteredReloadableClassHandler().loadClass( className ).newInstance(); } - private static Map< String, Class > _loadedClasses = new ConcurrentHashMap< String, Class >(); + private static Map/*< String, Class >*/ _loadedClasses = new InternalConcurrentHashMap/*< String, Class >*/(); private static class Null {} private static Class NULL_CLASS = Null.class; public Class loadCachedClass( String className ) { - Class clazz = _loadedClasses.get( className ); + Class clazz = ( Class ) _loadedClasses.get( className ); if ( clazz != null ) { @@ -96,7 +96,7 @@ { try { - clazz = getRegisteredHandler().loadClass( className ); + clazz = getRegisteredReloadableClassHandler().loadClass( className ); _loadedClasses.put( className, clazz ); return clazz; } @@ -203,7 +203,7 @@ return _pageFlowClassLoader != null; } - public ReloadableClassHandler getRegisteredHandler() + public ReloadableClassHandler getRegisteredReloadableClassHandler() { return ( ReloadableClassHandler ) super.getRegisteredHandler(); } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLRewriter.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLRewriter.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLRewriter.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLRewriter.java Mon Apr 11 23:42:11 2005 @@ -24,7 +24,7 @@ import org.apache.beehive.netui.core.urls.MutableURI; import org.apache.beehive.netui.core.urls.URLRewriter; -import org.apache.beehive.netui.core.urls.URLRewriter.URLType; +import org.apache.beehive.netui.core.urls.URLType; import org.apache.beehive.netui.pageflow.ServletContainerAdapter; import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils; import org.apache.beehive.netui.util.logging.Logger; @@ -119,7 +119,7 @@ * @param object the Object to test for equality. * @return true if object is another instance of DefaultURLRewriter. */ - @Override + public boolean equals( Object object ) { if ( object == this ) { return true; } @@ -140,7 +140,7 @@ * * @return a hash code value for this object. */ - @Override + public int hashCode() { return 0; Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/FacesBackingBeanFactory.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/FacesBackingBeanFactory.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/FacesBackingBeanFactory.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/FacesBackingBeanFactory.java Mon Apr 11 23:42:11 2005 @@ -17,8 +17,6 @@ */ package org.apache.beehive.netui.pageflow.internal; -import static org.apache.beehive.netui.pageflow.internal.InternalConstants.FACES_BACKING_ATTR; -import org.apache.beehive.netui.pageflow.annotations.Jpf; import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils; import org.apache.beehive.netui.pageflow.FacesBackingBean; import org.apache.beehive.netui.pageflow.PageFlowUtils; @@ -30,10 +28,10 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.ServletContext; -import static org.apache.beehive.netui.pageflow.internal.InternalConstants.*; public class FacesBackingBeanFactory + implements InternalConstants { private static final Logger _log = Logger.getInstance( FacesBackingBeanFactory.class ); @@ -67,23 +65,28 @@ + request.getRequestURI() ); } } - else if ( backingClass.getAnnotation( Jpf.FacesBacking.class ) != null ) + else { - if ( _log.isDebugEnabled() ) + AnnotationReader annReader = AnnotationReader.getAnnotationReader( backingClass, servletContext ); + + if ( annReader.getJpfAnnotation( backingClass, "FacesBacking" ) != null ) { - _log.debug( "Found backing class " + backingClassName + " for request " - + request.getRequestURI() + "; creating a new instance." ); + if ( _log.isDebugEnabled() ) + { + _log.debug( "Found backing class " + backingClassName + " for request " + + request.getRequestURI() + "; creating a new instance." ); + } + + bean = ( FacesBackingBean ) backingClass.newInstance(); } - - bean = ( FacesBackingBean ) backingClass.newInstance(); - } - else - { - if ( _log.isDebugEnabled() ) + else { - _log.debug( "Found matching backing class " + backingClassName + " for request " - + request.getRequestURI() + ", but it does not have the " - + Jpf.FacesBacking.class.getName() + " annotation." ); + if ( _log.isDebugEnabled() ) + { + _log.debug( "Found matching backing class " + backingClassName + " for request " + + request.getRequestURI() + ", but it does not have the " + + ANNOTATION_QUALIFIER + "FacesBacking" + " annotation." ); + } } } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalConstants.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalConstants.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalConstants.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalConstants.java Mon Apr 11 23:42:11 2005 @@ -17,10 +17,9 @@ */ package org.apache.beehive.netui.pageflow.internal; -import org.apache.beehive.netui.pageflow.FlowController; import org.apache.beehive.netui.pageflow.PageFlowConstants; -public class InternalConstants +public interface InternalConstants { /** * The page flow compiler generates this message key when the message is actually an expression for us to evaluate @@ -67,4 +66,6 @@ public static final String FACES_BACKING_EXTENSION = ".jsfb"; public static final String SHARED_FLOW_EXTENSION = ".jpfs"; + + public static final String ANNOTATION_QUALIFIER = "org.apache.beehive.netui.pageflow.annotations.Jpf."; } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalExpressionUtils.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalExpressionUtils.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalExpressionUtils.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalExpressionUtils.java Mon Apr 11 23:42:11 2005 @@ -132,7 +132,7 @@ private static final Map buildCookieMap(HttpServletRequest httpServletRequest) { HttpServletRequest servletRequest = httpServletRequest; - Map<String, Cookie> cookieMap = new HashMap<String, Cookie>(); + Map/*<String, Cookie>*/ cookieMap = new HashMap/*<String, Cookie>*/(); Cookie[] cookies = servletRequest.getCookies(); for(int i = 0; i < cookies.length; i++) { Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java Mon Apr 11 23:42:11 2005 @@ -51,11 +51,10 @@ import java.util.LinkedHashMap; import java.util.Map; -import static org.apache.beehive.netui.pageflow.internal.InternalConstants.*; public class InternalUtils - implements PageFlowConstants + implements PageFlowConstants, InternalConstants { private static final Logger _log = Logger.getInstance( InternalUtils.class ); @@ -79,7 +78,7 @@ */ public static void sendDevTimeError( String messageKey, Throwable cause, int productionTimeErrorCode, ServletRequest request, ServletResponse response, - ServletContext servletContext, Object ... messageArgs ) + ServletContext servletContext, Object[] messageArgs ) throws IOException { sendDevTimeError( messageKey, messageArgs, cause, productionTimeErrorCode, request, response, servletContext ); @@ -87,6 +86,7 @@ /** * If not in production mode, write an error to the response; otherwise, set a response error code. + * @deprecated Use [EMAIL PROTECTED] #sendDevTimeError(String, Throwable, int, ServletRequest, ServletResponse, ServletContext, Object[])} */ public static void sendDevTimeError( String messageKey, Object[] messageArgs, Throwable cause, int productionTimeErrorCode, ServletRequest request, @@ -116,7 +116,7 @@ * Write an error to the response. */ public static void sendError( String messageKey, Throwable cause, ServletRequest request, - HttpServletResponse response, Object ... messageArgs ) + HttpServletResponse response, Object[] messageArgs ) throws IOException { // TODO: the following null check will be unnecessary once the deprecated @@ -713,7 +713,7 @@ int lastSlash = pageURI.lastIndexOf( '/' ); if ( lastSlash != -1 ) { - StringBuilder value = new StringBuilder( qualifiedAction.length() + lastSlash ); + StringBuffer value = new StringBuffer( qualifiedAction.length() + lastSlash ); value.append( pageURI.substring( 0, lastSlash ) ); value.append( qualifiedAction ); return value.toString(); @@ -727,7 +727,7 @@ ModuleConfig appConfig = ( ModuleConfig ) request.getAttribute( Globals.MODULE_KEY ); if ( appConfig != null ) { - StringBuilder value = new StringBuilder( qualifiedAction.length() + 16 ); + StringBuffer value = new StringBuffer( qualifiedAction.length() + 16 ); value.append( appConfig.getPrefix() ); value.append( qualifiedAction ); return value.toString(); @@ -739,7 +739,7 @@ public static String qualifyAction( ServletContext servletContext, String action ) { assert action != null; - StringBuilder sb = null; + StringBuffer sb = null; // Use our servlet mapping, if one is specified String servletMapping = ( String ) servletContext.getAttribute( Globals.SERVLET_KEY ); @@ -753,7 +753,7 @@ } String actionMapping = getActionMappingName( action ); - sb = new StringBuilder( actionMapping.length() + servletMapping.length() + question + 1 ); + sb = new StringBuffer( actionMapping.length() + servletMapping.length() + question + 1 ); if ( servletMapping.startsWith( "*." ) ) { sb.append( actionMapping ); @@ -778,7 +778,7 @@ // already included in the action property else { - sb = new StringBuilder(action.length() + 1 ); + sb = new StringBuffer(action.length() + 1 ); if ( !action.startsWith( "/" ) ) { sb.append( '/' ); @@ -994,7 +994,7 @@ public static boolean avoidDirectResponseOutput( ServletRequest request ) { Boolean avoid = ( Boolean ) request.getAttribute( AVOID_DIRECT_RESPONSE_OUTPUT_ATTR ); - return avoid != null && avoid; + return avoid != null && avoid.booleanValue(); } /** @@ -1052,15 +1052,15 @@ if ( ignore ) { - if ( depth == null ) depth = 0; - request.setAttribute( IGNORE_INCLUDE_SERVLET_PATH_ATTR, depth + 1 ); + if ( depth == null ) depth = new Integer( 0 ); + request.setAttribute( IGNORE_INCLUDE_SERVLET_PATH_ATTR, new Integer( depth.intValue() + 1 ) ); } else { assert depth != null : "call to setIgnoreIncludeServletPath() was imbalanced"; - depth -= 1; + depth = new Integer( depth.intValue() - 1 ); - if ( depth == 0 ) + if ( depth.intValue() == 0 ) { request.removeAttribute( IGNORE_INCLUDE_SERVLET_PATH_ATTR ); } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/JavaControlUtils.java Mon Apr 11 23:42:11 2005 @@ -18,7 +18,6 @@ package org.apache.beehive.netui.pageflow.internal; import org.apache.beehive.controls.runtime.servlet.ServletBeanContext; -import org.apache.beehive.controls.api.ControlException; import org.apache.beehive.controls.api.bean.Controls; import org.apache.beehive.controls.api.bean.ControlBean; import org.apache.beehive.controls.api.bean.Control; @@ -34,10 +33,15 @@ import java.lang.reflect.Modifier; import java.util.Map; import java.util.HashMap; -import java.util.concurrent.ConcurrentHashMap; +import java.util.Iterator; + +import org.apache.beehive.netui.util.internal.concurrent.InternalConcurrentHashMap; import java.beans.beancontext.BeanContext; import org.apache.beehive.netui.util.logging.Logger; +import org.apache.beehive.netui.pageflow.ControlFieldInitializationException; +import org.apache.beehive.netui.pageflow.PageFlowUtils; +import org.apache.beehive.netui.pageflow.PageFlowManagedObject; /** @@ -47,10 +51,11 @@ { private static final Logger _log = Logger.getInstance( JavaControlUtils.class ); private static final String CONTROL_CONTEXT_CLASSNAME = ServletBeanContext.class.getName(); + private static final String CONTROL_ANNOTATION_CLASSNAME = Control.class.getName(); /** Map of control-container-class (e.g., PageFlowController) to Map of fields/control-properties. */ - private static ConcurrentHashMap< String, Map< Field, PropertyMap > > _controlFieldCache = - new ConcurrentHashMap< String, Map< Field, PropertyMap > >(); + private static InternalConcurrentHashMap/*< String, Map< Field, PropertyMap > >*/ _controlFieldCache = + new InternalConcurrentHashMap/*< String, Map< Field, PropertyMap > >*/(); public static void initializeControlContext( HttpServletRequest request, HttpServletResponse response, ServletContext servletContext ) @@ -83,9 +88,9 @@ { private String _controlBeanClassName; - public ControlInstantiationException( String controlBeanClassName, Throwable cause ) + public ControlInstantiationException( String controlBeanClassName, Throwable cause_ ) { - super( cause ); + super( cause_ ); _controlBeanClassName = controlBeanClassName; } @@ -95,8 +100,8 @@ } } - public static ControlBeanContext getControlBeanContext( HttpServletRequest request, HttpServletResponse response, - ServletContext servletContext, boolean createIfMissing ) + private static ControlBeanContext getControlBeanContext( HttpServletRequest request, HttpServletResponse response, + ServletContext servletContext, boolean createIfMissing ) { // // Retrieve the control bean context from the request, and if it's not there, from the session. @@ -123,7 +128,7 @@ // if ( createIfMissing ) { - beanContext = + beanContext = ( ControlBeanContext ) AdapterManager.getServletContainerAdapter( servletContext ).createControlBeanContext( request, response ); request.getSession().setAttribute( CONTROL_CONTEXT_CLASSNAME, beanContext ); request.setAttribute( CONTROL_CONTEXT_CLASSNAME, beanContext ); @@ -141,25 +146,16 @@ * @param properties * @return ControlBean */ - public static ControlBean createControl( String controlClassName, boolean isBeanClass, String controlID, - PropertyMap properties, ControlBeanContext beanContext ) - throws ControlInstantiationException + private static ControlBean createControl( String controlClassName, boolean isBeanClass, String controlID, + PropertyMap properties, ControlBeanContext beanContext ) + throws ClassNotFoundException { if ( ! isBeanClass ) controlClassName += "Bean"; - try - { - Object instance = Controls.instantiate( Thread.currentThread().getContextClassLoader(), controlClassName, - properties, beanContext, controlID ); - assert instance instanceof ControlBean : instance.getClass().getName(); - return ( ControlBean ) instance; - } - catch ( Exception e ) - { - assert e instanceof ControlException : e.getClass().getName(); - _log.error( "Error while constructing control bean of type " + controlClassName, e ); - throw new ControlInstantiationException( controlClassName, e ); - } + Object instance = Controls.instantiate( Thread.currentThread().getContextClassLoader(), controlClassName, + properties, beanContext, controlID ); + assert instance instanceof ControlBean : instance.getClass().getName(); + return ( ControlBean ) instance; } public static void destroyControl( Object controlInstance ) @@ -173,14 +169,14 @@ /** * @return a map of Field (accessible) -> AnnotationMap */ - public static Map getAccessibleControlFieldAnnotations( Class controlContainerClass ) + private static Map getAccessibleControlFieldAnnotations( Class controlContainerClass, ServletContext servletContext ) { String className = controlContainerClass.getName(); // // Reading the annotations is expensive. See if there's a cached copy of the map. // - Map< Field, PropertyMap > cached = _controlFieldCache.get( className ); + Map/*< Field, PropertyMap >*/ cached = ( Map ) _controlFieldCache.get( className ); if ( cached != null ) { @@ -188,9 +184,12 @@ } - HashMap< Field, PropertyMap > ret = new HashMap< Field, PropertyMap >(); + HashMap/*< Field, PropertyMap >*/ ret = new HashMap/*< Field, PropertyMap >*/(); boolean accessPrivateFields = true; + // Note that the annnotation reader doesn't change per-class. Inherited annotated elements are all read. + AnnotationReader annReader = AnnotationReader.getAnnotationReader( controlContainerClass, servletContext ); + do { Field[] fields = controlContainerClass.getDeclaredFields(); @@ -200,7 +199,8 @@ Field field = fields[i]; int modifiers = field.getModifiers(); - if ( ! Modifier.isStatic( modifiers ) && field.getAnnotation( Control.class ) != null ) + if ( ! Modifier.isStatic( modifiers ) + && annReader.getAnnotation( field.getName(), CONTROL_ANNOTATION_CLASSNAME ) != null ) { if ( accessPrivateFields || ! Modifier.isPrivate( modifiers ) ) { @@ -218,4 +218,100 @@ return ret; } + + /** + * Initialize all null member variables that are Java Controls. + * + * @param request the current HttpServletRequest. + */ + public static void initJavaControls( HttpServletRequest request, HttpServletResponse response, + ServletContext servletContext, PageFlowManagedObject controlClient ) + throws ControlFieldInitializationException + { + Class controlClientClass = controlClient.getClass(); + Map controlFields = getAccessibleControlFieldAnnotations( controlClientClass, servletContext ); + if ( controlFields.isEmpty() ) return; + + request = PageFlowUtils.unwrapMultipart( request ); + ControlBeanContext beanContext = getControlBeanContext( request, response, servletContext, false ); + assert beanContext != null : "ControlBeanContext was not initialized by PageFlowRequestProcessor"; + String classID = controlClientClass.getName(); + + for ( Iterator i = controlFields.entrySet().iterator(); i.hasNext(); ) + { + Map.Entry entry = ( Map.Entry ) i.next(); + Field field = ( Field ) entry.getKey(); + + // + // We don't want the field to be transient -- the reference should not go away when this + // object is serialized/deserialized. The checker should enforce this. + // + assert ! Modifier.isTransient( field.getModifiers() ) : field.getName(); + + try + { + if ( field.get( controlClient ) == null ) // make sure it's not already initialized + { + if ( _log.isTraceEnabled() ) + { + _log.trace( "Initializing field " + field.getName() + " (" + field.getType().getName() + + ") with a Java Control..." ); + } + + PropertyMap propertyMap = ( PropertyMap ) entry.getValue(); + Class fieldType = field.getType(); + String controlID = getControlID( field, classID, controlClient.hashCode() ); + boolean isControlBeanClass = ! fieldType.isInterface(); + ControlBean bean = + createControl( fieldType.getName(), isControlBeanClass, controlID, propertyMap, beanContext ); + field.set( controlClient, bean ); + } + } + catch ( Exception e ) + { + _log.error( "Exception occurred while initializing control field " + field.getName(), e ); + throw new ControlFieldInitializationException( field.getName(), controlClient, e ); + } + } + } + + /** + * Clean up all member variables that are Java Controls. + */ + public static void uninitJavaControls( ServletContext servletContext, PageFlowManagedObject controlClient ) + { + Map controlFields = getAccessibleControlFieldAnnotations( controlClient.getClass(), servletContext ); + + for ( Iterator i = controlFields.keySet().iterator(); i.hasNext(); ) + { + Field controlField = ( Field ) i.next(); + + try + { + Object fieldValue = controlField.get( controlClient ); + + if ( fieldValue != null ) + { + controlField.set( controlClient, null ); + destroyControl( fieldValue ); + } + } + catch ( IllegalAccessException e ) + { + _log.error( "Exception while uninitializing Java Control " + controlField.getName(), e ); + } + } + } + + /** + * Create a unique ID for a given Java Control field. + */ + private static String getControlID( Field controlField, String classID, int instanceID ) + { + StringBuffer controlID = new StringBuffer(); + controlID.append( classID ); // classname + controlID.append( '@' ).append( instanceID ); // instance ID + controlID.append( '.' ).append( controlField.getName() ); // name of the control field + return controlID.toString(); + } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/LegacySettings.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/LegacySettings.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/LegacySettings.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/LegacySettings.java Mon Apr 11 23:42:11 2005 @@ -22,14 +22,15 @@ import org.apache.beehive.netui.util.config.bean.PageflowConfig; import org.apache.beehive.netui.pageflow.PageFlowActionServlet; import org.apache.beehive.netui.pageflow.PageFlowContextListener; +import org.apache.beehive.netui.pageflow.PageFlowConstants; import javax.servlet.ServletContext; import java.io.Serializable; -import static org.apache.beehive.netui.pageflow.PageFlowConstants.*; -public class LegacySettings implements Serializable +public class LegacySettings + implements Serializable, PageFlowConstants { private static final Logger _log = Logger.getInstance( LegacySettings.class ); @@ -84,7 +85,7 @@ loadLegacyParam( FORWARD_OVERFLOW_COUNT_PARAM, servletContext, "max-forwards-per-request" ); if ( forwardOverflowCount != null ) { - _forwardOverflowCount = forwardOverflowCount; + _forwardOverflowCount = forwardOverflowCount.intValue(); } else { @@ -98,7 +99,7 @@ loadLegacyParam( NESTING_OVERFLOW_COUNT_PARAM, servletContext, "max-nesting-stack-depth" ); if ( nestingOverflowCount != null ) { - _nestingOverflowCount = nestingOverflowCount; + _nestingOverflowCount = nestingOverflowCount.intValue(); } else { @@ -115,7 +116,7 @@ _log.warn( "Servlet context-param " + SECURE_FORWARDS_PARAM + " is deprecated; use the ensure-secure-forwards element within pageflow-config in " + InternalConstants.NETUI_CONFIG_PATH ); - _secureForwards = Boolean.parseBoolean( doSecureForwards ); + _secureForwards = Boolean.valueOf( doSecureForwards ).booleanValue(); } else { @@ -160,7 +161,7 @@ try { - return Integer.parseInt( strVal ); + return Integer.valueOf( strVal ); } catch ( NumberFormatException e ) { Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowExceptionHandler.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowExceptionHandler.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowExceptionHandler.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowExceptionHandler.java Mon Apr 11 23:42:11 2005 @@ -58,7 +58,10 @@ if ( ae instanceof PageFlowExceptionConfig ) { String expressionMessage = ( ( PageFlowExceptionConfig ) ae ).getDefaultMessage(); - if ( expressionMessage != null ) error = new ExpressionMessage( expressionMessage, ex.getMessage() ); + if ( expressionMessage != null ) + { + error = new ExpressionMessage( expressionMessage, new Object[]{ ex.getMessage() } ); + } } if ( error == null ) error = new ActionMessage( ae.getKey(), ex.getMessage() ); Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowRequestWrapper.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowRequestWrapper.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowRequestWrapper.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowRequestWrapper.java Mon Apr 11 23:42:11 2005 @@ -82,12 +82,12 @@ public int getForwardedRequestCount() { - return _state.forwardedRequestCount != null ? _state.forwardedRequestCount : 0; + return _state.forwardedRequestCount != null ? _state.forwardedRequestCount.intValue() : 0; } public void setForwardedRequestCount( int count ) { - _state.forwardedRequestCount = count; + _state.forwardedRequestCount = new Integer( count ); } public String getOriginalServletPath() @@ -142,7 +142,7 @@ _state.returningFromActionIntercept = returningFromActionIntercept; } - public HttpServletRequest getRequest() + public HttpServletRequest getHttpRequest() { return ( HttpServletRequest ) super.getRequest(); } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowServiceProvider.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowServiceProvider.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowServiceProvider.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowServiceProvider.java Mon Apr 11 23:42:11 2005 @@ -19,8 +19,6 @@ import org.apache.beehive.netui.pageflow.PageFlowUtils; import org.apache.beehive.netui.pageflow.PageFlowController; -import org.apache.beehive.netui.pageflow.SharedFlowController; -import org.apache.beehive.controls.runtime.servlet.ServletBeanContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.ServletRequest; Added: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/RuntimeAnnotationReader.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/RuntimeAnnotationReader.java?view=auto&rev=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/RuntimeAnnotationReader.java (added) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/RuntimeAnnotationReader.java Mon Apr 11 23:42:11 2005 @@ -0,0 +1,22 @@ +/* + * Copyright 2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * $Header:$ + */ +package org.apache.beehive.netui.pageflow.internal; + +public class RuntimeAnnotationReader +{ +} Propchange: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/RuntimeAnnotationReader.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/XmlBeanActionForm.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/XmlBeanActionForm.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/XmlBeanActionForm.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/XmlBeanActionForm.java Mon Apr 11 23:42:11 2005 @@ -49,7 +49,7 @@ try { - return ( String ) xmlBean.getClass().getMethod( "xmlText" ).invoke( xmlBean ); + return ( String ) xmlBean.getClass().getMethod( "xmlText", null ).invoke( xmlBean, null ); } catch ( InvocationTargetException e ) { Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/requeststate/NameService.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/requeststate/NameService.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/requeststate/NameService.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/requeststate/NameService.java Mon Apr 11 23:42:11 2005 @@ -28,14 +28,14 @@ { private static final String NAME_SERVICE = "netui.nameService"; - private HashMap<String,WeakReference> _nameMap; + private HashMap/*<String,WeakReference>*/ _nameMap; private int _nextValue; /** * private constructor allowing for a factory method to access NameService objects. */ private NameService() { - _nameMap = new HashMap<String,WeakReference>(); + _nameMap = new HashMap/*<String,WeakReference>*/(); _nextValue = 0; } @@ -105,7 +105,7 @@ public INameable get(String name) { if (name == null) throw new IllegalStateException("name must not be null"); - WeakReference wr = _nameMap.get(name); + WeakReference wr = (WeakReference) _nameMap.get(name); if (wr == null) return null; INameable object = (INameable) wr.get(); Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DOMUtils.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DOMUtils.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DOMUtils.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DOMUtils.java Mon Apr 11 23:42:11 2005 @@ -103,7 +103,7 @@ if(list.size() == 1) { Element child = (Element) list.get(0); - StringBuilder buf = new StringBuilder(); + StringBuffer buf = new StringBuffer(); NodeList children = child.getChildNodes(); for(int i = 0; i < children.getLength(); i++) { @@ -131,7 +131,7 @@ */ public static String getElementText(Element element) { - StringBuilder buf = new StringBuilder(); + StringBuffer buf = new StringBuffer(); NodeList children = element.getChildNodes(); for(int i = 0; i < children.getLength(); i++) { @@ -164,7 +164,7 @@ for(int i = 0; i < children.size(); i++) { Node child = (Node) children.get(i); - StringBuilder buf = new StringBuilder(); + StringBuffer buf = new StringBuffer(); NodeList nodes = child.getChildNodes(); for(int j = 0; j < nodes.getLength(); j++) { Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DefaultURLRewriter.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DefaultURLRewriter.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DefaultURLRewriter.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/DefaultURLRewriter.java Mon Apr 11 23:42:11 2005 @@ -131,7 +131,7 @@ else { //Need to build up the url - StringBuilder urlBuf = new StringBuilder( protocol ); + StringBuffer urlBuf = new StringBuffer( protocol ); urlBuf.append( "://" ); urlBuf.append( serverName ); urlBuf.append( ":" ); Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/OldURLRewriterWrapper.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/OldURLRewriterWrapper.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/OldURLRewriterWrapper.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/OldURLRewriterWrapper.java Mon Apr 11 23:42:11 2005 @@ -79,12 +79,12 @@ public void rewriteURL( ServletContext servletContext, ServletRequest request, ServletResponse response, MutableURI uri, - org.apache.beehive.netui.core.urls.URLRewriter.URLType type, + org.apache.beehive.netui.core.urls.URLType type, boolean needsToBeSecure ) { String tempType = URLRewriter.RESOURCE_UNSECURE; - if ( type.equals( org.apache.beehive.netui.core.urls.URLRewriter.URLType.ACTION ) ) + if ( type.equals( org.apache.beehive.netui.core.urls.URLType.ACTION ) ) { if ( needsToBeSecure ) { @@ -95,7 +95,7 @@ tempType = URLRewriter.ACTION_UNSECURE; } } - else if ( type.equals( org.apache.beehive.netui.core.urls.URLRewriter.URLType.RESOURCE ) ) + else if ( type.equals( org.apache.beehive.netui.core.urls.URLType.RESOURCE ) ) { if ( needsToBeSecure ) { @@ -143,7 +143,7 @@ * @param object the Object to test for equality. * @return true if object is another instance of DefaultURLRewriter. */ - @Override + public boolean equals( Object object ) { if ( object == this ) { return true; } @@ -166,7 +166,7 @@ * * @return a hash code value for this object. */ - @Override + public int hashCode() { return _oldURLRewriter.hashCode(); Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/TemplateHelper.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/TemplateHelper.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/TemplateHelper.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/TemplateHelper.java Mon Apr 11 23:42:11 2005 @@ -509,7 +509,7 @@ return other; } - private static StringBuilder appendEnsureSeparator(StringBuilder buf, String token) + private static StringBuffer appendEnsureSeparator(StringBuffer buf, String token) { if(token != null && token.length() > 0) { if(buf.charAt(buf.length() - 1) != '/' && token.charAt(0) != '/') { @@ -544,7 +544,7 @@ private String toStringDefault() { - StringBuilder buf = new StringBuilder(32); + StringBuffer buf = new StringBuffer(32); // Append the server buf.append(scheme).append("://"); @@ -637,7 +637,7 @@ template.substitute("{url:currentPage}", ""); // Path - this is reserved - StringBuilder buf = new StringBuilder(32); + StringBuffer buf = new StringBuffer(32); if(getPath() != null) { // Append the webapp name //String webAppName = ApplicationHelper.getWebAppName(httpRequest); @@ -669,7 +669,7 @@ template.substitute("{url:path}", buf.toString()); // Query string - this is reserved - buf = new StringBuilder(32); + buf = new StringBuffer(32); if (queryString != null) buf.append(queryString); if(params != null && params.size() > 0) { Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/URLRewriterService.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/URLRewriterService.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/URLRewriterService.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/URLRewriterService.java Mon Apr 11 23:42:11 2005 @@ -117,17 +117,17 @@ // mutableUri = new FreezableMutableURI( url, false ); mutableUri.setEncoding( response.getCharacterEncoding() ); - org.apache.beehive.netui.core.urls.URLRewriter.URLType tempType = - org.apache.beehive.netui.core.urls.URLRewriter.URLType.RESOURCE; + org.apache.beehive.netui.core.urls.URLType tempType = + org.apache.beehive.netui.core.urls.URLType.RESOURCE; boolean needsToBeSecure = false; if ( type.equals( URLRewriter.ACTION_UNSECURE ) ) { - tempType = org.apache.beehive.netui.core.urls.URLRewriter.URLType.ACTION; + tempType = org.apache.beehive.netui.core.urls.URLType.ACTION; } else if ( type.equals( URLRewriter.ACTION_SECURE ) ) { - tempType = org.apache.beehive.netui.core.urls.URLRewriter.URLType.ACTION; + tempType = org.apache.beehive.netui.core.urls.URLType.ACTION; needsToBeSecure = true; } else if ( type.equals( URLRewriter.RESOURCE_SECURE ) ) Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/UrlTemplateDescriptor.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/UrlTemplateDescriptor.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/UrlTemplateDescriptor.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/UrlTemplateDescriptor.java Mon Apr 11 23:42:11 2005 @@ -54,11 +54,11 @@ public static final String RESOURCE_TEMPLATE = "resource-template"; public static final String SECURE_RESOURCE_TEMPLATE = "secure-resource-template"; - private static final List< String > KNOWN_TEMPLATE_TOKENS = - Arrays.asList( "{url:scheme}", "{url:domain}", "{url:port}", "{url:prefix}" ); + private static final List/*< String >*/ KNOWN_TEMPLATE_TOKENS = + Arrays.asList( new String[]{ "{url:scheme}", "{url:domain}", "{url:port}", "{url:prefix}" } ); - private static final List< String > REQUIRED_TEMPLATE_TOKENS = - Arrays.asList( "{url:path}", "{url:queryString}" ); + private static final List/*< String >*/ REQUIRED_TEMPLATE_TOKENS = + Arrays.asList( new String[]{ "{url:path}", "{url:queryString}" } ); // URL templates private URLTemplates _urlTemplates = new URLTemplates(); Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/xmlhttprequest/XmlHttpRequestServlet.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/xmlhttprequest/XmlHttpRequestServlet.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/xmlhttprequest/XmlHttpRequestServlet.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/xmlhttprequest/XmlHttpRequestServlet.java Mon Apr 11 23:42:11 2005 @@ -58,7 +58,7 @@ ServletContext ctxt = getServletContext(); RequestInterceptorContext context = new RequestInterceptorContext(request, response, ctxt); - List< Interceptor > interceptors = context.getRequestInterceptors(); + List/*< Interceptor >*/ interceptors = context.getRequestInterceptors(); try { Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleMap.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleMap.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleMap.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/BundleMap.java Mon Apr 11 23:42:11 2005 @@ -260,7 +260,7 @@ } private final String formatBundleNames(String[] names) { - StringBuilder sb = new StringBuilder(128); + StringBuffer sb = new StringBuffer(128); sb.append("["); for(int i = 0; i < names.length; i++) { if(i > 0) Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/common/ImplicitObjectUtil.java Mon Apr 11 23:42:11 2005 @@ -78,7 +78,7 @@ request.setAttribute(PAGE_INPUT_IMPLICIT_OBJECT_KEY, map != null ? map : Collections.EMPTY_MAP); } - public static final void loadSharedFlow(ServletRequest request, Map<String, SharedFlowController> sharedFlows) { + public static final void loadSharedFlow(ServletRequest request, Map/*<String, SharedFlowController>*/ sharedFlows) { if(sharedFlows != null) request.setAttribute(SHARED_FLOW_IMPLICIT_OBJECT_KEY, sharedFlows); } @@ -102,8 +102,8 @@ return form; } - public static final Map<String, SharedFlowController> getSharedFlow(ServletRequest request) { - return (Map<String, SharedFlowController>)request.getAttribute(SHARED_FLOW_IMPLICIT_OBJECT_KEY); + public static final Map/*<String, SharedFlowController>*/ getSharedFlow(ServletRequest request) { + return (Map/*<String, SharedFlowController>*/)request.getAttribute(SHARED_FLOW_IMPLICIT_OBJECT_KEY); } public static final PageFlowController getPageFlow(ServletRequest request, ServletResponse response) { Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIUpdateVariableResolver.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIUpdateVariableResolver.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIUpdateVariableResolver.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/NetUIUpdateVariableResolver.java Mon Apr 11 23:42:11 2005 @@ -97,7 +97,7 @@ return new String[]{"actionForm", "pageFlow", "globalApp", "request", "session", "application"}; } - private static final Map<String, SharedFlowController> getSharedFlow(ServletRequest request, ServletResponse response) { + private static final Map/*<String, SharedFlowController>*/ getSharedFlow(ServletRequest request, ServletResponse response) { return ImplicitObjectUtil.getSharedFlow(request); } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/ParsedExpression.java Mon Apr 11 23:42:11 2005 @@ -18,6 +18,7 @@ package org.apache.beehive.netui.script.el; import java.util.ArrayList; +import java.util.Iterator; import org.apache.beehive.netui.util.logging.Logger; @@ -32,7 +33,7 @@ private static final boolean DEBUG_ENABLED = LOGGER.isDebugEnabled(); private static final String EMPTY_STRING = ""; - private ArrayList<Term> _terms = new ArrayList<Term>(3); + private ArrayList/*<Term>*/ _terms = new ArrayList/*<Term>*/(3); private boolean _isExpression = false; private boolean _containsExpression = false; private ExpressionTerm _atomicExpression = null; @@ -157,9 +158,12 @@ } public String toString() { - StringBuilder builder = new StringBuilder(); - for(Term term : _terms) + StringBuffer builder = new StringBuffer(); + for(Iterator i = _terms.iterator(); i.hasNext();) + { + Term term = (Term) i.next(); builder.append(term.toString()); + } return builder.toString(); } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/el/util/ParseUtils.java Mon Apr 11 23:42:11 2005 @@ -40,15 +40,15 @@ private static final Logger LOGGER = Logger.getInstance(ParseUtils.class); - private static final HashMap<String, ParsedExpression> PARSED_CACHE = - new HashMap<String, ParsedExpression>(); + private static final HashMap/*<String, ParsedExpression>*/ PARSED_CACHE = + new HashMap/*<String, ParsedExpression>*/(); /* do not construct */ private ParseUtils() { } public static final ParsedExpression parse(String exprStr) { - ParsedExpression pe = PARSED_CACHE.get(exprStr); + ParsedExpression pe = (ParsedExpression) PARSED_CACHE.get(exprStr); if(pe != null) return pe; @@ -227,7 +227,7 @@ } public static String getContextString(String[] contexts) { - StringBuilder builder = new StringBuilder(); + StringBuffer builder = new StringBuffer(); builder.append("["); if(contexts != null) { for(int i = 0; i < contexts.length; i++) { Modified: incubator/beehive/trunk/netui/src/scoping/build.xml URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/scoping/build.xml?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/scoping/build.xml (original) +++ incubator/beehive/trunk/netui/src/scoping/build.xml Mon Apr 11 23:42:11 2005 @@ -27,7 +27,8 @@ debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" - source="${compile.source}"> + source="${compile.source}" + target="${compile.target}"> <include name="**/*.java"/> </javac> <copy todir="${classes.dir}/${module.name}"> Modified: incubator/beehive/trunk/netui/src/tags-databinding/build.xml URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/build.xml?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/build.xml (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/build.xml Mon Apr 11 23:42:11 2005 @@ -32,7 +32,8 @@ debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" - source="${compile.source}"> + source="${compile.source}" + target="${compile.target}"> <include name="**/*.java"/> </javac> Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridConfig.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridConfig.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridConfig.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridConfig.java Mon Apr 11 23:42:11 2005 @@ -37,11 +37,11 @@ public abstract Sort createSort(); - public abstract SortModel createSortModel(List<Sort> sorts); + public abstract SortModel createSortModel(List/*<Sort>*/ sorts); public abstract Filter createFilter(); - public abstract FilterModel createFilterModel(List<Filter> filters); + public abstract FilterModel createFilterModel(List/*<Filter>*/ filters); public abstract PagerModel createPagerModel(); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridStateFactory.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridStateFactory.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridStateFactory.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridStateFactory.java Mon Apr 11 23:42:11 2005 @@ -51,11 +51,11 @@ } private final ServletRequest _request; - private final HashMap<String, DataGridStateCodec> _cache; + private final HashMap/*<String, DataGridStateCodec>*/ _cache; private DataGridStateFactory(ServletRequest request) { _request = request; - _cache = new HashMap<String, DataGridStateCodec>(); + _cache = new HashMap/*<String, DataGridStateCodec>*/(); } public final DataGridState getDataGridState(String name) { @@ -92,7 +92,7 @@ private final DataGridStateCodec lookupCodec(String name, DataGridConfig config) { DataGridStateCodec codec = null; if(_cache.containsKey(name)) - codec = _cache.get(name); + codec = (DataGridStateCodec)_cache.get(name); else { assert config != null; codec = config.createStateCodec(_request, name); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterModel.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterModel.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterModel.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterModel.java Mon Apr 11 23:42:11 2005 @@ -19,25 +19,26 @@ import java.util.ArrayList; import java.util.List; +import java.util.Iterator; /** * */ public class FilterModel { - private List<Filter> _filters = null; + private List/*<Filter>*/ _filters = null; - public FilterModel(List<Filter> filters) { + public FilterModel(List/*<Filter>*/ filters) { _filters = filters; } - public List<Filter> getFilters() { + public List/*<Filter>*/ getFilters() { if(_filters == null) return null; else return _filters; } - public List<Filter> getFilters(String filterExpression) { + public List/*<Filter>*/ getFilters(String filterExpression) { if(_filters == null || filterExpression == null) return null; else return lookupFilters(filterExpression); @@ -52,13 +53,15 @@ else return false; } - private List<Filter> lookupFilters(String filterExpression) { + private List/*<Filter>*/ lookupFilters(String filterExpression) { assert filterExpression != null; assert !filterExpression.equals(""); /* todo: perf. caching or abstraction to make this faster */ - ArrayList<Filter> filters = new ArrayList<Filter>(); - for(Filter filter : _filters) { + ArrayList/*<Filter>*/ filters = new ArrayList/*<Filter>*/(); + for (Iterator i = _filters.iterator(); i.hasNext();) + { + Filter filter = (Filter) i.next(); if(filter.getFilterExpression().equals(filterExpression)) filters.add(filter); } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterOperationHint.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterOperationHint.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterOperationHint.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterOperationHint.java Mon Apr 11 23:42:11 2005 @@ -17,19 +17,78 @@ */ package org.apache.beehive.netui.databinding.datagrid.api.filter; -/** - */ -public enum FilterOperationHint { - NONE, - EQUAL, - NOT_EQUAL, - GREATER_THAN, - LESS_THAN, - GREATER_THAN_OR_EQUAL, - LESS_THAN_OR_EQUAL, - IS_ONE_OF, - STARTS_WITH, - CONTAINS, - IS_EMPTY, - IS_NOT_EMPTY +public class FilterOperationHint +{ + public static final int INT_NONE = 0; + public static final int INT_EQUAL = 1; + public static final int INT_NOT_EQUAL = 2; + public static final int INT_GREATER_THAN = 3; + public static final int INT_LESS_THAN = 4; + public static final int INT_GREATER_THAN_OR_EQUAL = 5; + public static final int INT_LESS_THAN_OR_EQUAL = 6; + public static final int INT_IS_ONE_OF = 7; + public static final int INT_STARTS_WITH = 8; + public static final int INT_CONTAINS = 9; + public static final int INT_IS_EMPTY = 10; + public static final int INT_IS_NOT_EMPTY = 11; + + public static final FilterOperationHint NONE = new FilterOperationHint(INT_NONE); + public static final FilterOperationHint EQUAL = new FilterOperationHint(INT_EQUAL); + public static final FilterOperationHint NOT_EQUAL = new FilterOperationHint(INT_NOT_EQUAL); + public static final FilterOperationHint GREATER_THAN = new FilterOperationHint(INT_GREATER_THAN); + public static final FilterOperationHint LESS_THAN = new FilterOperationHint(INT_LESS_THAN); + public static final FilterOperationHint GREATER_THAN_OR_EQUAL = new FilterOperationHint(INT_GREATER_THAN_OR_EQUAL); + public static final FilterOperationHint LESS_THAN_OR_EQUAL = new FilterOperationHint(INT_LESS_THAN_OR_EQUAL); + public static final FilterOperationHint IS_ONE_OF = new FilterOperationHint(INT_IS_ONE_OF); + public static final FilterOperationHint STARTS_WITH = new FilterOperationHint(INT_STARTS_WITH); + public static final FilterOperationHint CONTAINS = new FilterOperationHint(INT_CONTAINS); + public static final FilterOperationHint IS_EMPTY = new FilterOperationHint(INT_IS_EMPTY); + public static final FilterOperationHint IS_NOT_EMPTY = new FilterOperationHint(INT_IS_NOT_EMPTY); + + private int _val; + + private FilterOperationHint( int val ) + { + _val = val; + } + + public String toString() + { + switch ( _val ) + { + case INT_NONE: return "NONE"; + case INT_EQUAL: return "EQUAL"; + case INT_NOT_EQUAL: return "NOT_EQUAL"; + case INT_GREATER_THAN: return "GREATER_THAN"; + case INT_LESS_THAN: return "LESS_THAN"; + case INT_GREATER_THAN_OR_EQUAL: return "GREATER_THAN_OR_EQUAL"; + case INT_LESS_THAN_OR_EQUAL: return "LESS_THAN_OR_EQUAL"; + case INT_IS_ONE_OF: return "IS_ONE_OF"; + case INT_STARTS_WITH: return "STARTS_WITH"; + case INT_CONTAINS: return "CONTAINS"; + case INT_IS_EMPTY: return "IS_EMPTY"; + case INT_IS_NOT_EMPTY: return "IS_NOT_EMPTY"; + } + + assert false : _val; + return "<unknown FilterOperationHint>"; + } + + public boolean equals( Object o ) + { + if ( o == null ) return false; + if ( o == this ) return true; + if ( ! ( o instanceof FilterOperationHint ) ) return false; + return ( ( FilterOperationHint ) o )._val == _val; + } + + public int hashCode() + { + return _val; + } + + public int getValue() + { + return _val; + } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterTypeHint.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterTypeHint.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterTypeHint.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterTypeHint.java Mon Apr 11 23:42:11 2005 @@ -20,11 +20,15 @@ /** * */ -public enum FilterTypeHint { +public class FilterTypeHint { - DATE("date"), - STRING("string"), - NUMERIC("numeric"); + private static final String STR_DATE = "date"; + private static final String STR_STRING = "string"; + private static final String STR_NUMERIC = "numeric"; + + public static final FilterTypeHint DATE = new FilterTypeHint(STR_DATE); + public static final FilterTypeHint STRING = new FilterTypeHint(STR_STRING); + public static final FilterTypeHint NUMERIC = new FilterTypeHint(STR_NUMERIC); private String _hint = null; Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java Mon Apr 11 23:42:11 2005 @@ -43,8 +43,8 @@ private int _nextPage = -1; public PagerModel() { - _currentPage = DEFAULT_PAGE; - _currentRow = DEFAULT_ROW; + _currentPage = new Integer(DEFAULT_PAGE); + _currentRow = new Integer(DEFAULT_ROW); updatePagerState(); } @@ -71,7 +71,7 @@ public int getDataSetSize() { if(_dataSetSize == null) return 0; - else return _dataSetSize; + else return _dataSetSize.intValue(); } public String getPageAction() { @@ -91,20 +91,20 @@ } public int getPageSize() { - return _explicitPageSize != null ? _explicitPageSize : getDefaultPageSize(); + return _explicitPageSize != null ? _explicitPageSize.intValue() : getDefaultPageSize(); } public void setPageSize(int pageSize) { if(pageSize < 1) throw new IllegalArgumentException(Bundle.getErrorString("PagerModel_IllegalPageSize")); - _explicitPageSize = pageSize; + _explicitPageSize = new Integer(pageSize); updatePagerState(); } public int getPage() { - return (_currentPage != null ? _currentPage : DEFAULT_PAGE); + return (_currentPage != null ? _currentPage.intValue() : DEFAULT_PAGE); } /* todo: need to check that the new 'current' page is in range given the first/last boundaries */ @@ -115,21 +115,21 @@ } public int getRow() { - return (_currentRow != null ? _currentRow : DEFAULT_ROW); + return (_currentRow != null ? _currentRow.intValue() : DEFAULT_ROW); } public void setRow(int row) { - _currentRow = row; + _currentRow = new Integer(row); updatePagerState(); } public int getLastRowForPage() { if(_dataSetSize != null) { - if(_dataSetSize - _currentRow < getPageSize()) - return _currentRow + (_dataSetSize - _currentRow) - 1; - else return _currentRow + getPageSize() -1; + if(_dataSetSize.intValue() - _currentRow.intValue() < getPageSize()) + return _currentRow.intValue() + (_dataSetSize.intValue() - _currentRow.intValue()) - 1; + else return _currentRow.intValue() + getPageSize() -1; } - else return _currentRow + getPageSize() - 1; + else return _currentRow.intValue() + getPageSize() - 1; } public int getFirstPage() { @@ -146,20 +146,20 @@ public int getLastPage() { if(_lastPage != null) - return _lastPage; + return _lastPage.intValue(); else throw new IllegalStateException(Bundle.getErrorString("PagerModel_CantCalculateLastPage")); } private void updatePagerState() { if(getRow() == 0) - _currentPage = DEFAULT_PAGE; + _currentPage = new Integer(DEFAULT_PAGE); else - _currentPage = (int)Math.floor((double)getRow() / (double)getPageSize()); + _currentPage = new Integer((int)Math.floor((double)getRow() / (double)getPageSize())); - _prevPage = _currentPage - 1; - _nextPage = _currentPage + 1; + _prevPage = _currentPage.intValue() - 1; + _nextPage = _currentPage.intValue() + 1; if(_dataSetSize != null) - _lastPage = (int)(Math.ceil((double)_dataSetSize.doubleValue() / (double)getPageSize())) - 1; + _lastPage = new Integer((int)(Math.ceil((double)_dataSetSize.doubleValue() / (double)getPageSize())) - 1); } } Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellModel.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellModel.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellModel.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellModel.java Mon Apr 11 23:42:11 2005 @@ -18,9 +18,11 @@ package org.apache.beehive.netui.databinding.datagrid.api.rendering; import java.util.ArrayList; +import java.util.Iterator; import javax.servlet.jsp.JspException; import org.apache.beehive.netui.tags.html.FormatTag.Formatter; +import org.apache.beehive.netui.tags.html.FormatTag; import org.apache.beehive.netui.util.logging.Logger; import org.apache.beehive.netui.util.Bundle; @@ -31,7 +33,7 @@ private static final Logger LOGGER = Logger.getInstance(CellModel.class); private DataGridTagModel _dataGridTagModel; - private ArrayList<Formatter> _formatters; + private ArrayList/*<Formatter>*/ _formatters; public boolean isRenderingHeader() { return false; @@ -51,7 +53,7 @@ public void addFormatter(Formatter formatter) { if(_formatters == null) - _formatters = new ArrayList<Formatter>(); + _formatters = new ArrayList/*<Formatter>*/(); _formatters.add(formatter); } @@ -64,7 +66,9 @@ return value.toString(); Object formatted = value; - for(Formatter formatter : _formatters) { + for (Iterator i = _formatters.iterator(); i.hasNext();) + { + Formatter formatter = (Formatter) i.next(); assert formatter != null; try { formatted = formatter.format(formatted); Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java?view=diff&r1=161024&r2=161025 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java Mon Apr 11 23:42:11 2005 @@ -267,7 +267,7 @@ extends DataGridResourceProvider { private DataGridResourceProvider _delegate = null; - private HashMap<String, String> _resourceOverrides = null; + private HashMap/*<String, String>*/ _resourceOverrides = null; private OverridableDataGridResourceProvider(DataGridResourceProvider resourceProvider) { _delegate = resourceProvider; @@ -275,7 +275,7 @@ private void addResourceOverride(String key, String value) { if(_resourceOverrides == null) - _resourceOverrides = new HashMap<String, String>(); + _resourceOverrides = new HashMap/*<String, String>*/(); /* todo: could consider asserting that this key is known by the data grid framework */ _resourceOverrides.put(key, value); @@ -297,7 +297,7 @@ private final String internalGetMessage(String key) { if(_resourceOverrides != null && _resourceOverrides.containsKey(key)) - return _resourceOverrides.get(key); + return (String)_resourceOverrides.get(key); else return null; } }
