From fffc5f315111381d4bfe7678b4aa8fe37c2f6b21 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Fri, 26 Oct 2012 12:17:08 +0100 Subject: Cleanup ChangeLog entry from previous merge. --- ChangeLog | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 10976dd1b..f9fb3bd04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,18 +1,29 @@ 2012-10-16 Ivan Maidanski * java/util/Collections.java: - (emptySet(), EmptySet.iterator(), emptyList(), emptyMap(), - EmptyMap.entrySet(), EmptyMap.keySet(), EmptyMap.values()): Suppress - "unchecked" warnings. - (emptySet(), emptyList(), emptyMap()): Don't create new instance (use - the corresponding immutable container instance); remove FIXME. - (EmptySet.equals(Object), EmptyList.equals(Object), - EmptyMap.entrySet(), EmptyMap.equals(Object), EmptyMap.keySet(), - EmptyMap.values()): Add generic typing. + (emptySet()): Don't create new instance, instead using + the corresponding immutable container instance. Remove FIXME + and suppress resulting unchecked warning. + (EmptySet.iterator()): Suppress warning due to cast + for immutable container instance. + (EmptySet.equals(Object)): Add type parameters. + (emptyList()): Don't create new instance, instead using + the corresponding immutable container instance. Remove FIXME + and suppress resulting unchecked warning. + (EmptyList.equals(Object)): Add type parameters. + (emptyMap()): Don't create new instance, instead using + the corresponding immutable container instance. Remove FIXME + and suppress resulting unchecked warning. + (EmptyMap.entrySet()): Cast to parameterised type and + suppress warning. + (EmptyMap.equals(Object)): Add type parameters. + (EmptyMap.keySet()): Cast to parameterised type and + suppress warning. + (EmptyMap.values()): Likewise. (SingletonList.subList(int, int)): Use emptyList() instead of - EMPTY_LIST (to eliminate "unchecked" warning). - (SynchronizedCollection.toArray(T[])): Rename T type to E (to - suppress compiler warning about type hiding). + EMPTY_LIST to eliminate unchecked warning. + (SynchronizedCollection.toArray(T[])): Rename T type to E to + suppress compiler warning about type hiding. 2012-10-26 Andrew John Hughes -- cgit v1.2.1