cvs commit: cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/context SessionContextImpl.java

[cziegeler]

cziegeler    2003/05/06 10:08:53

  Modified:    
src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/generation
                        PortalGenerator.java
               
src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/context
                        SessionContextImpl.java
  Log:
  Adding new action for form manager
  
  Revision  Changes    Path
  1.4       +2 -3      
cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/generation/PortalGenerator.java
  
  Index: PortalGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/generation/PortalGenerator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PortalGenerator.java      4 May 2003 20:54:29 -0000       1.3
  +++ PortalGenerator.java      6 May 2003 17:08:53 -0000       1.4
  @@ -77,9 +77,8 @@
           PortalManager portal = null;
           FormManager formManager = null;
           try {
  -            // FIXME - workaround for form handling
               formManager = (FormManager)this.manager.lookup(FormManager.ROLE);
  -            // no need do to anything here with the form manager:)
  +            formManager.processInputFields();
   
               portal = (PortalManager) this.manager.lookup(PortalManager.ROLE);
               this.xmlConsumer.startDocument();
  
  
  
  1.3       +7 -11     
cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/context/SessionContextImpl.java
  
  Index: SessionContextImpl.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/context/SessionContextImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SessionContextImpl.java   4 May 2003 20:19:41 -0000       1.2
  +++ SessionContextImpl.java   6 May 2003 17:08:53 -0000       1.3
  @@ -287,8 +287,7 @@
               }
           }
   
  -        if (path.equals("layout") == true
  -            || path.startsWith("layout/") == true) {
  +        if (path.equals("layout") || path.startsWith("layout/") ) {
               try {
                   this.getLayoutDOM();
                   if (this.layoutDOM != null) list = 
DOMUtil.selectNodeList(this.layoutDOM, path);
  @@ -297,8 +296,7 @@
               }
           }
   
  -        if (path.equals("configuration") == true
  -            || path.startsWith("configuration/") == true) {
  +        if (path.equals("configuration") || 
path.startsWith("configuration/") ) {
               try {
                   if (this.configurationDOM != null) list = 
DOMUtil.selectNodeList(this.configurationDOM, path);
               } catch (javax.xml.transform.TransformerException 
localException) {
  @@ -306,8 +304,7 @@
               }
           }
   
  -        if (path.startsWith("coplet-data/") == true
  -            || path.equals("coplet-data") == true) {
  +        if (path.startsWith("coplet-data/") || path.equals("coplet-data") ) {
   
               if (this.statusProfile != null) {
                   if (this.copletID != null && this.copletNumber != null) {
  @@ -357,9 +354,8 @@
       public synchronized void setXML(String path, DocumentFragment fragment)
       throws ProcessingException {
           if (path != null) {
  -            if (path.startsWith("/") == true) path = path.substring(1);
  -            if (path.startsWith("coplet-data/") == true
  -                || path.equals("coplet-data") == true) {
  +            if (path.startsWith("/") ) path = path.substring(1);
  +            if (path.startsWith("coplet-data/") || 
path.equals("coplet-data") ) {
   
                   if (this.statusProfile != null) {
                       if (this.copletID != null && this.copletNumber != null) {
  @@ -390,7 +386,7 @@
                               }
                           }
   
  -                        if 
(this.copletPars.getParameter(PortalConstants.PARAMETER_PERSISTENT, 
"false").equals("true") == true) {
  +                        if 
(this.copletPars.getParameter(PortalConstants.PARAMETER_PERSISTENT, 
"false").equals("true") ) {
                               
this.profile.put(PortalConstants.PROFILE_SAVE_STATUS_FLAG, "true");
                           }
                       }