# HG changeset patch # User darcy # Date 1382385157 25200 # Node ID d9d1ad598db134253cbf6acb11fc6929d7b65d1e # Parent e56a970409e5c0090a71c07a880edfd87750dfb7 8022658: Revisit FunctionalInterface on some core libs types Reviewed-by: briangoetz, mduigou, mr diff -r e56a970409e5 -r d9d1ad598db1 jdk/src/share/classes/java/io/Closeable.java --- a/jdk/src/share/classes/java/io/Closeable.java Mon Oct 21 11:16:02 2013 -0700 +++ b/jdk/src/share/classes/java/io/Closeable.java Mon Oct 21 12:52:37 2013 -0700 @@ -34,7 +34,6 @@ * * @since 1.5 */ -@FunctionalInterface public interface Closeable extends AutoCloseable { /** diff -r e56a970409e5 -r d9d1ad598db1 jdk/src/share/classes/java/io/Flushable.java --- a/jdk/src/share/classes/java/io/Flushable.java Mon Oct 21 11:16:02 2013 -0700 +++ b/jdk/src/share/classes/java/io/Flushable.java Mon Oct 21 12:52:37 2013 -0700 @@ -34,7 +34,6 @@ * * @since 1.5 */ -@FunctionalInterface public interface Flushable { /** diff -r e56a970409e5 -r d9d1ad598db1 jdk/src/share/classes/java/lang/AutoCloseable.java --- a/jdk/src/share/classes/java/lang/AutoCloseable.java Mon Oct 21 11:16:02 2013 -0700 +++ b/jdk/src/share/classes/java/lang/AutoCloseable.java Mon Oct 21 12:52:37 2013 -0700 @@ -48,7 +48,6 @@ * @author Josh Bloch * @since 1.7 */ -@FunctionalInterface public interface AutoCloseable { /** * Closes this resource, relinquishing any underlying resources. diff -r e56a970409e5 -r d9d1ad598db1 jdk/src/share/classes/java/lang/Comparable.java --- a/jdk/src/share/classes/java/lang/Comparable.java Mon Oct 21 11:16:02 2013 -0700 +++ b/jdk/src/share/classes/java/lang/Comparable.java Mon Oct 21 12:52:37 2013 -0700 @@ -93,7 +93,6 @@ * @see java.util.Comparator * @since 1.2 */ -@FunctionalInterface public interface Comparable { /** * Compares this object with the specified object for order. Returns a diff -r e56a970409e5 -r d9d1ad598db1 jdk/src/share/classes/java/lang/Iterable.java --- a/jdk/src/share/classes/java/lang/Iterable.java Mon Oct 21 11:16:02 2013 -0700 +++ b/jdk/src/share/classes/java/lang/Iterable.java Mon Oct 21 12:52:37 2013 -0700 @@ -42,7 +42,6 @@ * @since 1.5 * @jls 14.14.2 The enhanced for statement */ -@FunctionalInterface public interface Iterable { /** * Returns an iterator over elements of type {@code T}. diff -r e56a970409e5 -r d9d1ad598db1 jdk/src/share/classes/java/lang/Readable.java --- a/jdk/src/share/classes/java/lang/Readable.java Mon Oct 21 11:16:02 2013 -0700 +++ b/jdk/src/share/classes/java/lang/Readable.java Mon Oct 21 12:52:37 2013 -0700 @@ -34,7 +34,6 @@ * * @since 1.5 */ -@FunctionalInterface public interface Readable { /**