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 2006/04/13 00:44:52 UTC
svn commit: r393635 - in
/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow: ./
internal/
Author: ekoneil
Date: Wed Apr 12 15:44:47 2006
New Revision: 393635
URL: http://svn.apache.org/viewcvs?rev=393635&view=rev
Log:
Just cleaning up some code...removing some unused fields, imports, etc.
No functionality changes.
BB: self
Test: NetUI pass
Modified:
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionNotFoundException.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionResolver.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServletContainerAdapter.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DynaFormData.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DynamicSubappActionServlet.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/EmptyNestingStackException.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ExpressionMessage.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FormData.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/GlobalApp.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalPageInputException.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MismatchedPageInputException.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MissingPageInputException.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowFileFilter.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObject.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/StrutsModule.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/BaseActionForm.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/LegacySettings.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowServiceProvider.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/URIContextFactory.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ViewRenderer.java
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionNotFoundException.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionNotFoundException.java?rev=393635&r1=393634&r2=393635&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionNotFoundException.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionNotFoundException.java Wed Apr 12 15:44:47 2006
@@ -17,7 +17,6 @@
*/
package org.apache.beehive.netui.pageflow;
-
/**
* Exception that occurs when the user tries to execute an action that does not exist on the page flow.
*/
@@ -25,7 +24,6 @@
{
private Object _form;
-
public ActionNotFoundException( String actionName, FlowController fc, Object form )
{
super( actionName, fc );
@@ -39,7 +37,6 @@
protected String[] getMessageParts()
{
- String formDescrip = _form != null ? "(form " + _form.getClass().getName() + ") " : "";
return new String[]{ "Unable to find action ", " (form=", ") in Page Flow ", "." };
}
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionResolver.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionResolver.java?rev=393635&r1=393634&r2=393635&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionResolver.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionResolver.java Wed Apr 12 15:44:47 2006
@@ -17,10 +17,8 @@
*/
package org.apache.beehive.netui.pageflow;
-import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
/**
* Interface for controller classes that resolve actions to URIs.
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java?rev=393635&r1=393634&r2=393635&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java Wed Apr 12 15:44:47 2006
@@ -17,8 +17,6 @@
*/
package org.apache.beehive.netui.pageflow;
-import org.apache.beehive.netui.util.internal.InternalStringBuilder;
-
import org.apache.beehive.netui.pageflow.internal.InternalConstants;
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
import org.apache.beehive.netui.pageflow.internal.PageFlowRequestWrapper;
@@ -27,7 +25,9 @@
import org.apache.beehive.netui.pageflow.handler.Handlers;
import org.apache.beehive.netui.pageflow.handler.ReloadableClassHandler;
import org.apache.beehive.netui.util.Bundle;
+import org.apache.beehive.netui.util.internal.InternalStringBuilder;
import org.apache.beehive.netui.util.internal.DiscoveryUtils;
+import org.apache.beehive.netui.util.internal.concurrent.InternalConcurrentHashMap;
import org.apache.beehive.netui.util.config.ConfigUtil;
import org.apache.beehive.netui.util.config.bean.PageFlowConfig;
import org.apache.beehive.netui.util.config.bean.ModuleConfigLocatorConfig;
@@ -67,9 +67,6 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Iterator;
-
-import org.apache.beehive.netui.util.internal.concurrent.InternalConcurrentHashMap;
-
/**
* ActionServlet that automatically registers requested Struts modules based on a set of module configuration file
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServletContainerAdapter.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServletContainerAdapter.java?rev=393635&r1=393634&r2=393635&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServletContainerAdapter.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultServletContainerAdapter.java Wed Apr 12 15:44:47 2006
@@ -28,15 +28,12 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
/**
* Default implementation of a Servlet container adapter.
*/
public abstract class DefaultServletContainerAdapter
implements ServletContainerAdapter
{
- private static final Logger _log = Logger.getInstance( DefaultServletContainerAdapter.class );
-
private static boolean _productionMode = true;
private ServletContext _servletContext;
@@ -120,7 +117,7 @@
*/
public int getSecureListenPort( HttpServletRequest request )
{
- // TODO: have a configuration in netui-config.xml to specify this; an alternative to having to have an adapter.
+ // TODO: have a configuration in beehive-netui-config.xml to specify this; an alternative to having to have an adapter.
return -1;
}
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DynaFormData.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DynaFormData.java?rev=393635&r1=393634&r2=393635&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DynaFormData.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DynaFormData.java Wed Apr 12 15:44:47 2006
@@ -23,7 +23,6 @@
import java.util.Set;
import org.apache.struts.validator.DynaValidatorForm;
-
/**
* Extension of org.apache.struts.validator.DynaValidatorForm that implements Map. This allows it to be
* used with NetUI tags.
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DynamicSubappActionServlet.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DynamicSubappActionServlet.java?rev=393635&r1=393634&r2=393635&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DynamicSubappActionServlet.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DynamicSubappActionServlet.java Wed Apr 12 15:44:47 2006
@@ -17,11 +17,9 @@
*/
package org.apache.beehive.netui.pageflow;
-import org.apache.beehive.netui.util.logging.Logger;
-
-import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
+import org.apache.beehive.netui.util.logging.Logger;
/**
* ActionServlet that dynamically registers modules based on naming/location conventions for Struts
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/EmptyNestingStackException.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/EmptyNestingStackException.java?rev=393635&r1=393634&r2=393635&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/EmptyNestingStackException.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/EmptyNestingStackException.java Wed Apr 12 15:44:47 2006
@@ -17,7 +17,6 @@
*/
package org.apache.beehive.netui.pageflow;
-
/**
* Exception that occurs when the user invokes an action in a nested page flow that uses a
* <code>{@link org.apache.beehive.netui.pageflow.annotations.Jpf.Forward @Jpf.Forward}(</code>...<code>
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ExpressionMessage.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ExpressionMessage.java?rev=393635&r1=393634&r2=393635&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ExpressionMessage.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ExpressionMessage.java Wed Apr 12 15:44:47 2006
@@ -19,12 +19,6 @@
import org.apache.struts.action.ActionMessage;
import org.apache.beehive.netui.pageflow.internal.InternalConstants;
-import org.apache.beehive.netui.pageflow.internal.InternalExpressionUtils;
-import org.apache.beehive.netui.pageflow.internal.InternalUtils;
-import org.apache.beehive.netui.util.logging.Logger;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
/**
* Extension of the base Struts ActionMessage; instead of retrieving messages and their arguments from message
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FormData.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FormData.java?rev=393635&r1=393634&r2=393635&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FormData.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FormData.java Wed Apr 12 15:44:47 2006
@@ -19,7 +19,6 @@
import org.apache.beehive.netui.pageflow.internal.BaseActionForm;
-
/**
* Base class for form beans associated with action methods in {@link PageFlowController}s. Note that Page Flow actions
* may take form beans of any type.
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/GlobalApp.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/GlobalApp.java?rev=393635&r1=393634&r2=393635&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/GlobalApp.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/GlobalApp.java Wed Apr 12 15:44:47 2006
@@ -18,14 +18,10 @@
package org.apache.beehive.netui.pageflow;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletContext;
-import org.apache.beehive.netui.pageflow.internal.InternalUtils;
-import org.apache.beehive.netui.pageflow.internal.InternalConstants;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionMapping;
-
/**
* Base class for user-defined global state and fallback controller logic. A specific instance of
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalPageInputException.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalPageInputException.java?rev=393635&r1=393634&r2=393635&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalPageInputException.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/IllegalPageInputException.java Wed Apr 12 15:44:47 2006
@@ -17,7 +17,6 @@
*/
package org.apache.beehive.netui.pageflow;
-
/**
* Exception that occurs when a action output has been added to a Forward that resolves to a
* {@link org.apache.beehive.netui.pageflow.annotations.Jpf.Forward @Jpf.Forward} annotation marked with
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MismatchedPageInputException.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MismatchedPageInputException.java?rev=393635&r1=393634&r2=393635&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MismatchedPageInputException.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MismatchedPageInputException.java Wed Apr 12 15:44:47 2006
@@ -17,7 +17,6 @@
*/
package org.apache.beehive.netui.pageflow;
-
/**
* Exception that occurs in iterative development mode when an action output attached to a {@link Forward} is of a
* different type than was declared.
@@ -27,8 +26,12 @@
public class MismatchedPageInputException
extends MismatchedActionOutputException
{
- public MismatchedPageInputException( String actionName, FlowController flowController, String actionOutputName,
- String forwardName, String expectedType, String actualType )
+ public MismatchedPageInputException( String actionName,
+ FlowController flowController,
+ String actionOutputName,
+ String forwardName,
+ String expectedType,
+ String actualType )
{
super( actionName, flowController, actionOutputName, forwardName, expectedType, actualType );
}
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MissingPageInputException.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MissingPageInputException.java?rev=393635&r1=393634&r2=393635&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MissingPageInputException.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/MissingPageInputException.java Wed Apr 12 15:44:47 2006
@@ -17,7 +17,6 @@
*/
package org.apache.beehive.netui.pageflow;
-
/**
* Exception that occurs when a required page input is missing from a {@link Forward}.
*
@@ -26,7 +25,9 @@
public class MissingPageInputException
extends MissingActionOutputException
{
- public MissingPageInputException( String actionName, FlowController flowController, String actionOutputName,
+ public MissingPageInputException( String actionName,
+ FlowController flowController,
+ String actionOutputName,
String forwardName )
{
super( actionName, flowController, actionOutputName, forwardName );
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java?rev=393635&r1=393634&r2=393635&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java Wed Apr 12 15:44:47 2006
@@ -394,7 +394,8 @@
public void removeSharedFlow( String sharedFlowName )
{
SharedFlowController sf = getSharedFlow( sharedFlowName );
- if ( sf != null ) sf.removeFromSession( getRequest() );
+ if ( sf != null )
+ sf.removeFromSession( getRequest() );
}
/**
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowFileFilter.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowFileFilter.java?rev=393635&r1=393634&r2=393635&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowFileFilter.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowFileFilter.java Wed Apr 12 15:44:47 2006
@@ -17,11 +17,10 @@
*/
package org.apache.beehive.netui.pageflow;
-import org.apache.beehive.netui.util.internal.FileUtils;
-
-import java.io.FilenameFilter;
import java.io.File;
+import java.io.FilenameFilter;
+import org.apache.beehive.netui.util.internal.FileUtils;
/**
* File filter that accepts any {@link PageFlowController} source file (*.jpf).
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObject.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObject.java?rev=393635&r1=393634&r2=393635&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObject.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObject.java Wed Apr 12 15:44:47 2006
@@ -57,7 +57,7 @@
* events could be received by this object. This flag prevents this with the assumption that once detached
* from the {@link HttpSession}, it is never reattached.
*/
- private boolean _valueUnbound = false;
+ private boolean _isDestroyed = false;
protected PageFlowManagedObject()
{
@@ -76,8 +76,7 @@
* Internal method to reinitialize only if necessary. The test is whether the ServletContext
* reference has been lost.
*/
- void reinitializeIfNecessary(HttpServletRequest request, HttpServletResponse response,
- ServletContext servletContext)
+ void reinitializeIfNecessary(HttpServletRequest request, HttpServletResponse response, ServletContext servletContext)
{
if (_servletContext == null) {
reinitialize(request, response, servletContext);
@@ -149,10 +148,10 @@
if ( servletContext != null )
{
- if ( !_valueUnbound && Handlers.get( servletContext ).getStorageHandler().allowBindingEvent( event ) )
+ if ( !_isDestroyed && Handlers.get( servletContext ).getStorageHandler().allowBindingEvent( event ) )
{
destroy( session );
- _valueUnbound = true;
+ _isDestroyed = true;
}
}
}
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/StrutsModule.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/StrutsModule.java?rev=393635&r1=393634&r2=393635&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/StrutsModule.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/StrutsModule.java Wed Apr 12 15:44:47 2006
@@ -19,7 +19,6 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.ServletContext;
/**
* An ActionResolver that submits actions to a Struts module.
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/BaseActionForm.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/BaseActionForm.java?rev=393635&r1=393634&r2=393635&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/BaseActionForm.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/BaseActionForm.java Wed Apr 12 15:44:47 2006
@@ -39,9 +39,9 @@
import java.util.Locale;
import java.util.Iterator;
-
/**
- * Base class for form beans associated with action methods in {@link org.apache.beehive.netui.pageflow.PageFlowController}s. Note that Page Flow actions
+ * Base class for form beans associated with action methods in
+ * {@link org.apache.beehive.netui.pageflow.PageFlowController}s. Note that Page Flow actions
* may take form beans of any type.
*/
public class BaseActionForm extends ValidatorForm
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/LegacySettings.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/LegacySettings.java?rev=393635&r1=393634&r2=393635&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/LegacySettings.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/LegacySettings.java Wed Apr 12 15:44:47 2006
@@ -27,8 +27,6 @@
import javax.servlet.ServletContext;
import java.io.Serializable;
-
-
public class LegacySettings
implements Serializable, PageFlowConstants
{
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowServiceProvider.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowServiceProvider.java?rev=393635&r1=393634&r2=393635&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowServiceProvider.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowServiceProvider.java Wed Apr 12 15:44:47 2006
@@ -34,7 +34,9 @@
{
private static final PageFlowServiceProvider _provider = new PageFlowServiceProvider();
- public static final PageFlowServiceProvider getProvider() { return _provider; }
+ public static PageFlowServiceProvider getProvider() {
+ return _provider;
+ }
private PageFlowServiceProvider()
{
@@ -45,19 +47,24 @@
ServletRequest getServletRequest();
}
- public Object getService( BeanContextServices bcs, Object requestor, Class serviceClass,
+ public Object getService( BeanContextServices bcs,
+ Object requestor,
+ Class serviceClass,
Object serviceSelector )
{
//
// These services are only available to controls running within the scope of a PageFlowBeanContext
//
- if ( ! ( bcs instanceof HasServletRequest ) ) return null;
+ if ( ! ( bcs instanceof HasServletRequest ) )
+ return null;
if ( PageFlowController.class.equals( serviceClass ) )
{
ServletRequest request = ( ( HasServletRequest ) bcs ).getServletRequest();
- if ( ! ( request instanceof HttpServletRequest ) ) return null;
- return PageFlowUtils.getCurrentPageFlow( ( HttpServletRequest ) request );
+
+ if ( ! ( request instanceof HttpServletRequest ) )
+ return null;
+ else return PageFlowUtils.getCurrentPageFlow( ( HttpServletRequest ) request );
}
return null;
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/URIContextFactory.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/URIContextFactory.java?rev=393635&r1=393634&r2=393635&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/URIContextFactory.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/URIContextFactory.java Wed Apr 12 15:44:47 2006
@@ -43,7 +43,7 @@
*
* @return the URIContext
*/
- public static final URIContext getInstance()
+ public static URIContext getInstance()
{
URIContext uriContext = MutableURI.getDefaultContext();
UrlConfig urlConfig = ConfigUtil.getConfig().getUrlConfig();
@@ -66,7 +66,7 @@
* @param forXML flag indicating that the URI is for an XML doc type
* @return the URIContext
*/
- public static final URIContext getInstance( boolean forXML )
+ public static URIContext getInstance( boolean forXML )
{
URIContext uriContext = null;
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ViewRenderer.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ViewRenderer.java?rev=393635&r1=393634&r2=393635&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ViewRenderer.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ViewRenderer.java Wed Apr 12 15:44:47 2006
@@ -25,6 +25,7 @@
public interface ViewRenderer
{
public void init( ServletRequest request );
+
public void renderView( ServletRequest servletRequest, ServletResponse response, ServletContext servletContext )
throws IOException;
}