Author: bayard
Date: Sun Mar 15 22:37:06 2009
New Revision: 754783
URL: http://svn.apache.org/viewvc?rev=754783&view=rev
Log:
stringToInt has been removed from the latest Lang, moving to the preferred toInt method call. Should fix Gump build.
Modified:
jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/CenterTag.java
jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/LeftPadTag.java
jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/LeftTag.java
jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/MidTag.java
jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/OverlayTag.java
jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/RepeatTag.java
jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/ReplaceTag.java
jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/RightPadTag.java
jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/RightTag.java
jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/SubstringTag.java
jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/TruncateNicelyTag.java
jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/WordWrapTag.java
Modified: jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/CenterTag.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/CenterTag.java?rev=754783&r1=754782&r2=754783&view=diff
==============================================================================
--- jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/CenterTag.java (original)
+++ jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/CenterTag.java Sun Mar 15 22:37:06 2009
@@ -82,7 +82,7 @@
public String changeString(String text) throws JspException {
- return StringUtils.center(text, NumberUtils.stringToInt(width), delimiter);
+ return StringUtils.center(text, NumberUtils.toInt(width), delimiter);
}
public void initAttributes() {
Modified: jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/LeftPadTag.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/LeftPadTag.java?rev=754783&r1=754782&r2=754783&view=diff
==============================================================================
--- jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/LeftPadTag.java (original)
+++ jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/LeftPadTag.java Sun Mar 15 22:37:06 2009
@@ -84,7 +84,7 @@
public String changeString(String text) throws JspException {
- return StringUtils.leftPad(text, NumberUtils.stringToInt(width), delimiter);
+ return StringUtils.leftPad(text, NumberUtils.toInt(width), delimiter);
}
public void initAttributes() {
Modified: jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/LeftTag.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/LeftTag.java?rev=754783&r1=754782&r2=754783&view=diff
==============================================================================
--- jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/LeftTag.java (original)
+++ jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/LeftTag.java Sun Mar 15 22:37:06 2009
@@ -58,7 +58,7 @@
public String changeString(String text) throws JspException {
- return StringUtils.left(text, NumberUtils.stringToInt(count));
+ return StringUtils.left(text, NumberUtils.toInt(count));
}
public void initAttributes() {
Modified: jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/MidTag.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/MidTag.java?rev=754783&r1=754782&r2=754783&view=diff
==============================================================================
--- jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/MidTag.java (original)
+++ jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/MidTag.java Sun Mar 15 22:37:06 2009
@@ -80,8 +80,8 @@
public String changeString(String text) throws JspException {
- int st = NumberUtils.stringToInt(start);
- int ct = NumberUtils.stringToInt(count);
+ int st = NumberUtils.toInt(start);
+ int ct = NumberUtils.toInt(count);
if(st == -1) {
st = (text.length() - ct)/2;
}
Modified: jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/OverlayTag.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/OverlayTag.java?rev=754783&r1=754782&r2=754783&view=diff
==============================================================================
--- jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/OverlayTag.java (original)
+++ jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/OverlayTag.java Sun Mar 15 22:37:06 2009
@@ -108,7 +108,7 @@
public String changeString(String text) throws JspException {
- return StringUtils.overlay(text, with, NumberUtils.stringToInt(start), NumberUtils.stringToInt(end));
+ return StringUtils.overlay(text, with, NumberUtils.toInt(start), NumberUtils.toInt(end));
}
public void initAttributes() {
Modified: jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/RepeatTag.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/RepeatTag.java?rev=754783&r1=754782&r2=754783&view=diff
==============================================================================
--- jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/RepeatTag.java (original)
+++ jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/RepeatTag.java Sun Mar 15 22:37:06 2009
@@ -58,7 +58,7 @@
public String changeString(String text) throws JspException {
- return StringUtils.repeat(text, NumberUtils.stringToInt(count));
+ return StringUtils.repeat(text, NumberUtils.toInt(count));
}
public void initAttributes() {
Modified: jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/ReplaceTag.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/ReplaceTag.java?rev=754783&r1=754782&r2=754783&view=diff
==============================================================================
--- jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/ReplaceTag.java (original)
+++ jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/ReplaceTag.java Sun Mar 15 22:37:06 2009
@@ -169,7 +169,7 @@
}
int ct = -1;
if(count != null) {
- ct = NumberUtils.stringToInt(count);
+ ct = NumberUtils.toInt(count);
}
return StringUtils.replace(text, repl, wit, ct);
}
Modified: jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/RightPadTag.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/RightPadTag.java?rev=754783&r1=754782&r2=754783&view=diff
==============================================================================
--- jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/RightPadTag.java (original)
+++ jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/RightPadTag.java Sun Mar 15 22:37:06 2009
@@ -84,7 +84,7 @@
public String changeString(String text) throws JspException {
- return StringUtils.rightPad(text, NumberUtils.stringToInt(width), delimiter);
+ return StringUtils.rightPad(text, NumberUtils.toInt(width), delimiter);
}
public void initAttributes() {
Modified: jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/RightTag.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/RightTag.java?rev=754783&r1=754782&r2=754783&view=diff
==============================================================================
--- jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/RightTag.java (original)
+++ jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/RightTag.java Sun Mar 15 22:37:06 2009
@@ -58,7 +58,7 @@
public String changeString(String text) throws JspException {
- return StringUtils.right(text, NumberUtils.stringToInt(count));
+ return StringUtils.right(text, NumberUtils.toInt(count));
}
public void initAttributes() {
Modified: jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/SubstringTag.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/SubstringTag.java?rev=754783&r1=754782&r2=754783&view=diff
==============================================================================
--- jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/SubstringTag.java (original)
+++ jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/SubstringTag.java Sun Mar 15 22:37:06 2009
@@ -85,9 +85,9 @@
public String changeString(String text) throws JspException {
if(end == null) {
- return StringUtils.substring(text, NumberUtils.stringToInt(start) );
+ return StringUtils.substring(text, NumberUtils.toInt(start) );
} else {
- return StringUtils.substring(text, NumberUtils.stringToInt(start), NumberUtils.stringToInt(end) );
+ return StringUtils.substring(text, NumberUtils.toInt(start), NumberUtils.toInt(end) );
}
}
Modified: jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/TruncateNicelyTag.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/TruncateNicelyTag.java?rev=754783&r1=754782&r2=754783&view=diff
==============================================================================
--- jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/TruncateNicelyTag.java (original)
+++ jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/TruncateNicelyTag.java Sun Mar 15 22:37:06 2009
@@ -95,8 +95,8 @@
public String changeString(String text) throws JspException {
- int l = NumberUtils.stringToInt(lower);
- int u = NumberUtils.stringToInt(upper);
+ int l = NumberUtils.toInt(lower);
+ int u = NumberUtils.toInt(upper);
return StringW.truncateNicely(text, l, u, this.appendToEnd);
}
Modified: jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/WordWrapTag.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/WordWrapTag.java?rev=754783&r1=754782&r2=754783&view=diff
==============================================================================
--- jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/WordWrapTag.java (original)
+++ jakarta/taglibs/proper/string/trunk/src/main/java/org/apache/taglibs/string/WordWrapTag.java Sun Mar 15 22:37:06 2009
@@ -131,7 +131,7 @@
}
public String changeString(String text) throws JspException {
- return StringW.wordWrap(text, NumberUtils.stringToInt(width), delimiter, split, delimiterInside );
+ return StringW.wordWrap(text, NumberUtils.toInt(width), delimiter, split, delimiterInside );
}
public void initAttributes() {
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.