Make it compilable with JDK1.6 emul
authorJaroslav Tulach <jaroslav.tulach@apidesign.org>
Sat, 29 Sep 2012 06:34:18 +0200
branchemul
changeset 51506ef276a0db
parent 50 752e94f59412
child 53 479af3c3f834
Make it compilable with JDK1.6
emul/src/main/java/java/lang/String.java
emul/src/main/java/java/lang/Throwable.java
     1.1 --- a/emul/src/main/java/java/lang/String.java	Sat Sep 29 06:29:06 2012 +0200
     1.2 +++ b/emul/src/main/java/java/lang/String.java	Sat Sep 29 06:34:18 2012 +0200
     1.3 @@ -2330,7 +2330,7 @@
     1.4              int off = 0;
     1.5              int next = 0;
     1.6              boolean limited = limit > 0;
     1.7 -            ArrayList<String> list = new ArrayList<>();
     1.8 +            ArrayList<String> list = new ArrayList<String>();
     1.9              while ((next = indexOf(ch, off)) != -1) {
    1.10                  if (!limited || list.size() < limit - 1) {
    1.11                      list.add(substring(off, next));
     2.1 --- a/emul/src/main/java/java/lang/Throwable.java	Sat Sep 29 06:29:06 2012 +0200
     2.2 +++ b/emul/src/main/java/java/lang/Throwable.java	Sat Sep 29 06:34:18 2012 +0200
     2.3 @@ -917,7 +917,7 @@
     2.4                  // Use the sentinel for a zero-length list
     2.5                  suppressed = SUPPRESSED_SENTINEL;
     2.6              } else { // Copy Throwables to new list
     2.7 -                suppressed = new ArrayList<>(1);
     2.8 +                suppressed = new ArrayList<Throwable>(1);
     2.9                  for (Throwable t : suppressedExceptions) {
    2.10                      // Enforce constraints on suppressed exceptions in
    2.11                      // case of corrupt or malicious stream.
    2.12 @@ -1048,7 +1048,7 @@
    2.13              return;
    2.14  
    2.15          if (suppressedExceptions == SUPPRESSED_SENTINEL)
    2.16 -            suppressedExceptions = new ArrayList<>(1);
    2.17 +            suppressedExceptions = new ArrayList<Throwable>(1);
    2.18  
    2.19          suppressedExceptions.add(exception);
    2.20      }