You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by do...@apache.org on 2005/02/08 20:58:53 UTC
svn commit: r152929 - in incubator/beehive/trunk/netui/src:
pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java
tags-html/org/apache/beehive/netui/tags/internal/ReturnActionViewRenderer.java
Author: dolander
Date: Tue Feb 8 11:58:50 2005
New Revision: 152929
URL: http://svn.apache.org/viewcvs?view=rev&rev=152929
Log:
Bit of code cleanup.
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/ReturnActionViewRenderer.java
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=152928&r2=152929
==============================================================================
--- 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 Tue Feb 8 11:58:50 2005
@@ -17,48 +17,37 @@
*/
package org.apache.beehive.netui.pageflow.internal;
-import org.apache.beehive.netui.core.urls.URLRewriterService;
import org.apache.beehive.netui.pageflow.*;
-import org.apache.beehive.netui.pageflow.handler.ReloadableClassHandler;
-import org.apache.beehive.netui.pageflow.handler.Handlers;
-import org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig;
import org.apache.beehive.netui.pageflow.config.PageFlowActionMapping;
+import org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig;
+import org.apache.beehive.netui.pageflow.handler.Handlers;
+import org.apache.beehive.netui.pageflow.handler.ReloadableClassHandler;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
-import org.apache.beehive.netui.util.logging.Logger;
import org.apache.beehive.netui.util.Bundle;
import org.apache.beehive.netui.util.ServletUtils;
-import org.apache.beehive.netui.util.config.bean.PageflowConfig;
import org.apache.beehive.netui.util.config.ConfigUtil;
+import org.apache.beehive.netui.util.config.bean.PageflowConfig;
+import org.apache.beehive.netui.util.logging.Logger;
+import org.apache.struts.Globals;
+import org.apache.struts.action.*;
+import org.apache.struts.config.ActionConfig;
+import org.apache.struts.config.ControllerConfig;
+import org.apache.struts.config.FormBeanConfig;
+import org.apache.struts.config.ModuleConfig;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
import java.io.IOException;
-import java.io.PrintStream;
import java.lang.reflect.Method;
-import java.util.Map;
-import java.util.Iterator;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.LinkedHashMap;
-import java.util.Enumeration;
-
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionError;
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionServlet;
-import org.apache.struts.action.DynaActionFormClass;
-import org.apache.struts.action.DynaActionForm;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.config.ModuleConfig;
-import org.apache.struts.config.ControllerConfig;
-import org.apache.struts.config.FormBeanConfig;
-import org.apache.struts.config.ActionConfig;
-import org.apache.struts.Globals;
+import java.util.Map;
import static org.apache.beehive.netui.pageflow.internal.InternalConstants.*;
@@ -711,7 +700,7 @@
int lastSlash = pageURI.lastIndexOf( '/' );
if ( lastSlash != -1 )
{
- StringBuilder value = new StringBuilder( qualifiedAction.length() + 16 );
+ StringBuilder value = new StringBuilder( qualifiedAction.length() + lastSlash );
value.append( pageURI.substring( 0, lastSlash ) );
value.append( qualifiedAction );
return value.toString();
@@ -737,7 +726,7 @@
public static String qualifyAction( ServletContext servletContext, String action )
{
assert action != null;
- StringBuilder sb = new StringBuilder( 32 );
+ StringBuilder sb = null;
// Use our servlet mapping, if one is specified
String servletMapping = ( String ) servletContext.getAttribute( Globals.SERVLET_KEY );
@@ -749,7 +738,9 @@
{
queryString = action.substring( question );
}
+
String actionMapping = getActionMappingName( action );
+ sb = new StringBuilder( actionMapping.length() + servletMapping.length() + question + 1 );
if ( servletMapping.startsWith( "*." ) )
{
sb.append( actionMapping );
@@ -774,6 +765,7 @@
// already included in the action property
else
{
+ sb = new StringBuilder(action.length() + 1 );
if ( !action.startsWith( "/" ) )
{
sb.append( '/' );
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java?view=diff&r1=152928&r2=152929
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java Tue Feb 8 11:58:50 2005
@@ -454,7 +454,7 @@
StringBuilderRenderAppender scriptWriter = new StringBuilderRenderAppender(script);
if (_formSubmit && formAction != null)
- srs.writeFeature(getScriptReporter(), scriptWriter, CoreScriptFeature.ANCHOR_SUBMIT, true, false,
+ srs.writeFeature(sr, scriptWriter, CoreScriptFeature.ANCHOR_SUBMIT, true, false,
null);
if (_popupSupport != null)
_popupSupport.writeScript(request, srs, getScriptReporter(), scriptWriter);
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/ReturnActionViewRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/ReturnActionViewRenderer.java?view=diff&r1=152928&r2=152929
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/ReturnActionViewRenderer.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/internal/ReturnActionViewRenderer.java Tue Feb 8 11:58:50 2005
@@ -92,7 +92,7 @@
_callbackFunc = request.getParameter(CALLBACK_PARAM);
}
- // $todo: JavaScript?
+ // @todo: JavaScript?
public void renderView(ServletRequest request, ServletResponse response, ServletContext servletContext)
throws IOException
{