From 9523be50de24af87fed6cf9dd305d7de2d34b9f8 Mon Sep 17 00:00:00 2001
From: James Strachan <james.strachan@gmail.com>
Date: Fri, 24 Feb 2012 17:25:59 +0000
Subject: [PATCH] added not null helper methods for Set and Map

---
 stdlib/ktSrc/JavaUtil.kt    | 8 ++++++--
 stdlib/ktSrc/JavaUtilMap.kt | 5 +++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/stdlib/ktSrc/JavaUtil.kt b/stdlib/ktSrc/JavaUtil.kt
index 6d0c7ce2de8..4c54219cb2a 100644
--- a/stdlib/ktSrc/JavaUtil.kt
+++ b/stdlib/ktSrc/JavaUtil.kt
@@ -55,8 +55,12 @@ inline fun <in T: java.lang.Comparable<T>> List<T>.sort(comparator: java.util.Co
 }
 
 /** Converts the nullable List into an empty List if its null */
-inline fun <T> java.util.List<T>?.notNull() : List<T>
-    = if (this != null) this else Collections.EMPTY_LIST as List<T>
+inline fun <T> java.util.List<T>?.notNull() : java.util.List<T>
+    = if (this != null) this else Collections.EMPTY_LIST as java.util.List<T>
+
+/** Converts the nullable Set into an empty Set if its null */
+inline fun <T> java.util.Set<T>?.notNull() : java.util.Set<T>
+    = if (this != null) this else Collections.EMPTY_SET as java.util.Set<T>
 
 /**
   TODO figure out necessary variance/generics ninja stuff... :)
diff --git a/stdlib/ktSrc/JavaUtilMap.kt b/stdlib/ktSrc/JavaUtilMap.kt
index 7c02d1f65cc..985e89225b5 100644
--- a/stdlib/ktSrc/JavaUtilMap.kt
+++ b/stdlib/ktSrc/JavaUtilMap.kt
@@ -2,6 +2,7 @@ package std.util
 
 import java.util.Map as JMap
 import java.util.HashMap
+import java.util.Collections
 
 // Temporary workaround: commenting out
 //import java.util.Map.Entry as JEntry
@@ -19,6 +20,10 @@ val JMap<*,*>.empty : Boolean
 /** Provides [] access to maps */
 fun <K, V> JMap<K, V>.set(key : K, value : V) = this.put(key, value)
 
+/** Converts the nullable Map into an empty Map if its null */
+inline fun <K,V> java.util.Map<K,V>?.notNull() : java.util.Map<K,V>
+    = if (this != null) this else Collections.EMPTY_MAP as java.util.Map<K,V>
+
 
 /** Returns the key of the entry */
 // Temporary workaround: commenting out