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

richfaces-svn-commits at lists.jboss.org richfaces-svn-commits at lists.jboss.org
Fri Apr 13 09:48:45 EDT 2007


Author: A.Skokov
Date: 2007-04-13 09:48:45 -0400 (Fri, 13 Apr 2007)
New Revision: 404

Modified:
   trunk/richfaces/menu-components/src/main/config/component/menucomponents.xml
   trunk/richfaces/menu-components/src/main/java/org/richfaces/component/UIMenuGroup.java
   trunk/richfaces/menu-components/src/main/java/org/richfaces/component/UIMenuItem.java
   trunk/richfaces/menu-components/src/main/java/org/richfaces/component/UIMenuSeparator.java
Log:
small refactoring

Modified: trunk/richfaces/menu-components/src/main/config/component/menucomponents.xml
===================================================================
--- trunk/richfaces/menu-components/src/main/config/component/menucomponents.xml	2007-04-13 13:32:00 UTC (rev 403)
+++ trunk/richfaces/menu-components/src/main/config/component/menucomponents.xml	2007-04-13 13:48:45 UTC (rev 404)
@@ -1,246 +1,268 @@
 <?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.MenuGroup</name>
-		<family>org.richfaces.DropDownMenu</family>
-		<classname>org.richfaces.component.html.HtmlMenuGroup</classname>
-		<superclass>org.richfaces.component.UIMenuGroup</superclass>
+    <component>
+        <name>org.richfaces.MenuGroup</name>
+        <family>org.richfaces.DropDownMenu</family>
+        <classname>org.richfaces.component.html.HtmlMenuGroup</classname>
+        <superclass>org.richfaces.component.UIMenuGroup</superclass>
         <description>
             <![CDATA[
             Defines expandable group of items inside popup list or another group. Should accept only "menuItem", "menuGroup" and "menuSeparator" components as children.
             ]]>
         </description>
 
-		<renderer  generate="true" override="true">
-			<name>org.richfaces.MenuGroupRenderer</name>
-			<template>org/richfaces/htmlMenuGroup.jspx</template>
-		</renderer>
+        <renderer generate="true" override="true">
+            <name>org.richfaces.MenuGroupRenderer</name>
+            <template>org/richfaces/htmlMenuGroup.jspx</template>
+        </renderer>
 
-		<tag>
-			<name>menuGroup</name>
-			<classname>org.richfaces.taglib.MenuGroupTag</classname>
-			<superclass>
-				org.ajax4jsf.framework.taglib.HtmlComponentTagBase
-			</superclass>
-		</tag>
+        <tag>
+            <name>menuGroup</name>
+            <classname>org.richfaces.taglib.MenuGroupTag</classname>
+            <superclass>
+                org.ajax4jsf.framework.taglib.HtmlComponentTagBase
+            </superclass>
+        </tag>
 
-	    <property>
-	        <name>icon</name>
-	        <classname>java.lang.String</classname>
-	        <description>Path to the icon to be displayed for the enabled item state</description>
-	    </property>
-	    <property>
-	        <name>iconDisabled</name>
-	        <classname>java.lang.String</classname>
-	        <description>Path to the icon to be displayed for the disabled item state</description>
-	    </property>
-	    <property>
-	        <name>disabled</name>
-	        <classname>boolean</classname>
-	        <description>If "true" sets state of the item to disabled state. "false" is default.</description>
-	        <defaultvalue>false</defaultvalue>
-	    </property>
-	    <property required="true">
-	        <name>value</name>
-	        <classname>java.lang.Object</classname>
-	        <description>Defines representation text for menuItem.</description>
-	    </property>
-	    <property>
-	        <name>direction</name>
-	        <classname>java.lang.String</classname>
-	        <description>Defines direction of the popup sublist to appear (right, left, auto(Default))</description>
-	    </property>
-	    <property>
-	        <name>iconFolder</name>
-	        <classname>java.lang.String</classname>
-	        <description>Path to the folder icon to be displayed for the enabled item state</description>
-	    </property>
-	    <property>
-	        <name>iconFolderDisabled</name>
-	        <classname>java.lang.String</classname>
-	        <description>Path to the folder icon to be displayed for the enabled item state</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>
-			<defaultvalue>"onmouseover"</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>onmousemove</name>
-	        <classname>java.lang.String</classname>
-	        <description>HTML: a script expression; a pointer is moved within</description>
-	        <defaultvalue><![CDATA[""]]></defaultvalue>
-	    </property>
-	    <property>
-	        <name>onmouseout</name>
-	        <classname>java.lang.String</classname>
-	        <description>HTML: a script expression; a pointer is moved away</description>
-	        <defaultvalue><![CDATA[""]]></defaultvalue>
-	    </property>
-	    <property>
-	        <name>onmouseover</name>
-	        <classname>java.lang.String</classname>
-	        <description>HTML: a script expression; a pointer is moved onto</description>
-	        <defaultvalue><![CDATA[""]]></defaultvalue>
-	    </property>
-	    <property>
-	        <name>onopen</name>
-	        <classname>java.lang.String</classname>
-	        <description>HTML: script expression; group was opened.</description>
-	        <defaultvalue><![CDATA[""]]></defaultvalue>
-	    </property>
-	    <property>
-	        <name>onclose</name>
-	        <classname>java.lang.String</classname>
-	        <description>HTML: script expression; group was closed.</description>
-	        <defaultvalue><![CDATA[""]]></defaultvalue>
-	    </property>
+        <property>
+            <name>icon</name>
+            <classname>java.lang.String</classname>
+            <description>Path to the icon to be displayed for the enabled item
+                state</description>
+        </property>
+        <property>
+            <name>iconDisabled</name>
+            <classname>java.lang.String</classname>
+            <description>Path to the icon to be displayed for the disabled item
+                state</description>
+        </property>
+        <property>
+            <name>disabled</name>
+            <classname>boolean</classname>
+            <description>If "true" sets state of the item to disabled state.
+                "false" is default.</description>
+            <defaultvalue>false</defaultvalue>
+        </property>
+        <property required="true">
+            <name>value</name>
+            <classname>java.lang.Object</classname>
+            <description>Defines representation text for menuItem.</description>
+        </property>
+        <property>
+            <name>direction</name>
+            <classname>java.lang.String</classname>
+            <description>Defines direction of the popup sublist to appear
+                (right, left, auto(Default))</description>
+        </property>
+        <property>
+            <name>iconFolder</name>
+            <classname>java.lang.String</classname>
+            <description>Path to the folder icon to be displayed for the enabled
+                item state</description>
+        </property>
+        <property>
+            <name>iconFolderDisabled</name>
+            <classname>java.lang.String</classname>
+            <description>Path to the folder icon to be displayed for the enabled
+                item state</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>
+            <defaultvalue>"onmouseover"</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>onmousemove</name>
+            <classname>java.lang.String</classname>
+            <description>HTML: a script expression; a pointer is moved
+                within</description>
+            <defaultvalue><![CDATA[""]]></defaultvalue>
+        </property>
+        <property>
+            <name>onmouseout</name>
+            <classname>java.lang.String</classname>
+            <description>HTML: a script expression; a pointer is moved
+                away</description>
+            <defaultvalue><![CDATA[""]]></defaultvalue>
+        </property>
+        <property>
+            <name>onmouseover</name>
+            <classname>java.lang.String</classname>
+            <description>HTML: a script expression; a pointer is moved
+                onto</description>
+            <defaultvalue><![CDATA[""]]></defaultvalue>
+        </property>
+        <property>
+            <name>onopen</name>
+            <classname>java.lang.String</classname>
+            <description>HTML: script expression; group was
+                opened.</description>
+            <defaultvalue><![CDATA[""]]></defaultvalue>
+        </property>
+        <property>
+            <name>onclose</name>
+            <classname>java.lang.String</classname>
+            <description>HTML: script expression; group was
+                closed.</description>
+            <defaultvalue><![CDATA[""]]></defaultvalue>
+        </property>
 
-	    <property>
-	        <name>selectStyle</name>
-	        <classname>java.lang.String</classname>
-	        <description>CSS style rules to be applied to selected items.</description>
-	    </property>
-	    <property>
-	        <name>selectClass</name>
-	        <classname>java.lang.String</classname>
-	        <description>Class to be applied to selected items.</description>
-	    </property>
-	    <property>
-	        <name>iconStyle</name>
-	        <classname>java.lang.String</classname>
-	        <description>CSS style rules to be applied to icon element.</description>
-	    </property>
-	    <property>
-	        <name>iconClass</name>
-	        <classname>java.lang.String</classname>
-	        <description>Class to be applied to icon element.</description>
-	    </property>
+        <property>
+            <name>selectStyle</name>
+            <classname>java.lang.String</classname>
+            <description>CSS style rules to be applied to selected
+                items.</description>
+        </property>
+        <property>
+            <name>selectClass</name>
+            <classname>java.lang.String</classname>
+            <description>Class to be applied to selected items.</description>
+        </property>
+        <property>
+            <name>iconStyle</name>
+            <classname>java.lang.String</classname>
+            <description>CSS style rules to be applied to icon
+                element.</description>
+        </property>
+        <property>
+            <name>iconClass</name>
+            <classname>java.lang.String</classname>
+            <description>Class to be applied to icon element.</description>
+        </property>
 
-		&ui_component_attributes;
-		&html_style_attributes;
-	</component>
-	<component>
-		<name>org.richfaces.MenuItem</name>
-		<family>org.richfaces.DropDownMenu</family>
-		<classname>org.richfaces.component.html.HtmlMenuItem</classname>
-		<superclass>org.richfaces.component.UIMenuItem</superclass>
-		<description>
-		<![CDATA[    ]]>
-		</description>
+        &ui_component_attributes;
+        &html_style_attributes;
+    </component>
+    <component>
+        <name>org.richfaces.MenuItem</name>
+        <family>org.richfaces.DropDownMenu</family>
+        <classname>org.richfaces.component.html.HtmlMenuItem</classname>
+        <superclass>org.richfaces.component.UIMenuItem</superclass>
+        <description>
+            <![CDATA[    ]]>
+        </description>
 
-		<renderer  generate="true" override="true">
-			<name>org.richfaces.MenuItemRenderer</name>
-			<template>org/richfaces/htmlMenuItem.jspx</template>
-		</renderer>
+        <renderer generate="true" override="true">
+            <name>org.richfaces.MenuItemRenderer</name>
+            <template>org/richfaces/htmlMenuItem.jspx</template>
+        </renderer>
 
 
-		<tag>
-			<name>menuItem</name>
-			<classname>org.richfaces.taglib.MenuItemTag</classname>
-			<superclass>
-				org.ajax4jsf.framework.taglib.HtmlComponentTagBase
-			</superclass>
-		</tag>
+        <tag>
+            <name>menuItem</name>
+            <classname>org.richfaces.taglib.MenuItemTag</classname>
+            <superclass>
+                org.ajax4jsf.framework.taglib.HtmlComponentTagBase
+            </superclass>
+        </tag>
 
-		<!-- Standart component attributes -->
-		&ui_component_attributes;
+        <!-- Standart component attributes -->
+        &ui_component_attributes;
 
-		<!-- Specific component attributes -->
-		<property>
-			<name>icon</name>
-			<classname>java.lang.String</classname>
-			<description>Path to the icon to be displayed for the enabled item state</description>
-		</property>
-		<property>
-			<name>iconDisabled</name>
-			<classname>java.lang.String</classname>
-			<description>Path to the icon to be displayed for the disabled item state</description>
-		</property>
-		<property>
-			<name>disabled</name>
-			<classname>boolean</classname>
-			<description>If "true" sets state of the item to disabled state. "false" is default</description>
-			<defaultvalue>false</defaultvalue>
-		</property>
-		<!-- property>
-			<name>value</name>
-			<classname>java.lang.Object</classname>
-			<description>Defines representation text for menuItem</description>
-		</property -->
-		<property>
-			<name>mode</name>
-			<classname>java.lang.String</classname>
-			<description>Set the submission mode (ajax, server(Default), none)</description>
-		</property>
+        <!-- Specific component attributes -->
+        <property>
+            <name>icon</name>
+            <classname>java.lang.String</classname>
+            <description>Path to the icon to be displayed for the enabled item
+                state</description>
+        </property>
+        <property>
+            <name>iconDisabled</name>
+            <classname>java.lang.String</classname>
+            <description>Path to the icon to be displayed for the disabled item
+                state</description>
+        </property>
+        <property>
+            <name>disabled</name>
+            <classname>boolean</classname>
+            <description>If "true" sets state of the item to disabled state.
+                "false" is default</description>
+            <defaultvalue>false</defaultvalue>
+        </property>
+        <!-- property>
+              <name>value</name>
+              <classname>java.lang.Object</classname>
+              <description>Defines representation text for menuItem</description>
+          </property -->
+        <property>
+            <name>mode</name>
+            <classname>java.lang.String</classname>
+            <description>Set the submission mode (ajax, server(Default),
+                none)</description>
+        </property>
 
-		<!-- Command attributes -->
-		&ui_command_attributes;
-		<property>
-			<name>target</name>
-			<classname>java.lang.Object</classname>
-			<description>Name of a frame where the resource retrieved via this hyperlink is to be displayed</description>
-			<defaultvalue>""</defaultvalue>
-		</property>
+        <!-- Command attributes -->
+        &ui_command_attributes;
+        <property>
+            <name>target</name>
+            <classname>java.lang.Object</classname>
+            <description>Name of a frame where the resource retrieved via this
+                hyperlink is to be displayed</description>
+            <defaultvalue>""</defaultvalue>
+        </property>
 
-		<!-- Events attributes -->
-		&html_events;
-		<property>
-			<name>onselect</name>
-			<classname>java.lang.String</classname>
-			<description>HTML: script expression; The onselect event occurs when a user selects some menu item.</description>
-			<defaultvalue>""</defaultvalue>
-		</property>
-		<property hidden="true">
-        	<name>ondblclick</name>
-        	<classname>java.lang.String</classname>
+        <!-- Events attributes -->
+        &html_events;
+        <property>
+            <name>onselect</name>
+            <classname>java.lang.String</classname>
+            <description>HTML: script expression; The onselect event occurs when
+                a user selects some menu item.</description>
+            <defaultvalue>""</defaultvalue>
         </property>
         <property hidden="true">
-        	<name>onkeydown</name>
-        	<classname>java.lang.String</classname>
+            <name>ondblclick</name>
+            <classname>java.lang.String</classname>
         </property>
         <property hidden="true">
-        	<name>onkeypress</name>
-        	<classname>java.lang.String</classname>
+            <name>onkeydown</name>
+            <classname>java.lang.String</classname>
         </property>
         <property hidden="true">
-        	<name>onkeyup</name>
-        	<classname>java.lang.String</classname>
+            <name>onkeypress</name>
+            <classname>java.lang.String</classname>
         </property>
+        <property hidden="true">
+            <name>onkeyup</name>
+            <classname>java.lang.String</classname>
+        </property>
 
         <!-- Style Attributes -->
         &html_style_attributes;
         <property>
-			<name>selectClass</name>
-			<classname>java.lang.String</classname>
-			<description>Class to be applied to selected items</description>
-		</property>
-		<property>
-			<name>selectStyle</name>
-			<classname>java.lang.String</classname>
-			<description>CSS style rules to be applied to selected items</description>
-		</property>
-		<property>
-			<name>iconClass</name>
-			<classname>java.lang.String</classname>
-			<description>Class to be applied to icon element</description>
-		</property>
-		<property>
-			<name>iconStyle</name>
-			<classname>java.lang.String</classname>
-			<description>CSS style rules to be applied to icon element</description>
-		</property>
+            <name>selectClass</name>
+            <classname>java.lang.String</classname>
+            <description>Class to be applied to selected items</description>
+        </property>
+        <property>
+            <name>selectStyle</name>
+            <classname>java.lang.String</classname>
+            <description>CSS style rules to be applied to selected
+                items</description>
+        </property>
+        <property>
+            <name>iconClass</name>
+            <classname>java.lang.String</classname>
+            <description>Class to be applied to icon element</description>
+        </property>
+        <property>
+            <name>iconStyle</name>
+            <classname>java.lang.String</classname>
+            <description>CSS style rules to be applied to icon
+                element</description>
+        </property>
 
-		&ajax_component_attributes;
-	</component>
+        &ajax_component_attributes;
+    </component>
     <component>
         <name>org.richfaces.MenuSeparator</name>
         <family>org.richfaces.DropDownMenu</family>
@@ -258,7 +280,8 @@
         <tag bodyContent="empty">
             <name>menuSeparator</name>
             <classname>org.richfaces.taglib.MenuSeparatorTag</classname>
-            <superclass>org.ajax4jsf.framework.taglib.UIComponentTagBase</superclass>
+            <superclass>
+                org.ajax4jsf.framework.taglib.UIComponentTagBase</superclass>
         </tag>
 
         &ui_component_attributes;

Modified: trunk/richfaces/menu-components/src/main/java/org/richfaces/component/UIMenuGroup.java
===================================================================
--- trunk/richfaces/menu-components/src/main/java/org/richfaces/component/UIMenuGroup.java	2007-04-13 13:32:00 UTC (rev 403)
+++ trunk/richfaces/menu-components/src/main/java/org/richfaces/component/UIMenuGroup.java	2007-04-13 13:48:45 UTC (rev 404)
@@ -26,11 +26,11 @@
 
 /**
  * JSF component class
- *
  */
 public abstract class UIMenuGroup extends UIOutput {
+    public static final String COMPONENT_TYPE = "org.richfaces.MenuGroup";
 
-	public abstract boolean isDisabled();
-	public abstract void setDisabled(boolean disabled);	
+    public abstract boolean isDisabled();
 
+    public abstract void setDisabled(boolean disabled);
 }

Modified: trunk/richfaces/menu-components/src/main/java/org/richfaces/component/UIMenuItem.java
===================================================================
--- trunk/richfaces/menu-components/src/main/java/org/richfaces/component/UIMenuItem.java	2007-04-13 13:32:00 UTC (rev 403)
+++ trunk/richfaces/menu-components/src/main/java/org/richfaces/component/UIMenuItem.java	2007-04-13 13:48:45 UTC (rev 404)
@@ -26,30 +26,30 @@
 import org.ajax4jsf.framework.ajax.AjaxActionComponent;
 import org.ajax4jsf.framework.ajax.AjaxComponent;
 import org.ajax4jsf.framework.ajax.AjaxSource;
-
 
+
 /**
  * JSF component class
  *
  */
 public abstract class UIMenuItem extends AjaxActionComponent implements AjaxComponent, AjaxSource, ActionSource {
-	
-	public static final String COMPONENT_TYPE = "org.richfaces.DropDownMenu";
-	
-	
+
+	public static final String COMPONENT_TYPE = "org.richfaces.MenuItem";
+
+
 	public abstract String getMode();
 	public abstract void setMode(String mode);
-	
+
 	public abstract Object getValue();
 	public abstract void setValue(Object value);
-	
+
 	public abstract String getIcon();
 	public abstract void setIcon(String icon);
-	
+
 	public abstract String getIconDisabled();
 	public abstract void setIconDisabled(String iconDisabled);
-	
+
 	public abstract boolean isDisabled();
-	public abstract void setDisabled(boolean disabled);	
+	public abstract void setDisabled(boolean disabled);
 
 }

Modified: trunk/richfaces/menu-components/src/main/java/org/richfaces/component/UIMenuSeparator.java
===================================================================
--- trunk/richfaces/menu-components/src/main/java/org/richfaces/component/UIMenuSeparator.java	2007-04-13 13:32:00 UTC (rev 403)
+++ trunk/richfaces/menu-components/src/main/java/org/richfaces/component/UIMenuSeparator.java	2007-04-13 13:48:45 UTC (rev 404)
@@ -29,5 +29,7 @@
  *
  */
 public abstract class UIMenuSeparator extends UIComponentBase {
+    
+    public static final String COMPONENT_TYPE = "org.richfaces.MenuSeparator";
 
 }




More information about the richfaces-svn-commits mailing list