July 2006 - logback-dev - mailman3.qos.ch

svn commit: r288 - logback/access/trunk/src/main/java/ch/qos/logback/access
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 14:53:53 2006 New Revision: 288 Modified: logback/access/trunk/src/main/java/ch/qos/logback/access/PatternLayout.java Log: Type Safety Modified: logback/access/trunk/src/main/java/ch/qos/logback/access/PatternLayout.java ============================================================================== --- logback/access/trunk/src/main/java/ch/qos/logback/access/PatternLayout.java (original) +++ logback/access/trunk/src/main/java/ch/qos/logback/access/PatternLayout.java Tue Jul 25 14:53:53 2006 @@ -34,7 +34,7 @@ public class PatternLayout extends PatternLayoutBase implements AccessLayout { - static final Map defaultConverterMap = new HashMap(); + static final Map<String, String> defaultConverterMap = new HashMap<String, String>(); public static String CLF_PATTERN = "%h %l %u %t \"%r\" %s %b";

1 0

svn commit: r287 - logback/core/trunk/src/test/java/ch/qos/logback/core/pattern/parser
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 14:53:02 2006 New Revision: 287 Modified: logback/core/trunk/src/test/java/ch/qos/logback/core/pattern/parser/TokenStreamTest.java Log: Type Safety Modified: logback/core/trunk/src/test/java/ch/qos/logback/core/pattern/parser/TokenStreamTest.java ============================================================================== --- logback/core/trunk/src/test/java/ch/qos/logback/core/pattern/parser/TokenStreamTest.java (original) +++ logback/core/trunk/src/test/java/ch/qos/logback/core/pattern/parser/TokenStreamTest.java Tue Jul 25 14:53:02 2006 @@ -40,7 +40,7 @@ public void testSingleLiteral() throws ScanException { List tl = new TokenStream("hello").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(new Token(Token.LITERAL, "hello")); assertEquals(witness, tl); } @@ -49,20 +49,20 @@ { List tl = new TokenStream("hello\\%world").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(new Token(Token.LITERAL, "hello%world")); assertEquals(witness, tl); } { List tl = new TokenStream("hello\\%").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(new Token(Token.LITERAL, "hello%")); assertEquals(witness, tl); } { List tl = new TokenStream("\\%").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(new Token(Token.LITERAL, "%")); assertEquals(witness, tl); } @@ -73,7 +73,7 @@ // test "%c" { List tl = new TokenStream("%c").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(Token.PERCENT_TOKEN); witness.add(new Token(Token.KEYWORD, "c")); assertEquals(witness, tl); @@ -82,7 +82,7 @@ { // test "xyz%-34c" List tl = new TokenStream("%a%b").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(Token.PERCENT_TOKEN); witness.add(new Token(Token.KEYWORD, "a")); witness.add(Token.PERCENT_TOKEN); @@ -93,7 +93,7 @@ { // test "xyz%-34c" List tl = new TokenStream("xyz%-34c").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(new Token(Token.LITERAL, "xyz")); witness.add(Token.PERCENT_TOKEN); witness.add(new Token(Token.FORMAT_MODIFIER, "-34")); @@ -104,7 +104,7 @@ public void testComplexNR() throws ScanException { List tl = new TokenStream("%d{1234} [%34.-67toto] %n").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(Token.PERCENT_TOKEN); witness.add(new Token(Token.KEYWORD, "d")); witness.add(new Token(Token.OPTION, "1234")); @@ -120,7 +120,7 @@ public void testEmptyP() throws ScanException { List tl = new TokenStream("()").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(new Token(Token.LITERAL, "(")); witness.add(Token.RIGHT_PARENTHESIS_TOKEN); assertEquals(witness, tl); @@ -128,7 +128,7 @@ public void testEmptyP2() throws ScanException { List tl = new TokenStream("%()").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(Token.PERCENT_TOKEN); witness.add(Token.LEFT_PARENTHESIS_TOKEN); witness.add(Token.RIGHT_PARENTHESIS_TOKEN); @@ -138,21 +138,21 @@ public void testEscape() throws ScanException { { List tl = new TokenStream("\\%").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(new Token(Token.LITERAL, "%")); assertEquals(witness, tl); } { List tl = new TokenStream("\\%\\(\\t\\)\\r\\n").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(new Token(Token.LITERAL, "%(\t)\r\n")); assertEquals(witness, tl); } { List tl = new TokenStream("\\\\%x").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(new Token(Token.LITERAL, "\\")); witness.add(Token.PERCENT_TOKEN); witness.add(new Token(Token.KEYWORD, "x")); @@ -161,7 +161,7 @@ { List tl = new TokenStream("%x\\)").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(Token.PERCENT_TOKEN); witness.add(new Token(Token.KEYWORD, "x")); witness.add(new Token(Token.LITERAL, ")")); @@ -170,7 +170,7 @@ { List tl = new TokenStream("%x\\_a").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(Token.PERCENT_TOKEN); witness.add(new Token(Token.KEYWORD, "x")); witness.add(new Token(Token.LITERAL, "a")); @@ -178,7 +178,7 @@ } { List tl = new TokenStream("%x\\_%b").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(Token.PERCENT_TOKEN); witness.add(new Token(Token.KEYWORD, "x")); witness.add(Token.PERCENT_TOKEN); @@ -190,7 +190,7 @@ public void testOptions() throws ScanException { { List tl = new TokenStream("%x{t}").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(Token.PERCENT_TOKEN); witness.add(new Token(Token.KEYWORD, "x")); witness.add(new Token(Token.OPTION, "t")); @@ -199,7 +199,7 @@ { List tl = new TokenStream("%x{t,y}").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(Token.PERCENT_TOKEN); witness.add(new Token(Token.KEYWORD, "x")); witness.add(new Token(Token.OPTION, "t,y")); @@ -208,7 +208,7 @@ { List tl = new TokenStream("%x{\"hello world.\", \"12y \"}").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(Token.PERCENT_TOKEN); witness.add(new Token(Token.KEYWORD, "x")); witness.add(new Token(Token.OPTION, "\"hello world.\", \"12y \"")); @@ -217,7 +217,7 @@ { List tl = new TokenStream("%x{opt\\}}").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(Token.PERCENT_TOKEN); witness.add(new Token(Token.KEYWORD, "x")); witness.add(new Token(Token.OPTION, "opt}")); @@ -227,7 +227,7 @@ public void testSimpleP() throws ScanException { List tl = new TokenStream("%(hello %class{.4?})").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(Token.PERCENT_TOKEN); witness.add(Token.LEFT_PARENTHESIS_TOKEN); witness.add(new Token(Token.LITERAL, "hello ")); @@ -240,7 +240,7 @@ public void testSimpleP2() throws ScanException { List tl = new TokenStream("X %a %-12.550(hello %class{.4?})").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(new Token(Token.LITERAL, "X ")); witness.add(Token.PERCENT_TOKEN); witness.add(new Token(Token.KEYWORD, "a")); @@ -258,7 +258,7 @@ public void testMultipleRecursion() throws ScanException { List tl = new TokenStream("%-1(%d %45(%class %file))").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(Token.PERCENT_TOKEN); witness.add(new Token(Token.FORMAT_MODIFIER, "-1")); witness.add(Token.LEFT_PARENTHESIS_TOKEN); @@ -282,7 +282,7 @@ public void testNested() throws ScanException { { List tl = new TokenStream("%(%a%(%b))").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(Token.PERCENT_TOKEN); witness.add(Token.LEFT_PARENTHESIS_TOKEN); witness.add(Token.PERCENT_TOKEN); @@ -299,7 +299,7 @@ { List tl = new TokenStream("\\(%h\\)").tokenize(); - List witness = new ArrayList(); + List<Token> witness = new ArrayList<Token>(); witness.add(new Token(Token.LITERAL, "(")); witness.add(Token.PERCENT_TOKEN); witness.add(new Token(Token.KEYWORD, "h"));

1 0

svn commit: r286 - logback/core/trunk/src/test/java/ch/qos/logback/core/pattern/parser
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 14:51:05 2006 New Revision: 286 Modified: logback/core/trunk/src/test/java/ch/qos/logback/core/pattern/parser/OptionTokenizerTest.java Log: Type Safety Modified: logback/core/trunk/src/test/java/ch/qos/logback/core/pattern/parser/OptionTokenizerTest.java ============================================================================== --- logback/core/trunk/src/test/java/ch/qos/logback/core/pattern/parser/OptionTokenizerTest.java (original) +++ logback/core/trunk/src/test/java/ch/qos/logback/core/pattern/parser/OptionTokenizerTest.java Tue Jul 25 14:51:05 2006 @@ -37,7 +37,7 @@ public void testSimple() throws ScanException { { List ol = new OptionTokenizer("abc").tokenize(); - List witness = new ArrayList(); + List<String> witness = new ArrayList<String>(); witness.add("abc"); assertEquals(witness, ol); } @@ -46,28 +46,28 @@ public void testSingleQuote() throws ScanException { { List ol = new OptionTokenizer("' '").tokenize(); - List witness = new ArrayList(); + List<String> witness = new ArrayList<String>(); witness.add(" "); assertEquals(witness, ol); } { List ol = new OptionTokenizer("' x\t'").tokenize(); - List witness = new ArrayList(); + List<String> witness = new ArrayList<String>(); witness.add(" x\t"); assertEquals(witness, ol); } { List ol = new OptionTokenizer("' x\\t'").tokenize(); - List witness = new ArrayList(); + List<String> witness = new ArrayList<String>(); witness.add(" x\t"); assertEquals(witness, ol); } { List ol = new OptionTokenizer("' x\\''").tokenize(); - List witness = new ArrayList(); + List<String> witness = new ArrayList<String>(); witness.add(" x\'"); assertEquals(witness, ol); } @@ -76,28 +76,28 @@ public void testDoubleQuote() throws ScanException { { List ol = new OptionTokenizer("\" \"").tokenize(); - List witness = new ArrayList(); + List<String> witness = new ArrayList<String>(); witness.add(" "); assertEquals(witness, ol); } { List ol = new OptionTokenizer("\" x\t\"").tokenize(); - List witness = new ArrayList(); + List<String> witness = new ArrayList<String>(); witness.add(" x\t"); assertEquals(witness, ol); } { List ol = new OptionTokenizer("\" x\\t\"").tokenize(); - List witness = new ArrayList(); + List<String> witness = new ArrayList<String>(); witness.add(" x\t"); assertEquals(witness, ol); } { List ol = new OptionTokenizer("\" x\\\"\"").tokenize(); - List witness = new ArrayList(); + List<String> witness = new ArrayList<String>(); witness.add(" x\""); assertEquals(witness, ol); } @@ -106,7 +106,7 @@ public void testMultiple() throws ScanException { { List ol = new OptionTokenizer("a, b").tokenize(); - List witness = new ArrayList(); + List<String> witness = new ArrayList<String>(); witness.add("a"); witness.add("b"); assertEquals(witness, ol);

1 0

svn commit: r285 - logback/core/trunk/src/main/java/ch/qos/logback/core/pattern/parser
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 14:49:25 2006 New Revision: 285 Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/pattern/parser/OptionTokenizer.java Log: Type Safety Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/pattern/parser/OptionTokenizer.java ============================================================================== --- logback/core/trunk/src/main/java/ch/qos/logback/core/pattern/parser/OptionTokenizer.java (original) +++ logback/core/trunk/src/main/java/ch/qos/logback/core/pattern/parser/OptionTokenizer.java Tue Jul 25 14:49:25 2006 @@ -28,7 +28,7 @@ } List tokenize() throws ScanException { - List tokenList = new ArrayList(); + List<String> tokenList = new ArrayList<String>(); StringBuffer buf = new StringBuffer(); while (pointer < patternLength) {

1 0

svn commit: r284 - logback/classic/trunk/src/test/java/ch/qos/logback/classic/pattern
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 14:48:05 2006 New Revision: 284 Modified: logback/classic/trunk/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java Log: Type Safety Modified: logback/classic/trunk/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java ============================================================================== --- logback/classic/trunk/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java (original) +++ logback/classic/trunk/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java Tue Jul 25 14:48:05 2006 @@ -41,7 +41,7 @@ Logger logger = LoggerFactory.getLogger(ConverterTest.class); LoggingEvent le; - List optionList = new ArrayList(); + List<String> optionList = new ArrayList<String>(); public ConverterTest(String arg0) { super(arg0);

1 0

svn commit: r283 - logback/classic/trunk/src/main/java/org/slf4j/impl
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 14:47:28 2006 New Revision: 283 Modified: logback/classic/trunk/src/main/java/org/slf4j/impl/BasicMarker.java Log: Type Safety Modified: logback/classic/trunk/src/main/java/org/slf4j/impl/BasicMarker.java ============================================================================== --- logback/classic/trunk/src/main/java/org/slf4j/impl/BasicMarker.java (original) +++ logback/classic/trunk/src/main/java/org/slf4j/impl/BasicMarker.java Tue Jul 25 14:47:28 2006 @@ -56,7 +56,7 @@ */ public class BasicMarker implements Marker { final String name; - List children; + List<Marker> children; final IMarkerFactory factory; BasicMarker(String name, IMarkerFactory factory) { @@ -74,7 +74,7 @@ "Null children cannot be added to a Marker."); } if (children == null) { - children = new Vector(); + children = new Vector<Marker>(); } children.add(child); }

1 0

svn commit: r282 - logback/classic/trunk/src/main/java/ch/qos/logback/classic/pattern
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 14:46:45 2006 New Revision: 282 Modified: logback/classic/trunk/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java Log: Type Safety Modified: logback/classic/trunk/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java ============================================================================== --- logback/classic/trunk/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java (original) +++ logback/classic/trunk/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java Tue Jul 25 14:46:45 2006 @@ -20,7 +20,7 @@ public class ThrowableInformationConverter extends ThrowableHandlingConverter { int lengthOption; - List evaluatorList = null; + List<EventEvaluator> evaluatorList = null; public void start() { @@ -62,7 +62,7 @@ private void addEvaluator(EventEvaluator ee) { if (evaluatorList == null) { - evaluatorList = new ArrayList(); + evaluatorList = new ArrayList<EventEvaluator>(); } evaluatorList.add(ee); }

1 0

svn commit: r281 - logback/classic/trunk/src/main/java/ch/qos/logback/classic/pattern
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 14:45:55 2006 New Revision: 281 Modified: logback/classic/trunk/src/main/java/ch/qos/logback/classic/pattern/CallerDataConverter.java Log: Type Safety Modified: logback/classic/trunk/src/main/java/ch/qos/logback/classic/pattern/CallerDataConverter.java ============================================================================== --- logback/classic/trunk/src/main/java/ch/qos/logback/classic/pattern/CallerDataConverter.java (original) +++ logback/classic/trunk/src/main/java/ch/qos/logback/classic/pattern/CallerDataConverter.java Tue Jul 25 14:45:55 2006 @@ -29,7 +29,7 @@ public class CallerDataConverter extends ClassicConverter { int depth = 5; - List evaluatorList; + List<EventEvaluator> evaluatorList; public void start() { String depthStr = getFirstOption(); @@ -64,7 +64,7 @@ private void addEvaluator(EventEvaluator ee) { if (evaluatorList == null) { - evaluatorList = new ArrayList(); + evaluatorList = new ArrayList<EventEvaluator>(); } evaluatorList.add(ee); }

1 0

svn commit: r280 - logback/classic/trunk/src/main/java/ch/qos/logback/classic/boolex
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 14:45:05 2006 New Revision: 280 Modified: logback/classic/trunk/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java Log: Type Safety Modified: logback/classic/trunk/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java ============================================================================== --- logback/classic/trunk/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java (original) +++ logback/classic/trunk/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java Tue Jul 25 14:45:05 2006 @@ -19,8 +19,8 @@ public final static String IMPORT_LEVEL = "import ch.qos.logback.classic.Level;\r\n"; - public final static List DEFAULT_PARAM_NAME_LIST = new ArrayList(); - public final static List DEFAULT_PARAM_TYPE_LIST = new ArrayList(); + public final static List<String> DEFAULT_PARAM_NAME_LIST = new ArrayList<String>(); + public final static List<Class> DEFAULT_PARAM_TYPE_LIST = new ArrayList<Class>(); static { DEFAULT_PARAM_NAME_LIST.add("DEBUG"); @@ -55,7 +55,7 @@ } protected String[] getParameterNames() { - List fullNameList = new ArrayList(); + List<String> fullNameList = new ArrayList<String>(); fullNameList.addAll(DEFAULT_PARAM_NAME_LIST); for(int i = 0; i < matcherList.size(); i++) { @@ -67,7 +67,7 @@ } protected Class[] getParameterTypes() { - List fullTypeList = new ArrayList(); + List<Class> fullTypeList = new ArrayList<Class>(); fullTypeList.addAll(DEFAULT_PARAM_TYPE_LIST); for(int i = 0; i < matcherList.size(); i++) { fullTypeList.add(Matcher.class);

1 0

svn commit: r279 - logback/classic/trunk/src/main/java/ch/qos/logback/classic
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 14:43:42 2006 New Revision: 279 Modified: logback/classic/trunk/src/main/java/ch/qos/logback/classic/Logger.java Log: Type Safety Modified: logback/classic/trunk/src/main/java/ch/qos/logback/classic/Logger.java ============================================================================== --- logback/classic/trunk/src/main/java/ch/qos/logback/classic/Logger.java (original) +++ logback/classic/trunk/src/main/java/ch/qos/logback/classic/Logger.java Tue Jul 25 14:43:42 2006 @@ -22,7 +22,6 @@ import ch.qos.logback.core.filter.Filter; import ch.qos.logback.core.spi.AppenderAttachable; import ch.qos.logback.core.spi.AppenderAttachableImpl; -import ch.qos.logback.core.status.ErrorStatus; public final class Logger implements org.slf4j.Logger, AppenderAttachable { @@ -56,7 +55,7 @@ /** * The children of this logger. A logger may have zero or more children. */ - private List childrenList; + private List<Logger> childrenList; private AppenderAttachableImpl aai; /** @@ -311,7 +310,7 @@ } if (childrenList == null) { - childrenList = new ArrayList(); + childrenList = new ArrayList<Logger>(); } Logger childLogger; if (this.isRootLogger()) { @@ -343,7 +342,7 @@ } if (childrenList == null) { - childrenList = new ArrayList(DEFAULT_CHILD_ARRAY_SIZE); + childrenList = new ArrayList<Logger>(DEFAULT_CHILD_ARRAY_SIZE); } Logger childLogger; childLogger = new Logger(childName, this, this.loggerContext);

1 0