mcconnell 2003/02/04 22:14:13 Modified: src/java/org/apache/log/format PatternFormatter.java Log: Checkstyle corrections. Revision Changes Path 1.36 +23 -14 jakarta-avalon-logkit/src/java/org/apache/log/format/PatternFormatter.java Index: PatternFormatter.java =================================================================== RCS file: /home/cvs/jakarta-avalon-logkit/src/java/org/apache/log/format/PatternFormatter.java,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- PatternFormatter.java 3 Feb 2003 17:40:12 -0000 1.35 +++ PatternFormatter.java 5 Feb 2003 06:14:13 -0000 1.36 @@ -144,6 +144,7 @@ * and maximum size of 10, followed by the message of the log event * without any size restriction. * </p> + * @author <a href="mailto:avalon-dev@jakarta.apache.org">Avalon Development Team</a> * @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a> * @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a> * @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a> @@ -208,6 +209,10 @@ { } + /** + * Creation of a new patter formatter baseed on a supplied pattern. + * @param pattern the patter + */ public PatternFormatter( final String pattern ) { parse( pattern ); @@ -230,7 +235,9 @@ //first check for a +|- sign if( '+' == pattern[ index ] ) + { index++; + } else if( '-' == pattern[ index ] ) { run.m_rightJustify = true; @@ -267,15 +274,14 @@ if( index >= pattern.length || '{' != pattern[ index ] ) { - throw - new IllegalArgumentException( "Badly formed pattern at character " + - index ); + throw new IllegalArgumentException( + "Badly formed pattern at character " + index ); } int typeStart = index; - while( index < pattern.length && - pattern[ index ] != ':' && pattern[ index ] != '}' ) + while( index < pattern.length + && pattern[ index ] != ':' && pattern[ index ] != '}' ) { index++; } @@ -302,9 +308,9 @@ if( index >= pattern.length || '}' != pattern[ index ] ) { - throw new - IllegalArgumentException( "Unterminated type in pattern at character " - + index ); + throw new IllegalArgumentException( + "Unterminated type in pattern at character " + + index ); } index++; @@ -332,7 +338,10 @@ final int start = index; boolean escapeMode = false; - if( '%' == pattern[ index ] ) index++; + if( '%' == pattern[ index ] ) + { + index++; + } final StringBuffer sb = new StringBuffer(); @@ -516,8 +525,8 @@ return getPriority( event.getPriority(), run.m_format ); case TYPE_CONTEXT: - if( null == run.m_format || - run.m_format.startsWith( "stack" ) ) + if( null == run.m_format + || run.m_format.startsWith( "stack" ) ) { //Print a warning out to stderr here //to indicate you are using a deprecated feature? @@ -732,8 +741,8 @@ while( index < size ) { - if( pattern[ index ] == '%' && - !( index != size - 1 && pattern[ index + 1 ] == '%' ) ) + if( pattern[ index ] == '%' + && !( index != size - 1 && pattern[ index + 1 ] == '%' ) ) { index += addPatternRun( stack, pattern, index ); }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]