Author: rich Date: Fri Jan 21 21:48:38 2005 New Revision: 126009 URL: http://svn.apache.org/viewcvs?view=rev&rev=126009 Log: Renamed all "delete" methods (e.g., delete() on FlowController) to "remove".
DRT: netui (WinXP) BB: self (linux) Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBean.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObject.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/targetScope/Controller.jpf incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfSingleton/anotherNonSingleton/AnotherNonSingletonController.jpf incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfSingleton/nonSingleton/NonSingletonController.jpf incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfSingleton/singleton/SingletonController.jpf Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBean.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBean.java?view=diff&rev=126009&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBean.java&r1=126008&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBean.java&r2=126009 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBean.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBean.java Fri Jan 21 21:48:38 2005 @@ -48,7 +48,7 @@ ScopedServletUtils.setScopedSessionAttr( InternalConstants.FACES_BACKING_ATTR, this, unwrappedRequest ); } - protected void deleteFromSession( HttpServletRequest request ) + protected void removeFromSession( HttpServletRequest request ) { HttpServletRequest unwrappedRequest = PageFlowUtils.unwrapMultipart( request ); ScopedServletUtils.removeScopedSessionAttr( InternalConstants.FACES_BACKING_ATTR, unwrappedRequest ); Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java?view=diff&rev=126009&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java&r1=126008&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java&r2=126009 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java Fri Jan 21 21:48:38 2005 @@ -1144,9 +1144,9 @@ { } - protected void delete() + protected void remove() { - deleteFromSession( getRequest() ); + removeFromSession( getRequest() ); } /** @@ -1168,7 +1168,7 @@ /** * Tell whether this is a "long lived" page flow. Once it is invoked, a long lived page flow is never - * removed from the session unless [EMAIL PROTECTED] FlowController#delete} is called. Navigating to another page flow hides + * removed from the session unless [EMAIL PROTECTED] FlowController#remove} is called. Navigating to another page flow hides * the current long lived controller, but does not remove it. */ protected boolean isLongLived() Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java?view=diff&rev=126009&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java&r1=126008&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java&r2=126009 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java Fri Jan 21 21:48:38 2005 @@ -88,7 +88,7 @@ private boolean _isOnNestingStack = false; private ViewRenderer _returnActionViewRenderer = null; - private static final String DELETING_PAGEFLOW_ATTR = InternalConstants.ATTR_PREFIX + "deletingPageFlow"; + private static final String REMOVING_PAGEFLOW_ATTR = InternalConstants.ATTR_PREFIX + "removingPageFlow"; private static final String SAVED_PREVIOUS_PAGE_INFO_ATTR = InternalConstants.ATTR_PREFIX + "savedPrevPageInfo"; private static final String CACHED_INFO_KEY = "cachedInfo"; private static final Logger _log = Logger.getInstance( PageFlowController.class ); @@ -138,7 +138,7 @@ /** * Tell whether this is a "long lived" page flow. Once it is invoked, a long lived page flow is never - * removed from the session unless [EMAIL PROTECTED] #delete} is called. Navigating to another page flow hides + * removed from the session unless [EMAIL PROTECTED] #remove} is called. Navigating to another page flow hides * the current long lived controller, but does not remove it. */ protected boolean isLongLived() @@ -149,18 +149,18 @@ /** * Remove this instance from the session. */ - protected synchronized void deleteFromSession( HttpServletRequest request ) + protected synchronized void removeFromSession( HttpServletRequest request ) { // This request attribute is used in persistInSession to prevent re-saving of this instance. - request.setAttribute( DELETING_PAGEFLOW_ATTR, this ); + request.setAttribute( REMOVING_PAGEFLOW_ATTR, this ); if ( isLongLived() ) { - PageFlowUtils.deleteLongLivedPageFlow( getModulePath(), request ); + PageFlowUtils.removeLongLivedPageFlow( getModulePath(), request ); } else { - InternalUtils.deleteCurrentPageFlow( request ); + InternalUtils.removeCurrentPageFlow( request ); } } @@ -205,11 +205,11 @@ public void ensureFailover( HttpServletRequest request ) { // - // delete() puts the pageflow instance into a request attribute. Make sure not to re-save this - // instance if it's being deleted. Also, if the session is null (after having been invalidated + // remove() puts the pageflow instance into a request attribute. Make sure not to re-save this + // instance if it's being removed. Also, if the session is null (after having been invalidated // by the user), don't recreate it. // - if ( request.getAttribute( DELETING_PAGEFLOW_ATTR ) != this && request.getSession( false ) != null ) + if ( request.getAttribute( REMOVING_PAGEFLOW_ATTR ) != this && request.getSession( false ) != null ) { HttpServletRequest unwrappedRequest = PageFlowUtils.unwrapMultipart( request ); ServletContainerAdapter servletContainerAdapter = AdapterManager.getServletContainerAdapter( getServletContext() ); Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObject.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObject.java?view=diff&rev=126009&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObject.java&r1=126008&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObject.java&r2=126009 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObject.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowManagedObject.java Fri Jan 21 21:48:38 2005 @@ -112,7 +112,7 @@ /** * Remove this instance from the session. */ - protected abstract void deleteFromSession( HttpServletRequest request ); + protected abstract void removeFromSession( HttpServletRequest request ); /** * Store this object in the user session, in the appropriate place. Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java?view=diff&rev=126009&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java&r1=126008&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java&r2=126009 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java Fri Jan 21 21:48:38 2005 @@ -285,22 +285,11 @@ } /** - * Destroy the current [EMAIL PROTECTED] GlobalApp} instance. - * - * @deprecated Use [EMAIL PROTECTED] #deleteSharedFlow} instead. - * @param request the current HttpServletRequest. - */ - public static void deleteGlobalApp( HttpServletRequest request ) - { - deleteSharedFlow( InternalConstants.GLOBALAPP_CLASSNAME, request ); - } - - /** * Destroy the current [EMAIL PROTECTED] SharedFlowController} of the given class name. * @param sharedFlowClassName the class name of the current SharedFlowController to destroy. * @param request the current HttpServletRequest. */ - public static void deleteSharedFlow( String sharedFlowClassName, HttpServletRequest request ) + public static void removeSharedFlow( String sharedFlowClassName, HttpServletRequest request ) { HttpSession session = request.getSession( false ); if ( session != null ) request.getSession().removeAttribute( SHARED_FLOW_ATTR_PREFIX + sharedFlowClassName ); @@ -308,19 +297,19 @@ /** - * Delete a "long-lived" page flow from the session. Once it is created, a long-lived page flow - * is never removed from the session unless this method or [EMAIL PROTECTED] PageFlowController#delete} is + * Remove a "long-lived" page flow from the session. Once it is created, a long-lived page flow + * is never removed from the session unless this method or [EMAIL PROTECTED] PageFlowController#remove} is * called. Navigating to another page flow hides the current long-lived controller, but does not * remove it. */ - public static void deleteLongLivedPageFlow( String modulePath, HttpServletRequest request ) + public static void removeLongLivedPageFlow( String modulePath, HttpServletRequest request ) { HttpServletRequest unwrappedRequest = unwrapMultipart( request ); String attrName = InternalUtils.getLongLivedFlowAttr( modulePath ); ScopedServletUtils.removeScopedSessionAttr( attrName, unwrappedRequest ); // - // Now, if the current page flow is long-lived, delete the reference. + // Now, if the current page flow is long-lived, remove the reference. // String currentLongLivedModulePath = ( String ) ScopedServletUtils.getScopedSessionAttr( CURRENT_LONGLIVED_ATTR, unwrappedRequest ); Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java?view=diff&rev=126009&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java&r1=126008&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java&r2=126009 ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java Fri Jan 21 21:48:38 2005 @@ -124,8 +124,8 @@ /** * Remove this instance from the session. */ - protected synchronized void deleteFromSession( HttpServletRequest request ) + protected synchronized void removeFromSession( HttpServletRequest request ) { - PageFlowUtils.deleteSharedFlow( getClass().getName(), request ); + PageFlowUtils.removeSharedFlow( getClass().getName(), request ); } } 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&rev=126009&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java&r1=126008&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java&r2=126009 ============================================================================== --- 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 Fri Jan 21 21:48:38 2005 @@ -277,7 +277,7 @@ setCurrentActionResolver( jpf, request ); } - public static void deleteCurrentPageFlow( HttpServletRequest request ) + public static void removeCurrentPageFlow( HttpServletRequest request ) { HttpServletRequest unwrappedRequest = PageFlowUtils.unwrapMultipart( request ); ScopedServletUtils.removeScopedSessionAttr( CURRENT_JPF_ATTR, unwrappedRequest ); Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/targetScope/Controller.jpf Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/targetScope/Controller.jpf?view=diff&rev=126009&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/targetScope/Controller.jpf&r1=126008&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/targetScope/Controller.jpf&r2=126009 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/targetScope/Controller.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/targetScope/Controller.jpf Fri Jan 21 21:48:38 2005 @@ -34,26 +34,7 @@ ) protected Forward killMe() { - delete(); + remove(); return new Forward("success"); } } - [EMAIL PROTECTED](value = { - "<!-- This data is auto-generated. Hand-editing this section is not recommended. -->", - "<view-properties>", - "<pageflow-object id='pageflow:/miniTests/pageFlowScopeID/Controller.jpf'/>", - "<pageflow-object id='page:display.jsp'><property name='x' value='60'/><property name='y' value='40'/></pageflow-object>", - "<pageflow-object id='page:index.jsp'><property value='220' name='x'/><property value='100' name='y'/></pageflow-object>", - "<pageflow-object id='action:begin.do'><property value='80' name='x'/><property value='100' name='y'/></pageflow-object>", - "<pageflow-object id='action-call:@page:[EMAIL PROTECTED]@action:begin.do@'><property name='elbowsX' value='60,70,70,80'/><property name='elbowsY' value='85,85,55,55'/><property name='fromPort' value='South_1'/><property name='toPort' value='North_1'/></pageflow-object>", - "<pageflow-object id='action:submit.do'><property name='x' value='220'/><property name='y' value='220'/></pageflow-object>", - "<pageflow-object id='action:display.do'><property name='x' value='100'/><property name='y' value='220'/></pageflow-object>", - "<pageflow-object id='action-call:@page:[EMAIL PROTECTED]@action:submit.do@'><property name='elbowsX' value='220,220,220,220'/><property name='elbowsY' value='145,160,160,175'/><property name='fromPort' value='South_1'/><property name='toPort' value='North_1'/></pageflow-object>", - "<pageflow-object id='action-call:@page:[EMAIL PROTECTED]@action:display.do@'/>", - "<pageflow-object id='action:killMe.do'><property name='x' value='320'/><property name='y' value='320'/></pageflow-object>", - "<pageflow-object id='forward:[EMAIL PROTECTED]:killMe.do@'><property name='elbowsX' value='283,270,270,257'/><property name='elbowsY' value='312,312,103,103'/><property name='fromPort' value='West_1'/><property name='toPort' value='East_2'/><property name='label' value='success'/></pageflow-object>", - "<pageflow-object id='action-call:@page:[EMAIL PROTECTED]@action:killMe.do@'><property name='elbowsX' value='257,270,270,283'/><property name='elbowsY' value='92,92,301,301'/><property name='fromPort' value='East_1'/><property name='toPort' value='West_0'/></pageflow-object>", - "</view-properties>" -}) -interface VIEW_PROPERTIES { } Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfSingleton/anotherNonSingleton/AnotherNonSingletonController.jpf Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfSingleton/anotherNonSingleton/AnotherNonSingletonController.jpf?view=diff&rev=126009&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfSingleton/anotherNonSingleton/AnotherNonSingletonController.jpf&r1=126008&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfSingleton/anotherNonSingleton/AnotherNonSingletonController.jpf&r2=126009 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfSingleton/anotherNonSingleton/AnotherNonSingletonController.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfSingleton/anotherNonSingleton/AnotherNonSingletonController.jpf Fri Jan 21 21:48:38 2005 @@ -20,143 +20,7 @@ import org.apache.beehive.netui.pageflow.PageFlowController; import org.apache.beehive.netui.pageflow.annotations.Jpf; -/** - * @jpf:controller - * - * @jpf:view-properties view-properties:: - * <!-- This data is auto-generated. Hand-editing this section is not recommended. --> - * <view-properties> - * <pageflow-object id="pageflow:/pageFlowCore/pfSingleton/nonSingleton/NonSingletonController.jpf"/> - * <pageflow-object id="action:begin.do"> - * <property value="80" name="x"/> - * <property value="100" name="y"/> - * </pageflow-object> - * <pageflow-object id="action:go.do"> - * <property value="400" name="x"/> - * <property value="100" name="y"/> - * </pageflow-object> - * <pageflow-object id="action:deleteMe.do"> - * <property value="240" name="x"/> - * <property value="240" name="y"/> - * </pageflow-object> - * <pageflow-object id="action-call:@page:[EMAIL PROTECTED]@action:begin.do@"> - * <property value="204,160,160,116" name="elbowsX"/> - * <property value="92,92,92,92" name="elbowsY"/> - * <property value="West_1" name="fromPort"/> - * <property value="East_1" name="toPort"/> - * </pageflow-object> - * <pageflow-object id="action-call:@page:[EMAIL PROTECTED]@action:go.do@"> - * <property value="276,320,320,364" name="elbowsX"/> - * <property value="92,92,92,92" name="elbowsY"/> - * <property value="East_1" name="fromPort"/> - * <property value="West_1" name="toPort"/> - * </pageflow-object> - * <pageflow-object id="page:index.jsp"> - * <property value="240" name="x"/> - * <property value="100" name="y"/> - * </pageflow-object> - * <pageflow-object id="external-jpf:/pageFlowCore/pfSingleton/singleton/SingletonController.jpf"> - * <property value="560" name="x"/> - * <property value="100" name="y"/> - * </pageflow-object> - * <pageflow-object id="forward:[EMAIL PROTECTED]:begin.do@"> - * <property value="116,160,160,204" name="elbowsX"/> - * <property value="92,92,92,92" name="elbowsY"/> - * <property value="East_1" name="fromPort"/> - * <property value="West_1" name="toPort"/> - * <property value="success" name="label"/> - * </pageflow-object> - * <pageflow-object id="forward:path#success#/pageFlowCore/pfSingleton/singleton/[EMAIL PROTECTED]:go.do@"> - * <property value="436,480,480,524" name="elbowsX"/> - * <property value="92,92,92,92" name="elbowsY"/> - * <property value="East_1" name="fromPort"/> - * <property value="West_1" name="toPort"/> - * <property value="success" name="label"/> - * </pageflow-object> - * <pageflow-object id="forward:[EMAIL PROTECTED]:deleteMe.do@"> - * <property value="251,251,251,251" name="elbowsX"/> - * <property value="196,170,170,144" name="elbowsY"/> - * <property value="North_2" name="fromPort"/> - * <property value="South_2" name="toPort"/> - * <property value="success" name="label"/> - * </pageflow-object> - * <pageflow-object id="action-call:@page:[EMAIL PROTECTED]@action:deleteMe.do@"> - * <property value="229,229,229,229" name="elbowsX"/> - * <property value="144,170,170,196" name="elbowsY"/> - * <property value="South_0" name="fromPort"/> - * <property value="North_0" name="toPort"/> - * </pageflow-object> - * </view-properties> - * :: - */ [EMAIL PROTECTED]( - ) [EMAIL PROTECTED]( - value = { - "<!-- This data is auto-generated. Hand-editing this section is not recommended. -->", - "<view-properties>", - "<pageflow-object id='pageflow:/pageFlowCore/pfSingleton/nonSingleton/NonSingletonController.jpf'/>", - "<pageflow-object id='action:begin.do'>", - " <property value='80' name='x'/>", - " <property value='100' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action:go.do'>", - " <property value='400' name='x'/>", - " <property value='100' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action:deleteMe.do'>", - " <property value='240' name='x'/>", - " <property value='240' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action-call:@page:[EMAIL PROTECTED]@action:begin.do@'>", - " <property value='204,160,160,116' name='elbowsX'/>", - " <property value='92,92,92,92' name='elbowsY'/>", - " <property value='West_1' name='fromPort'/>", - " <property value='East_1' name='toPort'/>", - "</pageflow-object>", - "<pageflow-object id='action-call:@page:[EMAIL PROTECTED]@action:go.do@'>", - " <property value='276,320,320,364' name='elbowsX'/>", - " <property value='92,92,92,92' name='elbowsY'/>", - " <property value='East_1' name='fromPort'/>", - " <property value='West_1' name='toPort'/>", - "</pageflow-object>", - "<pageflow-object id='page:index.jsp'>", - " <property value='240' name='x'/>", - " <property value='100' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='external-jpf:/pageFlowCore/pfSingleton/singleton/SingletonController.jpf'>", - " <property value='560' name='x'/>", - " <property value='100' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='forward:[EMAIL PROTECTED]:begin.do@'>", - " <property value='116,160,160,204' name='elbowsX'/>", - " <property value='92,92,92,92' name='elbowsY'/>", - " <property value='East_1' name='fromPort'/>", - " <property value='West_1' name='toPort'/>", - " <property value='success' name='label'/>", - "</pageflow-object>", - "<pageflow-object id='forward:path#success#/pageFlowCore/pfSingleton/singleton/[EMAIL PROTECTED]:go.do@'>", - " <property value='436,480,480,524' name='elbowsX'/>", - " <property value='92,92,92,92' name='elbowsY'/>", - " <property value='East_1' name='fromPort'/>", - " <property value='West_1' name='toPort'/>", - " <property value='success' name='label'/>", - "</pageflow-object>", - "<pageflow-object id='forward:[EMAIL PROTECTED]:deleteMe.do@'>", - " <property value='251,251,251,251' name='elbowsX'/>", - " <property value='196,170,170,144' name='elbowsY'/>", - " <property value='North_2' name='fromPort'/>", - " <property value='South_2' name='toPort'/>", - " <property value='success' name='label'/>", - "</pageflow-object>", - "<pageflow-object id='action-call:@page:[EMAIL PROTECTED]@action:deleteMe.do@'>", - " <property value='229,229,229,229' name='elbowsX'/>", - " <property value='144,170,170,196' name='elbowsY'/>", - " <property value='South_0' name='fromPort'/>", - " <property value='North_0' name='toPort'/>", - "</pageflow-object>", - "</view-properties>" - }) [EMAIL PROTECTED]() public class AnotherNonSingletonController extends PageFlowController { public String val = ""; @@ -203,7 +67,7 @@ }) protected Forward deleteMe() { - delete(); + remove(); return new Forward( "success" ); } } Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfSingleton/nonSingleton/NonSingletonController.jpf Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfSingleton/nonSingleton/NonSingletonController.jpf?view=diff&rev=126009&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfSingleton/nonSingleton/NonSingletonController.jpf&r1=126008&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfSingleton/nonSingleton/NonSingletonController.jpf&r2=126009 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfSingleton/nonSingleton/NonSingletonController.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfSingleton/nonSingleton/NonSingletonController.jpf Fri Jan 21 21:48:38 2005 @@ -20,143 +20,7 @@ import org.apache.beehive.netui.pageflow.PageFlowController; import org.apache.beehive.netui.pageflow.annotations.Jpf; -/** - * @jpf:controller - * - * @jpf:view-properties view-properties:: - * <!-- This data is auto-generated. Hand-editing this section is not recommended. --> - * <view-properties> - * <pageflow-object id="pageflow:/pageFlowCore/pfSingleton/nonSingleton/NonSingletonController.jpf"/> - * <pageflow-object id="action:begin.do"> - * <property value="80" name="x"/> - * <property value="100" name="y"/> - * </pageflow-object> - * <pageflow-object id="action:go.do"> - * <property value="400" name="x"/> - * <property value="100" name="y"/> - * </pageflow-object> - * <pageflow-object id="action:deleteMe.do"> - * <property value="240" name="x"/> - * <property value="240" name="y"/> - * </pageflow-object> - * <pageflow-object id="action-call:@page:[EMAIL PROTECTED]@action:begin.do@"> - * <property value="204,160,160,116" name="elbowsX"/> - * <property value="92,92,92,92" name="elbowsY"/> - * <property value="West_1" name="fromPort"/> - * <property value="East_1" name="toPort"/> - * </pageflow-object> - * <pageflow-object id="action-call:@page:[EMAIL PROTECTED]@action:go.do@"> - * <property value="276,320,320,364" name="elbowsX"/> - * <property value="92,92,92,92" name="elbowsY"/> - * <property value="East_1" name="fromPort"/> - * <property value="West_1" name="toPort"/> - * </pageflow-object> - * <pageflow-object id="page:index.jsp"> - * <property value="240" name="x"/> - * <property value="100" name="y"/> - * </pageflow-object> - * <pageflow-object id="external-jpf:/pageFlowCore/pfSingleton/singleton/SingletonController.jpf"> - * <property value="560" name="x"/> - * <property value="100" name="y"/> - * </pageflow-object> - * <pageflow-object id="forward:[EMAIL PROTECTED]:begin.do@"> - * <property value="116,160,160,204" name="elbowsX"/> - * <property value="92,92,92,92" name="elbowsY"/> - * <property value="East_1" name="fromPort"/> - * <property value="West_1" name="toPort"/> - * <property value="success" name="label"/> - * </pageflow-object> - * <pageflow-object id="forward:path#success#/pageFlowCore/pfSingleton/singleton/[EMAIL PROTECTED]:go.do@"> - * <property value="436,480,480,524" name="elbowsX"/> - * <property value="92,92,92,92" name="elbowsY"/> - * <property value="East_1" name="fromPort"/> - * <property value="West_1" name="toPort"/> - * <property value="success" name="label"/> - * </pageflow-object> - * <pageflow-object id="forward:[EMAIL PROTECTED]:deleteMe.do@"> - * <property value="251,251,251,251" name="elbowsX"/> - * <property value="196,170,170,144" name="elbowsY"/> - * <property value="North_2" name="fromPort"/> - * <property value="South_2" name="toPort"/> - * <property value="success" name="label"/> - * </pageflow-object> - * <pageflow-object id="action-call:@page:[EMAIL PROTECTED]@action:deleteMe.do@"> - * <property value="229,229,229,229" name="elbowsX"/> - * <property value="144,170,170,196" name="elbowsY"/> - * <property value="South_0" name="fromPort"/> - * <property value="North_0" name="toPort"/> - * </pageflow-object> - * </view-properties> - * :: - */ [EMAIL PROTECTED]( - ) [EMAIL PROTECTED]( - value = { - "<!-- This data is auto-generated. Hand-editing this section is not recommended. -->", - "<view-properties>", - "<pageflow-object id='pageflow:/pageFlowCore/pfSingleton/nonSingleton/NonSingletonController.jpf'/>", - "<pageflow-object id='action:begin.do'>", - " <property value='80' name='x'/>", - " <property value='100' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action:go.do'>", - " <property value='400' name='x'/>", - " <property value='100' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action:deleteMe.do'>", - " <property value='240' name='x'/>", - " <property value='240' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action-call:@page:[EMAIL PROTECTED]@action:begin.do@'>", - " <property value='204,160,160,116' name='elbowsX'/>", - " <property value='92,92,92,92' name='elbowsY'/>", - " <property value='West_1' name='fromPort'/>", - " <property value='East_1' name='toPort'/>", - "</pageflow-object>", - "<pageflow-object id='action-call:@page:[EMAIL PROTECTED]@action:go.do@'>", - " <property value='276,320,320,364' name='elbowsX'/>", - " <property value='92,92,92,92' name='elbowsY'/>", - " <property value='East_1' name='fromPort'/>", - " <property value='West_1' name='toPort'/>", - "</pageflow-object>", - "<pageflow-object id='page:index.jsp'>", - " <property value='240' name='x'/>", - " <property value='100' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='external-jpf:/pageFlowCore/pfSingleton/singleton/SingletonController.jpf'>", - " <property value='560' name='x'/>", - " <property value='100' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='forward:[EMAIL PROTECTED]:begin.do@'>", - " <property value='116,160,160,204' name='elbowsX'/>", - " <property value='92,92,92,92' name='elbowsY'/>", - " <property value='East_1' name='fromPort'/>", - " <property value='West_1' name='toPort'/>", - " <property value='success' name='label'/>", - "</pageflow-object>", - "<pageflow-object id='forward:path#success#/pageFlowCore/pfSingleton/singleton/[EMAIL PROTECTED]:go.do@'>", - " <property value='436,480,480,524' name='elbowsX'/>", - " <property value='92,92,92,92' name='elbowsY'/>", - " <property value='East_1' name='fromPort'/>", - " <property value='West_1' name='toPort'/>", - " <property value='success' name='label'/>", - "</pageflow-object>", - "<pageflow-object id='forward:[EMAIL PROTECTED]:deleteMe.do@'>", - " <property value='251,251,251,251' name='elbowsX'/>", - " <property value='196,170,170,144' name='elbowsY'/>", - " <property value='North_2' name='fromPort'/>", - " <property value='South_2' name='toPort'/>", - " <property value='success' name='label'/>", - "</pageflow-object>", - "<pageflow-object id='action-call:@page:[EMAIL PROTECTED]@action:deleteMe.do@'>", - " <property value='229,229,229,229' name='elbowsX'/>", - " <property value='144,170,170,196' name='elbowsY'/>", - " <property value='South_0' name='fromPort'/>", - " <property value='North_0' name='toPort'/>", - "</pageflow-object>", - "</view-properties>" - }) [EMAIL PROTECTED]() public class NonSingletonController extends PageFlowController { public String val = ""; @@ -203,7 +67,7 @@ }) protected Forward deleteMe() { - delete(); + remove(); return new Forward( "success" ); } } Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfSingleton/singleton/SingletonController.jpf Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfSingleton/singleton/SingletonController.jpf?view=diff&rev=126009&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfSingleton/singleton/SingletonController.jpf&r1=126008&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfSingleton/singleton/SingletonController.jpf&r2=126009 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfSingleton/singleton/SingletonController.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfSingleton/singleton/SingletonController.jpf Fri Jan 21 21:48:38 2005 @@ -20,185 +20,11 @@ import org.apache.beehive.netui.pageflow.PageFlowController; import org.apache.beehive.netui.pageflow.annotations.Jpf; -/** - * @jpf:controller singleton="true" - * - * @jpf:view-properties view-properties:: - * <!-- This data is auto-generated. Hand-editing this section is not recommended. --> - * <view-properties> - * <pageflow-object id="pageflow:/pageFlowCore/pfSingleton/singleton/SingletonController.jpf"/> - * <pageflow-object id="action:begin.do"> - * <property value="100" name="x"/> - * <property value="180" name="y"/> - * </pageflow-object> - * <pageflow-object id="action:go.do"> - * <property value="420" name="x"/> - * <property value="180" name="y"/> - * </pageflow-object> - * <pageflow-object id="action:deleteAndGo.do"> - * <property value="420" name="x"/> - * <property value="100" name="y"/> - * </pageflow-object> - * <pageflow-object id="action:deleteAndStay.do"> - * <property value="260" name="x"/> - * <property value="300" name="y"/> - * </pageflow-object> - * <pageflow-object id="action-call:@page:[EMAIL PROTECTED]@action:deleteAndStay.do@"> - * <property value="271,271,271,271" name="elbowsX"/> - * <property value="224,240,240,256" name="elbowsY"/> - * <property value="South_2" name="fromPort"/> - * <property value="North_2" name="toPort"/> - * </pageflow-object> - * <pageflow-object id="action-call:@page:[EMAIL PROTECTED]@action:begin.do@"> - * <property value="224,180,180,136" name="elbowsX"/> - * <property value="172,172,172,172" name="elbowsY"/> - * <property value="West_1" name="fromPort"/> - * <property value="East_1" name="toPort"/> - * </pageflow-object> - * <pageflow-object id="action-call:@page:[EMAIL PROTECTED]@action:go.do@"> - * <property value="296,340,340,384" name="elbowsX"/> - * <property value="183,183,183,183" name="elbowsY"/> - * <property value="East_2" name="fromPort"/> - * <property value="West_2" name="toPort"/> - * </pageflow-object> - * <pageflow-object id="action-call:@page:[EMAIL PROTECTED]@action:deleteAndGo.do@"> - * <property value="296,340,340,384" name="elbowsX"/> - * <property value="161,161,92,92" name="elbowsY"/> - * <property value="East_0" name="fromPort"/> - * <property value="West_1" name="toPort"/> - * </pageflow-object> - * <pageflow-object id="page:index.jsp"> - * <property value="260" name="x"/> - * <property value="180" name="y"/> - * </pageflow-object> - * <pageflow-object id="external-jpf:/pageFlowCore/pfSingleton/nonSingleton/NonSingletonController.jpf"> - * <property value="580" name="x"/> - * <property value="180" name="y"/> - * </pageflow-object> - * <pageflow-object id="forward:[EMAIL PROTECTED]:begin.do@"> - * <property value="136,180,180,224" name="elbowsX"/> - * <property value="172,172,172,172" name="elbowsY"/> - * <property value="East_1" name="fromPort"/> - * <property value="West_1" name="toPort"/> - * <property value="success" name="label"/> - * </pageflow-object> - * <pageflow-object id="forward:path#success#/pageFlowCore/pfSingleton/nonSingleton/[EMAIL PROTECTED]:go.do@"> - * <property value="456,500,500,544" name="elbowsX"/> - * <property value="183,183,183,183" name="elbowsY"/> - * <property value="East_2" name="fromPort"/> - * <property value="West_2" name="toPort"/> - * <property value="success" name="label"/> - * </pageflow-object> - * <pageflow-object id="forward:path#success#/pageFlowCore/pfSingleton/nonSingleton/[EMAIL PROTECTED]:deleteAndGo.do@"> - * <property value="456,500,500,544" name="elbowsX"/> - * <property value="92,92,161,161" name="elbowsY"/> - * <property value="East_1" name="fromPort"/> - * <property value="West_0" name="toPort"/> - * <property value="success" name="label"/> - * </pageflow-object> - * <pageflow-object id="forward:[EMAIL PROTECTED]:deleteAndStay.do@"> - * <property value="249,249,249,249" name="elbowsX"/> - * <property value="256,240,240,224" name="elbowsY"/> - * <property value="North_0" name="fromPort"/> - * <property value="South_0" name="toPort"/> - * <property value="success" name="label"/> - * </pageflow-object> - * </view-properties> - * :: - */ [EMAIL PROTECTED]( - longLived = true) [EMAIL PROTECTED]( - value = { - "<!-- This data is auto-generated. Hand-editing this section is not recommended. -->", - "<view-properties>", - "<pageflow-object id='pageflow:/pageFlowCore/pfSingleton/singleton/SingletonController.jpf'/>", - "<pageflow-object id='action:begin.do'>", - " <property value='100' name='x'/>", - " <property value='180' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action:go.do'>", - " <property value='420' name='x'/>", - " <property value='180' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action:deleteAndGo.do'>", - " <property value='420' name='x'/>", - " <property value='100' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action:deleteAndStay.do'>", - " <property value='260' name='x'/>", - " <property value='300' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action-call:@page:[EMAIL PROTECTED]@action:deleteAndStay.do@'>", - " <property value='271,271,271,271' name='elbowsX'/>", - " <property value='224,240,240,256' name='elbowsY'/>", - " <property value='South_2' name='fromPort'/>", - " <property value='North_2' name='toPort'/>", - "</pageflow-object>", - "<pageflow-object id='action-call:@page:[EMAIL PROTECTED]@action:begin.do@'>", - " <property value='224,180,180,136' name='elbowsX'/>", - " <property value='172,172,172,172' name='elbowsY'/>", - " <property value='West_1' name='fromPort'/>", - " <property value='East_1' name='toPort'/>", - "</pageflow-object>", - "<pageflow-object id='action-call:@page:[EMAIL PROTECTED]@action:go.do@'>", - " <property value='296,340,340,384' name='elbowsX'/>", - " <property value='183,183,183,183' name='elbowsY'/>", - " <property value='East_2' name='fromPort'/>", - " <property value='West_2' name='toPort'/>", - "</pageflow-object>", - "<pageflow-object id='action-call:@page:[EMAIL PROTECTED]@action:deleteAndGo.do@'>", - " <property value='296,340,340,384' name='elbowsX'/>", - " <property value='161,161,92,92' name='elbowsY'/>", - " <property value='East_0' name='fromPort'/>", - " <property value='West_1' name='toPort'/>", - "</pageflow-object>", - "<pageflow-object id='page:index.jsp'>", - " <property value='260' name='x'/>", - " <property value='180' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='external-jpf:/pageFlowCore/pfSingleton/nonSingleton/NonSingletonController.jpf'>", - " <property value='580' name='x'/>", - " <property value='180' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='forward:[EMAIL PROTECTED]:begin.do@'>", - " <property value='136,180,180,224' name='elbowsX'/>", - " <property value='172,172,172,172' name='elbowsY'/>", - " <property value='East_1' name='fromPort'/>", - " <property value='West_1' name='toPort'/>", - " <property value='success' name='label'/>", - "</pageflow-object>", - "<pageflow-object id='forward:path#success#/pageFlowCore/pfSingleton/nonSingleton/[EMAIL PROTECTED]:go.do@'>", - " <property value='456,500,500,544' name='elbowsX'/>", - " <property value='183,183,183,183' name='elbowsY'/>", - " <property value='East_2' name='fromPort'/>", - " <property value='West_2' name='toPort'/>", - " <property value='success' name='label'/>", - "</pageflow-object>", - "<pageflow-object id='forward:path#success#/pageFlowCore/pfSingleton/nonSingleton/[EMAIL PROTECTED]:deleteAndGo.do@'>", - " <property value='456,500,500,544' name='elbowsX'/>", - " <property value='92,92,161,161' name='elbowsY'/>", - " <property value='East_1' name='fromPort'/>", - " <property value='West_0' name='toPort'/>", - " <property value='success' name='label'/>", - "</pageflow-object>", - "<pageflow-object id='forward:[EMAIL PROTECTED]:deleteAndStay.do@'>", - " <property value='249,249,249,249' name='elbowsX'/>", - " <property value='256,240,240,224' name='elbowsY'/>", - " <property value='North_0' name='fromPort'/>", - " <property value='South_0' name='toPort'/>", - " <property value='success' name='label'/>", - "</pageflow-object>", - "</view-properties>" - }) [EMAIL PROTECTED](longLived = true) public class SingletonController extends PageFlowController { public String val = ""; - /** - * @jpf:action - * @jpf:forward name="success" path="index.jsp" - */ @Jpf.Action( forwards = { @Jpf.Forward( @@ -210,10 +36,6 @@ return new Forward( "success" ); } - /** - * @jpf:action - * @jpf:forward name="success" path="/pageFlowCore/pfSingleton/nonSingleton/NonSingletonController.jpf" - */ @Jpf.Action( forwards = { @Jpf.Forward( @@ -225,10 +47,6 @@ return new Forward( "success" ); } - /** - * @jpf:action - * @jpf:forward name="success" path="/pageFlowCore/pfSingleton/nonSingleton/NonSingletonController.jpf" - */ @Jpf.Action( forwards = { @Jpf.Forward( @@ -237,14 +55,10 @@ }) protected Forward deleteAndGo() { - delete(); + remove(); return new Forward( "success" ); } - /** - * @jpf:action - * @jpf:forward name="success" path="index.jsp" - */ @Jpf.Action( forwards = { @Jpf.Forward( @@ -253,7 +67,7 @@ }) protected Forward deleteAndStay() { - delete(); + remove(); return new Forward( "success" ); } }
