From 852ff66033951ea44a94c25d5eb9da418c87dac4 Mon Sep 17 00:00:00 2001 From: "David A. Madore" Date: Sat, 17 Apr 2010 13:32:16 +0200 Subject: Use ad hoc classes rather than hashes for context and options. --- org/madore/damlengine/DamlEngine.java | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'org/madore/damlengine/DamlEngine.java') diff --git a/org/madore/damlengine/DamlEngine.java b/org/madore/damlengine/DamlEngine.java index 712f7e3..03e089d 100644 --- a/org/madore/damlengine/DamlEngine.java +++ b/org/madore/damlengine/DamlEngine.java @@ -1,7 +1,5 @@ package org.madore.damlengine; -import java.util.LinkedList; -import java.util.HashMap; import java.io.OutputStreamWriter; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilder; @@ -13,17 +11,18 @@ public final class DamlEngine { public static final String DAML_NS = "http://www.madore.org/~david/NS/daml/"; - static Document doc; - private DamlEngine() { } // Forbid instantiation - public static void processDocument() { + public static class RootOptions extends TodoItem.Options { + } + + public static void processDocument(Document doc) { TodoDeque todoDeque = new TodoDeque(); - HashMap options = new HashMap(); - options.put("isRoot", true); - todoDeque.registerAtEnd(TodoElement.getTodoElement(doc.getDocumentElement(), - new HashMap(), - options)); + TodoContext context = new TodoContext(doc); + TodoItem.Options options = new RootOptions(); + todoDeque. + registerAtEnd(TodoElement.getTodoElement(doc.getDocumentElement(), + context, options)); todoDeque.dispatchLoop(); } @@ -42,8 +41,8 @@ public final class DamlEngine { } for (String fname : args) { - doc = db.parse(fname); - processDocument(); + Document doc = db.parse(fname); + processDocument(doc); doc.normalizeDocument(); Unparser unparser = new Unparser(doc, new OutputStreamWriter(System.out)); -- cgit v1.2.3