1 files changed, 5 insertions, 4 deletions
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSNotification.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSNotification.java
index 4fbd8af..90d09a4 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSNotification.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSNotification.java
@@ -33,7 +33,7 @@ public class NSNotification {
 
 	protected String name;
 	protected Object object;
-	protected Map userInfo;
+	protected Map<? extends Object, ? extends Object> userInfo;
 
 	// for debugging only
 	private Throwable stackTrace;
@@ -57,7 +57,7 @@ public class NSNotification {
 	 * Constructor specifying name, object, and a Map containing application
 	 * specific information.
 	 */
-	public NSNotification(String aName, Object anObject, Map aUserInfo) {
+	public NSNotification(String aName, Object anObject, Map<? extends Object, ? extends Object> aUserInfo) {
 		name = aName;
 		object = anObject;
 		if (showStack)
@@ -84,7 +84,7 @@ public class NSNotification {
 	 * specific information relating to this notification, or null if no such data
 	 * exists.
 	 */
-	public NSDictionary userInfo() {
+	public NSDictionary<? extends Object, ? extends Object> userInfo() {
 		if (userInfo == null)
 			return null;
 		return new NSDictionary<>(userInfo);
@@ -95,7 +95,7 @@ public class NSNotification {
 	 * notification, or null if no such data exists. Note: this method is not in the
 	 * spec.
 	 */
-	public Map userInfoMap() {
+	public Map<? extends Object, ? extends Object> userInfoMap() {
 		return userInfo;
 	}
 
@@ -111,6 +111,7 @@ public class NSNotification {
 	/**
 	 * Returns a human-readable string representation.
 	 */
+	@Override
 	public String toString() {
 		return "[ " + name() + " : " + object() + " : " + userInfo() + " ]";
 	}