1 files changed, 8 insertions, 8 deletions

diff --git a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WODynamicElement.java b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WODynamicElement.java
index 6cf7acd..8cae72c 100644
--- a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WODynamicElement.java
+++ b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WODynamicElement.java
@@ -39,14 +39,14 @@ public abstract class WODynamicElement extends WOElement {
 	private static final long serialVersionUID = -5383805382837136590L;
 	protected String name;
 	protected WOElement rootElement;
-	protected NSDictionary associations;
+	protected NSDictionary<String, Object> associations;
 
 	/**
 	 * The default constructor.
 	 */
 	protected WODynamicElement() {
 		name = null;
-		associations = new NSMutableDictionary();
+		associations = new NSMutableDictionary<>();
 		rootElement = null;
 	}
 
@@ -57,7 +57,7 @@ public abstract class WODynamicElement extends WOElement {
 	 * and the values are associations to be applied to the context's current
 	 * component.
 	 */
-	public WODynamicElement(String aName, NSDictionary anAssociationMap, WOElement aRootElement) {
+	public WODynamicElement(String aName, NSDictionary<String, Object> anAssociationMap, WOElement aRootElement) {
 		this();
 		name = aName;
 		associations = anAssociationMap;
@@ -84,9 +84,9 @@ public abstract class WODynamicElement extends WOElement {
 	 * @param c The component where the values of the properties have to be
 	 *          retrieved from.
 	 */
-	Map urlFields(WOComponent c) {
-		HashMap map = new HashMap(associations.count());
-		Enumeration enumeration = associations.keyEnumerator();
+	Map<String, Object> urlFields(WOComponent c) {
+		HashMap<String, Object> map = new HashMap<>(associations.count());
+		Enumeration<String> enumeration = associations.keyEnumerator();
 		while (enumeration.hasMoreElements()) {
 			String key = (String) enumeration.nextElement();
 			if (key.charAt(0) == '?') {
@@ -147,8 +147,8 @@ public abstract class WODynamicElement extends WOElement {
 	 * @param standardProperties An array of Strings with all the associations that
 	 *                           should be excluded from the resulting string.
 	 */
-	String additionalHTMLProperties(WOComponent c, NSArray standardProperties) {
-		Enumeration enumeration = associations.keyEnumerator();
+	String additionalHTMLProperties(WOComponent c, NSArray<String> standardProperties) {
+		Enumeration<String> enumeration = associations.keyEnumerator();
 		StringBuffer buf = new StringBuffer();
 		while (enumeration.hasMoreElements()) {
 			String key = (String) enumeration.nextElement();