changeset 3473:028ef371113f

8150077: Due to a javac type inference issue, javadoc doesn't compile with a jdk prior to 8u40 Reviewed-by: jjg
author simonis
date Wed, 17 Feb 2016 19:09:44 +0100
parents fb1ccb29bf7f
children b14765617d7f
files src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/RootDocImpl.java
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java	Wed Feb 17 11:19:07 2016 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java	Wed Feb 17 19:09:44 2016 +0100
@@ -176,7 +176,7 @@
         List<Element> excludeList = members.stream()
                 .filter((member) -> (!isDeprecated(member)))
                 .sorted(makeGeneralPurposeComparator())
-                .collect(Collectors.toCollection(ArrayList::new));
+                .collect(Collectors.<Element, List<Element>>toCollection(ArrayList::new));
         return excludeList;
     }
 
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/RootDocImpl.java	Wed Feb 17 11:19:07 2016 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/RootDocImpl.java	Wed Feb 17 19:09:44 2016 +0100
@@ -272,7 +272,7 @@
     public List<Element> getSelectedElements(List<? extends Element> elements) {
         return elements.stream()
                 .filter(e -> isIncluded(e))
-                .collect(Collectors.toList());
+                .collect(Collectors.<Element>toList());
     }
 
     @Override