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

1 files changed, 6 insertions, 9 deletions

diff --git a/org/madore/damlengine/TodoAttr.java b/org/madore/damlengine/TodoAttr.java
index 721b4f6..0cc5389 100644
--- a/org/madore/damlengine/TodoAttr.java
+++ b/org/madore/damlengine/TodoAttr.java
@@ -9,8 +9,8 @@ public abstract class TodoAttr extends TodoItem {
 
     public static abstract class Factory {
 	public abstract TodoAttr newItem(Attr attr, Element owner,
-					 Map<String,Object> context,
-					 Map<String,Object> options);
+					 TodoContext context,
+					 TodoItem.Options options);
     }
 
     protected static Map<String,Factory> damlAttrFactories;
@@ -22,20 +22,17 @@ public abstract class TodoAttr extends TodoItem {
 
     Attr attr;
     Element owner;
-    Map<String,Object> context;
-    Map<String,Object> options;
 
     public TodoAttr(Attr attr, Element owner,
-		    Map<String,Object> context, Map<String,Object> options) {
+		    TodoContext context, TodoItem.Options options) {
+	super(context, options);
 	this.attr = attr;
 	this.owner = owner;
-	this.context = context;
-	this.options = options;
     }
 
     public static TodoAttr getTodoAttr(Attr attr, Element owner,
-				       Map<String,Object> context,
-				       Map<String,Object> options) {
+				       TodoContext context,
+				       TodoItem.Options options) {
 	Factory factory = null;
 	String nsuri = attr.getNamespaceURI();
 	if ( nsuri != null && nsuri.equals(DamlEngine.DAML_NS) )