[richfaces-svn-commits] JBoss Rich Faces SVN: r405 - in trunk/richfaces/dropdown-menu/src: main/java/org/richfaces/component and 1 other directories.

Author: A.Skokov Date: 2007-04-13 09:49:39 -0400 (Fri, 13 Apr 2007) New Revision: 405 Modified: trunk/richfaces/dropdown-menu/src/main/config/component/dropdownmenu.xml trunk/richfaces/dropdown-menu/src/main/java/org/richfaces/component/UIDropDownMenu.java trunk/richfaces/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java Log: small refactoring. test updated Modified: trunk/richfaces/dropdown-menu/src/main/config/component/dropdownmenu.xml =================================================================== --- trunk/richfaces/dropdown-menu/src/main/config/component/dropdownmenu.xml 2007-04-13 13:48:45 UTC (rev 404) +++ trunk/richfaces/dropdown-menu/src/main/config/component/dropdownmenu.xml 2007-04-13 13:49:39 UTC (rev 405) @@ -1,27 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "https://ajax4jsf.dev.java.net/nonav/dtds/component-config.dtd" > <components> - <component> - <name>org.richfaces.DropDownMenu</name> - <family>org.richfaces.DropDownMenu</family> - <classname>org.richfaces.component.html.HtmlDropDownMenu</classname> - <superclass>org.richfaces.component.UIDropDownMenu</superclass> - <description> - <![CDATA[ ]]> - </description> + <component> + <name>org.richfaces.DropDownMenu</name> + <family>org.richfaces.DropDownMenu</family> + <classname>org.richfaces.component.html.HtmlDropDownMenu</classname> + <superclass>org.richfaces.component.UIDropDownMenu</superclass> + <description> + <![CDATA[ ]]> + </description> - <renderer generate="true" override="true"> - <name>org.richfaces.DropDownMenuRenderer</name> - <template>org/richfaces/htmlDropDownMenu.jspx</template> - </renderer> + <renderer generate="true" override="true"> + <name>org.richfaces.DropDownMenuRenderer</name> + <template>org/richfaces/htmlDropDownMenu.jspx</template> + </renderer> - <tag> - <name>dropDownMenu</name> - <classname>org.richfaces.taglib.DropDownMenuTag</classname> - <superclass> - org.ajax4jsf.framework.taglib.HtmlComponentTagBase - </superclass> - </tag> + <tag> + <name>dropDownMenu</name> + <classname>org.richfaces.taglib.DropDownMenuTag</classname> + <superclass> + org.ajax4jsf.framework.taglib.HtmlComponentTagBase + </superclass> + </tag> <taghandler generate="true"> <classname>org.richfaces.taglib.DropDownMenuTagHandler</classname> @@ -30,203 +30,208 @@ &ui_component_attributes; - <property> - <name>event</name> - <classname>java.lang.String</classname> - <description> - Defines the event on the representation element that triggers the menu's appearance. - </description> - </property> + <property> + <name>event</name> + <classname>java.lang.String</classname> + <description> + Defines the event on the representation element that triggers + the menu's appearance. + </description> + </property> - <property> - <name>mode</name> - <classname>java.lang.String</classname> - <description> - Set the submission mode for all menu items of the menu except ones where this attribute redefined. (ajax,server(Default),none) - </description> - <defaultvalue>"server"</defaultvalue> - </property> + <property> + <name>mode</name> + <classname>java.lang.String</classname> + <description> + Set the submission mode for all menu items of the menu except + ones where this attribute redefined. (ajax,server(Default),none) + </description> + <defaultvalue>"server"</defaultvalue> + </property> - <property> - <name>showDelay</name> - <classname>java.lang.Integer</classname> - <description> - Delay between event and menu showing. - </description> - <defaultvalue><![CDATA[new Integer(300)]]></defaultvalue> - </property> + <property> + <name>showDelay</name> + <classname>java.lang.Integer</classname> + <description> + Delay between event and menu showing. + </description> + <defaultvalue><![CDATA[new Integer(300)]]></defaultvalue> + </property> - <property> - <name>hideDelay</name> - <classname>java.lang.Integer</classname> - <description> - Delay between losing focus and menu closing. - </description> - <defaultvalue><![CDATA[new Integer(300)]]></defaultvalue> - </property> + <property> + <name>hideDelay</name> + <classname>java.lang.Integer</classname> + <description> + Delay between losing focus and menu closing. + </description> + <defaultvalue><![CDATA[new Integer(300)]]></defaultvalue> + </property> - <property> - <name>value</name> - <classname>java.lang.Object</classname> - <description> - Defines representation text for Label used for menu calls. - </description> - </property> + <property> + <name>value</name> + <classname>java.lang.Object</classname> + <description> + Defines representation text for Label used for menu calls. + </description> + </property> - <property> - <name>direction</name> - <classname>java.lang.String</classname> - <description> - Defines direction of the popup list to appear (top-right, top-left bottom-right, bottom-left, auto(default)) - </description> - <defaultvalue>"auto"</defaultvalue> - </property> + <property> + <name>direction</name> + <classname>java.lang.String</classname> + <description> + Defines direction of the popup list to appear (top-right, + top-left bottom-right, bottom-left, auto(default)) + </description> + <defaultvalue>"auto"</defaultvalue> + </property> - <property> - <name>popupWidth</name> - <classname>java.lang.String</classname> - <description> - Set minimal width for the all of the lists that will appear. - </description> - </property> + <property> + <name>popupWidth</name> + <classname>java.lang.String</classname> + <description> + Set minimal width for the all of the lists that will appear. + </description> + </property> - <property> - <name>jointPoint</name> - <classname>java.lang.String</classname> - <description> - Set the corner of the label for the popup to be connected with. (auto(default), tr, tl, bl, br, where tr – top-right) - </description> - <defaultvalue>"auto"</defaultvalue> - </property> + <property> + <name>jointPoint</name> + <classname>java.lang.String</classname> + <description> + Set the corner of the label for the popup to be connected with. + (auto(default), tr, tl, bl, br, where tr – top-right) + </description> + <defaultvalue>"auto"</defaultvalue> + </property> - <property> - <name>horizontalOffset</name> - <classname>int</classname> - <description> - Sets the horizontal offset between popup list and label element conjunction point - </description> - <defaultvalue><![CDATA[0]]></defaultvalue> - </property> + <property> + <name>horizontalOffset</name> + <classname>int</classname> + <description> + Sets the horizontal offset between popup list and label element + conjunction point + </description> + <defaultvalue><![CDATA[0]]></defaultvalue> + </property> - <property> - <name>verticalOffset</name> - <classname>int</classname> - <description> - Sets the vertical offset between popup list and label element conjunction point - </description> - <defaultvalue><![CDATA[0]]></defaultvalue> - </property> + <property> + <name>verticalOffset</name> + <classname>int</classname> + <description> + Sets the vertical offset between popup list and label element + conjunction point + </description> + <defaultvalue><![CDATA[0]]></defaultvalue> + </property> - &html_style_attributes; + &html_style_attributes; - <property> - <name>selectItemStyle</name> - <classname>java.lang. String</classname> - <description> - </description> - </property> + <property> + <name>selectItemStyle</name> + <classname>java.lang. String</classname> + <description> + </description> + </property> - <property> - <name>selectItemClass</name> - <classname>java.lang.String</classname> - <description> - </description> - </property> + <property> + <name>selectItemClass</name> + <classname>java.lang.String</classname> + <description> + </description> + </property> - <property> - <name>disabledItemStyle</name> - <classname>java.lang.String</classname> - <description> - </description> - </property> + <property> + <name>disabledItemStyle</name> + <classname>java.lang.String</classname> + <description> + </description> + </property> - <property> - <name>disabledItemClass</name> - <classname>java.lang.String</classname> - <description> - </description> - </property> + <property> + <name>disabledItemClass</name> + <classname>java.lang.String</classname> + <description> + </description> + </property> - <property> - <name>itemStyle</name> - <classname>java.lang.String</classname> - <description> - </description> - </property> + <property> + <name>itemStyle</name> + <classname>java.lang.String</classname> + <description> + </description> + </property> - <property> - <name>itemClass</name> - <classname>java.lang.String</classname> - <description> - </description> - </property> + <property> + <name>itemClass</name> + <classname>java.lang.String</classname> + <description> + </description> + </property> - <property> - <name>oncollapse</name> - <classname>java.lang.String</classname> - <description> - Event must occurs on menu closure - </description> - <defaultvalue><![CDATA[""]]></defaultvalue> - </property> + <property> + <name>oncollapse</name> + <classname>java.lang.String</classname> + <description> + Event must occurs on menu closure + </description> + <defaultvalue><![CDATA[""]]></defaultvalue> + </property> - <property> - <name>onexpand</name> - <classname>java.lang.String</classname> - <description> - Event must occurs on menu opening - </description> - <defaultvalue><![CDATA[""]]></defaultvalue> - </property> + <property> + <name>onexpand</name> + <classname>java.lang.String</classname> + <description> + Event must occurs on menu opening + </description> + <defaultvalue><![CDATA[""]]></defaultvalue> + </property> - <property> - <name>onmouseout</name> - <classname>java.lang.String</classname> - <description> - HTML: script expression; a pointer was moved away. - </description> - <defaultvalue><![CDATA[""]]></defaultvalue> - </property> + <property> + <name>onmouseout</name> + <classname>java.lang.String</classname> + <description> + HTML: script expression; a pointer was moved away. + </description> + <defaultvalue><![CDATA[""]]></defaultvalue> + </property> - <property> - <name>onmousemove</name> - <classname>java.lang.String</classname> - <description> - HTML: script expression; a pointer was moved within. - </description> - <defaultvalue><![CDATA[""]]></defaultvalue> - </property> + <property> + <name>onmousemove</name> + <classname>java.lang.String</classname> + <description> + HTML: script expression; a pointer was moved within. + </description> + <defaultvalue><![CDATA[""]]></defaultvalue> + </property> - <property> - <name>onmouseover</name> - <classname>java.lang.String</classname> - <description> - HTML: script expression; a pointer was moved onto. - </description> - <defaultvalue><![CDATA[""]]></defaultvalue> - </property> + <property> + <name>onmouseover</name> + <classname>java.lang.String</classname> + <description> + HTML: script expression; a pointer was moved onto. + </description> + <defaultvalue><![CDATA[""]]></defaultvalue> + </property> - <property> - <name>onitemselect</name> - <classname>java.lang.String</classname> - <description> - HTML: script expression; some item was selected. - </description> - <defaultvalue><![CDATA[""]]></defaultvalue> - </property> + <property> + <name>onitemselect</name> + <classname>java.lang.String</classname> + <description> + HTML: script expression; some item was selected. + </description> + <defaultvalue><![CDATA[""]]></defaultvalue> + </property> - <property> - <name>ongroupactivate</name> - <classname>java.lang.String</classname> - <description> - HTML: script expression; some group was activated. - </description> - <defaultvalue><![CDATA[""]]></defaultvalue> - </property> + <property> + <name>ongroupactivate</name> + <classname>java.lang.String</classname> + <description> + HTML: script expression; some group was activated. + </description> + <defaultvalue><![CDATA[""]]></defaultvalue> + </property> - - </component> + </component> </components> Modified: trunk/richfaces/dropdown-menu/src/main/java/org/richfaces/component/UIDropDownMenu.java =================================================================== --- trunk/richfaces/dropdown-menu/src/main/java/org/richfaces/component/UIDropDownMenu.java 2007-04-13 13:48:45 UTC (rev 404) +++ trunk/richfaces/dropdown-menu/src/main/java/org/richfaces/component/UIDropDownMenu.java 2007-04-13 13:49:39 UTC (rev 405) @@ -26,18 +26,17 @@ /** * JSF component class - * */ public abstract class UIDropDownMenu extends UIComponentBase implements MenuComponent { - public static final String COMPONENT_TYPE = "org.richfaces.dropDownMenu"; - - + public static final String COMPONENT_TYPE = "org.richfaces.DropDownMenu"; + public abstract void setEvent(String Event); + public abstract String getEvent(); - + public abstract void setMode(String mode); + public abstract String getMode(); - } 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-13 13:48:45 UTC (rev 404) +++ trunk/richfaces/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java 2007-04-13 13:49:39 UTC (rev 405) @@ -25,15 +25,11 @@ import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlScript; -import org.richfaces.event.SwitchablePanelSwitchEvent; -import org.richfaces.component.UISwitchablePanel; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.commons.lang.StringUtils; -import javax.faces.component.UIComponent; + import javax.faces.component.UIForm; -import javax.faces.component.UIOutput; import javax.faces.component.html.HtmlForm; -import javax.faces.event.ActionEvent; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -45,7 +41,7 @@ public class DropDownMenuComponentTest extends AbstractAjax4JsfTestCase { private static Set javaScripts = new HashSet(); - static { + static { javaScripts.add("prototype.js"); javaScripts.add("org.ajax4jsf.framework.ajax.AjaxScript"); javaScripts.add("scripts/menu.js"); @@ -68,16 +64,52 @@ */ public void setUp() throws Exception { super.setUp(); - - - + form = new HtmlForm(); form.setId("form"); facesContext.getViewRoot().getChildren().add(form); dropDownMenu = (UIDropDownMenu)application.createComponent("org.richfaces.DropDownMenu"); dropDownMenu.setId("DropDownMenu"); form.getChildren().add(dropDownMenu); - + + UIMenuItem item = (UIMenuItem)application.createComponent("org.richfaces.MenuItem"); + item.setId("item11"); + item.setValue("Item 11"); + dropDownMenu.getChildren().add(item); + + UIMenuGroup group = (UIMenuGroup)application.createComponent("org.richfaces.MenuGroup"); + group.setId("group1"); + group.setValue("Group 1"); + dropDownMenu.getChildren().add(group); + + item = (UIMenuItem)application.createComponent("org.richfaces.MenuItem"); + item.setId("item12"); + item.setValue("Item 12"); + dropDownMenu.getChildren().add(item); + + UIMenuSeparator separator = (UIMenuSeparator)application.createComponent("org.richfaces.MenuSeparator"); + separator.setId("separator1"); + dropDownMenu.getChildren().add(separator); + + item = (UIMenuItem)application.createComponent("org.richfaces.MenuItem"); + item.setId("item13"); + item.setValue("Item 13"); + dropDownMenu.getChildren().add(item); + + //--------------------------------------------------------------------- + item = (UIMenuItem)application.createComponent("org.richfaces.MenuItem"); + item.setId("item21"); + item.setValue("Item 21"); + group.getChildren().add(item); + + separator = (UIMenuSeparator)application.createComponent("org.richfaces.MenuSeparator"); + separator.setId("separator2"); + group.getChildren().add(separator); + + item = (UIMenuItem)application.createComponent("org.richfaces.MenuItem"); + item.setId("item22"); + item.setValue("Item 22"); + group.getChildren().add(item); } /* (non-Javadoc) @@ -85,8 +117,8 @@ */ public void tearDown() throws Exception { super.tearDown(); - dropDownMenu = null; - form = null; + dropDownMenu = null; + form = null; } /** @@ -94,7 +126,7 @@ * * @throws Exception */ - + public void testRender() throws Exception { HtmlPage page = renderView(); assertNotNull(page); @@ -121,12 +153,12 @@ HtmlElement link = (HtmlElement) links.get(0); assertTrue(link.getAttributeValue("href").contains("org/richfaces/renderkit/html/css/dropdownmenu.xcss")); } - + /** * Test script rendering * * @throws Exception - */ + */ public void testRenderScript() throws Exception { HtmlPage page = renderView(); assertNotNull(page); @@ -147,8 +179,8 @@ } } } - - + + }