portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capabilities/impl CapabilityValveImpl.java
Date Wed, 01 Dec 2004 20:28:21 GMT
weaver      2004/12/01 12:28:21

  Modified:    portal/src/java/org/apache/jetspeed/capabilities/impl
                        CapabilityValveImpl.java
  Log:
  remove redundant try/catch block
  
  Revision  Changes    Path
  1.6       +74 -84    jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java
  
  Index: CapabilityValveImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CapabilityValveImpl.java	2 Aug 2004 18:57:08 -0000	1.5
  +++ CapabilityValveImpl.java	1 Dec 2004 20:28:21 -0000	1.6
  @@ -30,109 +30,99 @@
   
   /**
    * Invokes the capability mapper in the request pipeline
  - *
  - * @author <a href="mailto:roger.ruttimann@earthlink.net">Roger Ruttimann</a>
  + * 
  + * @author <a href="mailto:roger.ruttimann@earthlink.net">Roger Ruttimann </a>
    * @version $Id$
    */
   public class CapabilityValveImpl implements CapabilityValve
   {
       private static final Log log = LogFactory.getLog(CapabilityValveImpl.class);
  -    String resourceDefault;        // the default name for a resource
  +    String resourceDefault; // the default name for a resource
       private Capabilities capabilities;
  -    
  -    public CapabilityValveImpl(Capabilities capabilities)
  +
  +    public CapabilityValveImpl( Capabilities capabilities )
       {
           this.capabilities = capabilities;
       }
  -    
  +
       /**
  -      * Initialize the valve before using in a pipeline.
  -      */
  +     * Initialize the valve before using in a pipeline.
  +     */
       public void initialize() throws PipelineException
       {
   
       }
  -    
  -   
  -    public void invoke(RequestContext request, ValveContext context)
  -        throws PipelineException
  +
  +    public void invoke( RequestContext request, ValveContext context ) throws PipelineException
       {
  -        try
  +
  +        String requestMediaType = request.getRequestParameter(ProfilingRule.STANDARD_MEDIATYPE);
  +        String agent = request.getRequest().getHeader("User-Agent");
  +
  +        // Get capability map
  +        CapabilityMap cm = capabilities.getCapabilityMap(agent);
  +
  +        if (cm == null)
           {
  -            String requestMediaType = request.getRequestParameter(ProfilingRule.STANDARD_MEDIATYPE);
  -            String agent = request.getRequest().getHeader("User-Agent"); 
  -            
  -                        
  -            // Get capability map
  -            CapabilityMap cm = capabilities.getCapabilityMap(agent);
  -            
  -            if ( cm == null)
  -            {
  -                log.debug("Couldn't create capability map for agent: " + agent);
  -            }
  -            else
  -            {
  -                log.debug("Created Capability map for agent: " + agent);
  -            }
  -            
  -            MediaType mediaType = cm.getPreferredMediaType();                         

  -            MimeType mimeType = cm.getPreferredType();
  -            
  -            if(mediaType == null)
  -            {
  -                log.error("CapabilityMap returned a null media type");
  -                throw new PipelineException("CapabilityMap returned a null media type");
  -            }
  -            
  -            if(mimeType == null)
  -            {
  -                log.error("CapabilityMap returned a null mime type");
  -                throw new PipelineException("CapabilityMap returned a null mime type");
  -            }
  -            
  -            String encoding = request.getRequest().getCharacterEncoding();
  -            
  -            
  -            if (encoding == null)
  -            {
  -                if (mediaType != null && mediaType.getCharacterSet() != null)
  -                {
  -                    encoding = mediaType.getCharacterSet();
  -                }
  -            }
  -            
  -            if (log.isDebugEnabled())
  -            {
  -                log.debug("MediaType: " + mediaType.getName());
  -                log.debug("Encoding: "  + encoding);
  -                log.debug("Mimetype: "  + mimeType.getName());
  -            }
  -                                                                            
  -            // Put the encoding in the request
  -            request.setCharacterEncoding(encoding);
  -    
  -            // Put the CapabilityMap into the request
  -            request.setCapabilityMap(cm);
  -            
  -            // Put the Media Type into the request
  -            request.setMediaType(mediaType.getName());
  -                       
  -            // Put the Mime Type into the request
  -            request.setMimeType(mimeType.getName());
  -            
  -            // Put the Mime Type and Charset into the response
  -            StringBuffer contentType = new StringBuffer(mimeType.getName());
  -            if (encoding != null)
  +            log.debug("Couldn't create capability map for agent: " + agent);
  +        }
  +        else
  +        {
  +            log.debug("Created Capability map for agent: " + agent);
  +        }
  +
  +        MediaType mediaType = cm.getPreferredMediaType();
  +        MimeType mimeType = cm.getPreferredType();
  +
  +        if (mediaType == null)
  +        {
  +            log.error("CapabilityMap returned a null media type");
  +            throw new PipelineException("CapabilityMap returned a null media type");
  +        }
  +
  +        if (mimeType == null)
  +        {
  +            log.error("CapabilityMap returned a null mime type");
  +            throw new PipelineException("CapabilityMap returned a null mime type");
  +        }
  +
  +        String encoding = request.getRequest().getCharacterEncoding();
  +
  +        if (encoding == null)
  +        {
  +            if (mediaType != null && mediaType.getCharacterSet() != null)
               {
  -                contentType.append("; charset=" + encoding);
  +                encoding = mediaType.getCharacterSet();
               }
  -            request.getResponse().setContentType(contentType.toString());            
  -        } 
  -        catch (Exception e)
  +        }
  +
  +        if (log.isDebugEnabled())
  +        {
  +            log.debug("MediaType: " + mediaType.getName());
  +            log.debug("Encoding: " + encoding);
  +            log.debug("Mimetype: " + mimeType.getName());
  +        }
  +
  +        // Put the encoding in the request
  +        request.setCharacterEncoding(encoding);
  +
  +        // Put the CapabilityMap into the request
  +        request.setCapabilityMap(cm);
  +
  +        // Put the Media Type into the request
  +        request.setMediaType(mediaType.getName());
  +
  +        // Put the Mime Type into the request
  +        request.setMimeType(mimeType.getName());
  +
  +        // Put the Mime Type and Charset into the response
  +        StringBuffer contentType = new StringBuffer(mimeType.getName());
  +        if (encoding != null)
           {
  -            e.printStackTrace();
  -            throw new PipelineException(e.getMessage(), e);
  +            contentType.append("; charset=" + encoding);
           }
  +        request.getResponse().setContentType(contentType.toString());
  +
           // Pass control to the next Valve in the Pipeline
           context.invokeNext(request);
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message