dion 2004/08/29 06:20:54
Modified: jelly/src/java/org/apache/commons/jelly/expression
CompositeExpression.java
Log:
Formatting
Revision Changes Path
1.10 +70 -114
jakarta-commons/jelly/src/java/org/apache/commons/jelly/expression/CompositeExpression.java
Index: CompositeExpression.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/expression/CompositeExpression.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CompositeExpression.java 24 Feb 2004 14:02:07 -0000 1.9
+++ CompositeExpression.java 29 Aug 2004 13:20:54 -0000 1.10
@@ -91,140 +91,99 @@
StringBuffer expr = new StringBuffer();
MAIN:
- while ( cur < len )
- {
+ while ( cur < len ) {
c = text.charAt( cur );
- switch ( c )
- {
+ switch ( c ) {
case('$'):
- {
- if ( cur+1<len )
- {
+ if ( cur+1<len ) {
++cur;
c = text.charAt( cur );
- switch ( c )
- {
+ switch ( c ) {
case('$'):
- {
chars.append( c );
break;
- }
case('{'):
- {
- if ( chars.length() > 0 )
- {
+ if ( chars.length() > 0 ) {
answer.addTextExpression( chars.toString() );
chars.delete(0, chars.length() );
}
- if (cur+1<len)
- {
+ if (cur+1<len) {
++cur;
- while (cur<len)
- {
+ while (cur<len) {
c = text.charAt(cur);
- {
- switch ( c )
- {
- case('"'):
- {
- expr.append( c );
- ++cur;
-
- DOUBLE_QUOTE:
- while(cur<len)
- {
- c = text.charAt(cur);
-
- boolean escape = false;
-
- switch ( c )
- {
- case('\\'):
- {
- escape = true;
- ++cur;
- expr.append(c);
- break;
- }
- case('"'):
- {
- ++cur;
- expr.append(c);
- break DOUBLE_QUOTE;
- }
- default:
- {
- escape=false;
- ++cur;
- expr.append(c);
- }
- }
- }
- break;
- }
- case('\''):
- {
- expr.append( c );
- ++cur;
-
- SINGLE_QUOTE:
- while(cur<len)
- {
- c = text.charAt(cur);
-
- boolean escape = false;
-
- switch ( c )
- {
- case('\\'):
- {
- escape = true;
- ++cur;
- expr.append(c);
- break;
- }
- case('\''):
- {
- ++cur;
- expr.append(c);
- break SINGLE_QUOTE;
- }
- default:
- {
- escape=false;
- ++cur;
- expr.append(c);
- }
- }
- }
- break;
- }
- case('}'):
- {
-
answer.addExpression(factory.createExpression(expr.toString()));
- expr.delete(0, expr.length());
- ++cur;
- continue MAIN;
- }
- default:
- {
- expr.append( c );
- ++cur;
- }
- }
+ switch ( c ) {
+ case('"'):
+ expr.append( c );
+ ++cur;
+
+ DOUBLE_QUOTE:
+ while(cur<len) {
+ c = text.charAt(cur);
+
+ boolean escape = false;
+
+ switch ( c ) {
+ case('\\'):
+ escape = true;
+ ++cur;
+ expr.append(c);
+ break;
+ case('"'):
+ ++cur;
+ expr.append(c);
+ break DOUBLE_QUOTE;
+ default:
+ escape=false;
+ ++cur;
+ expr.append(c);
+ } // switch
+ } // while
+ break;
+ case('\''):
+ expr.append( c );
+ ++cur;
+
+ SINGLE_QUOTE:
+ while(cur<len) {
+ c = text.charAt(cur);
+
+ boolean escape = false;
+
+ switch ( c ) {
+ case('\\'):
+ escape = true;
+ ++cur;
+ expr.append(c);
+ break;
+ case('\''):
+ ++cur;
+ expr.append(c);
+ break SINGLE_QUOTE;
+ default:
+ escape=false;
+ ++cur;
+ expr.append(c);
+ } // switch
+ } // while
+ break;
+ case('}'):
+
answer.addExpression(factory.createExpression(expr.toString()));
+ expr.delete(0, expr.length());
+ ++cur;
+ continue MAIN;
+ default:
+ expr.append( c );
+ ++cur;
}
}
}
break;
- }
default:
- {
chars.append(c);
- }
}
}
else
@@ -232,11 +191,8 @@
chars.append(c);
}
break;
- }
default:
- {
chars.append( c );
- }
}
++cur;
}
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
