# HG changeset patch # User Jaroslav Tulach # Date 1348893258 -7200 # Node ID 506ef276a0db79993a3eabc39ef67cae48774be6 # Parent 752e94f59412dfd4fb62f75e513aaf4ab224c007 Make it compilable with JDK1.6 diff -r 752e94f59412 -r 506ef276a0db emul/src/main/java/java/lang/String.java --- a/emul/src/main/java/java/lang/String.java Sat Sep 29 06:29:06 2012 +0200 +++ b/emul/src/main/java/java/lang/String.java Sat Sep 29 06:34:18 2012 +0200 @@ -2330,7 +2330,7 @@ int off = 0; int next = 0; boolean limited = limit > 0; - ArrayList list = new ArrayList<>(); + ArrayList list = new ArrayList(); while ((next = indexOf(ch, off)) != -1) { if (!limited || list.size() < limit - 1) { list.add(substring(off, next)); diff -r 752e94f59412 -r 506ef276a0db emul/src/main/java/java/lang/Throwable.java --- a/emul/src/main/java/java/lang/Throwable.java Sat Sep 29 06:29:06 2012 +0200 +++ b/emul/src/main/java/java/lang/Throwable.java Sat Sep 29 06:34:18 2012 +0200 @@ -917,7 +917,7 @@ // Use the sentinel for a zero-length list suppressed = SUPPRESSED_SENTINEL; } else { // Copy Throwables to new list - suppressed = new ArrayList<>(1); + suppressed = new ArrayList(1); for (Throwable t : suppressedExceptions) { // Enforce constraints on suppressed exceptions in // case of corrupt or malicious stream. @@ -1048,7 +1048,7 @@ return; if (suppressedExceptions == SUPPRESSED_SENTINEL) - suppressedExceptions = new ArrayList<>(1); + suppressedExceptions = new ArrayList(1); suppressedExceptions.add(exception); }