Author: akushunin Date: 2007-08-31 08:51:21 -0400 (Fri, 31 Aug 2007) New Revision: 2651 Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss trunk/ui/dataTable/src/test/java/org/richfaces/component/DataGridComponentTest.java trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java trunk/ui/paint2D/src/test/java/org/richfaces/component/Paint2DTest.java trunk/ui/panel/src/test/java/org/richfaces/component/PanelComponentTest.java trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java Log: Changes in xcss connected with new parameters in skins some changes in JUnit tests Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss =================================================================== --- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss 2007-08-31 12:18:24 UTC (rev 2650) +++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss 2007-08-31 12:51:21 UTC (rev 2651) @@ -149,7 +149,7 @@ <u:selector name=".rich-calendar-week"> <u:style name="background" skin="additionalBackgroundColor"/> <u:style name="border-bottom-color" skin="panelBorderColor"/> - <u:style name="background-color" skin="calendarwWeekBackgroundColor"/> + <u:style name="background-color" skin="calendarWeekBackgroundColor"/> <u:style name="border-right-color" skin="panelBorderColor"/> <u:style name="font-size" skin="generalSizeFont"/> <u:style name="font-family" skin="generalFamilyFont"/> @@ -157,8 +157,8 @@ <u:selector name=".rich-calendar-holly"> - <u:style name="background-color" value="calendarHolidaysBackgroundColor"/> - <u:style name="color" value="calendarHolidaysTextColor"/> + <u:style name="background-color" skin="calendarHolidaysBackgroundColor"/> + <u:style name="color" skin="calendarHolidaysTextColor"/> </u:selector> <u:selector name=".rich-calendar-boundary-dates"> @@ -166,8 +166,8 @@ </u:selector> <u:selector name=".rich-calendar-today"> - <u:style name="background-color" value="calendarCurrentBackgroundColor"/> - <u:style name="color" value="calendarCurrentTextColor"/> + <u:style name="background-color" skin="calendarCurrentBackgroundColor"/> + <u:style name="color" skin="calendarCurrentTextColor"/> <u:style name="font-weight" value="bold"/> </u:selector> @@ -182,7 +182,7 @@ </u:selector> <u:selector name=".rich-calendar-today.rich-calendar-hover"> - <u:style name="color" value="calendarCurrentBackgroundColor"/> + <u:style name="color" skin="calendarCurrentBackgroundColor"/> </u:selector> <u:selector name=".rich-calendar-toolfooter"> Modified: trunk/ui/dataTable/src/test/java/org/richfaces/component/DataGridComponentTest.java =================================================================== --- trunk/ui/dataTable/src/test/java/org/richfaces/component/DataGridComponentTest.java 2007-08-31 12:18:24 UTC (rev 2650) +++ trunk/ui/dataTable/src/test/java/org/richfaces/component/DataGridComponentTest.java 2007-08-31 12:51:21 UTC (rev 2651) @@ -25,7 +25,10 @@ import java.util.Date; import java.util.List; +import javax.faces.component.UIComponent; +import javax.faces.component.UIForm; import javax.faces.component.UIOutput; +import javax.faces.component.html.HtmlForm; import javax.faces.component.html.HtmlOutputText; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; @@ -39,6 +42,7 @@ public class DataGridComponentTest extends AbstractAjax4JsfTestCase { private UIDataGrid dataGrid; + private UIComponent form; /** * Create the test case @@ -58,6 +62,9 @@ public void setUp() throws Exception { super.setUp(); + form = new HtmlForm(); + form.setId("form"); + facesContext.getViewRoot().getChildren().add(form); dataGrid = (UIDataGrid) application .createComponent("org.richfaces.DataGrid"); dataGrid.setId("dataGrid"); @@ -70,7 +77,7 @@ } dataGrid.setValue(list); - facesContext.getViewRoot().getChildren().add(dataGrid); + form.getChildren().add(dataGrid); } /* @@ -120,16 +127,20 @@ null, null, null); dataGrid.getFacets().put("footer", footer); footer.setValue("Footer"); - + UIOutput caption = (UIOutput) createComponent( HtmlOutputText.COMPONENT_TYPE, HtmlOutputText.class.getName(), null, null, null); + caption.setValue("Caption"); + caption.setId("caption"); dataGrid.getFacets().put("caption", caption); - caption.setValue("Caption"); + // System.out.println(dataGrid.getFacets().toString()); + + HtmlPage page = renderView(); assertNotNull(page); - // System.out.println(page.asXml()); + System.out.println(page.asXml()); HtmlElement table = page.getHtmlElementById(dataGrid .getClientId(facesContext)); Modified: trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java =================================================================== --- trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2007-08-31 12:18:24 UTC (rev 2650) +++ trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2007-08-31 12:51:21 UTC (rev 2651) @@ -257,7 +257,7 @@ HtmlPage page = renderView(); assertNotNull(page); - //System.out.println(page.asXml()); + System.out.println(page.asXml()); try { page.getHtmlElementById(scroller.getClientId(facesContext)); assertTrue(false); Modified: trunk/ui/paint2D/src/test/java/org/richfaces/component/Paint2DTest.java =================================================================== --- trunk/ui/paint2D/src/test/java/org/richfaces/component/Paint2DTest.java 2007-08-31 12:18:24 UTC (rev 2650) +++ trunk/ui/paint2D/src/test/java/org/richfaces/component/Paint2DTest.java 2007-08-31 12:51:21 UTC (rev 2651) @@ -96,7 +96,7 @@ SetUp(); HtmlPage page = renderView(); assertNotNull(page); - System.out.println(page.asXml()); + //System.out.println(page.asXml()); HtmlImage htmlP2D = (HtmlImage) page.getHtmlElementById(p2d.getClientId(facesContext)); assertEquals("img", htmlP2D.getNodeName()); Modified: trunk/ui/panel/src/test/java/org/richfaces/component/PanelComponentTest.java =================================================================== --- trunk/ui/panel/src/test/java/org/richfaces/component/PanelComponentTest.java 2007-08-31 12:18:24 UTC (rev 2650) +++ trunk/ui/panel/src/test/java/org/richfaces/component/PanelComponentTest.java 2007-08-31 12:51:21 UTC (rev 2651) @@ -79,7 +79,7 @@ { HtmlPage page = renderView(); assertNotNull(page); - System.out.println(page.asXml()); + //System.out.println(page.asXml()); HtmlElement div = page.getHtmlElementById("panel"); assertNotNull(div); assertEquals("div", div.getNodeName()); @@ -109,7 +109,7 @@ htmlPanel.getFacets().put("header", text); HtmlPage page = renderView(); assertNotNull(page); - System.out.println(page.asXml()); + //System.out.println(page.asXml()); HtmlElement div = page.getHtmlElementById("panel_header"); assertNotNull(div); } @@ -129,7 +129,7 @@ } HtmlPage page = renderView(); assertNotNull(page); - System.out.println(page.asXml()); + //System.out.println(page.asXml()); HtmlElement div = page.getHtmlElementById("panel"); assertNotNull(div); for (int i = 0; i < attributes.length; i++) { Modified: trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java =================================================================== --- trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java 2007-08-31 12:18:24 UTC (rev 2650) +++ trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java 2007-08-31 12:51:21 UTC (rev 2651) @@ -216,7 +216,7 @@ */ public void testRenderScript() throws Exception { HtmlPage page = renderView(); - System.out.println(page.asXml()); + //System.out.println(page.asXml()); assertNotNull(page); List scripts = page.getDocumentElement().getHtmlElementsByTagName(