To support scala messagepack, change some method accessibilities and add new constructor to MessagePack.java

takeshita · takeshita · commit 5d2924802996 · 2011-10-13T03:13:28.000+09:00
diff --git a/src/main/java/org/msgpack/MessagePack.java b/src/main/java/org/msgpack/MessagePack.java
@@ -67,6 +67,9 @@ public MessagePack() {
     public MessagePack(MessagePack msgpack) {
 	registry = new TemplateRegistry(msgpack.registry);
     }
+    public MessagePack(TemplateRegistry registry) {
+        this.registry = registry;
+    }
 
     /**
      * 
diff --git a/src/main/java/org/msgpack/template/TemplateRegistry.java b/src/main/java/org/msgpack/template/TemplateRegistry.java
@@ -69,7 +69,7 @@ public class TemplateRegistry {
      */
     private TemplateRegistry() {
 	parent = null;
-	chain = new TemplateBuilderChain(this);
+	chain = createTemplateBuilderChain();
 	genericCache = new HashMap<Type, GenericTemplate>();
 	cache = new HashMap<Type, Template<Type>>();
 	registerTemplates();
@@ -86,11 +86,16 @@ public TemplateRegistry(TemplateRegistry registry) {
 	} else {
 	    parent = new TemplateRegistry();
 	}
-	chain = new TemplateBuilderChain(this);
+	chain = createTemplateBuilderChain();
 	cache = new HashMap<Type, Template<Type>>();
 	genericCache = parent.genericCache;
     }
 
+    protected TemplateBuilderChain createTemplateBuilderChain(){
+        return new TemplateBuilderChain(this);
+    }
+
+
     public void setClassLoader(final ClassLoader cl) {
 	chain = new TemplateBuilderChain(this, cl);
     }
diff --git a/src/main/java/org/msgpack/template/builder/TemplateBuilderChain.java b/src/main/java/org/msgpack/template/builder/TemplateBuilderChain.java
@@ -45,7 +45,7 @@ public TemplateBuilderChain(final TemplateRegistry registry, final ClassLoader c
 	reset(registry, cl);
     }
 
-    private void reset(final TemplateRegistry registry, final ClassLoader cl) {
+    protected void reset(final TemplateRegistry registry, final ClassLoader cl) {
 	if (registry == null) {
 	    throw new NullPointerException("registry is null");
 	}

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,9 @@ public MessagePack() {`
`67`	`67`	`public MessagePack(MessagePack msgpack) {`
`68`	`68`	`registry = new TemplateRegistry(msgpack.registry);`
`69`	`69`	`}`
	`70`	`+ public MessagePack(TemplateRegistry registry) {`
	`71`	`+ this.registry = registry;`
	`72`	`+ }`
`70`	`73`
`71`	`74`	`/**`
`72`	`75`	`*`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public TemplateBuilderChain(final TemplateRegistry registry, final ClassLoader c`
`45`	`45`	`reset(registry, cl);`
`46`	`46`	`}`
`47`	`47`
`48`		`- private void reset(final TemplateRegistry registry, final ClassLoader cl) {`
	`48`	`+ protected void reset(final TemplateRegistry registry, final ClassLoader cl) {`
`49`	`49`	`if (registry == null) {`
`50`	`50`	`throw new NullPointerException("registry is null");`
`51`	`51`	`}`