[jboss-cvs] jboss-seam/src/pdf/org/jboss/seam/pdf ...

[Norman Richards]

  User: nrichards
  Date: 07/12/20 14:34:55

  Modified:    src/pdf/org/jboss/seam/pdf    DocumentData.java
                        DocumentStorePhaseListener.java
                        DocumentStoreServlet.java
  Log:
  JBSEAM-2366
  
  Revision  Changes    Path
  1.4       +12 -0     jboss-seam/src/pdf/org/jboss/seam/pdf/DocumentData.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DocumentData.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/pdf/org/jboss/seam/pdf/DocumentData.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- DocumentData.java	3 Dec 2007 17:25:44 -0000	1.3
  +++ DocumentData.java	20 Dec 2007 19:34:54 -0000	1.4
  @@ -5,12 +5,16 @@
       DocumentType documentType;
       String baseName;
   
  +    String disposition = "inline";
  +    
       public DocumentData(String baseName, DocumentType documentType, byte[] data) {
           super();
           this.data = data;
           this.documentType = documentType;
           this.baseName = baseName;
       }
  +    
  +     
       public byte[] getData() {
           return data;
       }
  @@ -25,6 +29,14 @@
           return getBaseName() + "." + getDocumentType().getExtension();
       }
   
  +    public void setDisposition(String disposition) {
  +        this.disposition = disposition;
  +    }
  +    
  +    public String getDisposition() {
  +        return disposition;
  +    }
  +
       static public class DocumentType {
           private String mimeType;
           private String extension;
  
  
  
  1.9       +3 -1      jboss-seam/src/pdf/org/jboss/seam/pdf/DocumentStorePhaseListener.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DocumentStorePhaseListener.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/pdf/org/jboss/seam/pdf/DocumentStorePhaseListener.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- DocumentStorePhaseListener.java	3 Dec 2007 17:25:44 -0000	1.8
  +++ DocumentStorePhaseListener.java	20 Dec 2007 19:34:54 -0000	1.9
  @@ -49,7 +49,9 @@
               HttpServletResponse response = (HttpServletResponse) context.getExternalContext().getResponse();
               response.setContentType( documentData.getDocumentType().getMimeType() );
               
  -            response.setHeader("Content-Disposition", "inline; filename=\"" + documentData.getFileName() + "\"");
  +            response.setHeader("Content-Disposition", 
  +                                documentData.getDisposition() + 
  +                                "; filename=\"" + documentData.getFileName() + "\"");
               
               if (data != null) 
               {
  
  
  
  1.16      +3 -2      jboss-seam/src/pdf/org/jboss/seam/pdf/DocumentStoreServlet.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DocumentStoreServlet.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/pdf/org/jboss/seam/pdf/DocumentStoreServlet.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- DocumentStoreServlet.java	3 Dec 2007 17:25:44 -0000	1.15
  +++ DocumentStoreServlet.java	20 Dec 2007 19:34:54 -0000	1.16
  @@ -46,7 +46,8 @@
   
               response.setContentType(documentData.getDocumentType().getMimeType());
               response.setHeader("Content-Disposition", 
  -                               "inline; filename=\"" + documentData.getFileName() + "\"");
  +                               documentData.getDisposition() + 
  +                               "; filename=\"" + documentData.getFileName() + "\"");
   
               if (data != null) {
                   response.getOutputStream().write(data);