Author: scottbw
Date: Tue Apr 6 15:52:03 2010
New Revision: 931193
URL: http://svn.apache.org/viewvc?rev=931193&view=rev
Log:
Added support for LRO and RLO text direction types as defined at:
http://dev.w3.org/2006/waf/widgets/#valid-directional-indicators and added some
very basic unit tests for them.
Modified:
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/DirectionalityUtilsTest.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AbstractLocalizedEntity.java
Modified:
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/DirectionalityUtilsTest.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/DirectionalityUtilsTest.java?rev=931193&r1=931192&r2=931193&view=diff
==============================================================================
---
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/DirectionalityUtilsTest.java
(original)
+++
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/DirectionalityUtilsTest.java
Tue Apr 6 15:52:03 2010
@@ -41,6 +41,20 @@ public class DirectionalityUtilsTest {
}
@Test
+ public void getDirectionalityRootElementOverrideLro(){
+ Element widget = new Element("widget");
+ widget.setAttribute("dir","rlo");
+ assertEquals(AbstractLocalizedEntity.getTextDirection(widget),
AbstractLocalizedEntity.RIGHT_TO_LEFT_OVERRIDE);
+ }
+
+ @Test
+ public void getDirectionalityRootElementOverrideRlo(){
+ Element widget = new Element("widget");
+ widget.setAttribute("dir","lro");
+ assertEquals(AbstractLocalizedEntity.getTextDirection(widget),
AbstractLocalizedEntity.LEFT_TO_RIGHT_OVERRIDE);
+ }
+
+ @Test
public void getDirectionalityChildElementDefault(){
Element widget = new Element("widget");
Element name = new Element("name");
Modified:
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AbstractLocalizedEntity.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AbstractLocalizedEntity.java?rev=931193&r1=931192&r2=931193&view=diff
==============================================================================
---
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AbstractLocalizedEntity.java
(original)
+++
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AbstractLocalizedEntity.java
Tue Apr 6 15:52:03 2010
@@ -104,10 +104,14 @@ public abstract class AbstractLocalizedE
public static final String RIGHT_TO_LEFT = "rtl";
+ public static final String LEFT_TO_RIGHT_OVERRIDE = "lro";
+
+ public static final String RIGHT_TO_LEFT_OVERRIDE = "rlo";
+
/**
- * Returns the direction (rtl or ltr) of the child text of an element
+ * Returns the direction (rtl, ltr, lro, rlo) of the child text of an
element
* @param element the element to parse
- * @return the string "ltr" or "rtl"
+ * @return the string "ltr", "rtl", "lro" or "rlo"
*/
public static String getTextDirection(Element element){
try {
@@ -119,6 +123,8 @@ public abstract class AbstractLocalizedE
String dirValue =
UnicodeUtils.normalizeSpaces(dir.getValue());
if (dirValue.equals("rtl")) return
RIGHT_TO_LEFT;
if (dirValue.equals("ltr")) return
LEFT_TO_RIGHT;
+ if (dirValue.equals("rlo")) return
RIGHT_TO_LEFT_OVERRIDE;
+ if (dirValue.equals("lro")) return
LEFT_TO_RIGHT_OVERRIDE;
return
getTextDirection(element.getParentElement());
}
} catch (Exception e) {
