From 961bdfc66151b9aef46149e4730110ef409e5587 Mon Sep 17 00:00:00 2001 From: "David A. Madore" Date: Fri, 26 Aug 2011 16:53:03 +0200 Subject: Move most of the context to a "general context" substructure. This is so as to make sure that cloning (which does a shallow copy) gives us references to the same mutable content. --- org/madore/damlengine/Context.java | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) (limited to 'org/madore/damlengine/Context.java') diff --git a/org/madore/damlengine/Context.java b/org/madore/damlengine/Context.java index 22912a7..f5d12bf 100644 --- a/org/madore/damlengine/Context.java +++ b/org/madore/damlengine/Context.java @@ -6,19 +6,24 @@ import org.w3c.dom.*; public class Context implements Cloneable { public final Document doc; - public Element htmlNode; - public Element headNode; - public String uriToTop; - public String fileName; - public StringBuffer styleContent; - public StringBuffer scriptContent; - public DocumentFragment title; - public String titleStr; - public String titleLang; - public DocumentFragment subtitle; - public String subtitleStr; - public String subtitleLang; - public ArrayList translations; + + public static class GeneralContext { + public Element htmlNode; + public Element headNode; + public String uriToTop; + public String fileName; + public StringBuffer styleContent; + public StringBuffer scriptContent; + public DocumentFragment title; + public String titleStr; + public String titleLang; + public DocumentFragment subtitle; + public String subtitleStr; + public String subtitleLang; + public ArrayList translations; + } + + public GeneralContext gc; public static class EntryContext { public String year; @@ -37,10 +42,11 @@ public class Context implements Cloneable { } } - public EntryContext entryCtx; + public EntryContext ent; public Context(Document doc) { this.doc = doc; + this.gc = new GeneralContext(); } public Context clone() { -- cgit v1.2.3