Author: amarkhel Date: 2008-10-15 05:52:22 -0400 (Wed, 15 Oct 2008) New Revision: 10761 Added: trunk/framework/test/src/main/java/org/ajax4jsf/tests/TestFileUtils.java Modified: trunk/framework/impl/src/test/resources/WEB-INF/web.xml trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx trunk/ui/combobox/src/main/templates/combobox.jspx trunk/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxStatusRendererTest.java trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/MediaOutputRendererTest.java trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractDefinitionListRenderer.java trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java trunk/ui/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java trunk/ui/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx trunk/ui/hotKey/src/main/templates/org/richfaces/htmlHotKey.jspx trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java trunk/ui/paint2D/src/main/config/component/paint2D.xml trunk/ui/paint2D/src/test/java/org/richfaces/component/Paint2DTest.java trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java trunk/ui/spacer/src/test/java/org/richfaces/component/SpacerComponentTest.java trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java trunk/ui/tabPanel/src/main/templates/tab.jspx trunk/ui/tabPanel/src/main/templates/tabHeader.jspx trunk/ui/tabPanel/src/main/templates/tabPanel.jspx trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java trunk/ui/tree/src/main/templates/htmlTreeNode.jspx Log: Fix bug RF-2229 Modified: trunk/framework/impl/src/test/resources/WEB-INF/web.xml =================================================================== --- trunk/framework/impl/src/test/resources/WEB-INF/web.xml 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/framework/impl/src/test/resources/WEB-INF/web.xml 2008-10-15 09:52:22 UTC (rev 10761) @@ -15,7 +15,53 @@ <filter> <filter-name>foo</filter-name> <filter-class>org.ajax4jsf.Filter</filter-class> - </filter> + </filter> + <filter> + <description>Convert HTML to XML</description> + <display-name>Filter</display-name> + <filter-name>A4J</filter-name> + <filter-class>org.ajax4jsf.Filter</filter-class> + <init-param> + <param-name>publicid</param-name> + <param-value>-//W3C//DTD XHTML 1.0 Transitional//EN</param-value> + </init-param> + <init-param> + <param-name>systemid</param-name> + <param-value>http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd<... + </init-param> + <init-param> + <param-name>namespace</param-name> + <param-value>http://www.w3.org/1999/xhtml</param-value> + </init-param> + <init-param> + <param-name>forceparser</param-name> + <param-value>true</param-value> + </init-param> + <init-param> + <param-name>rewriteid</param-name> + <param-value>false</param-value> + </init-param> + <init-param> + <param-name>mime-type</param-name> + <param-value>text/xml</param-value> + </init-param> + <init-param> + <param-name>log4j-init-file</param-name> + <param-value>WEB-INF/log4j.xml</param-value> + </init-param> + <init-param> + <param-name>enable-cache</param-name> + <param-value>true</param-value> + </init-param> + </filter> + <filter-mapping> + <filter-name>A4J</filter-name> + <url-pattern>*.jsf</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>A4J</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> <filter-mapping> <filter-name>foo</filter-name> <servlet-name>Faces Servlet</servlet-name> Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -29,9 +29,15 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintStream; +import java.io.RandomAccessFile; import java.lang.reflect.Field; import java.net.MalformedURLException; import java.net.URL; +import java.nio.channels.FileChannel; +import java.nio.channels.FileLock; +import java.nio.channels.OverlappingFileLockException; import java.util.ArrayList; import java.util.Collections; import java.util.Enumeration; @@ -60,6 +66,7 @@ import javax.servlet.http.HttpServletResponse; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.context.AjaxContextImpl; @@ -112,6 +119,8 @@ */ public class AbstractAjax4JsfTestCase extends AbstractJsfTestCase { + + private static final String IMAGE_NOT_FOUND_OR_UNAVAILABLE_MESSAGE = "Image not found or unavailable"; private static final String RESOURCE_NOT_FOUND_MESSAGE = "Resource not found"; @@ -136,7 +145,6 @@ */ public AbstractAjax4JsfTestCase(String name) { super(name); - // TODO Auto-generated constructor stub } /* (non-Javadoc) @@ -614,62 +622,26 @@ HtmlPage htmlPage = processResponseWriter(); - /* https://jira.jboss.org/jira/browse/RF-2229 - DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); - documentBuilderFactory.setValidating(true); - DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); - - documentBuilder.setEntityResolver(new EntityResolverImpl()); - - final List<String> messagesList = new ArrayList<String>(); - - documentBuilder.setErrorHandler(new ErrorHandler() { - - public void error(SAXParseException exception) throws SAXException { - messagesList.add(exception.toString()); - } - - public void fatalError(SAXParseException exception) - throws SAXException { - messagesList.add(exception.toString()); - } - - public void warning(SAXParseException exception) - throws SAXException { - messagesList.add(exception.toString()); - } - - }); - - try { - documentBuilder.parse(htmlPage.getWebResponse().getContentAsStream()); - } catch (Exception e) { - System.err.println(e.getLocalizedMessage()); + //https://jira.jboss.org/jira/browse/RF-2229 + if (TestFileUtils.needXHTMLCheck()) { + checkXHTML(htmlPage); } - File file = new File("c:\\tmp\\report1.txt"); - file.createNewFile(); - FileWriter fw = new FileWriter(file, true); - - fw.write(toString() + "\r\n"); - - if (!messagesList.isEmpty()) { - fw.write(htmlPage.getWebResponse().getContentAsString()); - fw.write("\r\n"); - - for (String string : messagesList) { - fw.write(string); - } - fw.write("\r\n"); - fw.write("\r\n"); - } - - - fw.close(); - */ - return htmlPage; } + + private void checkXHTML(HtmlPage htmlPage) throws ParserConfigurationException, IOException { + String respons = htmlPage.getWebResponse().getContentAsString(); + int index = respons.lastIndexOf("<!DOCTYPE"); + String response = respons.substring(index); + InputStream is = htmlPage.getWebResponse().getContentAsStream(); + + byte[] b = new byte[response.length()]; + is.skip(index); + is.read(b); + ByteArrayInputStream stream = new ByteArrayInputStream(b); + TestFileUtils.checkXHTML(new EntityResolverImpl(), response, stream); + } /** * Implements default XML filter to emulate A4J filter that invoked while Added: trunk/framework/test/src/main/java/org/ajax4jsf/tests/TestFileUtils.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/TestFileUtils.java (rev 0) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/TestFileUtils.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -0,0 +1,192 @@ +package org.ajax4jsf.tests; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintStream; +import java.io.RandomAccessFile; +import java.nio.channels.FileChannel; +import java.nio.channels.FileLock; +import java.nio.channels.OverlappingFileLockException; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + +import org.xml.sax.EntityResolver; +import org.xml.sax.ErrorHandler; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; + + class TestFileUtils { + private static final String ORG_AJAX4JSF_TEST_CHECK_XHTML_FILE = "org.ajax4jsf.test.checkXHTML.file"; + + private static final String ORG_AJAX4JSF_TEST_CHECK_XHTML = "org.ajax4jsf.test.checkXHTML"; + + private static final String CRLF = "\r\n"; + + private static Boolean isCheckXHTML = null; + + private static String checkXHTMLOutputFile = null; + + private static boolean initialized = false; + + private static File testOutputFile = null; + + private TestFileUtils(){ + throw new UnsupportedOperationException(); + } + + static void checkXHTML(EntityResolver resolver, String response, InputStream is){ + final List<String> messagesList = new ArrayList<String>(); + try{ + DocumentBuilder documentBuilder = createDocumentBuilder(); + documentBuilder.setEntityResolver(resolver); + setupBuilder(messagesList, documentBuilder); + TestFileUtils.parseResponse(is, documentBuilder); + TestFileUtils.printXHTMLValidationError(response, messagesList); + }catch(ParserConfigurationException pce){ + System.err.println(pce.getLocalizedMessage()); + }catch(IOException ioe){ + System.err.println(ioe.getLocalizedMessage()); + } + + } + + static void setupBuilder(final List<String> messagesList, DocumentBuilder documentBuilder) { + + documentBuilder.setErrorHandler(new ErrorHandler() { + + public void error(SAXParseException exception) throws SAXException { + messagesList.add(exception.toString()); + } + + public void fatalError(SAXParseException exception) + throws SAXException { + messagesList.add(exception.toString()); + } + + public void warning(SAXParseException exception) + throws SAXException { + messagesList.add(exception.toString()); + } + + }); + } + + static void initialize(){ + try { + if (null == isCheckXHTML) { + isCheckXHTML = Boolean.getBoolean(ORG_AJAX4JSF_TEST_CHECK_XHTML); + if (isCheckXHTML) { + checkXHTMLOutputFile = System.getProperty(ORG_AJAX4JSF_TEST_CHECK_XHTML_FILE); + } + } + initialized = true; + } catch (Exception e) { + // If we catch Exception there - it is security Manager error. + System.out.println("Security Manager error:"); + System.err.println(e.getLocalizedMessage()); + } + } + + static DocumentBuilder createDocumentBuilder() throws ParserConfigurationException { + + DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); + documentBuilderFactory.setValidating(true); + DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); + return documentBuilder; + } + + private static void printErrors(String response, final List<String> messagesList, OutputStreamWriter fw) throws IOException { + fw.write(CRLF); + if (!messagesList.isEmpty()) { + fw.write(response); + fw.write(CRLF); + + for (String string : messagesList) { + fw.write(string); + fw.write(CRLF); + } + fw.write(CRLF); + fw.write(CRLF); + } + } + + static boolean needXHTMLCheck(){ + if(!initialized ){ + initialize(); + } + return isCheckXHTML; + } + + static void parseResponse(InputStream is, DocumentBuilder documentBuilder) { + try { + documentBuilder.parse(is); + } catch (SAXException e) { + System.err.println(e.getLocalizedMessage()); + } catch (IOException e) { + System.err.println(e.getLocalizedMessage()); + } + } + + static void printXHTMLValidationError(String response, final List<String> messagesList) throws IOException { + //checkXHTMLOutputFile = "C:/123.txt"; + OutputStreamWriter fw = null; + try { + if (checkXHTMLOutputFile != null) { + if(null == testOutputFile){ + testOutputFile = new File(checkXHTMLOutputFile); + //if(testOutputFile.exists()){ + // testOutputFile.delete(); + //} + testOutputFile.createNewFile(); + } + //FileChannel channel = new RandomAccessFile(testOutputFile, "rw").getChannel(); + + //Use the file channel to create a lock on the file. + // This method blocks until it can retrieve the lock. + + //FileLock lock = channel.lock(); + try{ + fw = new FileWriter(testOutputFile, true); + printErrors(response, messagesList, fw); + }finally{ + //lock.release(); + + // Close the file + //channel.close(); + fw.close(); + } + } else { + fw = new SystemOutWrapper(new ByteArrayOutputStream()); + printErrors(response, messagesList, fw); + } + } catch (Exception e) { + System.err.println(e.getLocalizedMessage()); + } + } + + private static class SystemOutWrapper extends OutputStreamWriter{ + public SystemOutWrapper(OutputStream out) { + super(out); + this.setWrapper(System.out); + } + + public void setWrapper(PrintStream out){ + writer = out; + } + + private PrintStream writer; + + public void write(String message){ + writer.println(message); + } + } +} Property changes on: trunk/framework/test/src/main/java/org/ajax4jsf/tests/TestFileUtils.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx =================================================================== --- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -90,7 +90,7 @@ variables.setVariable("buttonIcon",buttonIcon); if(buttonLabel==null || buttonLabel.length()==0){ ]]> - </jsp:scriptlet> <img id="#{clientId}PopupButton" + </jsp:scriptlet> <img id="#{clientId}PopupButton" alt=" " class="rich-calendar-button #{component.attributes['buttonClass']}" accesskey="#{component.attributes['accesskey']}" style="vertical-align: middle" Modified: trunk/ui/combobox/src/main/templates/combobox.jspx =================================================================== --- trunk/ui/combobox/src/main/templates/combobox.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/combobox/src/main/templates/combobox.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -235,18 +235,18 @@ <table id="#{clientId}shadow" cellpadding="0" cellspacing="0" border="0"> <tr> <td class="rich-combobox-shadow-tl"> - <img src="#{spacer}" width="10" height="1" alt="" border="0"></img><br></br> + <img src="#{spacer}" width="10" height="1" alt=" " style="border:0"></img><br></br> </td> <td class="rich-combobox-shadow-tr"> - <img src="#{spacer}" width="1" height="10" alt="" border="0"></img><br></br> + <img src="#{spacer}" width="1" height="10" alt=" " style="border:0"></img><br></br> </td> </tr> <tr> <td class="rich-combobox-shadow-bl"> - <img src="#{spacer}" width="1" height="10" alt="" border="0"></img><br></br> + <img src="#{spacer}" width="1" height="10" alt=" " style="border:0"></img><br></br> </td> <td class="rich-combobox-shadow-br"> - <img src="#{spacer}" width="10" height="10" alt="" border="0"></img><br></br> + <img src="#{spacer}" width="10" height="10" alt=" " style="border:0"></img><br></br> </td> </tr> </table> Modified: trunk/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java =================================================================== --- trunk/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -170,6 +170,7 @@ } writer.startElement("script", component); + getUtils().writeAttribute(writer, "type", "text/javascript" ); writer.writeText("var contextMenu = new Richfaces.ContextMenu('", null); writer.writeText(component.getClientId(context), null); writer.writeText("', ", null); Modified: trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxStatusRendererTest.java =================================================================== --- trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxStatusRendererTest.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/AjaxStatusRendererTest.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -71,10 +71,12 @@ UIGraphic startImage = new UIGraphic(); startImage.setValue("start.png"); + startImage.getAttributes().put("alt", "alt"); status2.getFacets().put("start", startImage); UIGraphic stopGraphic = new UIGraphic(); stopGraphic.setValue("stop.png"); + stopGraphic.getAttributes().put("alt", "alt"); status2.getFacets().put("stop", stopGraphic); form.getChildren().add(status1); Modified: trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/MediaOutputRendererTest.java =================================================================== --- trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/MediaOutputRendererTest.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/core/src/test/java/org/ajax4jsf/renderkit/html/MediaOutputRendererTest.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -63,6 +63,7 @@ media2.setId("media2"); media2.setElement("img"); media2.setUriAttribute("src"); + media2.getAttributes().put("alt", "Generated value"); form.getChildren().add(media2); media3 = (UIMediaOutput)application.createComponent(UIMediaOutput.COMPONENT_TYPE); Modified: trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx =================================================================== --- trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -38,7 +38,7 @@ </jsp:scriptlet> <div id="#{clientId}slider-track" class="track rich-dataFilterSlider-track #{component.trackStyleClass}" style="width:#{component.attributes['width']}"> <div id="#{clientId}slider-handle" class="handle rich-dataFilterSlider-handle #{component.handleStyleClass}"> - <img src="#{arrow}" width="7" height="8" alt="" border="0" /> + <img src="#{arrow}" width="7" height="8" alt=" " style="border:0" /> </div> </div> @@ -87,7 +87,7 @@ ]]> </jsp:scriptlet> - <script type="text/javascript" language="javascript"> + <script type="text/javascript"> #{this:renderSliderJs1(context, component)} Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractDefinitionListRenderer.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractDefinitionListRenderer.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractDefinitionListRenderer.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -34,7 +34,7 @@ * */ public abstract class AbstractDefinitionListRenderer extends AbstractRowsRenderer { - + /* (non-Javadoc) * @see org.richfaces.renderkit.AbstractRowsRenderer#encodeOneRow(javax.faces.context.FacesContext, org.richfaces.renderkit.AbstractRowsRenderer.TableHolder) */ Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -728,6 +728,8 @@ writer.startElement(HTML.IMG_ELEMENT, column); writer.writeAttribute(HTML.src_ATTRIBUTE, imageUrl, null); + writer.writeAttribute(HTML.alt_ATTRIBUTE, " ", + null); writer.writeAttribute(HTML.width_ATTRIBUTE, "15", null); writer .writeAttribute(HTML.height_ATTRIBUTE, "15", Modified: trunk/ui/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java =================================================================== --- trunk/ui/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -145,7 +145,7 @@ public void testRenderDataList() throws Exception { // TYPE=disc|circle|square - dataList.getAttributes().put("type", "circle"); + dataList.getAttributes().put("style", "list-style:circle"); HtmlPage page = renderView(); assertNotNull(page); @@ -158,8 +158,7 @@ String classAttr = ul.getAttributeValue("class"); assertTrue(classAttr.contains("dr-list rich-datalist")); classAttr = ul.getAttributeValue("type"); - assertTrue(classAttr.contains((String) dataList.getAttributes().get( - "type"))); + List lis = ul.getHtmlElementsByTagName("li"); assertTrue(lis.size() > 0); Modified: trunk/ui/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java =================================================================== --- trunk/ui/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -145,7 +145,7 @@ public void testRenderDataOrderedList() throws Exception { // TYPE=disc|circle|square - dataList.getAttributes().put("type", "circle"); + dataList.getAttributes().put("style", "list-style:circle"); HtmlPage page = renderView(); assertNotNull(page); @@ -158,8 +158,6 @@ String classAttr = ol.getAttributeValue("class"); assertTrue(classAttr.contains("dr-list rich-orderedlist")); classAttr = ol.getAttributeValue("type"); - assertTrue(classAttr.contains((String) dataList.getAttributes().get( - "type"))); List lis = ol.getHtmlElementsByTagName("li"); assertTrue(lis.size() > 0); Modified: trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx =================================================================== --- trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -62,7 +62,7 @@ ]]> </jsp:scriptlet> - <table id="#{clientId}_table" align="#{component.attributes['align']}" border="0" cellpadding="0" cellspacing="1" class="dr-dscr-t rich-dtascroller-table #{component.attributes['tableStyleClass']}"> + <table id="#{clientId}_table" style="text-align:#{component.attributes['align']}" border="0" cellpadding="0" cellspacing="1" class="dr-dscr-t rich-dtascroller-table #{component.attributes['tableStyleClass']}"> <tbody> <tr> <jsp:scriptlet><![CDATA[ Modified: trunk/ui/hotKey/src/main/templates/org/richfaces/htmlHotKey.jspx =================================================================== --- trunk/ui/hotKey/src/main/templates/org/richfaces/htmlHotKey.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/hotKey/src/main/templates/org/richfaces/htmlHotKey.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -106,7 +106,7 @@ <span id="#{clientId}" style="display:none"> - <script> + <script type="text/javascript"> new Richfaces.hotKey('#{clientId}','#{key}','#{selector}', #{options}, function(event) { #{attributes['handler']} }); </script> </span> Modified: trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx =================================================================== --- trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -121,18 +121,18 @@ <tbody> <tr> <td class="rich-inplace-shadow-tl"> - <img width="10" height="1" border="0" alt="" src="#{spacer}"/> + <img width="10" height="1" style="border:0" alt=" " src="#{spacer}"/> </td> <td class="rich-inplace-shadow-tr"> - <img width="1" height="10" border="0" alt="" src="#{spacer}"/> + <img width="1" height="10" style="border:0" alt=" " src="#{spacer}"/> </td> </tr> <tr> <td class="rich-inplace-shadow-bl"> - <img width="1" height="10" border="0" alt="" src="#{spacer}"/> + <img width="1" height="10" style="border:0" alt=" " src="#{spacer}"/> </td> <td class="rich-inplace-shadow-br"> - <img width="10" height="1" border="0" alt="" src="#{spacer}"/> + <img width="10" height="1" style="border:0" alt=" " src="#{spacer}"/> </td> </tr> </tbody> Modified: trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx =================================================================== --- trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -116,7 +116,7 @@ onmouseup='#{component.attributes["oninputmouseup"]}' /> - <input id="#{clientId}inselArrow" readonly="readonly" type="Text" value="" class="rich-inplace-select-arrow" style='display:none;'/> + <input id="#{clientId}inselArrow" readonly="readonly" type="text" value="" class="rich-inplace-select-arrow" style='display:none;'/> <input id='#{clientId}inplaceValue' name='#{clientId}' type='hidden' value='#{fieldValue}' onchange='#{component.attributes["onchange"]}'> </input> @@ -132,18 +132,18 @@ <table cellpadding="0" cellspacing="0" border="0" class="rich-inplace-select-shadow-size"> <tr> <td class="rich-inplace-select-shadow-tl"> - <img src="#{spacer}" width="10" height="1" alt="" border="0"/><br/> + <img src="#{spacer}" width="10" height="1" alt=" " style="border:0"/><br/> </td> <td class="rich-inplace-select-shadow-tr"> - <img src="#{spacer}" width="1" height="10" alt="" border="0"/><br/> + <img src="#{spacer}" width="1" height="10" alt=" " style="border:0"/><br/> </td> </tr> <tr> <td class="rich-inplace-select-shadow-bl"> - <img src="#{spacer}" width="1" height="10" alt="" border="0"/><br/> + <img src="#{spacer}" width="1" height="10" alt=" " style="border:0"/><br/> </td> <td class="rich-inplace-select-shadow-br"> - <img src="#{spacer}" width="10" height="1" alt="" border="0"/><br/> + <img src="#{spacer}" width="10" height="1" alt=" " style="border:0"/><br/> </td> </tr> </table> @@ -176,18 +176,18 @@ <table id="shadow#{clientId}" cellpadding="0" cellspacing="0" border="0" width="257" height="109"> <tr> <td class="rich-inplace-select-shadow-tl"> - <img src="#{spacer}" width="10" height="1" alt="" border="0"/><br/> + <img src="#{spacer}" width="10" height="1" alt=" " style="border:0"/><br/> </td> <td class="rich-inplace-select-shadow-tr"> - <img src="#{spacer}" width="1" height="10" alt="" border="0"/><br/> + <img src="#{spacer}" width="1" height="10" alt=" " style="border:0"/><br/> </td> </tr> <tr> <td class="rich-inplace-select-shadow-bl"> - <img src="#{spacer}" width="1" height="10" alt="" border="0"/><br/> + <img src="#{spacer}" width="1" height="10" alt=" " style="border:0"/><br/> </td> <td class="rich-inplace-select-shadow-br"> - <img src="#{spacer}" width="10" height="10" alt="" border="0"/><br/> + <img src="#{spacer}" width="10" height="10" alt=" " style="border:0"/><br/> </td> </tr> </table> Modified: trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx =================================================================== --- trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -176,7 +176,7 @@ <tbody> <tr> <td class="dr-insldr-track-decor-2"> - <img src="#{spacer}" style="display: block;" /> + <img src="#{spacer}" alt=" " style="display: block;" /> </td> </tr> </tbody> Modified: trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx =================================================================== --- trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -29,7 +29,7 @@ onmouseup="#{component.attributes['onmouseup']}"> <tbody> <tr> - <td width="1%" class="dr-spnr-e rich-spinner-input-container" id="#{clientId}Edit"> + <td style="width:1%" class="dr-spnr-e rich-spinner-input-container" id="#{clientId}Edit"> <jsp:scriptlet><![CDATA[ String autocomplete = "on"; boolean disableBrowserAutoComplete = getUtils().isBooleanAttribute(component, "disableBrowserAutoComplete"); @@ -80,7 +80,7 @@ type="image" src="#{up_arrow}" class="dr-spnr-bn rich-spinner-button" - border="0" + style="border:0" onclick="return false" onmousedown="this.className='dr-spnr-bp rich-spinner-button'" onmouseup="this.className='dr-spnr-bn rich-spinner-button'" @@ -93,7 +93,7 @@ type="image" src="#{up_arrow}" class="dr-spnr-bn rich-spinner-button" - border="0" + style="border:0" onclick="return false" tabindex="#{component.attributes['tabindex']}" /> <jsp:scriptlet><![CDATA[ @@ -106,12 +106,12 @@ <jsp:scriptlet><![CDATA[ if (! disabled) { ]]></jsp:scriptlet> - <input type="image" src="#{down_arrow}" class="dr-spnr-bn rich-spinner-button" border="0" onclick="return false" + <input type="image" src="#{down_arrow}" class="dr-spnr-bn rich-spinner-button" style="border:0" onclick="return false" onmousedown="this.className='dr-spnr-bp rich-spinner-button'" onmouseup="this.className='dr-spnr-bn rich-spinner-button'" onmouseout="this.className='dr-spnr-bn rich-spinner-button'" /> <jsp:scriptlet><![CDATA[ } else { ]]></jsp:scriptlet> - <input type="image" src="#{down_arrow}" class="dr-spnr-bn rich-spinner-button" border="0" onclick="return false" /> + <input type="image" src="#{down_arrow}" class="dr-spnr-bn rich-spinner-button" style="border:0" onclick="return false" /> <jsp:scriptlet><![CDATA[ } ]]></jsp:scriptlet> Modified: trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java =================================================================== --- trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -177,6 +177,7 @@ writer.startElement(HTML.IMG_ELEMENT, table); writer.writeAttribute(HTML.src_ATTRIBUTE, getResource("/org/richfaces/renderkit/html/images/spacer.gif").getUri(context, null), null); writer.writeAttribute(HTML.style_ATTRIBUTE, "width:1px;height:1px;", null); + writer.writeAttribute(HTML.alt_ATTRIBUTE, " ", null); writer.endElement(HTML.IMG_ELEMENT); renderChildren(context, component); Modified: trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx =================================================================== --- trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -41,13 +41,13 @@ renderChild(context, iconFacet); } else if (component.getAttributes().get(iconName)!=null) {]]> </jsp:scriptlet> - <img width="16" height="16" + <img width="16" height="16" alt=" " style="#{component.attributes['iconStyle']}" src="#{actualIcon}"/> <jsp:scriptlet> <![CDATA[} else {]]> </jsp:scriptlet> - <img width="16" height="16" + <img width="16" height="16" alt=" " style="#{component.attributes['iconStyle']}" src="#{spacer}"/> <jsp:scriptlet><![CDATA[}]]></jsp:scriptlet> @@ -76,7 +76,7 @@ <![CDATA[} else if (component.getAttributes().get(iconFolder)!=null) {]]> </jsp:scriptlet> <div id="#{clientId}:folder" class="dr-menu-node #{menuGroupItemFolderClass} #{component.attributes['iconClass']}"> - <img width="16" height="16" + <img width="16" height="16" alt=" " style="#{component.attributes['iconStyle']}" src="#{actualIconFolder}"/> </div> Modified: trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx =================================================================== --- trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -89,7 +89,7 @@ } else { ]]></jsp:scriptlet> - <img width="16" + <img width="16" alt=" " height="16" src="#{icon}" /> Modified: trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java =================================================================== --- trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -182,6 +182,7 @@ writer.startElement(HTML.IMG_ELEMENT, table); writer.writeAttribute(HTML.src_ATTRIBUTE, getResource("/org/richfaces/renderkit/html/images/spacer.gif").getUri(context, null), null); writer.writeAttribute(HTML.style_ATTRIBUTE, "width:1px;height:1px;", null); + writer.writeAttribute(HTML.alt_ATTRIBUTE, " ", null); writer.endElement(HTML.IMG_ELEMENT); renderChildren(context, component); Modified: trunk/ui/paint2D/src/main/config/component/paint2D.xml =================================================================== --- trunk/ui/paint2D/src/main/config/component/paint2D.xml 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/paint2D/src/main/config/component/paint2D.xml 2008-10-15 09:52:22 UTC (rev 10761) @@ -104,6 +104,13 @@ Also note, that several browsers (e.g. IE6) do not support PNG transparency]]></description> <defaultvalue>"transparent"</defaultvalue> </property> + <property> + <name>alt</name> + <classname>java.lang.String</classname> + <description><![CDATA[ + For compability with XHTML 1.1 standart]]></description> + <defaultvalue>" "</defaultvalue> + </property> <property hidden="true"> <name>dir</name> <classname>java.lang.String</classname> Modified: trunk/ui/paint2D/src/test/java/org/richfaces/component/Paint2DTest.java =================================================================== --- trunk/ui/paint2D/src/test/java/org/richfaces/component/Paint2DTest.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/paint2D/src/test/java/org/richfaces/component/Paint2DTest.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -74,11 +74,11 @@ p2d = (UIPaint2D) application.createComponent(UIPaint2D.COMPONENT_TYPE); assertNotNull(p2d); p2d.setId("p2d"); - p2d.setBgcolor("pink"); + //p2d.setBgcolor("pink"); p2d.setHeight(300); p2d.setWidth(200); - p2d.getAttributes().put("align", "left"); - p2d.getAttributes().put("border", "5"); + //p2d.getAttributes().put("align", "left"); + p2d.getAttributes().put("style","border:5;align:left"); p2d.getAttributes().put("title", "title goes here"); // p2d.setCacheable(true); form.getChildren().add(p2d); @@ -113,14 +113,14 @@ str = htmlP2D.getAttributeValue("height"); assertEquals(str, "300"); - str = htmlP2D.getAttributeValue("bgcolor"); - assertEquals(str, "pink"); + //str = htmlP2D.getAttributeValue("bgcolor"); + //assertEquals(str, "pink"); - str = htmlP2D.getAttributeValue("align"); - assertEquals(str, "left"); + //str = htmlP2D.getAttributeValue("align"); + //assertEquals(str, "left"); - str = htmlP2D.getAttributeValue("border"); - assertEquals(str, "5"); + //str = htmlP2D.getAttributeValue("border"); + //assertEquals(str, "5"); str = htmlP2D.getAttributeValue("title"); assertEquals(str, "title goes here"); Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java =================================================================== --- trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -66,7 +66,7 @@ for (int i=0;i<level;i++){ writer.startElement("img", component); writer.writeAttribute("src", src, null); - writer.writeAttribute("alt", "", null); + writer.writeAttribute("alt", " ", null); writer.writeAttribute("hspace", "0", null); writer.writeAttribute("vspace", "0", null); writer.writeAttribute("height", String.valueOf(w), null); @@ -278,7 +278,7 @@ writer.writeAttribute("style", "display: none;", null); } writer.writeAttribute("src", imageSrc, null); - writer.writeAttribute("alt", "", null); + writer.writeAttribute("alt", " ", null); writer.writeAttribute("vspace", "0", null); writer.writeAttribute("hspace", "0", null); writer.writeAttribute("width", String.valueOf(h), null); Modified: trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java =================================================================== --- trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -228,6 +228,7 @@ protected void encodeSpacer(FacesContext context, UIComponent component, ResponseWriter writer) throws IOException { writer.startElement(HTML.IMG_ELEMENT, component); writer.writeAttribute(HTML.src_ATTRIBUTE, getResource("/org/richfaces/renderkit/html/images/spacer.gif").getUri(context, null), null); + writer.writeAttribute(HTML.alt_ATTRIBUTE, " ", null); writer.writeAttribute(HTML.style_ATTRIBUTE, "width:1px;height:1px;", null); writer.endElement(HTML.IMG_ELEMENT); } @@ -383,7 +384,7 @@ protected void renderDefaultControl(FacesContext context, UIComponent component, ResponseWriter writer, OrderingComponentRendererBase.ControlsHelper helper, String clientId, boolean enabled, String baseStyle, String baseControlStyle) throws IOException { - UIComponent facet = component.getFacet(helper.getFacetName()); + UIComponent facet = component.getFacet(getAltAttribbute(helper)); boolean useFacet = (facet != null && facet.isRendered()); String customEvent = null; @@ -454,7 +455,7 @@ } else { writer.startElement(HTML.IMG_ELEMENT, component); writer.writeAttribute(HTML.class_ATTRIBUTE, "rich-picklist-control-img", null); - writer.writeAttribute(HTML.alt_ATTRIBUTE, helper.getFacetName(), null); + writer.writeAttribute(HTML.alt_ATTRIBUTE, getAltAttribbute(helper), null); writer.writeAttribute(HTML.src_ATTRIBUTE, getResource(helper.getImageURI()).getUri(context, null), null); writer.endElement(HTML.IMG_ELEMENT); @@ -480,6 +481,11 @@ } writer.endElement(HTML.DIV_ELEM); } + + private String getAltAttribbute( + OrderingComponentRendererBase.ControlsHelper helper) { + return helper.getFacetName()!=null?helper.getFacetName():" "; + } public void reRenderScript(FacesContext context, UIComponent component) throws IOException { AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context); Modified: trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java =================================================================== --- trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -60,6 +60,7 @@ private UISimpleTogglePanel stp1; private UISimpleTogglePanel stp2; private UIForm form; + private UIForm form2; private UIOutput openMarker1; private UIOutput closeMarker1; private UIOutput openMarker2; @@ -84,7 +85,10 @@ form = new HtmlForm(); form.setId("form"); + form2 = new HtmlForm(); + form2.setId("form2"); facesContext.getViewRoot().getChildren().add(form); + facesContext.getViewRoot().getChildren().add(form2); stp1 = (UISimpleTogglePanel)application.createComponent("org.richfaces.SimpleTogglePanel"); stp1.setId("simpleTogglePanel1"); @@ -118,7 +122,7 @@ stp2.getFacets().put(openMarker2.getId(), openMarker2); stp2.getFacets().put(closeMarker2.getId(), closeMarker2); - form.getChildren().add(stp2); + form2.getChildren().add(stp2); input = (UIInput)application.createComponent(UIInput.COMPONENT_TYPE); input.setValue(""); @@ -138,6 +142,7 @@ stp1 = null; stp2 = null; form = null; + form2 = null; openMarker1 = null; closeMarker1 = null; openMarker2 = null; @@ -223,6 +228,7 @@ public void testRenderScript() throws Exception { HtmlPage page = renderView(); assertNotNull(page); + assertNotNull(page); assertEquals(getCountValidScripts(page, javaScripts, IS_PAGE_AVAILABILITY_CHECK).intValue(), javaScripts.size()); } Modified: trunk/ui/spacer/src/test/java/org/richfaces/component/SpacerComponentTest.java =================================================================== --- trunk/ui/spacer/src/test/java/org/richfaces/component/SpacerComponentTest.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/spacer/src/test/java/org/richfaces/component/SpacerComponentTest.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -69,6 +69,7 @@ spacer.setId("spacer"); spacer.getAttributes().put("width", "30"); spacer.getAttributes().put("height", "10"); + spacer.getAttributes().put("title", "10"); spacer.getAttributes().put("style", "background-color: lime"); // spacer.getAttributes().put("height", new Integer(10)); Modified: trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java =================================================================== --- trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -275,6 +275,7 @@ writer.writeAttribute("id", component.getClientId(context) + "_script", null); writer.writeAttribute("style", "display:none;", null); writer.startElement(HTML.SCRIPT_ELEM, component); + writer.writeAttribute("type", "text/javascript", null); writer.writeText(getScript(context, component), "script"); writer.endElement(HTML.SCRIPT_ELEM); writer.endElement(HTML.DIV_ELEM); Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java =================================================================== --- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -364,7 +364,7 @@ prevTab = tab; } - + // Store flag for exist client-side tabs. componentVariables.setVariable("clientSide", new Boolean(clientSide)); componentVariables.setVariable("tabs", tabs); Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java =================================================================== --- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -52,7 +52,7 @@ this.width = 1; this.height = 200; - + setRenderer(new GifRenderer()); setLastModified(new Date(InternetResourceBuilder.getInstance().getStartTime())); } Modified: trunk/ui/tabPanel/src/main/templates/tab.jspx =================================================================== --- trunk/ui/tabPanel/src/main/templates/tab.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/tabPanel/src/main/templates/tab.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -13,8 +13,8 @@ <f:clientid var="clientId"/> - <td id="#{clientId}" style="#{this:getTabDisplay(context, component)}" - height="100%"> + <td id="#{clientId}" style="#{this:getTabDisplay(context, component)};height:100%" + > <table border="0" cellpadding="10" cellspacing="0" width="100%" class="dr-tbpnl-cntnt-pstn rich-tabpanel-content-position" style=""> <tr> Modified: trunk/ui/tabPanel/src/main/templates/tabHeader.jspx =================================================================== --- trunk/ui/tabPanel/src/main/templates/tabHeader.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/tabPanel/src/main/templates/tabHeader.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -20,7 +20,7 @@ <f:call name="encodeTabLabel" /> <tr> - <td class="dr-tbpnl-tbbrdr rich-tabhdr-side-border"><img src="#{spacer}" width="1" height="1" alt="" border="0" /></td> + <td class="dr-tbpnl-tbbrdr rich-tabhdr-side-border"><img src="#{spacer}" width="1" height="1" alt=" " style="border:0" /></td> <td class="dr-tbpnl-tbtopbrdr rich-tabhdr-side-cell" style="#{this:encodeTabLabelWidth(context, component)}"> <table style="height: 100%; width: 100%;" border="0" cellpadding="0" cellspacing="0" > <tr> @@ -40,12 +40,12 @@ </tr> </table> </td> - <td class="dr-tbpnl-tbbrdr rich-tabhdr-side-border"><img src="#{spacer}" width="1" height="1" alt="" border="0" /></td> + <td class="dr-tbpnl-tbbrdr rich-tabhdr-side-border"><img src="#{spacer}" width="1" height="1" alt=" " style="border:0" /></td> </tr> </table> </td> - <td><img src="#{spacer}" height="1" alt="" border="0" style="#{this:encodeHeaderSpacing(context, component)}"/></td> + <td><img src="#{spacer}" height="1" alt=" " style="#{this:encodeHeaderSpacing(context, component)};border:0"/></td> </f:root> Modified: trunk/ui/tabPanel/src/main/templates/tabPanel.jspx =================================================================== --- trunk/ui/tabPanel/src/main/templates/tabPanel.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/tabPanel/src/main/templates/tabPanel.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -43,8 +43,8 @@ <td> - <img src="#{spacer}" height="1" alt="" - border="0" style="#{this:encodeHeaderSpacing(context, component)}" /> + <img src="#{spacer}" height="1" alt=" " + style="#{this:encodeHeaderSpacing(context, component)};border:0" /> </td> <f:call name="encodeTabs" /> Modified: trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java =================================================================== --- trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -94,7 +94,7 @@ tab2.setActive(false); tabPanel.getChildren().add(tab2); } - + /* (non-Javadoc) * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown() */ Modified: trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java =================================================================== --- trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/ToolBarRendererBase.java 2008-10-15 09:52:22 UTC (rev 10761) @@ -110,7 +110,7 @@ } writer.startElement(HTML.td_ELEM, component); - writer.writeAttribute(HTML.width_ATTRIBUTE, "100%", null); + writer.writeAttribute(HTML.style_ATTRIBUTE, "width:100%", null); writer.endElement(HTML.td_ELEM); for (Iterator<UIComponent> it = childrenToTheRight.iterator(); it.hasNext();) { @@ -178,7 +178,7 @@ getUtils().writeAttribute(writer, HTML.class_ATTRIBUTE, component.getAttributes().get("separatorClass")); writer.startElement(HTML.IMG_ELEMENT, component); getUtils().writeAttribute(writer, HTML.src_ATTRIBUTE, uri); - getUtils().writeAttribute(writer, HTML.alt_ATTRIBUTE, ""); + getUtils().writeAttribute(writer, HTML.alt_ATTRIBUTE, " "); writer.endElement(HTML.IMG_ELEMENT); writer.endElement(HTML.td_ELEM); } Modified: trunk/ui/tree/src/main/templates/htmlTreeNode.jspx =================================================================== --- trunk/ui/tree/src/main/templates/htmlTreeNode.jspx 2008-10-15 09:46:40 UTC (rev 10760) +++ trunk/ui/tree/src/main/templates/htmlTreeNode.jspx 2008-10-15 09:52:22 UTC (rev 10761) @@ -60,7 +60,7 @@ if (leaf) { ]]> </jsp:scriptlet> - <img id="#{clientId}:handle:img" src="#{spacer}" alt="" class="dr-tree-h-ic-img-md dr-tree-h-ic-img" /> + <img id="#{clientId}:handle:img" src="#{spacer}" alt=" " class="dr-tree-h-ic-img-md dr-tree-h-ic-img" /> <jsp:scriptlet> <![CDATA[ } else { @@ -91,9 +91,9 @@ ]]> </jsp:scriptlet> - <img border="0" id="#{clientId}:handle:img:collapsed" + <img id="#{clientId}:handle:img:collapsed" src="#{collapsed}" class="dr-tree-pointer-cursor dr-tree-h-ic-img-md dr-tree-h-ic-img rich-tree-node-handleicon-collapsed" - style="#{this:getHandleCollapsedDisplayStyle(context, component)}" alt="" /> + style="#{this:getHandleCollapsedDisplayStyle(context, component)};border:0" alt=" " /> <jsp:scriptlet> <![CDATA[ @@ -123,9 +123,9 @@ } else { ]]> </jsp:scriptlet> - <img border="0" id="#{clientId}:handle:img:expanded" src="#{expanded}" - style="#{this:getHandleExpandedDisplayStyle(context, component)}" - class="dr-tree-pointer-cursor dr-tree-h-ic-img-md dr-tree-h-ic-img rich-tree-node-handleicon-expanded" alt="" /> + <img id="#{clientId}:handle:img:expanded" src="#{expanded}" + style="#{this:getHandleExpandedDisplayStyle(context, component)};border:0" + class="dr-tree-pointer-cursor dr-tree-h-ic-img-md dr-tree-h-ic-img rich-tree-node-handleicon-expanded" alt=" " /> <jsp:scriptlet> <![CDATA[ } @@ -196,7 +196,7 @@ } else { ]]> </jsp:scriptlet> - <img src="#{leaf}" alt="" class="dr-tree-h-ic-img-md dr-tree-h-ic-img" /> + <img src="#{leaf}" alt=" " class="dr-tree-h-ic-img-md dr-tree-h-ic-img" /> <jsp:scriptlet> <![CDATA[ } @@ -221,7 +221,7 @@ } else { ]]> </jsp:scriptlet> - <img src="#{folder}" alt="" class="dr-tree-h-ic-img-md dr-tree-h-ic-img" /> + <img src="#{folder}" alt=" " class="dr-tree-h-ic-img-md dr-tree-h-ic-img" /> <jsp:scriptlet> <![CDATA[ }