Use ad hoc classes rather than hashes for context and options.

1 files changed, 11 insertions, 11 deletions

diff --git a/org/madore/damlengine/TodoDefaultElement.java b/org/madore/damlengine/TodoDefaultElement.java
index 942bca1..fd916e3 100644
--- a/org/madore/damlengine/TodoDefaultElement.java
+++ b/org/madore/damlengine/TodoDefaultElement.java
@@ -1,7 +1,5 @@
 package org.madore.damlengine;
 
-import java.util.Map;
-import java.util.HashMap;
 import java.util.ArrayList;
 import org.w3c.dom.*;
 
@@ -9,16 +7,16 @@ public class TodoDefaultElement extends TodoElement {
 
     public static class Factory extends TodoElement.Factory {
 	public TodoDefaultElement newItem(Element node,
-					  Map<String,Object> context,
-					  Map<String,Object> options) {
+					  TodoContext context,
+					  TodoItem.Options options) {
 	    return new TodoDefaultElement(node, context, options);
 	}
     }
 
     public TodoDefaultElement(Element node,
-			      Map<String,Object> context,
-			      Map<String,Object> options) {
-	super(node,context,options);
+			      TodoContext context,
+			      TodoItem.Options options) {
+	super(node, context, options);
     }
 
     public void handleAttributes() {
@@ -26,8 +24,9 @@ public class TodoDefaultElement extends TodoElement {
 	Node attr;
 	ArrayList<TodoAttr> toProcess = new ArrayList<TodoAttr>();
 	for ( int i=0 ; (attr=attrs.item(i)) != null ; i++ ) {
-	    TodoAttr it = TodoAttr.getTodoAttr((Attr)attr, this.node, this.context,
-					       new HashMap<String,Object>());
+	    TodoAttr it
+		= TodoAttr.getTodoAttr((Attr)attr, this.node, this.context,
+				       new TodoItem.Options());
 	    if ( it != null )
 		toProcess.add(it);
 	}
@@ -41,8 +40,9 @@ public class TodoDefaultElement extends TodoElement {
 	ArrayList<TodoElement> toProcess = new ArrayList<TodoElement>();
 	for ( int i=0 ; (child=children.item(i)) != null ; i++ ) {
 	    if ( child.getNodeType() == Node.ELEMENT_NODE ) {
-		TodoElement it = TodoElement.getTodoElement((Element)child, this.context,
-							    new HashMap<String,Object>());
+		TodoElement it
+		    = TodoElement.getTodoElement((Element)child, this.context,
+						 new TodoItem.Options());
 		toProcess.add(it);
 	    }
 	}