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.

1 files changed, 20 insertions, 14 deletions

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<String> 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<String> 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() {