Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some formatting. 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1478487 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary D. Gregory 2013-05-02 19:04:35 +00:00
parent 640da9075b
commit 9e529c7c6a
1 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java
View File

@ -490,52 +490,66 @@ static Token[] lexx(final String format) {
StringBuilder buffer = null;
Token previous = null;
final int sz = array.length;
for(int i=0; i<sz; i++) {
for (int i = 0; i < sz; i++) {
final char ch = array[i];
if(inLiteral && ch != '\'') {
if (inLiteral && ch != '\'') {
buffer.append(ch); // buffer can't be null if inLiteral is true
continue;
}
Object value = null;
switch(ch) {
// TODO: Need to handle escaping of '
case '\'' :
if(inLiteral) {
buffer = null;
inLiteral = false;
} else {
buffer = new StringBuilder();
list.add(new Token(buffer));
inLiteral = true;
}
break;
case 'y' : value = y; break;
case 'M' : value = M; break;
case 'd' : value = d; break;
case 'H' : value = H; break;
case 'm' : value = m; break;
case 's' : value = s; break;
case 'S' : value = S; break;
default :
if(buffer == null) {
buffer = new StringBuilder();
list.add(new Token(buffer));
}
buffer.append(ch);
switch (ch) {
// TODO: Need to handle escaping of '
case '\'':
if (inLiteral) {
buffer = null;
inLiteral = false;
} else {
buffer = new StringBuilder();
list.add(new Token(buffer));
inLiteral = true;
}
break;
case 'y':
value = y;
break;
case 'M':
value = M;
break;
case 'd':
value = d;
break;
case 'H':
value = H;
break;
case 'm':
value = m;
break;
case 's':
value = s;
break;
case 'S':
value = S;
break;
default:
if (buffer == null) {
buffer = new StringBuilder();
list.add(new Token(buffer));
}
buffer.append(ch);
}
if(value != null) {
if(previous != null && previous.getValue() == value) {
if (value != null) {
if (previous != null && previous.getValue() == value) {
previous.increment();
} else {
final Token token = new Token(value);
list.add(token);
list.add(token);
previous = token;
}
buffer = null;
buffer = null;
}
}
return list.toArray( new Token[list.size()] );
return list.toArray(new Token[list.size()]);
}
//-----------------------------------------------------------------------