Author: pete.muir(a)jboss.org Date: 2008-08-30 07:55:40 -0400 (Sat, 30 Aug 2008) New Revision: 8855 Modified: trunk/src/pdf/org/jboss/seam/pdf/ui/ITextComponent.java trunk/src/pdf/org/jboss/seam/pdf/ui/UIBarCode.java trunk/src/pdf/org/jboss/seam/pdf/ui/UIField.java trunk/src/pdf/org/jboss/seam/pdf/ui/UIForm.java trunk/src/pdf/org/jboss/seam/pdf/ui/UIImage.java Log: JBSEAM-3356 Modified: trunk/src/pdf/org/jboss/seam/pdf/ui/ITextComponent.java =================================================================== --- trunk/src/pdf/org/jboss/seam/pdf/ui/ITextComponent.java 2008-08-29 22:09:12 UTC (rev 8854) +++ trunk/src/pdf/org/jboss/seam/pdf/ui/ITextComponent.java 2008-08-30 11:55:40 UTC (rev 8855) @@ -15,6 +15,7 @@ import com.lowagie.text.Chunk; import com.lowagie.text.Document; +import com.lowagie.text.DocumentException; import com.lowagie.text.Font; import com.lowagie.text.xml.simpleparser.EntitiesToUnicode; @@ -33,8 +34,10 @@ /** * signal that the component should create it's managed object + * @throws IOException + * @throws DocumentException */ - abstract public void createITextObject(FacesContext context); + abstract public void createITextObject(FacesContext context) throws IOException, DocumentException; /** * remove the itext objext @@ -178,7 +181,14 @@ public void encodeBegin(FacesContext context) throws IOException { - createITextObject(context); + try + { + createITextObject(context); + } + catch (DocumentException e) + { + throw new FacesException(e); + } } @Override @@ -234,8 +244,7 @@ @SuppressWarnings("unchecked") public void encode(FacesContext context, UIComponent component) - throws IOException, - FacesException + throws IOException { if (!component.isRendered()) { return; Modified: trunk/src/pdf/org/jboss/seam/pdf/ui/UIBarCode.java =================================================================== --- trunk/src/pdf/org/jboss/seam/pdf/ui/UIBarCode.java 2008-08-29 22:09:12 UTC (rev 8854) +++ trunk/src/pdf/org/jboss/seam/pdf/ui/UIBarCode.java 2008-08-30 11:55:40 UTC (rev 8855) @@ -204,7 +204,7 @@ } @Override - public void createITextObject(FacesContext context) { + public void createITextObject(FacesContext context) throws IOException { barcode = createBarcodeType(getType()); barcode.setCode(getCode()); @@ -253,12 +253,8 @@ if (bars == null) { bars = Color.BLACK; } - try { - byte[] imageData = imageToByteArray(barcode.createAwtImage(bars, Color.WHITE)); - itextObject = new ImageWrapper(imageData, Type.IMAGE_JPEG); - } catch (IOException e) { - throw new RuntimeException(e); - } + byte[] imageData = imageToByteArray(barcode.createAwtImage(bars, Color.WHITE)); + itextObject = new ImageWrapper(imageData, Type.IMAGE_JPEG); } } Modified: trunk/src/pdf/org/jboss/seam/pdf/ui/UIField.java =================================================================== --- trunk/src/pdf/org/jboss/seam/pdf/ui/UIField.java 2008-08-29 22:09:12 UTC (rev 8854) +++ trunk/src/pdf/org/jboss/seam/pdf/ui/UIField.java 2008-08-30 11:55:40 UTC (rev 8855) @@ -2,6 +2,7 @@ import java.io.IOException; +import javax.faces.FacesException; import javax.faces.context.FacesContext; import org.jboss.seam.contexts.Contexts; @@ -28,7 +29,7 @@ catch (DocumentException e) { String message = Interpolator.instance().interpolate("Could not set field #0 to #1", getName(), getValue()); - throw new IOException(message); + throw new FacesException(message, e); } } Modified: trunk/src/pdf/org/jboss/seam/pdf/ui/UIForm.java =================================================================== --- trunk/src/pdf/org/jboss/seam/pdf/ui/UIForm.java 2008-08-29 22:09:12 UTC (rev 8854) +++ trunk/src/pdf/org/jboss/seam/pdf/ui/UIForm.java 2008-08-30 11:55:40 UTC (rev 8855) @@ -4,6 +4,7 @@ import java.io.IOException; import java.net.URL; +import javax.faces.FacesException; import javax.faces.context.FacesContext; import org.jboss.seam.contexts.Contexts; @@ -23,7 +24,6 @@ public class UIForm extends FormComponent { public static final String COMPONENT_FAMILY = "org.jboss.seam.pdf.UIForm"; - private static final String CONTENT_TYPE = "application/pdf"; private Log log = Logging.getLog(getClass()); @@ -55,7 +55,7 @@ } catch (DocumentException e) { - throw new IOException("Could not create PDF stamper"); + throw new FacesException("Could not create PDF stamper", e); } fields = stamper.getAcroFields(); Contexts.getEventContext().set(FIELDS_KEY, fields); @@ -71,7 +71,7 @@ } catch (DocumentException e) { - throw new IOException("Could not flush PDF"); + throw new FacesException("Could not flush PDF", e); } String viewId = Pages.getViewId(facesContext); Modified: trunk/src/pdf/org/jboss/seam/pdf/ui/UIImage.java =================================================================== --- trunk/src/pdf/org/jboss/seam/pdf/ui/UIImage.java 2008-08-29 22:09:12 UTC (rev 8854) +++ trunk/src/pdf/org/jboss/seam/pdf/ui/UIImage.java 2008-08-30 11:55:40 UTC (rev 8855) @@ -9,7 +9,7 @@ import org.jboss.seam.pdf.ITextUtils; import org.jboss.seam.ui.graphicImage.ImageTransform; -import com.lowagie.text.BadElementException; +import com.lowagie.text.DocumentException; import com.lowagie.text.Image; public class UIImage @@ -117,32 +117,26 @@ @SuppressWarnings("unchecked") @Override - public void createITextObject(FacesContext context) { + public void createITextObject(FacesContext context) throws IOException, DocumentException { value = valueBinding(context, "value", value); // instance() doesn't work here - we need a new instance - org.jboss.seam.ui.graphicImage.Image seamImage = new org.jboss.seam.ui.graphicImage.Image(); - try { - if (value instanceof BufferedImage) { - seamImage.setBufferedImage((BufferedImage)value); - } else { - seamImage.setInput(value); - } + org.jboss.seam.ui.graphicImage.Image seamImage = new org.jboss.seam.ui.graphicImage.Image(); + if (value instanceof BufferedImage) { + seamImage.setBufferedImage((BufferedImage)value); + } else { + seamImage.setInput(value); + } - for (UIComponent cmp : this.getChildren()) { - if (cmp instanceof ImageTransform) { - ImageTransform imageTransform = (ImageTransform) cmp; - imageTransform.applyTransform(seamImage); - } - } + for (UIComponent cmp : this.getChildren()) { + if (cmp instanceof ImageTransform) { + ImageTransform imageTransform = (ImageTransform) cmp; + imageTransform.applyTransform(seamImage); + } + } - byte[] data = seamImage.getImage(); - image = Image.getInstance(data); - } catch (IOException e) { - throw new RuntimeException(e); - } catch (BadElementException e) { - throw new RuntimeException(e); - } + byte[] data = seamImage.getImage(); + image = Image.getInstance(data); rotation = (Float) valueBinding(context, "rotation", rotation);