Author: Alex.Kolonitsky Date: 2010-12-28 04:23:56 -0500 (Tue, 28 Dec 2010) New Revision: 20824 Added: trunk/ui/common/api/src/main/java/org/richfaces/component/Positioning.java Removed: trunk/ui/output/api/src/main/java/org/richfaces/TooltipDirection.java Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml Log: rename TooltipDirection Positioning Copied: trunk/ui/common/api/src/main/java/org/richfaces/component/Positioning.java (from rev 20801, trunk/ui/output/api/src/main/java/org/richfaces/TooltipDirection.java) =================================================================== --- trunk/ui/common/api/src/main/java/org/richfaces/component/Positioning.java (rev 0) +++ trunk/ui/common/api/src/main/java/org/richfaces/component/Positioning.java 2010-12-28 09:23:56 UTC (rev 20824) @@ -0,0 +1,29 @@ +package org.richfaces.component; + +/** + * @author amarkhel + */ +public enum Positioning { + topRight("RT"), + topLeft("LT"), + bottomRight("BR"), + bottomLeft("BL"), + + auto("AA"), + topAuto("AT"), + bottomAuto("AB"), + autoRight("RA"), + autoLeft("LA"); + + public static final Positioning DEFAULT = bottomRight; + + String value; + + Positioning(String value) { + this.value = value; + } + + public String getValue() { + return value; + } +} Deleted: trunk/ui/output/api/src/main/java/org/richfaces/TooltipDirection.java =================================================================== --- trunk/ui/output/api/src/main/java/org/richfaces/TooltipDirection.java 2010-12-28 01:13:35 UTC (rev 20823) +++ trunk/ui/output/api/src/main/java/org/richfaces/TooltipDirection.java 2010-12-28 09:23:56 UTC (rev 20824) @@ -1,10 +0,0 @@ -package org.richfaces; - -/** - * @author amarkhel - */ -public enum TooltipDirection { - topRight, topLeft, bottomRight, bottomLeft, auto; - - public static final TooltipDirection DEFAULT = bottomRight; -} Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java 2010-12-28 01:13:35 UTC (rev 20823) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java 2010-12-28 09:23:56 UTC (rev 20824) @@ -65,7 +65,7 @@ public abstract boolean isAttached(); - public abstract TooltipDirection getDirection(); + public abstract Positioning getDirection(); public abstract boolean isDisabled(); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java 2010-12-28 01:13:35 UTC (rev 20823) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java 2010-12-28 09:23:56 UTC (rev 20824) @@ -87,11 +87,11 @@ getStateHelper().put(PropertyKeys.attached, attached); } - public TooltipDirection getDirection() { - return (TooltipDirection) getStateHelper().eval(PropertyKeys.direction, TooltipDirection.DEFAULT); + public Positioning getDirection() { + return (Positioning) getStateHelper().eval(PropertyKeys.direction, Positioning.DEFAULT); } - public void setDirection(TooltipDirection direction) { + public void setDirection(Positioning direction) { getStateHelper().put(PropertyKeys.direction, direction); } Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-12-28 01:13:35 UTC (rev 20823) +++ trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-12-28 09:23:56 UTC (rev 20824) @@ -855,7 +855,7 @@ <property> <description></description> <property-name>direction</property-name> - <property-class>org.richfaces.component.TooltipDirection</property-class> + <property-class>org.richfaces.component.Positioning</property-class> </property> <property> <description></description> Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-12-28 01:13:35 UTC (rev 20823) +++ trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-12-28 09:23:56 UTC (rev 20824) @@ -909,7 +909,7 @@ </attribute> <attribute> <name>direction</name> - <type>org.richfaces.component.TooltipDirection</type> + <type>org.richfaces.component.Positioning</type> </attribute> <attribute> <name>disabled</name>