luehe       2004/11/01 14:22:37

  Modified:    catalina/src/share/org/apache/catalina/connector
                        RequestFacade.java
  Log:
  Fixed formatting prior to making changes
  
  Revision  Changes    Path
  1.6       +53 -28    
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/RequestFacade.java
  
  Index: RequestFacade.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/RequestFacade.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- RequestFacade.java        23 Jun 2004 08:24:57 -0000      1.5
  +++ RequestFacade.java        1 Nov 2004 22:22:37 -0000       1.6
  @@ -49,7 +49,8 @@
           
       // ----------------------------------------------------------- DoPrivileged
       
  -    private final class GetAttributePrivilegedAction implements PrivilegedAction{
  +    private final class GetAttributePrivilegedAction
  +            implements PrivilegedAction {
           
           public Object run() {
               return request.getAttributeNames();
  @@ -57,7 +58,8 @@
       }
        
       
  -    private final class GetParameterMapPrivilegedAction implements PrivilegedAction{
  +    private final class GetParameterMapPrivilegedAction
  +            implements PrivilegedAction {
           
           public Object run() {
               return request.getParameterMap();
  @@ -65,30 +67,38 @@
       }    
       
       
  -    private final class GetRequestDispatcherPrivilegedAction implements 
PrivilegedAction{
  +    private final class GetRequestDispatcherPrivilegedAction
  +            implements PrivilegedAction {
  +
           private String path;
  +
           public GetRequestDispatcherPrivilegedAction(String path){
               this.path = path;
           }
           
           public Object run() {   
               return request.getRequestDispatcher(path);
  -       }           
  +        }           
       }    
       
       
  -    private final class GetParameterPrivilegedAction implements PrivilegedAction{
  +    private final class GetParameterPrivilegedAction
  +            implements PrivilegedAction {
  +
           public String name;
  +
           public GetParameterPrivilegedAction(String name){
               this.name = name;
           }
  +
           public Object run() {       
               return request.getParameter(name);
           }           
       }    
       
        
  -    private final class GetParameterNamesPrivilegedAction implements 
PrivilegedAction{
  +    private final class GetParameterNamesPrivilegedAction
  +            implements PrivilegedAction {
           
           public Object run() {          
               return request.getParameterNames();
  @@ -96,26 +106,32 @@
       } 
       
       
  -    private final class GetParameterValuePrivilegedAction implements 
PrivilegedAction{
  +    private final class GetParameterValuePrivilegedAction
  +            implements PrivilegedAction {
  +
           public String name;
  +
           public GetParameterValuePrivilegedAction(String name){
               this.name = name;
           }
  +
           public Object run() {       
               return request.getParameterValues(name);
           }           
       }    
     
       
  -    private final class GetCookiesPrivilegedAction implements PrivilegedAction{
  +    private final class GetCookiesPrivilegedAction
  +            implements PrivilegedAction {
           
  -       public Object run() {       
  +        public Object run() {       
               return request.getCookies();
           }           
       }      
       
       
  -    private final class GetCharacterEncodingPrivilegedAction implements 
PrivilegedAction{
  +    private final class GetCharacterEncodingPrivilegedAction
  +            implements PrivilegedAction {
           
           public Object run() {       
               return request.getCharacterEncoding();
  @@ -123,8 +139,11 @@
       }   
           
       
  -    private final class GetHeadersPrivilegedAction implements PrivilegedAction{
  +    private final class GetHeadersPrivilegedAction
  +            implements PrivilegedAction {
  +
           private String name;
  +
           public GetHeadersPrivilegedAction(String name){
               this.name = name;
           }
  @@ -135,7 +154,8 @@
       }    
           
       
  -    private final class GetHeaderNamesPrivilegedAction implements PrivilegedAction{
  +    private final class GetHeaderNamesPrivilegedAction
  +            implements PrivilegedAction {
   
           public Object run() {       
               return request.getHeaderNames();
  @@ -143,7 +163,8 @@
       }  
               
       
  -    private final class GetLocalePrivilegedAction implements PrivilegedAction{
  +    private final class GetLocalePrivilegedAction
  +            implements PrivilegedAction {
   
           public Object run() {       
               return request.getLocale();
  @@ -151,14 +172,17 @@
       }    
               
       
  -    private final class GetLocalesPrivilegedAction implements PrivilegedAction{
  +    private final class GetLocalesPrivilegedAction
  +            implements PrivilegedAction {
   
           public Object run() {       
               return request.getLocales();
           }           
       }    
       
  -    private final class GetSessionPrivilegedAction implements PrivilegedAction{
  +    private final class GetSessionPrivilegedAction
  +            implements PrivilegedAction {
  +
           private boolean create;
           
           public GetSessionPrivilegedAction(boolean create){
  @@ -168,7 +192,8 @@
           public Object run() {  
               return request.getSession(create);
           }           
  -    }      
  +    }
  +
       // ----------------------------------------------------------- Constructors
   
   
  @@ -550,22 +575,22 @@
   
   
       public String getLocalAddr() {
  -             return request.getLocalAddr();
  -     }
  +        return request.getLocalAddr();
  +    }
   
   
  -     public String getLocalName() {
  -             return request.getLocalName();
  -     }
  +    public String getLocalName() {
  +        return request.getLocalName();
  +    }
   
   
  -     public int getLocalPort() {
  -             return request.getLocalPort();
  -     }
  +    public int getLocalPort() {
  +        return request.getLocalPort();
  +    }
   
   
  -     public int getRemotePort() {
  -             return request.getRemotePort();
  -     }
  +    public int getRemotePort() {
  +        return request.getRemotePort();
  +    }
   
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to