[prev in list] [next in list] [prev in thread] [next in thread] 

List:       slide-dev
Subject:    cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method VersionControlMethod.java
From:       pnever () apache ! org
Date:       2002-04-29 13:21:40
[Download RAW message or body]

pnever      02/04/29 06:21:40

  Modified:    src/webdav/server/org/apache/slide/webdav/method
                        VersionControlMethod.java
  Log:
  No substantial change - indentation only!!
  
  Revision  Changes    Path
  1.14      +22 -22    \
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/VersionControlMethod.java
  
  Index: VersionControlMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/VersionControlMethod.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- VersionControlMethod.java	25 Apr 2002 21:15:15 -0000	1.13
  +++ VersionControlMethod.java	29 Apr 2002 13:21:40 -0000	1.14
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/VersionControlMethod.java,v \
                1.13 2002/04/25 21:15:15 jericho Exp $
  - * $Revision: 1.13 $
  - * $Date: 2002/04/25 21:15:15 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/VersionControlMethod.java,v \
1.14 2002/04/29 13:21:40 pnever Exp $  + * $Revision: 1.14 $
  + * $Date: 2002/04/29 13:21:40 $
    *
    * ====================================================================
    *
  @@ -101,13 +101,13 @@
    * @author <a href="mailto:peter.nevermann@softwareag.com">Peter Nevermann</a>
    */
   public class VersionControlMethod extends WebdavMethod
  -implements DeltavConstants {
  +    implements DeltavConstants {
       
       /**
        * Resource to be written.
        */
       private String resourcePath;
  -        
  +    
       /**
        * The VERSION-CONTROL request can be used to create a new VCR for an existing
        * version history (see 6.7 of RFC3253)
  @@ -122,9 +122,9 @@
        * @param resp HTTP response
        */
       public VersionControlMethod( NamespaceAccessToken token,
  -                                 HttpServletRequest req,
  -                                 HttpServletResponse resp,
  -                                 WebdavServletConfig config)
  +                                HttpServletRequest req,
  +                                HttpServletResponse resp,
  +                                WebdavServletConfig config)
       {
           super(token, req, resp, config);
           readRequestContent();
  @@ -142,8 +142,8 @@
           }
           
           if( req.getContentLength() > 0 ) {
  -        try{
  -            retrieveRequestContent();
  +            try{
  +                retrieveRequestContent();
                   Element vce = getRequestContent().getRootElement();
                   Element ve = null;
                   if( vce == null || !vce.getName().equals(E_VERSION_CONTROL) ) {
  @@ -163,12 +163,12 @@
                               if( hre == null || !hre.getName().equals(E_HREF) )
                                   throw new Exception();
                               existingVersionPath = getSlidePath( hre.getText() );
  -        }
  +                        }
                           catch( Exception x ) {
                               Domain.warn( E_VERSION+" element must contain \
                "+E_HREF+" element" );
  -            resp.setStatus(WebdavStatus.SC_BAD_REQUEST);
  -            throw new WebdavException(WebdavStatus.SC_BAD_REQUEST);
  -        }
  +                            resp.setStatus(WebdavStatus.SC_BAD_REQUEST);
  +                            throw new \
WebdavException(WebdavStatus.SC_BAD_REQUEST);  +                        }
                           break;
                       }
                   }
  @@ -178,16 +178,16 @@
                   throw new WebdavException(WebdavStatus.SC_BAD_REQUEST);
               }
               catch( IOException x ){
  -            resp.setStatus(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
  -            throw new WebdavException(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
  -        }
  +                resp.setStatus(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
  +                throw new WebdavException(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
  +            }
               catch( javax.xml.parsers.ParserConfigurationException x ){
  -            resp.setStatus(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
  -            throw new WebdavException(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
  +                resp.setStatus(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
  +                throw new WebdavException(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
  +            }
           }
       }
  -    }
  -
  +    
       /**
        * Execute the request.
        *
  @@ -202,7 +202,7 @@
               VersioningHelper vh = VersioningHelper.getVersioningHelper(
                   slideToken, token, req, resp, getConfig() );
               if( existingVersionPath == null )
  -            vh.versionControl( resourcePath );
  +                vh.versionControl( resourcePath );
               else
                   vh.versionControl( resourcePath, existingVersionPath );
           }
  
  
  

--
To unsubscribe, e-mail:   <mailto:slide-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:slide-dev-help@jakarta.apache.org>


[prev in list] [next in list] [prev in thread] [next in thread]