[seam-commits] Seam SVN: r8315 - trunk/ui/src/main/java/org/jboss/seam/ui/graphicImage and 1 other directory.

Author: pete.muir(a)jboss.org Date: 2008-06-02 06:47:51 -0400 (Mon, 02 Jun 2008) New Revision: 8315 Modified: branches/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java trunk/ui/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java Log: Oops, wrong branch for JBSEAM-2517 Modified: branches/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java =================================================================== --- branches/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java 2008-06-02 10:35:00 UTC (rev 8314) +++ branches/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java 2008-06-02 10:47:51 UTC (rev 8315) @@ -46,14 +46,10 @@ extension = image.getContentType().getExtension(); writer.startElement(HTML.IMG_ELEM, graphicImage); - if (graphicImage.getId() != null) - { - writer.writeAttribute(HTML.ID_ATTR, graphicImage.getClientId(context), HTML.ID_ATTR); - } - String url = context.getExternalContext().getRequestContextPath() + GraphicImageResource.GRAPHIC_IMAGE_RESOURCE_PATH + "/" + key + extension; writer.writeAttribute(HTML.SRC_ATTR, url, HTML.SRC_ATTR); + HTML.renderHTMLAttributes(writer, component, HTML.IMG_PASSTHROUGH_ATTRIBUTES); writer.endElement(HTML.IMG_ELEM); } Modified: trunk/ui/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java =================================================================== --- trunk/ui/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java 2008-06-02 10:35:00 UTC (rev 8314) +++ trunk/ui/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java 2008-06-02 10:47:51 UTC (rev 8315) @@ -46,10 +46,14 @@ extension = image.getContentType().getExtension(); writer.startElement(HTML.IMG_ELEM, graphicImage); + if (graphicImage.getId() != null) + { + writer.writeAttribute(HTML.ID_ATTR, graphicImage.getClientId(context), HTML.ID_ATTR); + } + String url = context.getExternalContext().getRequestContextPath() + GraphicImageResource.GRAPHIC_IMAGE_RESOURCE_PATH + "/" + key + extension; writer.writeAttribute(HTML.SRC_ATTR, url, HTML.SRC_ATTR); - HTML.renderHTMLAttributes(writer, component, HTML.IMG_PASSTHROUGH_ATTRIBUTES); writer.endElement(HTML.IMG_ELEM); }