JBoss Rich Faces SVN: r452 - in trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces: renderkit/html and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: d.bulahov
Date: 2007-04-19 10:42:14 -0400 (Thu, 19 Apr 2007)
New Revision: 452
Modified:
trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java
trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java
Log:
http://jira.jboss.com/jira/browse/RF-107
Modified: trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java
===================================================================
--- trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java 2007-04-19 14:40:54 UTC (rev 451)
+++ trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java 2007-04-19 14:42:14 UTC (rev 452)
@@ -66,12 +66,13 @@
return true;
}
- public void broadcast(FacesEvent facesEvent) throws AbortProcessingException {
- FacesContext facesContext = FacesContext.getCurrentInstance();
- if (AjaxRendererUtils.isAjaxRequest(facesContext) && this.getSwitchType().equals(AJAX_SWITCH_TYPE)) {
- AjaxRendererUtils.addRegionByName(facesContext,
- this,
- this.getId());
- }
- }
+ //public void broadcast(FacesEvent facesEvent) throws AbortProcessingException {
+ // super.broadcast(facesEvent);
+ // FacesContext facesContext = FacesContext.getCurrentInstance();
+ // if (AjaxRendererUtils.isAjaxRequest(facesContext) && this.getSwitchType().equals(AJAX_SWITCH_TYPE)) {
+ // AjaxRendererUtils.addRegionByName(facesContext,
+ // this,
+ // this.getId());
+ // }
+ //}
}
Modified: trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java
===================================================================
--- trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java 2007-04-19 14:40:54 UTC (rev 451)
+++ trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java 2007-04-19 14:42:14 UTC (rev 452)
@@ -70,7 +70,7 @@
if (clnId != null) {
// enqueue event here for this component or for component with Id
// taken fro forId attribute
-
+
String switchType = panel.getSwitchType();
if (!(UISimpleTogglePanel.CLIENT_SWITCH_TYPE.equals(switchType))) {
@@ -81,28 +81,39 @@
//xxxx by nick - denis - use constants, please!
panel.setOpened(UISimpleTogglePanel.EXPANDED);
}
-
+ SimpleToggleEvent event = new SimpleToggleEvent(panel, (panel.isOpened()));
+ if (panel.isImmediate()) {
+ event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
+ } else {
+ event.setPhaseId(PhaseId.INVOKE_APPLICATION);
+ }
+ event.queue();
+
} else {
+ if (panel.isOpened()!= new Boolean((String) clnId).booleanValue()){
+ SimpleToggleEvent event = new SimpleToggleEvent(panel, (panel.isOpened()));
+ if (panel.isImmediate()) {
+ event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
+ } else {
+ event.setPhaseId(PhaseId.INVOKE_APPLICATION);
+ }
+ event.queue();
+ }
panel.setOpened(new Boolean((String) clnId).booleanValue());
}
+
- SimpleToggleEvent event = new SimpleToggleEvent(panel, (panel.isOpened()));
- if (panel.isImmediate()) {
- event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
- } else {
- event.setPhaseId(PhaseId.INVOKE_APPLICATION);
- }
- event.queue();
-
- //xxx by nick - denis - same as in ToggleControlRenderer
- if (!UISimpleTogglePanel.AJAX_SWITCH_TYPE.equals(panel.getSwitchType()))
- {
- ActionEvent actionEvent = new ActionEvent(component);
- component.queueEvent(actionEvent);
- }
}
+
+
+ if (AjaxRendererUtils.isAjaxRequest(context) && panel.getSwitchType().equals(UISimpleTogglePanel.AJAX_SWITCH_TYPE)) {
+ AjaxRendererUtils.addRegionByName(context,
+ panel,
+ panel.getId());
+ }
+
}
public String getdivdisplay(FacesContext context, UIComponent component) {
19 years
JBoss Rich Faces SVN: r451 - trunk.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2007-04-19 10:40:54 -0400 (Thu, 19 Apr 2007)
New Revision: 451
Added:
trunk/doc/
Log:
19 years
JBoss Rich Faces SVN: r449 - trunk/richfaces/dropdown-menu/src/test/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: d.bulahov
Date: 2007-04-19 10:00:01 -0400 (Thu, 19 Apr 2007)
New Revision: 449
Modified:
trunk/richfaces/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java
Log:
Unit tests development
Modified: trunk/richfaces/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java
===================================================================
--- trunk/richfaces/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java 2007-04-19 10:57:19 UTC (rev 448)
+++ trunk/richfaces/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java 2007-04-19 14:00:01 UTC (rev 449)
@@ -22,14 +22,22 @@
package org.richfaces.component;
+import com.gargoylesoftware.htmlunit.Page;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlScript;
+
+import org.ajax4jsf.framework.resource.InternetResource;
+import org.ajax4jsf.framework.resource.InternetResourceBuilder;
+import org.ajax4jsf.framework.resource.ResourceBuilderImpl;
+import org.ajax4jsf.framework.util.image.ImageInfo;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
import org.apache.commons.lang.StringUtils;
import javax.faces.component.UIForm;
import javax.faces.component.html.HtmlForm;
+import javax.servlet.http.HttpServletResponse;
+
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -42,8 +50,9 @@
private static Set javaScripts = new HashSet();
static {
- javaScripts.add("prototype.js");
+ javaScripts.add("prototype.js");
javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript");
+ javaScripts.add("org.ajax4jsf.framework.util.command.CommandScript");
javaScripts.add("scripts/menu.js");
}
@@ -70,6 +79,8 @@
facesContext.getViewRoot().getChildren().add(form);
dropDownMenu = (UIDropDownMenu)application.createComponent("org.richfaces.DropDownMenu");
dropDownMenu.setId("DropDownMenu");
+ dropDownMenu.getAttributes().put("style", "width:300px");
+ dropDownMenu.getAttributes().put("styleClass", "myclass");
form.getChildren().add(dropDownMenu);
UIMenuItem item = (UIMenuItem)application.createComponent("org.richfaces.MenuItem");
@@ -137,10 +148,32 @@
String classAttr = div.getAttributeValue("class");
assertTrue(classAttr.contains("dr-menu-label"));
assertTrue(classAttr.contains("dr-menu-label-unselect"));
- assertTrue(classAttr.contains("rich-menu-label"));
- assertTrue(classAttr.contains("rich-menu-label-unselect"));
+ assertTrue(classAttr.contains("rich-ddmenu-label"));
+ assertTrue(classAttr.contains("rich-ddmenu-label-unselect"));
+ assertTrue(classAttr.contains("myclass"));
+ String style = div.getAttributeValue("style");
+ assertTrue(style.contains("width:300px"));
}
+
/**
+ * Test component not rendering
+ *
+ * @throws Exception
+ */
+ public void testNotRender() throws Exception {
+ dropDownMenu.setRendered(false);
+ HtmlPage page = renderView();
+ assertNotNull(page);
+ try {
+ page.getHtmlElementById(dropDownMenu.getClientId(facesContext));
+ assertTrue(false);
+ } catch(Exception ex) {
+ }
+ }
+
+
+
+ /**
* Test style rendering
*
* @throws Exception
@@ -149,7 +182,7 @@
HtmlPage page = renderView();
assertNotNull(page);
List links = page.getDocumentElement().getHtmlElementsByTagName("link");
- assertEquals(1, links.size());
+ assertEquals(2, links.size());
HtmlElement link = (HtmlElement) links.get(0);
assertTrue(link.getAttributeValue("href").contains("org/richfaces/renderkit/html/css/dropdownmenu.xcss"));
}
@@ -180,7 +213,35 @@
}
}
+
+ public void testRenderImages() throws Exception {
+ renderView();
+ InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
+ InternetResource resource = builder.getResource("org/richfaces/renderkit/html/css/dropdownmenu.xcss");
+ assertNotNull(resource);
+ String uri = "http:" + resource.getUri(facesContext, null);
+ Page page = webClient.getPage(uri);
+ assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
+ String[] resources = new String[] {
+ "org.richfaces.renderkit.html.images.background.MenuListBackground"
+ };
+
+ for (int i = 0; i < resources.length; i++) {
+ resource = builder.getResource(resources[i]);
+ assertNotNull(resource);
+ uri = "http:" + resource.getUri(facesContext, null);
+ page = webClient.getPage(uri);
+ assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
+ ImageInfo info = new ImageInfo();
+ info.setInput(page.getWebResponse().getContentAsStream());
+ //image recognizable?
+ assertTrue(info.check());
+ assertEquals(ImageInfo.FORMAT_GIF, info.getFormat());
+ }
+ }
+
+
}
19 years
JBoss Rich Faces SVN: r448 - trunk/richfaces/menu-components/src/test/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: F.antonov
Date: 2007-04-19 06:57:19 -0400 (Thu, 19 Apr 2007)
New Revision: 448
Modified:
trunk/richfaces/menu-components/src/test/java/org/richfaces/renderkit/html/MenuItemRendererBaseTest.java
Log:
MenuItem component test cases development.
Modified: trunk/richfaces/menu-components/src/test/java/org/richfaces/renderkit/html/MenuItemRendererBaseTest.java
===================================================================
--- trunk/richfaces/menu-components/src/test/java/org/richfaces/renderkit/html/MenuItemRendererBaseTest.java 2007-04-19 09:57:15 UTC (rev 447)
+++ trunk/richfaces/menu-components/src/test/java/org/richfaces/renderkit/html/MenuItemRendererBaseTest.java 2007-04-19 10:57:19 UTC (rev 448)
@@ -26,102 +26,126 @@
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
import org.richfaces.component.MenuComponent;
+import org.richfaces.component.UIMenuGroup;
import org.richfaces.component.UIMenuItem;
import org.richfaces.component.html.HtmlMenuItem;
/**
* Unit test for MenuItem renderer.
*/
-public class MenuItemRendererBaseTest
- extends AbstractAjax4JsfTestCase
-{
-
- private UIMenuItem menuItem;
- private MenuComponent menu;
- private static MenuItemRendererBase renderer = new MenuItemRendererBase();
-
- /**
- * Simple implementation of MenuComponent interfase.
- */
- private class MenuComponentImpl extends UIComponentBase implements MenuComponent {
-
- public String getFamily() {
- // TODO Auto-generated method stub
- return null;
- }
+public class MenuItemRendererBaseTest extends AbstractAjax4JsfTestCase {
- public String getMode() {
- return MenuComponent.MODE_AJAX;
- }
-
- }
-
- /**
+ private UIMenuItem menuItem;
+
+ private MenuComponent menu;
+
+ private static MenuItemRendererBase renderer = new MenuItemRendererBase();
+
+ /**
+ * Simple implementation of MenuComponent interfase.
+ */
+ private class MenuComponentImpl extends UIComponentBase implements
+ MenuComponent {
+
+ public String getFamily() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getMode() {
+ return MenuComponent.MODE_AJAX;
+ }
+
+ }
+
+ /**
* Create the test case
- *
- * @param testName name of the test case
+ *
+ * @param testName
+ * name of the test case
*/
- public MenuItemRendererBaseTest(String testName)
- {
+ public MenuItemRendererBaseTest(String testName) {
super(testName);
}
-
+
public void setUp() throws Exception {
- super.setUp();
-
- menu = new MenuComponentImpl();
-
- menuItem = (UIMenuItem) application.createComponent(HtmlMenuItem.COMPONENT_TYPE);
- menuItem.setId("menuItem");
- menuItem.setValue("Menu Item");
-
- ((UIComponent) menu).getChildren().add(menuItem);
+ super.setUp();
+
+ menu = new MenuComponentImpl();
+
+ menuItem = (UIMenuItem) application
+ .createComponent(HtmlMenuItem.COMPONENT_TYPE);
+ menuItem.setId("menuItem");
+ menuItem.setValue("Menu Item");
+
+ ((UIComponent) menu).getChildren().add(menuItem);
}
public void tearDown() throws Exception {
- super.tearDown();
- menuItem = null;
- menu = null;
+ super.tearDown();
+ menuItem = null;
+ menu = null;
}
-
+
/**
* Test for resolveSubmitMode method.
*/
- public void testResolveSubmitModeMethod() throws Exception
- {
- menuItem.setMode(null);
- assertEquals(menuItem.getParent(), menu);
- String resultMode = renderer.resolveSubmitMode(menuItem);
- assertEquals(resultMode, MenuComponent.MODE_AJAX);
-
- menuItem.setMode(MenuComponent.MODE_NONE);
- resultMode = renderer.resolveSubmitMode(menuItem);
- assertEquals(resultMode, MenuComponent.MODE_NONE);
+ public void testResolveSubmitModeMethod() throws Exception {
+ menuItem.setMode(null);
+ assertEquals(menuItem.getParent(), menu);
+ String resultMode = renderer.resolveSubmitMode(menuItem);
+ assertEquals(resultMode, MenuComponent.MODE_AJAX);
+
+ menuItem.setMode(MenuComponent.MODE_NONE);
+ resultMode = renderer.resolveSubmitMode(menuItem);
+ assertEquals(resultMode, MenuComponent.MODE_NONE);
}
-
+
/**
* Test for processInlineStyles method.
*/
- public void testProcessInlineStylesMethod() throws Exception
- {
- String style = "some style";
- String selectStyle = "some select style";
- String result = renderer.processInlineStyles(facesContext, menuItem, true);
- assertEquals(result, "");
-
- menuItem.getAttributes().put("selectStyle", selectStyle);
- result = renderer.processInlineStyles(facesContext, menuItem, false);
- assertTrue(! result.contains(selectStyle));
- assertTrue(! result.contains(style));
-
- result = renderer.processInlineStyles(facesContext, menuItem, true);
- assertTrue(result.contains(selectStyle));
- assertTrue(! result.contains(style));
-
- menuItem.getAttributes().put("style", style);
- result = renderer.processInlineStyles(facesContext, menuItem, true);
- assertTrue(result.contains(selectStyle));
- assertTrue(result.contains(style));
+ public void testProcessInlineStylesMethod() throws Exception {
+ String style = "some style";
+ String selectStyle = "some select style";
+ String result = renderer.processInlineStyles(facesContext, menuItem,
+ true);
+ assertEquals(result, "");
+
+ menuItem.getAttributes().put("selectStyle", selectStyle);
+ result = renderer.processInlineStyles(facesContext, menuItem, false);
+ assertTrue(!result.contains(selectStyle));
+ assertTrue(!result.contains(style));
+
+ result = renderer.processInlineStyles(facesContext, menuItem, true);
+ assertTrue(result.contains(selectStyle));
+ assertTrue(!result.contains(style));
+
+ menuItem.getAttributes().put("style", style);
+ result = renderer.processInlineStyles(facesContext, menuItem, true);
+ assertTrue(result.contains(selectStyle));
+ assertTrue(result.contains(style));
}
+ /**
+ * Test for getComponentClass methods.
+ */
+ public void testGetComponentClassMethod() throws Exception {
+
+ assertEquals(renderer.getComponentClass(), UIMenuItem.class);
+ MenuGroupRendererBase menuGroupRenderer = new MenuGroupRendererBase();
+ assertEquals(menuGroupRenderer.getComponentClass(), UIMenuGroup.class);
+ }
+
+ /**
+ * Test for getStringAttributeOrEmptyString method.
+ */
+ public void testGetStringAttributeOrEmptyStringMethod() throws Exception {
+ menuItem.getAttributes().put("existsAttribute", "attributeValue");
+ assertTrue(renderer.getStringAttributeOrEmptyString(menuItem,
+ "existsAttribute").equalsIgnoreCase("attributeValue"));
+ assertTrue(renderer.getStringAttributeOrEmptyString(menuItem,
+ "notExistsAttribute").equalsIgnoreCase(""));
+
+ }
+
}
19 years
JBoss Rich Faces SVN: r447 - trunk/richfaces/dataTable/src/test/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: F.antonov
Date: 2007-04-19 05:57:15 -0400 (Thu, 19 Apr 2007)
New Revision: 447
Modified:
trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataDefinitionListComponentsTest.java
trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataGridComponentTest.java
trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java
trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java
trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java
Log:
DataTable components test cases development.
Modified: trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataDefinitionListComponentsTest.java
===================================================================
--- trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataDefinitionListComponentsTest.java 2007-04-19 08:27:50 UTC (rev 446)
+++ trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataDefinitionListComponentsTest.java 2007-04-19 09:57:15 UTC (rev 447)
@@ -26,10 +26,6 @@
import java.util.Iterator;
import java.util.List;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import javax.faces.component.UIComponent;
import javax.faces.component.UIOutput;
import javax.faces.component.html.HtmlOutputLink;
import javax.faces.component.html.HtmlOutputText;
@@ -40,8 +36,6 @@
import javax.faces.model.ListDataModel;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
-import org.richfaces.component.html.HtmlColumnGroup;
-import org.richfaces.component.html.HtmlColumn;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
@@ -51,7 +45,7 @@
*/
public class DataDefinitionListComponentsTest extends AbstractAjax4JsfTestCase {
- private UIDataList dataList;
+ private UIDataDefinitionList dataList;
/**
* Create the test case
@@ -71,7 +65,7 @@
public void setUp() throws Exception {
super.setUp();
- dataList = (UIDataList) application
+ dataList = (UIDataDefinitionList) application
.createComponent("org.richfaces.DataDefinitionList");
dataList.setId("dataDefinitionList");
@@ -211,5 +205,8 @@
assertNotNull(dd);
classAttr = dd.getAttributeValue("class");
assertTrue(classAttr.contains("dr-definition rich-definition"));
+
+ Iterator fixedChildren = dataList.fixedChildren();
+ assertNotNull(fixedChildren);
}
}
Modified: trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataGridComponentTest.java
===================================================================
--- trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataGridComponentTest.java 2007-04-19 08:27:50 UTC (rev 446)
+++ trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataGridComponentTest.java 2007-04-19 09:57:15 UTC (rev 447)
@@ -23,20 +23,12 @@
import java.util.ArrayList;
import java.util.Date;
-import java.util.Iterator;
import java.util.List;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import javax.faces.component.UIComponent;
import javax.faces.component.UIOutput;
import javax.faces.component.html.HtmlOutputText;
-import javax.faces.model.ListDataModel;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
-import org.richfaces.component.html.HtmlColumnGroup;
-import org.richfaces.component.html.HtmlColumn;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
@@ -46,9 +38,7 @@
*/
public class DataGridComponentTest extends AbstractAjax4JsfTestCase {
- private UIDataGrid dataGrid;
-
-
+ private UIDataGrid dataGrid;
/**
* Create the test case
@@ -71,15 +61,15 @@
dataGrid = (UIDataGrid) application
.createComponent("org.richfaces.DataGrid");
dataGrid.setId("dataGrid");
-
+
dataGrid.setColumns(5);
-
+
List list = new ArrayList();
for (int i = 1; i <= 10; i++) {
list.add(new Date((long) Math.random()));
}
dataGrid.setValue(list);
-
+
facesContext.getViewRoot().getChildren().add(dataGrid);
}
@@ -89,9 +79,9 @@
* @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown()
*/
public void tearDown() throws Exception {
- super.tearDown();
+ super.tearDown();
dataGrid = null;
- }
+ }
/**
* Test DataGrid component rendering.
@@ -99,23 +89,23 @@
* @throws Exception
*/
public void testRenderDataGrid() throws Exception {
-
+
HtmlPage page = renderView();
assertNotNull(page);
- //System.out.println(page.asXml());
+ // System.out.println(page.asXml());
HtmlElement table = page.getHtmlElementById(dataGrid
.getClientId(facesContext));
assertNotNull(table);
}
-
+
/**
* Test DataGrid component facets rendering.
*
* @throws Exception
*/
public void testRenderDataGridFacets() throws Exception {
-
+
dataGrid.getAttributes().put("rowClasses", "row1,row2");
dataGrid.getAttributes().put("columnClasses", "A,B,Y,B,C");
@@ -124,13 +114,13 @@
null, null, null);
dataGrid.getFacets().put("header", header);
header.setValue("Header");
-
+
UIOutput footer = (UIOutput) createComponent(
HtmlOutputText.COMPONENT_TYPE, HtmlOutputText.class.getName(),
null, null, null);
dataGrid.getFacets().put("footer", footer);
footer.setValue("Footer");
-
+
UIOutput caption = (UIOutput) createComponent(
HtmlOutputText.COMPONENT_TYPE, HtmlOutputText.class.getName(),
null, null, null);
@@ -139,7 +129,7 @@
HtmlPage page = renderView();
assertNotNull(page);
- //System.out.println(page.asXml());
+ // System.out.println(page.asXml());
HtmlElement table = page.getHtmlElementById(dataGrid
.getClientId(facesContext));
@@ -147,12 +137,11 @@
assertEquals("table", table.getNodeName());
String classAttr = table.getAttributeValue("class");
assertTrue(classAttr.contains("dr-table rich-table"));
-
+
List captions = table.getHtmlElementsByTagName("caption");
assertNotNull(captions);
assertEquals(1, captions.size());
- classAttr = ((HtmlElement) captions.get(0))
- .getAttributeValue("class");
+ classAttr = ((HtmlElement) captions.get(0)).getAttributeValue("class");
assertTrue(classAttr.contains("dr-table-caption rich-table-caption"));
List headers = table.getHtmlElementsByTagName("thead");
@@ -172,7 +161,7 @@
assertNotNull(td);
classAttr = td.getAttributeValue("class");
assertTrue(classAttr
- .contains("dr-table-headercell rich-table-headercell"));
+ .contains("dr-table-headercell rich-table-headercell"));
List footers = table.getHtmlElementsByTagName("tfoot");
assertNotNull(footers);
@@ -191,8 +180,8 @@
classAttr = td.getAttributeValue("class");
assertTrue(classAttr
.contains("dr-table-footercell rich-table-footercell"));
-
- List bodies = table.getHtmlElementsByTagName("tbody");
+
+ List bodies = table.getHtmlElementsByTagName("tbody");
assertEquals(1, bodies.size());
trs = ((HtmlElement) bodies.get(0)).getHtmlElementsByTagName("tr");
assertTrue(trs.size() > 0);
@@ -208,32 +197,72 @@
assertNotNull(td);
classAttr = td.getAttributeValue("class");
assertTrue(classAttr.contains("dr-table-cell rich-table-cell"));
- assertTrue(classAttr.contains("A"));
+ assertTrue(classAttr.contains("A"));
}
-
+
/**
* Test UIDataGrid component class.
*
* @throws Exception
*/
public void testUIDataGrid() throws Exception {
-
+
dataGrid.setColumns(1);
-
+
dataGrid.setElements(5);
- assertEquals(5, dataGrid.getElements());
-
+ assertEquals(5, dataGrid.getElements());
+
HtmlPage page = renderView();
assertNotNull(page);
- //System.out.println(page.asXml());
+ // System.out.println(page.asXml());
HtmlElement table = page.getHtmlElementById(dataGrid
.getClientId(facesContext));
assertNotNull(table);
- List bodies = table.getHtmlElementsByTagName("tbody");
+ List bodies = table.getHtmlElementsByTagName("tbody");
assertEquals(1, bodies.size());
List trs = ((HtmlElement) bodies.get(0)).getHtmlElementsByTagName("tr");
assertEquals(5, trs.size());
}
-
+
+ /**
+ * Test UIDataGrid component class.
+ *
+ * @throws Exception
+ */
+ public void testDataGridWithSubTable() throws Exception {
+
+ UIColumn column1 = (UIColumn) application
+ .createComponent("org.richfaces.Column");
+ dataGrid.getChildren().add(column1);
+ HtmlOutputText text1 = (HtmlOutputText) createComponent(
+ HtmlOutputText.COMPONENT_TYPE, HtmlOutputText.class.getName(),
+ null, null, null);
+ text1.setValue("Column");
+ column1.getChildren().add(text1);
+
+ UIColumn column2 = (UIColumn) application
+ .createComponent("org.richfaces.Column");
+ dataGrid.getChildren().add(column2);
+ HtmlOutputText text2 = (HtmlOutputText) createComponent(
+ HtmlOutputText.COMPONENT_TYPE, HtmlOutputText.class.getName(),
+ null, null, null);
+ text2.setValue("Column2");
+ column2.getChildren().add(text2);
+
+ dataGrid.getAttributes().put("columnClasses", "sub1,");
+
+ HtmlPage page = renderView();
+ assertNotNull(page);
+ // System.out.println(page.asXml());
+
+ HtmlElement table = page.getHtmlElementById(dataGrid
+ .getClientId(facesContext));
+ assertNotNull(table);
+ List bodies = table.getHtmlElementsByTagName("tbody");
+ assertEquals(1, bodies.size());
+ List trs = ((HtmlElement) bodies.get(0)).getHtmlElementsByTagName("tr");
+ assertEquals(2, trs.size());
+ }
+
}
Modified: trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java
===================================================================
--- trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java 2007-04-19 08:27:50 UTC (rev 446)
+++ trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataListComponentsTest.java 2007-04-19 09:57:15 UTC (rev 447)
@@ -23,13 +23,8 @@
import java.util.ArrayList;
import java.util.Date;
-import java.util.Iterator;
import java.util.List;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import javax.faces.component.UIComponent;
import javax.faces.component.UIOutput;
import javax.faces.component.html.HtmlOutputLink;
import javax.faces.component.html.HtmlOutputText;
@@ -40,8 +35,6 @@
import javax.faces.model.ListDataModel;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
-import org.richfaces.component.html.HtmlColumnGroup;
-import org.richfaces.component.html.HtmlColumn;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
Modified: trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java
===================================================================
--- trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java 2007-04-19 08:27:50 UTC (rev 446)
+++ trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataOrderedListComponentsTest.java 2007-04-19 09:57:15 UTC (rev 447)
@@ -23,13 +23,8 @@
import java.util.ArrayList;
import java.util.Date;
-import java.util.Iterator;
import java.util.List;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import javax.faces.component.UIComponent;
import javax.faces.component.UIOutput;
import javax.faces.component.html.HtmlOutputLink;
import javax.faces.component.html.HtmlOutputText;
@@ -40,8 +35,6 @@
import javax.faces.model.ListDataModel;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
-import org.richfaces.component.html.HtmlColumnGroup;
-import org.richfaces.component.html.HtmlColumn;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
Modified: trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java
===================================================================
--- trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java 2007-04-19 08:27:50 UTC (rev 446)
+++ trunk/richfaces/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java 2007-04-19 09:57:15 UTC (rev 447)
@@ -25,7 +25,6 @@
import java.util.Date;
import java.util.Iterator;
import java.util.List;
-import java.util.Random;
import javax.faces.component.UIOutput;
import javax.faces.component.html.HtmlOutputLink;
@@ -191,7 +190,7 @@
HtmlPage page = renderView();
assertNotNull(page);
- // System.out.println(page.asXml());
+ //System.out.println(page.asXml());
HtmlElement table = page.getHtmlElementById(dataTable
.getClientId(facesContext));
@@ -277,7 +276,7 @@
null, null, null);
dataTable.getFacets().put("footer", footer);
footer.setValue("Footer");
-
+
HtmlPage page = renderView();
assertNotNull(page);
// System.out.println(page.asXml());
@@ -330,6 +329,10 @@
classAttr = td.getAttributeValue("class");
assertTrue(classAttr
.contains("dr-table-footercell rich-table-footercell"));
+
+ Iterator fixedChildren = dataTable.fixedChildren();
+ assertNotNull(fixedChildren);
+ assertTrue(fixedChildren.hasNext());
}
/**
@@ -350,6 +353,9 @@
dataTable.getAttributes().put("rowClasses", "row1,row2");
dataTable.getAttributes().put("columnClasses", "column1,column2");
+ column1.getAttributes().put("styleClass", "column1StyleClass");
+ column2.getAttributes().put("styleClass", "");
+
HtmlPage page = renderView();
assertNotNull(page);
// System.out.println(page.asXml());
@@ -382,6 +388,7 @@
assertNotNull(td);
classAttr = td.getAttributeValue("class");
assertTrue(classAttr.contains("column1"));
+ assertTrue(classAttr.contains("column1StyleClass"));
}
/**
@@ -430,4 +437,18 @@
// System.out.println(page.asXml());
}
+ /**
+ * Test for UIColumnGroup class.
+ *
+ * @throws Exception
+ */
+ public void testUIColumnGroup() throws Exception {
+
+ try {
+ columnGroup.setBreakBefore(true);
+ assertTrue(false);
+ } catch (Exception e) {
+ assertTrue(e instanceof IllegalStateException);
+ }
+ }
}
19 years
JBoss Rich Faces SVN: r446 - in trunk/richfaces/menu-components/src: test/java/org/richfaces/component and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: a.izobov
Date: 2007-04-19 04:27:50 -0400 (Thu, 19 Apr 2007)
New Revision: 446
Modified:
trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java
trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java
trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
Log:
test rendering images added
Modified: trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java
===================================================================
--- trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java 2007-04-18 18:27:02 UTC (rev 445)
+++ trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java 2007-04-19 08:27:50 UTC (rev 446)
@@ -42,16 +42,14 @@
int intValue;
tmp = (String) skin.getParameter(context,"headerBackgroundColor");
- if (tmp != null) {
- intValue = HtmlColor.decode(tmp).getRGB();
- mnd.setGeneralColor(new Integer(intValue));
- } else mnd.setGeneralColor(null);
+ if (tmp == null) tmp = "#4A75B5";
+ intValue = HtmlColor.decode(tmp).getRGB();
+ mnd.setGeneralColor(new Integer(intValue));
tmp = (String) skin.getParameter(context,"tabDisabledTextColor");
- if (tmp != null) {
- intValue = HtmlColor.decode(tmp).getRGB();
- mnd.setDisabledColor(new Integer(intValue));
- } else mnd.setDisabledColor(null);
+ if (tmp == null) tmp = "#6A92CF";
+ intValue = HtmlColor.decode(tmp).getRGB();
+ mnd.setDisabledColor(new Integer(intValue));
return mnd;
}
Modified: trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java
===================================================================
--- trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java 2007-04-18 18:27:02 UTC (rev 445)
+++ trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java 2007-04-19 08:27:50 UTC (rev 446)
@@ -30,13 +30,20 @@
import javax.faces.component.UIForm;
import javax.faces.component.html.HtmlForm;
import javax.faces.component.html.HtmlOutputText;
+import javax.servlet.http.HttpServletResponse;
import org.richfaces.component.html.HtmlMenuGroup;
+import org.richfaces.renderkit.html.images.MenuNodeImage;
+import com.gargoylesoftware.htmlunit.Page;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlScript;
+import org.ajax4jsf.framework.resource.InternetResource;
+import org.ajax4jsf.framework.resource.InternetResourceBuilder;
+import org.ajax4jsf.framework.resource.ResourceBuilderImpl;
+import org.ajax4jsf.framework.util.image.ImageInfo;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
import org.apache.commons.lang.StringUtils;
@@ -269,4 +276,19 @@
}
}
+ public void testRenderImages() throws Exception {
+ renderView();
+ InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
+ InternetResource resource = builder.createResource(null, MenuNodeImage.class.getName());
+ assertNotNull(resource);
+ String uri = "http:" + resource.getUri(facesContext, null);
+ Page page = webClient.getPage(uri);
+ assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
+ ImageInfo info = new ImageInfo();
+ info.setInput(page.getWebResponse().getContentAsStream());
+ //image recognizable?
+ assertTrue(info.check());
+ assertEquals(ImageInfo.FORMAT_GIF, info.getFormat());
+ }
+
}
Modified: trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
===================================================================
--- trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2007-04-18 18:27:02 UTC (rev 445)
+++ trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2007-04-19 08:27:50 UTC (rev 446)
@@ -34,6 +34,7 @@
import javax.servlet.http.HttpServletResponse;
import org.richfaces.component.html.HtmlMenuItem;
+import org.richfaces.renderkit.html.images.background.MenuItemBackground;
import com.gargoylesoftware.htmlunit.Page;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
@@ -362,4 +363,19 @@
assertEquals(ImageInfo.FORMAT_GIF, info.getFormat());
}
+ public void testRenderImages() throws Exception {
+ renderView();
+ InternetResourceBuilder builder = ResourceBuilderImpl.getInstance();
+ InternetResource resource = builder.createResource(null, MenuItemBackground.class.getName());
+ assertNotNull(resource);
+ String uri = "http:" + resource.getUri(facesContext, null);
+ Page page = webClient.getPage(uri);
+ assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
+ ImageInfo info = new ImageInfo();
+ info.setInput(page.getWebResponse().getContentAsStream());
+ //image recognizable?
+ assertTrue(info.check());
+ assertEquals(ImageInfo.FORMAT_GIF, info.getFormat());
+ }
+
}
19 years
JBoss Rich Faces SVN: r445 - trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-04-18 14:27:02 -0400 (Wed, 18 Apr 2007)
New Revision: 445
Modified:
trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
Log:
Valid Ajax invocation TODO added
Modified: trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
===================================================================
--- trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2007-04-18 16:37:39 UTC (rev 444)
+++ trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2007-04-18 18:27:02 UTC (rev 445)
@@ -21,20 +21,19 @@
package org.richfaces.renderkit.html;
-import org.ajax4jsf.framework.renderer.AjaxRendererUtils;
-import org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase;
-import org.ajax4jsf.framework.util.javascript.JSFunction;
-import org.richfaces.component.UIDatascroller;
-import org.richfaces.event.DataScrollerEvent;
+import java.io.IOException;
+import java.util.Map;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.faces.event.ActionEvent;
-import javax.faces.event.PhaseId;
-import java.io.IOException;
-import java.util.Map;
+import org.ajax4jsf.framework.renderer.AjaxRendererUtils;
+import org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase;
+import org.ajax4jsf.framework.util.javascript.JSFunction;
+import org.richfaces.component.UIDatascroller;
+import org.richfaces.event.DataScrollerEvent;
public class DataScrollerRenderer extends HeaderResourcesRendererBase {
@@ -107,6 +106,7 @@
ActionEvent actionEvent = new ActionEvent(scroller);
scroller.queueEvent(actionEvent);
+ //TODO nick - ? - should be invoked in broadcast
AjaxRendererUtils.addRegionByName(context, component, component.getId());
AjaxRendererUtils.addRegionByName(context, component, scroller.getFor());
}
19 years
JBoss Rich Faces SVN: r444 - trunk/richfaces-samples/dataFilterSliderDemo/src/main/java/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-04-18 12:37:39 -0400 (Wed, 18 Apr 2007)
New Revision: 444
Modified:
trunk/richfaces-samples/dataFilterSliderDemo/src/main/java/org/richfaces/DataFilterSliderDao.java
Log:
commit test
Modified: trunk/richfaces-samples/dataFilterSliderDemo/src/main/java/org/richfaces/DataFilterSliderDao.java
===================================================================
--- trunk/richfaces-samples/dataFilterSliderDemo/src/main/java/org/richfaces/DataFilterSliderDao.java 2007-04-18 16:01:25 UTC (rev 443)
+++ trunk/richfaces-samples/dataFilterSliderDemo/src/main/java/org/richfaces/DataFilterSliderDao.java 2007-04-18 16:37:39 UTC (rev 444)
@@ -30,4 +30,5 @@
public List getAllCarMakes();
public int genRand();
+
}
19 years
JBoss Rich Faces SVN: r442 - in trunk/richfaces/dropdown-menu/src/main: java/org/richfaces/renderkit/html/images and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: a.izobov
Date: 2007-04-18 10:52:02 -0400 (Wed, 18 Apr 2007)
New Revision: 442
Added:
trunk/richfaces/dropdown-menu/src/main/java/org/richfaces/renderkit/html/images/
trunk/richfaces/dropdown-menu/src/main/java/org/richfaces/renderkit/html/images/background/
trunk/richfaces/dropdown-menu/src/main/java/org/richfaces/renderkit/html/images/background/MenuListBackground.java
Modified:
trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss
trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
Log:
skinning
Added: trunk/richfaces/dropdown-menu/src/main/java/org/richfaces/renderkit/html/images/background/MenuListBackground.java
===================================================================
--- trunk/richfaces/dropdown-menu/src/main/java/org/richfaces/renderkit/html/images/background/MenuListBackground.java (rev 0)
+++ trunk/richfaces/dropdown-menu/src/main/java/org/richfaces/renderkit/html/images/background/MenuListBackground.java 2007-04-18 14:52:02 UTC (rev 442)
@@ -0,0 +1,32 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces 3.0 - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.renderkit.html.images.background;
+
+import org.richfaces.renderkit.html.BaseGradient;
+
+public class MenuListBackground extends BaseGradient {
+
+ public MenuListBackground() {
+ super(22, 3, "additionalBackgroundColor", "tabBackgroundColor", true);
+ }
+
+}
Modified: trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss
===================================================================
--- trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss 2007-04-18 14:49:11 UTC (rev 441)
+++ trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss 2007-04-18 14:52:02 UTC (rev 442)
@@ -6,17 +6,13 @@
<f:verbatim><![CDATA[
-.dr-menu_list_position {
- top : 17;
- left: -1
-}
-.dr-menu_list_border {
+.dr-menu-list-border {
border : 1px solid #bfbfc0;
background-color : #e7f2fb;
float : left;
position : absolute;
}
-.dr-menu_list_bg {
+.dr-menu-list-bg {
border-top : 1px solid #e7f2fb;
border-left : 1px solid #e7f2fb;
border-right : 1px solid #e7f2fb;
@@ -25,11 +21,9 @@
.dr-menu-label {
padding : 2px 5px 2px 5px;
white-space : nowrap;
- font-family : arial;
- font-size : 11px;
+ position: relative;
width : 75px;
height : 18px;
- position: relative;
}
.dr-menu-label-unselect {
border : 1px solid transparent;
@@ -51,12 +45,35 @@
top:0px;
height:1px;
width:1px;
- /*display:none;*/
}
]]>
</f:verbatim>
+<u:selector name=".dr-menu-list-border">
+ <u:style name="border-color" skin="panelBorderColor" />
+ <u:style name="background-color" skin="additionalBackgroundColor" />
+</u:selector>
+<u:selector name=".dr-menu-list-bg">
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.background.MenuListBackground"/>
+ </u:style>
+ <u:style name="border-top-color" skin="additionalBackgroundColor" />
+ <u:style name="border-left-color" skin="additionalBackgroundColor" />
+ <u:style name="border-right-color" skin="additionalBackgroundColor" />
+</u:selector>
+
+<u:selector name=".dr-menu-label">
+ <u:style name="font-family" skin="generalFamilyFont" />
+ <u:style name="font-size" skin="generalSizeFont" />
+</u:selector>
+
+<u:selector name=".dr-menu-label-select">
+ <u:style name="border-color" skin="panelBorderColor" />
+ <u:style name="background-color" skin="headerBackgroundColor" />
+ <u:style name="color" skin="headerTextColor" />
+</u:selector>
+
</f:template>
Modified: trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
===================================================================
--- trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-04-18 14:49:11 UTC (rev 441)
+++ trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-04-18 14:52:02 UTC (rev 442)
@@ -21,10 +21,10 @@
<jsp:scriptlet>
<![CDATA[org.richfaces.component.util.FormUtil.throwEnclFormReqExceptionIfNeed(context,component);]]>
</jsp:scriptlet>
- <div id="#{clientId}" class="dr-menu-label dr-menu-label-unselect rich-menu-label rich-menu-label-unselect #{component.attributes['styleClass']}"
+ <div id="#{clientId}" class="dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect #{component.attributes['styleClass']}"
style="#{component.attributes['style']};"
- onmouseover="this.className='dr-menu-label dr-menu-label-select rich-menu-label rich-menu-label-select' ; #{component.attributes['onmouseover']}"
- onmouseout="this.className='dr-menu-label dr-menu-label-unselect rich-menu-label rich-menu-label-unselect'; #{component.attributes['onmouseout']}"
+ onmouseover="this.className='dr-menu-label dr-menu-label-select rich-ddmenu-label rich-ddmenu-label-select' ; #{component.attributes['onmouseover']}"
+ onmouseout="this.className='dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect'; #{component.attributes['onmouseout']}"
onmousemove="#{component.attributes['onmousemove']}">
<jsp:scriptlet>
<![CDATA[if(component.getFacet("label")!=null && component.getFacet("label").isRendered()) {]]>
19 years
JBoss Rich Faces SVN: r441 - in trunk/richfaces/menu-components: skins and 8 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: a.izobov
Date: 2007-04-18 10:49:11 -0400 (Wed, 18 Apr 2007)
New Revision: 441
Added:
trunk/richfaces/menu-components/skins/
trunk/richfaces/menu-components/skins/images/
trunk/richfaces/menu-components/skins/images/menu_item_bg.gif
trunk/richfaces/menu-components/skins/images/menu_list_bg.gif
trunk/richfaces/menu-components/skins/images/node.gif
trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/
trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java
trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/background/
trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/background/MenuItemBackground.java
Removed:
trunk/richfaces/menu-components/skins/images/menu_item_bg.gif
trunk/richfaces/menu-components/skins/images/menu_list_bg.gif
trunk/richfaces/menu-components/skins/images/node.gif
trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/images/
Modified:
trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss
trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx
trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx
trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java
trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
Log:
skinning
Copied: trunk/richfaces/menu-components/skins/images (from rev 418, trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/images)
Deleted: trunk/richfaces/menu-components/skins/images/menu_item_bg.gif
===================================================================
(Binary files differ)
Copied: trunk/richfaces/menu-components/skins/images/menu_item_bg.gif (from rev 437, trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/images/menu_item_bg.gif)
===================================================================
(Binary files differ)
Deleted: trunk/richfaces/menu-components/skins/images/menu_list_bg.gif
===================================================================
(Binary files differ)
Copied: trunk/richfaces/menu-components/skins/images/menu_list_bg.gif (from rev 437, trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/images/menu_list_bg.gif)
===================================================================
(Binary files differ)
Deleted: trunk/richfaces/menu-components/skins/images/node.gif
===================================================================
(Binary files differ)
Copied: trunk/richfaces/menu-components/skins/images/node.gif (from rev 437, trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/images/node.gif)
===================================================================
(Binary files differ)
Added: trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java
===================================================================
--- trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java (rev 0)
+++ trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java 2007-04-18 14:49:11 UTC (rev 441)
@@ -0,0 +1,96 @@
+package org.richfaces.renderkit.html.images;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.faces.context.FacesContext;
+
+import org.ajax4jsf.framework.resource.GifRenderer;
+import org.ajax4jsf.framework.resource.InternetResourceBuilder;
+import org.ajax4jsf.framework.resource.Java2Dresource;
+import org.ajax4jsf.framework.resource.ResourceContext;
+import org.ajax4jsf.framework.skin.Skin;
+import org.ajax4jsf.framework.skin.SkinFactory;
+import org.ajax4jsf.framework.util.HtmlColor;
+
+public class MenuNodeImage extends Java2Dresource {
+
+ private static final Dimension dimensions = new Dimension(7, 14);
+
+ protected Dimension getDimensions(ResourceContext resourceContext) {
+ return dimensions;
+ }
+ public Dimension getDimensions(FacesContext facesContext, Object data) {
+ return dimensions;
+ }
+
+ public MenuNodeImage() {
+ setRenderer(new GifRenderer());
+ setLastModified(new Date(InternetResourceBuilder.getInstance().getStartTime()));
+ }
+
+ protected Object getDataToStore(FacesContext context, Object data) {
+
+ MenuNodeImageData mnd = new MenuNodeImageData();
+ Skin skin = SkinFactory.getInstance().getSkin(context);
+
+ String tmp;
+ int intValue;
+
+ tmp = (String) skin.getParameter(context,"headerBackgroundColor");
+ if (tmp != null) {
+ intValue = HtmlColor.decode(tmp).getRGB();
+ mnd.setGeneralColor(new Integer(intValue));
+ } else mnd.setGeneralColor(null);
+
+ tmp = (String) skin.getParameter(context,"tabDisabledTextColor");
+ if (tmp != null) {
+ intValue = HtmlColor.decode(tmp).getRGB();
+ mnd.setDisabledColor(new Integer(intValue));
+ } else mnd.setDisabledColor(null);
+
+ return mnd;
+ }
+
+ protected void paint(ResourceContext context, Graphics2D g2d) {
+ MenuNodeImageData mnd = (MenuNodeImageData) restoreData(context);
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+
+ g2d.setColor(new Color(mnd.getGeneralColor().intValue()));
+ g2d.drawLine(2,0,2,6);
+ g2d.drawLine(3,1,3,5);
+ g2d.drawLine(4,2,4,4);
+ g2d.drawLine(5,3,5,3);
+
+ g2d.setColor(new Color(mnd.getDisabledColor().intValue()));
+ g2d.drawLine(2,7,2,13);
+ g2d.drawLine(3,8,3,12);
+ g2d.drawLine(4,9,4,11);
+ g2d.drawLine(5,10,5,10);
+ }
+
+
+ protected static class MenuNodeImageData implements Serializable{
+ private static final long serialVersionUID = 1732700513743861251L;
+
+ private Integer disabledColor;
+ private Integer generalColor;
+
+ public Integer getDisabledColor() {
+ return disabledColor;
+ }
+ public void setDisabledColor(Integer disabledColor) {
+ this.disabledColor = disabledColor;
+ }
+ public Integer getGeneralColor() {
+ return generalColor;
+ }
+ public void setGeneralColor(Integer generalColor) {
+ this.generalColor = generalColor;
+ }
+ }
+}
Added: trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/background/MenuItemBackground.java
===================================================================
--- trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/background/MenuItemBackground.java (rev 0)
+++ trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/background/MenuItemBackground.java 2007-04-18 14:49:11 UTC (rev 441)
@@ -0,0 +1,32 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces 3.0 - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.renderkit.html.images.background;
+
+import org.richfaces.renderkit.html.BaseGradient;
+
+public class MenuItemBackground extends BaseGradient {
+
+ public MenuItemBackground() {
+ super(3, 16, "additionalBackgroundColor", "tabBackgroundColor");
+ }
+
+}
Modified: trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss
===================================================================
--- trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss 2007-04-18 14:46:37 UTC (rev 440)
+++ trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss 2007-04-18 14:49:11 UTC (rev 441)
@@ -15,16 +15,6 @@
white-space : nowrap;
position : relative;
}
-.dr-menu-item-disabled {
- border : 1px solid transparent;
- cursor : default;
- color : #839eca;
-}
-.dr-menu-label {
- font-family : arial;
- font-size : 11px;
- text-decoration : none;
-}
.dr-menu-item-enabled {
border : 0px solid transparent;
padding : 2px 36px 2px 2px;
@@ -32,16 +22,12 @@
.dr-menu-item-hover {
border : 1px solid #4a70ab;
cursor : pointer;
- background : url(menu_item_bg.gif) repeat-x top #a9c5e7;
}
.dr-menu-item-disabled {
- border : 1px solid transparent;
+ border : 0px solid transparent;
cursor : default;
color : #839eca;
}
-.dr-menu-label-disabled {
- color : #839eca;
-}
.dr-menu-icon {
margin-right : 10px;
}
@@ -64,59 +50,41 @@
.dr-menu-item-disabled .dr-menu-node {
background-position : bottom;
}
+]]>
-.dr-menu-list-position {
- top : 17;
- left: -1
-}
-.dr-menu-list-border {
- border : 1px solid #bfbfc0;
- background-color : #e7f2fb;
- float : left;
- position : absolute;
-}
-.dr-menu-sublist {
- top : -8;
- left:13;
-}
-.dr-menu-list-bg {
- border-top : 1px solid #e7f2fb;
- border-left : 1px solid #e7f2fb;
- border-right : 1px solid #e7f2fb;
- background : url(menu_list_bg.gif) repeat-y left;
-}
+</f:verbatim>
-.underneath_iframe{
- position: absolute;
- z-index: 90;
- visibility:hidden;
- left:0px;
- top:0px;
- height:1px;
- width:1px;
- /*display:none;*/
-}
+<u:selector name=".dr-menu-separator">
+ <u:style name="border-top-color" skin="panelBorderColor" />
+</u:selector>
+<u:selector name=".dr-menu-item">
+ <u:style name="font-family" skin="generalFamilyFont" />
+ <u:style name="font-size" skin="generalSizeFont" />
+</u:selector>
-]]>
-
-</f:verbatim>
-<u:selector name=".dr-menu-node">
- <u:style name="background-image">
- <f:resource f:key="/org/richfaces/renderkit/html/images/node.gif"/>
- </u:style>
+<u:selector name=".dr-menu-item-disabled">
+ <u:style name="color" skin="tabDisabledTextColor" />
</u:selector>
<u:selector name=".dr-menu-item-hover">
<u:style name="background-image">
- <f:resource f:key="/org/richfaces/renderkit/html/images/menu_item_bg.gif"/>
+ <f:resource f:key="org.richfaces.renderkit.html.images.background.MenuItemBackground"/>
</u:style>
+ <u:style name="background-position" value="top left"/>
+ <u:style name="background-repeat" value="repeat-x"/>
+ <u:style name="border-color" skin="headerBackgroundColor" />
+ <u:style name="background-color" skin="tabBackgroundColor" />
</u:selector>
-<u:selector name=".dr-menu-list-bg">
+<u:selector name=".dr-menu-node">
<u:style name="background-image">
- <f:resource f:key="/org/richfaces/renderkit/html/images/menu_list_bg.gif"/>
+ <f:resource f:key="org.richfaces.renderkit.html.images.MenuNodeImage"/>
</u:style>
</u:selector>
+<u:selector name=".dr-menu-item a">
+ <u:style name="color" skin="generalTextColor" />
+</u:selector>
+
</f:template>
Modified: trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx
===================================================================
--- trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2007-04-18 14:46:37 UTC (rev 440)
+++ trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2007-04-18 14:49:11 UTC (rev 441)
@@ -29,10 +29,10 @@
style="#{component.attributes['style']}"
onmouseout="this.className='dr-menu-item dr-menu-item-enabled rich-menu-group';
$('ref#{clientId}:icon').className='dr-menu-icon rich-menu-item-icon #{component.attributes['iconClass']}';
- $('ref#{clientId}:anchor').className='dr-menu-label rich-menu-item-label';"
+ $('ref#{clientId}:anchor').className='rich-menu-item-label';"
onmouseover="this.className='dr-menu-item dr-menu-item-hover rich-menu-group rich-menu-group-hover'; #{component.attributes['selectClass']}
$('ref#{clientId}:icon').className='dr-menu-icon dr-menu-icon-selected rich-menu-item-icon rich-menu-item-icon-selected #{component.attributes['iconClass']}';
- $('ref#{clientId}:anchor').className='dr-menu-label dr-menu-label-selected rich-menu-item-label rich-menu-item-label-selected';"
+ $('ref#{clientId}:anchor').className='rich-menu-item-label rich-menu-item-label-selected';"
onmousemove="#{component.attributes['onmousemove']}">
<span id="ref#{clientId}:icon"
@@ -56,7 +56,7 @@
<jsp:scriptlet><![CDATA[}]]></jsp:scriptlet>
</span>
- <a id="ref#{clientId}:anchor" class="dr-menu-label rich-menu-item-label" href="#">#{component.attributes['value']}</a>
+ <a id="ref#{clientId}:anchor" class="rich-menu-item-label" href="#">#{component.attributes['value']}</a>
<div id="ref#{clientId}:folder" class="dr-menu-node rich-menu-item-folder"/>
</div>
@@ -87,8 +87,7 @@
<jsp:scriptlet><![CDATA[}]]></jsp:scriptlet>
</span>
- <span class="dr-menu-label dr-menu-label-disabled rich-menu-item-label-disabled">#{component.attributes['value']}</span>
-
+ <span class="rich-menu-item-label-disabled">#{component.attributes['value']}</span>
<div id="ref#{clientId}:folder" class="dr-menu-node rich-menu-item-folder-disabled"/>
</div>
Modified: trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx
===================================================================
--- trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2007-04-18 14:46:37 UTC (rev 440)
+++ trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2007-04-18 14:49:11 UTC (rev 441)
@@ -40,11 +40,11 @@
onmouseout="this.className='dr-menu-item dr-menu-item-enabled rich-menu-item rich-menu-item-enabled #{component.attributes['styleClass']}';
#{onmouseoutInlineStyles}
$('#{clientId}:icon').className='dr-menu-icon rich-menu-item-icon #{component.attributes['iconClass']}';
- $('#{clientId}:anchor').className='dr-menu-label rich-menu-item-label';"
+ $('#{clientId}:anchor').className='rich-menu-item-label';"
onmouseover="this.className='dr-menu-item dr-menu-item-hover rich-menu-item rich-menu-item-hover #{component.attributes['styleClass']} #{component.attributes['selectClass']}';
#{onmouseoverInlineStyles}
$('#{clientId}:icon').className='dr-menu-icon dr-menu-icon-selected rich-menu-item-icon rich-menu-item-icon-selected #{component.attributes['iconClass']}';
- $('#{clientId}:anchor').className='dr-menu-label dr-menu-label-selected rich-menu-item-label rich-menu-item-label-selected';"
+ $('#{clientId}:anchor').className='rich-menu-item-label rich-menu-item-label-selected';"
style="#{component.attributes['style']}"
onclick="this.className='dr-menu-item dr-menu-item-enabled rich-menu-item rich-menu-item-enabled #{component.attributes['styleClass']}'; #{component.attributes['onselect']}; #{onclick}">
<f:call name="utils.encodeAttributes">
@@ -82,7 +82,7 @@
]]></jsp:scriptlet>
<span id="#{clientId}:disabled"
- class="dr-menu-label dr-menu-label-disabled rich-menu-item-label rich-menu-item-label-disabled"
+ class="rich-menu-item-label rich-menu-item-label-disabled"
>
#{component.attributes['value']}
<f:call name="renderChildren" />
@@ -94,7 +94,7 @@
<a id="#{clientId}:anchor"
href="#"
- class="dr-menu-label rich-menu-item-label">
+ class="rich-menu-item-label">
#{component.attributes['value']}
<f:call name="renderChildren" />
</a>
Modified: trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java
===================================================================
--- trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java 2007-04-18 14:46:37 UTC (rev 440)
+++ trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java 2007-04-18 14:49:11 UTC (rev 441)
@@ -201,7 +201,7 @@
assertNotNull(anchor);
assertEquals("a", anchor.getNodeName());
String classAttr = anchor.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-menu-label rich-menu-item-label"));
+ assertTrue(classAttr.contains("rich-menu-item-label"));
HtmlElement span = page.getHtmlElementById("ref"
+ menuGroup.getClientId(facesContext) + ":icon");
Modified: trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
===================================================================
--- trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2007-04-18 14:46:37 UTC (rev 440)
+++ trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2007-04-18 14:49:11 UTC (rev 441)
@@ -161,7 +161,7 @@
assertEquals("span", span.getNodeName());
String classAttr = span.getAttributeValue("class");
assertTrue(classAttr
- .contains("dr-menu-label dr-menu-label-disabled rich-menu-item-label rich-menu-item-label-disabled"));
+ .contains("rich-menu-item-label rich-menu-item-label-disabled"));
span = page.getHtmlElementById(menuItem.getClientId(facesContext)
+ ":icon");
@@ -202,7 +202,7 @@
assertNotNull(anchor);
assertEquals("a", anchor.getNodeName());
String classAttr = anchor.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-menu-label rich-menu-item-label"));
+ assertTrue(classAttr.contains("rich-menu-item-label"));
HtmlElement span = page.getHtmlElementById(menuItem
.getClientId(facesContext)
19 years