[Jaffa-cvs] JaffaComponentsPrinting/source/java/org/jaffa/modules/printing/services FormPrintEngin

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/jaffa/JaffaComponentsPrinting/source/java/org/jaffa/modules/printing/services
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9750/source/java/org/jaffa/modules/printing/services

Modified Files:
	FormPrintEngineIText.java FormPrintEnginePdfLib.java 
	FormPrintEngineVelocity.java IFormPrintEngine.java 
	MultiFormPrintEngine.java 
Log Message:
Refactored tests and linked in Ghostscript and ImageMagick to allow auotomated PDF deltas
If the Junit.properties does not define links to these external programs, they are not used in the tests
Renamed methods on base factory that refered to Pdf and used Form as this also applies to velocity
Reoganized templates and reference data for the tests

Index: FormPrintEngineIText.java
===================================================================
RCS file: /cvsroot/jaffa/JaffaComponentsPrinting/source/java/org/jaffa/modules/printing/services/FormPrintEngineIText.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FormPrintEngineIText.java	24 Aug 2006 01:31:00 -0000	1.7
--- FormPrintEngineIText.java	26 Aug 2006 01:52:28 -0000	1.8
***************
*** 126,129 ****
--- 126,130 ----
   * a RGB color value in the format '#FFFFFF'
   * <li><b>Background</b> - Not Supported
+  * <li><b>Sample Data</b> - Will display this value in the field instead of its name in template mode
   * </ul>
   * @author PaulE
***************
*** 739,743 ****
           * @return the generated pdf as a byte array
           */
!         public byte[] getGeneratedPdf() throws FormPrintException {
              if(!isProcessed())
                  throw new IllegalStateException("The form not been processed yet");
--- 740,744 ----
           * @return the generated pdf as a byte array
           */
!         public byte[] getGeneratedForm() throws FormPrintException {
              if(!isProcessed())
                  throw new IllegalStateException("The form not been processed yet");
***************
*** 768,773 ****
           * write errors.
           */
!         public File writePdf() throws FormPrintException {
!             return writePdf(null);
          }
  
--- 769,774 ----
           * write errors.
           */
!         public File writeForm() throws FormPrintException {
!             return writeForm(null);
          }
  
***************
*** 779,783 ****
           * write errors.
           */
!         public File writePdf(File fileout) throws FormPrintException {
              if(!isProcessed())
                  throw new IllegalStateException("The form not been processed yet");
--- 780,784 ----
           * write errors.
           */
!         public File writeForm(File fileout) throws FormPrintException {
              if(!isProcessed())
                  throw new IllegalStateException("The form not been processed yet");

Index: FormPrintEngineVelocity.java
===================================================================
RCS file: /cvsroot/jaffa/JaffaComponentsPrinting/source/java/org/jaffa/modules/printing/services/FormPrintEngineVelocity.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FormPrintEngineVelocity.java	24 Jul 2006 21:31:25 -0000	1.6
--- FormPrintEngineVelocity.java	26 Aug 2006 01:52:28 -0000	1.7
***************
*** 190,195 ****
       * write errors.
       */
!     public File writePdf() throws FormPrintException {
!         return writePdf(null);
      }
  
--- 190,195 ----
       * write errors.
       */
!     public File writeForm() throws FormPrintException {
!         return writeForm(null);
      }
  
***************
*** 201,205 ****
       * write errors.
       */
!     public File writePdf(File fileout) throws FormPrintException {
          if(!isProcessed())
              throw new IllegalStateException("The form not been processed yet");
--- 201,205 ----
       * write errors.
       */
!     public File writeForm(File fileout) throws FormPrintException {
          if(!isProcessed())
              throw new IllegalStateException("The form not been processed yet");
***************
*** 223,227 ****
       * @return the generated pdf as a byte array
       */
!     public byte[] getGeneratedPdf() throws FormPrintException {
          if(!isProcessed())
              throw new IllegalStateException("The form not been processed yet");
--- 223,227 ----
       * @return the generated pdf as a byte array
       */
!     public byte[] getGeneratedForm() throws FormPrintException {
          if(!isProcessed())
              throw new IllegalStateException("The form not been processed yet");

Index: MultiFormPrintEngine.java
===================================================================
RCS file: /cvsroot/jaffa/JaffaComponentsPrinting/source/java/org/jaffa/modules/printing/services/MultiFormPrintEngine.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MultiFormPrintEngine.java	24 Jul 2006 21:31:26 -0000	1.5
--- MultiFormPrintEngine.java	26 Aug 2006 01:52:28 -0000	1.6
***************
*** 126,130 ****
       * The core method in the engine is the generate() method, it must only be
       * called once, and must be called before you call any method that
!      * accessed the generated PDF ( like writeForm() or getGeneratedPdf() )
       * 
       * @throws FormPrintException This is thrown if there is any error in generating the PDF document.
--- 126,131 ----
       * The core method in the engine is the generate() method, it must only be
       * called once, and must be called before you call any method that
!      * accessed the generated PDF ( like writeForm() or getGeneratedForm() )
!      * 
       * 
       * @throws FormPrintException This is thrown if there is any error in generating the PDF document.
***************
*** 175,179 ****
              engine.setCurrentPageOffset(pageOffset);
              engine.generate();
!             m_documents.add(engine.getGeneratedPdf());
              pageOffset+=engine.getTotalPages();
          }
--- 176,180 ----
              engine.setCurrentPageOffset(pageOffset);
              engine.generate();
!             m_documents.add(engine.getGeneratedForm());
              pageOffset+=engine.getTotalPages();
          }

Index: IFormPrintEngine.java
===================================================================
RCS file: /cvsroot/jaffa/JaffaComponentsPrinting/source/java/org/jaffa/modules/printing/services/IFormPrintEngine.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** IFormPrintEngine.java	17 Aug 2006 02:27:37 -0000	1.5
--- IFormPrintEngine.java	26 Aug 2006 01:52:28 -0000	1.6
***************
*** 83,87 ****
       * The core method in the engine is the generate() method, it must only be
       * called once, and must be called before you call any method that
!      * accessed the generated PDF ( like writePdf() or getGeneratedPdf() )
       * @throws FormPrintException This is thrown if there is any error in generating the PDF document.
       * The details will be in the message text
--- 83,89 ----
       * The core method in the engine is the generate() method, it must only be
       * called once, and must be called before you call any method that
!      * accessed the generated PDF ( like writeForm() or getGeneratedForm() )
!      * 
!      * 
       * @throws FormPrintException This is thrown if there is any error in generating the PDF document.
       * The details will be in the message text
***************
*** 106,110 ****
       * call has to also generate the form)
       */
!     public byte[] getGeneratedPdf() throws FormPrintException;
  
      /**
--- 108,112 ----
       * call has to also generate the form)
       */
!     public byte[] getGeneratedForm() throws FormPrintException;
  
      /**
***************
*** 118,122 ****
       * call has to also generate the form)
       */
!     public File writePdf() throws FormPrintException;
  
      /**
--- 120,124 ----
       * call has to also generate the form)
       */
!     public File writeForm() throws FormPrintException;
  
      /**
***************
*** 129,133 ****
       * call has to also generate the form)
       */
!     public File writePdf(File fileout) throws FormPrintException;
  
  
--- 131,135 ----
       * call has to also generate the form)
       */
!     public File writeForm(File fileout) throws FormPrintException;
  
  

Index: FormPrintEnginePdfLib.java
===================================================================
RCS file: /cvsroot/jaffa/JaffaComponentsPrinting/source/java/org/jaffa/modules/printing/services/FormPrintEnginePdfLib.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FormPrintEnginePdfLib.java	17 Aug 2006 02:27:37 -0000	1.2
--- FormPrintEnginePdfLib.java	26 Aug 2006 01:52:28 -0000	1.3
***************
*** 328,332 ****
       * @return the generated pdf as a byte array
       */
!     public byte[] getGeneratedPdf() throws FormPrintException {
          if(!isProcessed())
              throw new IllegalStateException("The form not been processed yet");
--- 328,332 ----
       * @return the generated pdf as a byte array
       */
!     public byte[] getGeneratedForm() throws FormPrintException {
          if(!isProcessed())
              throw new IllegalStateException("The form not been processed yet");
***************
*** 347,352 ****
       * write errors.
       */
!     public File writePdf() throws FormPrintException {
!         return writePdf(null);
      }
  
--- 347,352 ----
       * write errors.
       */
!     public File writeForm() throws FormPrintException {
!         return writeForm(null);
      }
  
***************
*** 358,362 ****
       * write errors.
       */
!     public File writePdf(File fileout) throws FormPrintException {
          if(!isProcessed())
              throw new IllegalStateException("The form not been processed yet");
--- 358,362 ----
       * write errors.
       */
!     public File writeForm(File fileout) throws FormPrintException {
          if(!isProcessed())
              throw new IllegalStateException("The form not been processed yet");
***************
*** 366,370 ****
--- 366,373 ----
              OutputStream bos = new FileOutputStream(fileout);
              bos.write(m_pdf.get_buffer());
+             bos.flush();
              bos.close();
+             if(log.isDebugEnabled())
+                 log.debug("PDFLib wrote out form " + fileout.getAbsolutePath());
          } catch (IOException e) {
              log.error("Error Reading Uploaded File", e);

[Jaffa-cvs] JaffaComponentsPrinting/source/java/org/jaffa/modules/printing/services FormPrintEngin

JAFFA is a Rich Web 2.0 POJO based Event-Driven SOA framework

[Jaffa-cvs] JaffaComponentsPrinting/source/java/org/jaffa/modules/printing/services FormPrintEngineIText.java, 1.7, 1.8 FormPrintEnginePdfLib.java, 1.2, 1.3 FormPrintEngineVelocity.java, 1.6, 1.7 IFormPrintEngine.java, 1.5, 1.6 MultiFormPrintEngine.java, 1.5, 1.6