Author: scottbw
Date: Wed Apr 14 19:03:45 2010
New Revision: 934123
URL: http://svn.apache.org/viewvc?rev=934123&view=rev
Log:
Replaced reference to antlr StringUtils with commons-lang StringUtils, and
removed direct dependency on Antlr from parser and main project. (This was
probably just a case of Eclipse auto-importing the wrong StringUtils class.)
Modified:
incubator/wookie/trunk/ivy.xml
incubator/wookie/trunk/parser/java/ivy.xml
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/NumberUtils.java
Modified: incubator/wookie/trunk/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/ivy.xml?rev=934123&r1=934122&r2=934123&view=diff
==============================================================================
--- incubator/wookie/trunk/ivy.xml (original)
+++ incubator/wookie/trunk/ivy.xml Wed Apr 14 19:03:45 2010
@@ -14,8 +14,6 @@
</dependency>
<dependency org="com.ibm.icu" name="icu4j" rev="4_2_1"
conf="deploy->default">
</dependency>
- <dependency org="antlr" name="antlr" rev="2.7.7"
conf="deploy->default">
- </dependency>
<dependency org="cglib" name="cglib" rev="2.2" conf="deploy->default">
</dependency>
<dependency org="org.apache.commons" name="commons-email" rev="1.1"
conf="deploy->default">
Modified: incubator/wookie/trunk/parser/java/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/ivy.xml?rev=934123&r1=934122&r2=934123&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/ivy.xml (original)
+++ incubator/wookie/trunk/parser/java/ivy.xml Wed Apr 14 19:03:45 2010
@@ -8,8 +8,6 @@
</configurations>
<dependencies>
- <dependency org="antlr" name="antlr" rev="2.7.7"
conf="deploy->default">
- </dependency>
<dependency org="com.ibm.icu" name="icu4j" rev="4_2_1"
conf="deploy->default">
</dependency>
<dependency org="commons-logging" name="commons-logging" rev="1.1.1"
conf="deploy->default">
Modified:
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/NumberUtils.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/NumberUtils.java?rev=934123&r1=934122&r2=934123&view=diff
==============================================================================
---
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/NumberUtils.java
(original)
+++
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/NumberUtils.java
Wed Apr 14 19:03:45 2010
@@ -14,7 +14,7 @@
package org.apache.wookie.w3c.util;
-import antlr.StringUtils;
+import org.apache.commons.lang.StringUtils;
/**
* Utility for handling numbers according to W3C processing rules
@@ -26,7 +26,8 @@ public class NumberUtils {
public static int processNonNegativeInteger(String in) throws
NumberFormatException {
int result = 0;
in = UnicodeUtils.normalizeSpaces(in);
- StringUtils.stripFront(in, " ");
+ StringUtils.stripStart(in, "");
+
if (in.length() == 0) throw new NumberFormatException("no
non-space characters");