[Wonder-cvs] CVS: Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions ERXWOComponentContent.java,1.3.2.2,1.3.2.3 ERXWOTemplate.java,1.3.2.2,1.3.2.3

[Jonathan B. L. <le...@us...>]

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23464

Modified Files:
      Tag: Wonder_2_0_0_Branch
	ERXWOComponentContent.java ERXWOTemplate.java 
Log Message:
merging anjo's patches down to the branch


Index: ERXWOComponentContent.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXWOComponentContent.java,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -d -r1.3.2.2 -r1.3.2.3
*** ERXWOComponentContent.java	15 Jul 2005 17:31:41 -0000	1.3.2.2
--- ERXWOComponentContent.java	18 Jul 2005 17:43:05 -0000	1.3.2.3
***************
*** 155,159 ****
              }
          }
-         
          return _defaultTemplate;
      }
--- 155,158 ----
***************
*** 171,176 ****
          WOElement template = template(component);
          wocontext._setCurrentComponent(component.parent());
!         WOActionResults result;
!         result = template.invokeAction(worequest, wocontext);
          wocontext._setCurrentComponent(component);
          return result;
--- 170,174 ----
          WOElement template = template(component);
          wocontext._setCurrentComponent(component.parent());
!         WOActionResults result = template.invokeAction(worequest, wocontext);
          wocontext._setCurrentComponent(component);
          return result;

Index: ERXWOTemplate.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXWOTemplate.java,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -d -r1.3.2.2 -r1.3.2.3
*** ERXWOTemplate.java	15 Jul 2005 17:31:41 -0000	1.3.2.2
--- ERXWOTemplate.java	18 Jul 2005 17:43:05 -0000	1.3.2.3
***************
*** 42,46 ****
      }
  
!     public WOActionResults _invokeAction(WORequest worequest, WOContext wocontext) {
          WOActionResults results = _template.invokeAction(worequest, wocontext);
          return results;
--- 42,46 ----
      }
  
!     public WOActionResults invokeAction(WORequest worequest, WOContext wocontext) {
          WOActionResults results = _template.invokeAction(worequest, wocontext);
          return results;