* [ 1658530 ] Remove jPDF dependency

print/.classpath

@@ -7,6 +7,7 @@
 	<classpathentry kind="src" path="/looks"/>
 	<classpathentry kind="lib" path="/tools/lib/barbecue-1.0.6d.jar"/>
 	<classpathentry kind="lib" path="/lib/CCTools.jar"/>
-	<classpathentry kind="lib" path="/lib/jPDF.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/itext-1.4.8.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/jpedal.jar"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>

print/build.xml

@@ -25,9 +25,10 @@
     <pathelement path="../lib/CCTools.jar"/>
     <pathelement path="../looks/CLooks.jar"/>
     <pathelement path="../dbPort/dbPort.jar"/>
-    <pathelement path="../lib/freepdf.jar"/>
     <pathelement path="../lib/customization.jar"/>
     <pathelement path="../lib/patches.jar"/>
+	<pathelement path="../tools/lib/jpedal.jar"/>
+	<pathelement path="../tools/lib/itext-1.4.8.jar"/>
   </path>
 
 

print/src/org/adempiere/pdf/Document.java

@@ -0,0 +1,112 @@
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution                        *
+ * Copyright (C) 1999-2006 Adempiere, Inc. All Rights Reserved.                *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.adempiere.pdf;
+
+import java.awt.Graphics2D;
+import java.awt.print.PageFormat;
+import java.awt.print.Pageable;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+
+import org.adempiere.pdf.viewer.PDFViewerBean;
+
+import com.lowagie.text.FontFactory;
+import com.lowagie.text.Rectangle;
+import com.lowagie.text.pdf.DefaultFontMapper;
+import com.lowagie.text.pdf.PdfContentByte;
+import com.lowagie.text.pdf.PdfTemplate;
+import com.lowagie.text.pdf.PdfWriter;
+
+/**
+ * Generate PDF document using iText
+ * @author Low Heng Sin
+ *
+ */
+public class Document {
+
+	private static void writePDF(Pageable pageable, OutputStream output)
+	{
+		try {
+            final PageFormat pf = pageable.getPageFormat(0);
+            
+            final com.lowagie.text.Document document =
+            	new com.lowagie.text.Document(new Rectangle(
+            			(int) pf.getWidth(), (int) pf.getHeight()));
+            final PdfWriter writer = PdfWriter.getInstance(
+                    document, output);
+            writer.setPdfVersion(PdfWriter.VERSION_1_2);
+            document.open();
+            final DefaultFontMapper mapper = new DefaultFontMapper();
+            FontFactory.registerDirectories();
+            final float w = (float) pf.getWidth();
+            final float h = (float) pf.getHeight();
+            final PdfContentByte cb = writer.getDirectContent();
+            for (int page = 0; page < pageable.getNumberOfPages(); page++) {
+            	if (page != 0) {
+            		document.newPage();
+            	}
+            	
+	            final PdfTemplate tp = cb.createTemplate(w, h);
+	            final Graphics2D g2 = tp.createGraphics(w, h, mapper);
+	            tp.setWidth(w);
+	            tp.setHeight(h);
+	            pageable.getPrintable(page).print(g2, pf, page);
+	            g2.dispose();
+	            cb.addTemplate(tp, 0, 0);
+            }
+            document.close();
+            
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+	}
+	
+	public static File getPDFAsFile(String filename, Pageable pageable) {
+        final File result = new File(filename);
+        
+        try {
+        	writePDF(pageable, new FileOutputStream(result));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        
+        return result;
+    }
+    
+    public static byte[] getPDFAsArray(Pageable pageable) {
+        try {
+            ByteArrayOutputStream output = new ByteArrayOutputStream(10240);
+            writePDF(pageable, output);
+            return output.toByteArray();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } 
+
+        return null;
+    }
+    
+    public static PDFViewerBean getViewer() {
+    	return new PDFViewerBean();
+    }
+    
+    public static boolean isValid(Pageable layout) {
+    	return true;
+    }
+    
+    public static boolean isLicensed() {
+    	return true;
+    }    
+}

print/src/org/adempiere/pdf/viewer/PDFViewerBean.java

@@ -0,0 +1,551 @@
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution                        *
+ * Copyright (C) 1999-2006 Adempiere, Inc. All Rights Reserved.                *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
+package org.adempiere.pdf.viewer;
+
+import java.awt.*;
+import java.awt.event.*;
+import java.awt.image.*;
+import java.awt.print.*;
+import java.io.*;
+
+import javax.swing.*;
+import javax.swing.filechooser.FileFilter;
+
+import org.jpedal.*;
+
+/**
+ * PDF Viewer using jpedal
+ * @author Low Heng Sin
+ *
+ */
+public class PDFViewerBean extends JPanel {
+    private static final long serialVersionUID = 1L;
+    
+    private final PdfDecoder decoder = new PdfDecoder();
+    private final JScrollPane center = new JScrollPane(decoder);
+    private final JTextField pageField = new JTextField(2);
+    private final JLabel pageCountLabel = new JLabel("00");
+    private final JComboBox rotationSelect = new JComboBox(new String[] {
+            "0", "90", "180", "270"});
+    private final JComboBox zoomSelect;
+    private final float[] zoomFactors = new float[] {
+            0.25f, 0.33f, 0.50f, 0.75f, 1.00f, 1.50f, 2.00f, 4.00f, 8.00f};
+
+    private final Action printAction = new AbstractAction() {
+        private static final long serialVersionUID = 1L;
+
+        public void actionPerformed(ActionEvent e) {
+            print();
+        }
+    };
+    
+    private final Action saveAction = new AbstractAction() {
+        private static final long serialVersionUID = 1L;
+
+        public void actionPerformed(ActionEvent e) {
+            save();
+        }
+    };
+    
+    private final Action goFirstAction = new AbstractAction() {
+        private static final long serialVersionUID = 1L;
+
+        public void actionPerformed(ActionEvent e) {
+            goFirst();
+        }
+    };
+    
+    private final Action goPreviousAction = new AbstractAction() {
+        private static final long serialVersionUID = 1L;
+
+        public void actionPerformed(ActionEvent e) {
+            goPrevious();
+        }
+    };
+    
+    private final Action goNextAction = new AbstractAction() {
+        private static final long serialVersionUID = 1L;
+
+        public void actionPerformed(ActionEvent e) {
+            goNext();
+        }
+    };
+    
+    private final Action goLastAction = new AbstractAction() {
+        private static final long serialVersionUID = 1L;
+
+        public void actionPerformed(ActionEvent e) {
+            goLast();
+        }
+    };
+
+    private final Action zoomInAction = new AbstractAction() {
+        private static final long serialVersionUID = 1L;
+
+        public void actionPerformed(ActionEvent e) {
+            zoomIn();
+        }
+    };
+
+    private final Action zoomOutAction = new AbstractAction() {
+        private static final long serialVersionUID = 1L;
+
+        public void actionPerformed(ActionEvent e) {
+            zoomOut();
+        }
+    };
+
+    private final Action rotateCClockAction = new AbstractAction() {
+        private static final long serialVersionUID = 1L;
+
+        public void actionPerformed(ActionEvent e) {
+            rotateCClock();
+        }
+    };
+
+    private final Action rotateClockAction = new AbstractAction() {
+        private static final long serialVersionUID = 1L;
+
+        public void actionPerformed(ActionEvent e) {
+            rotateClock();
+        }
+    };
+
+    private String filename;
+    private int currentPage = 1;
+    private int scaleStep = 3;
+    private int rotation = 0;
+
+	private File tmpFile = null;
+
+    public PDFViewerBean() {
+        final String[] zoomLabels = new String[zoomFactors.length];
+        for (int i = 0; i < zoomFactors.length; i++) {
+            zoomLabels[i] = Integer.toString((int) (zoomFactors[i] * 100));
+        }
+        zoomSelect = new JComboBox(zoomLabels);
+        
+        zoomSelect.addActionListener(new ActionListener() {
+            private boolean isAdjusting = false;
+            public void actionPerformed(ActionEvent e) {
+                if (isAdjusting) {
+                    return;
+                }
+                isAdjusting = true;
+                try {
+                    setScaleStep(zoomSelect.getSelectedIndex());
+                } finally {
+                    isAdjusting = false;
+                }
+            }
+        });
+        
+        rotationSelect.addActionListener(new ActionListener() {
+            private boolean isAdjusting = false;
+            public void actionPerformed(ActionEvent e) {
+                if (isAdjusting) {
+                    return;
+                }
+                isAdjusting = true;
+                try {
+                    setRotation(rotationSelect.getSelectedIndex() * 90);
+                } finally {
+                    isAdjusting = false;
+                }
+            }
+        });
+        
+        setLayout(new BorderLayout());
+        createToolBar();
+        add(BorderLayout.CENTER, center);
+        pageField.addFocusListener(new FocusAdapter() {        
+            public void focusGained(FocusEvent e) {
+                pageField.selectAll();
+            }
+        });
+        pageField.setHorizontalAlignment(SwingConstants.TRAILING);
+        pageField.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                setCurrentPage(Integer.parseInt(pageField.getText()));
+            }
+        });
+        
+        setPreferredSize(new Dimension(480, 0));
+    }
+    
+    public void setRotation(int rotation) {
+        this.rotation = rotation;
+        rotationSelect.setSelectedIndex(rotation / 90);
+        updateZoomRotate();
+    }
+
+    public void goFirst() {
+        setCurrentPage(1);
+    }
+
+    public void goPrevious() {
+        setCurrentPage(currentPage - 1);
+    }
+
+    public void goNext() {
+        setCurrentPage(currentPage + 1);
+    }
+
+    public void goLast() {
+        setCurrentPage(decoder.getPageCount());
+    }
+    
+    public void setCurrentPage(int page) {
+        if (page < 1 || page > decoder.getPageCount()) {
+            return;
+        }
+        
+        final Cursor oldCursor = getCursor();
+        try {
+            setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+            decoder.setPageParameters(zoomFactors[scaleStep], page);
+            decoder.decodePage(page);
+            setRotation(decoder.getPdfPageData().getRotation(page));
+            currentPage = page;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return;
+        } finally {
+            setCursor(oldCursor);
+        }
+        
+        goFirstAction.setEnabled(currentPage > 1);
+        goPreviousAction.setEnabled(currentPage > 1);
+        goNextAction.setEnabled(currentPage < decoder.getPageCount());
+        goLastAction.setEnabled(currentPage < decoder.getPageCount());
+        
+        pageField.setText(Integer.toString(currentPage));
+    }
+    
+    public void zoomIn() {
+        setScaleStep(scaleStep + 1);
+    }
+    
+    public void zoomOut() {
+        setScaleStep(scaleStep - 1);
+    }
+    
+    public void rotateCClock() {
+        rotationSelect.setSelectedIndex(
+                (rotationSelect.getSelectedIndex() + 3) % 4);
+    }
+    
+    public void rotateClock() {
+        rotationSelect.setSelectedIndex(
+                (rotationSelect.getSelectedIndex() + 1) % 4);
+    }
+    
+    public void save() {
+        final JFileChooser fc = new JFileChooser();
+        fc.setFileFilter(new FileFilter() {
+        
+            public String getDescription() {
+                return "PDF File";
+            }
+        
+            public boolean accept(File f) {
+                return f.isDirectory()
+                    || f.getName().toLowerCase().endsWith(".pdf");
+            }
+        
+        });
+        
+        if (fc.showSaveDialog(this) != JFileChooser.APPROVE_OPTION) {
+            return;
+        }
+        
+        File targetFile = fc.getSelectedFile();
+        if (!targetFile.getName().toLowerCase().endsWith(".pdf")) {
+            targetFile =
+                new File(targetFile.getParentFile(), targetFile.getName() + ".pdf");
+        }
+        if (targetFile.exists()) {
+            if (JOptionPane.showConfirmDialog(this,
+                                              "Do you want to overwrite the file?")
+                != JOptionPane.YES_OPTION) {
+                return;
+            }
+        }
+        
+        try {
+            final InputStream is = new FileInputStream(filename);
+            try {
+                final OutputStream os = new FileOutputStream(targetFile);
+                try {
+                    final byte[] buffer = new byte[32768];
+                    for (int read; (read = is.read(buffer)) != -1; ) {
+                        os.write(buffer, 0, read);
+                    }
+                } finally {
+                    os.close();
+                }
+            } finally {
+                is.close();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void print() {
+        PrinterJob printJob = PrinterJob.getPrinterJob();
+        //decoder.enableScaledPrinting(false);
+        printJob.setPageable(decoder);
+        final PageFormat pf = printJob.defaultPage();
+        decoder.setPageFormat(pf);
+        decoder.setTextPrint(PdfDecoder.TEXTGLYPHPRINT);
+        printJob.setPrintable(decoder, pf);
+        if (printJob.printDialog()) {
+            final Cursor oldCursor = getCursor();
+            try {
+                setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+                printJob.print();
+            } catch (PrinterException e) {
+                e.printStackTrace();
+            } finally {
+                setCursor(oldCursor);
+            }
+        }
+    }
+
+    protected void createToolBar() {
+        final JToolBar bar = new JToolBar();
+        
+        bar.add(createActionButton(printAction,
+                                   null,
+                                   "22x22/document-print.png",
+                                   "Print document"));
+        bar.add(createActionButton(saveAction,
+                                   null,
+                                   "22x22/document-save.png",
+                                   "Save document"));
+        
+        //bar.addSeparator(new Dimension(10,0));
+        
+        bar.add(createActionButton(goFirstAction,
+                                   null,
+                                   "22x22/go-first.png",
+                                   "First page"));
+        bar.add(createActionButton(goPreviousAction,
+                                   null,
+                                   "22x22/go-previous.png",
+                                   "Previos page"));
+        final JPanel pagePanel = createToolbarItemPanel(pageField);
+        
+        bar.add(pagePanel);
+        //bar.add(new JLabel("/"));
+        //bar.add(pageCountLabel);
+        bar.add(createActionButton(goNextAction,
+                                   null,
+                                   "22x22/go-next.png",
+                                   "Next page"));
+        bar.add(createActionButton(goLastAction,
+                                   null,
+                                   "22x22/go-last.png",
+                                   "Last page"));
+        
+        //bar.addSeparator(new Dimension(10,0));
+        
+        bar.add(createActionButton(zoomOutAction,
+                                   null,
+                                   "22x22/zoom-out.png",
+                                   "Next page"));
+        bar.add(createToolbarItemPanel(zoomSelect));
+        bar.add(createActionButton(zoomInAction,
+                                   null,
+                                   "22x22/zoom-in.png",
+                                   "Next page"));
+        
+        //bar.addSeparator(new Dimension(10,0));
+        
+        bar.add(createActionButton(rotateCClockAction,
+                                   null,
+                                   "22x22/rotate-cclock.png",
+                                   "Next page"));
+        bar.add(createToolbarItemPanel(rotationSelect));
+        bar.add(createActionButton(rotateClockAction,
+                                   null,
+                                   "22x22/rotate-clock.png",
+                                   "Next page"));
+        
+        bar.setFloatable(false);
+        add(BorderLayout.NORTH, bar);
+    }
+
+    protected JPanel createToolbarItemPanel(JComponent component) {
+        final JPanel pagePanel = new JPanel(new GridBagLayout());
+        pagePanel.add(component);
+        pagePanel.setMaximumSize(pagePanel.getPreferredSize());
+        return pagePanel;
+    }
+    
+    public void loadPDF(String filename) {
+        this.filename = filename;
+        try {
+        	decoder.closePdfFile();
+            decoder.openPdfFile(filename);
+            pageCountLabel.setText(decoder.getPageCount() + " ");
+            setCurrentPage(1);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    
+    protected JButton createActionButton(Action action,
+                                         String text,
+                                         String image,
+                                         String tooltip) {
+        final ImageIcon icon =
+            new ImageIcon(getClass().getResource(image));
+        final double colorFactor = 0.9;
+        
+        final RGBImageFilter filter = new RGBImageFilter() {
+            public int filterRGB(int x, int y, int rgb) {
+                final int alpha = (rgb >> 24) & 0xff;
+                final int red   = (rgb >> 16) & 0xff;
+                final int green = (rgb >>  8) & 0xff;
+                final int blue  = (rgb      ) & 0xff;
+                return ((int) (alpha * colorFactor) << 24)
+                     | ((int) (red   * colorFactor) << 16)
+                     | ((int) (green * colorFactor) << 8)
+                     | ((int) (blue  * colorFactor));
+            }
+        };
+        
+        final ImageIcon darkerIcon = new ImageIcon(
+                Toolkit.getDefaultToolkit().createImage(
+                        new FilteredImageSource(icon.getImage().getSource(),
+                                                filter)));
+        final JButton result = new JButton();
+        result.setAction(action);
+        result.setText(text);
+        result.setIcon(darkerIcon);
+        result.setBorderPainted(false);
+        result.setHorizontalTextPosition(SwingConstants.CENTER);
+        result.setVerticalTextPosition(SwingConstants.BOTTOM);
+        result.setMnemonic(0);
+        result.setToolTipText(tooltip);
+
+        final Dimension dim = result.getPreferredSize();
+        result.setMaximumSize(new Dimension(32, dim.height));
+
+        result.addMouseListener(new MouseAdapter() {
+            public void mouseEntered(MouseEvent me) {
+                result.setBorderPainted(true);
+                result.setIcon(icon);
+            }
+            public void mouseExited(MouseEvent me) {
+                result.setBorderPainted(false);
+                result.setIcon(darkerIcon);
+            }
+        });
+        
+        result.setBorderPainted(false);
+        result.setFocusPainted(false);
+
+        return result;
+    }
+
+    public int getCurrentPage() {
+        return currentPage;
+    }
+    
+    public void clearDocument() {
+    	decoder.closePdfFile();
+    	if (tmpFile != null) {
+    		tmpFile.delete();
+    		tmpFile = null;
+    	}
+    }
+    
+    public void setScaleStep(int scaleStep) {
+        if (scaleStep < 0 || zoomFactors.length <= scaleStep) {
+            return;
+        }
+        
+        this.scaleStep = scaleStep;
+        zoomSelect.setSelectedIndex(scaleStep);
+        updateZoomRotate();
+    }
+
+    protected void updateZoomRotate() {
+        final Cursor oldCursor = getCursor();
+        try {
+            setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+            decoder.setPageParameters(zoomFactors[scaleStep],
+                                      currentPage,
+                                      rotation);
+            decoder.invalidate();
+            decoder.repaint();
+            zoomInAction.setEnabled(scaleStep < zoomFactors.length - 1);
+            zoomOutAction.setEnabled(scaleStep > 0);
+        } finally {
+            setCursor(oldCursor);
+        }
+    }
+
+    public void setScale(int percent) {
+        int step;
+        for (step = 0; step < zoomFactors.length - 1; step++) {
+            if (zoomFactors[step] * 100 >= percent) {
+                break;
+            }
+        }
+    	setScaleStep(step);
+    }
+    
+    public void loadPDF(InputStream is) {
+    	if (tmpFile != null) {
+    		tmpFile.delete();
+    	}
+    	
+        try {
+            tmpFile = File.createTempFile("compiere", ".pdf");
+            tmpFile.deleteOnExit();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return;
+        }
+        
+        try {
+			final OutputStream os = new FileOutputStream(tmpFile);
+            try {
+                final byte[] buffer = new byte[32768];
+                for (int read; (read = is.read(buffer)) != -1; ) {
+                    os.write(buffer, 0, read);
+                }
+            } catch (IOException e) {
+				e.printStackTrace();
+			} finally {
+                os.close();
+            }
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		
+		loadPDF(tmpFile.getAbsolutePath());
+    }
+
+	protected void finalize() throws Throwable {
+    	if (tmpFile != null) {
+    		tmpFile.delete();
+    	}
+    	decoder.closePdfFile();
+	}
+}

print/src/org/compiere/print/ArchiveEngine.java

@@ -20,8 +20,7 @@ import java.awt.print.*;
 import org.compiere.model.*;
 import org.compiere.print.layout.*;
 import org.compiere.util.*;
-import com.qoppa.pdf.*;
-import com.qoppa.pdfProcess.*;
+import org.adempiere.pdf.*;
 
 
 /**
@@ -44,7 +43,7 @@ public class ArchiveEngine
 	 * 	@return existing document or newly created if Client enabled archiving. 
 	 * 	Will return NULL if archiving not enabled
 	 */ 
-	public PDFDocument archive (LayoutEngine layout, PrintInfo info)
+	public byte[] archive (LayoutEngine layout, PrintInfo info)
 	{
 		//	Do we need to Archive ?
 		MClient client = MClient.get(layout.getCtx());
@@ -86,7 +85,7 @@ public class ArchiveEngine
 		archive.setBinaryData(data);
 		archive.save();
 		
-		return null;
+		return data;
 	}	//	archive
 	
 	/**

print/src/org/compiere/print/ReportEngine.java

@@ -33,7 +33,7 @@ import org.compiere.model.*;
 import org.compiere.print.layout.*;
 import org.compiere.process.*;
 import org.compiere.util.*;
-import com.qoppa.pdf.*;
+import org.adempiere.pdf.*;
 
 /**
  *	Report Engine.