Mercurial > hg > Members > nobuyasu > jungle-network

changeset 62:85bc7416ae02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
modified some container using SingletonMessage
author one
date Fri, 19 Jul 2013 11:08:04 +0900
parents e871e8fc3f69
children 3b0091c91e61
files .classpath src/alice/jungle/datasegment/store/operations/DefaultNodeOperationContainer.java src/alice/jungle/datasegment/store/operations/DefaultNodePathContainer.java src/alice/jungle/datasegment/store/operations/DefaultTreeOperationContainer.java src/alice/jungle/datasegment/store/operations/DefaultTreeOperationLogContainer.java
diffstat 5 files changed, 21 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/.classpath	Mon Jul 15 18:26:10 2013 +0900
+++ b/.classpath	Fri Jul 19 11:08:04 2013 +0900
@@ -19,6 +19,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="/Alice/Alice.jar"/>
+	<classpathentry kind="lib" path="/Users/nobuyasu/workspace/Alice/Alice.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
--- a/src/alice/jungle/datasegment/store/operations/DefaultNodeOperationContainer.java	Mon Jul 15 18:26:10 2013 +0900
+++ b/src/alice/jungle/datasegment/store/operations/DefaultNodeOperationContainer.java	Fri Jul 19 11:08:04 2013 +0900
@@ -15,6 +15,8 @@
 import org.msgpack.template.OrdinalEnumTemplate;
 import org.msgpack.type.Value;
 
+import alice.codesegment.SingletonMessage;
+
 @Message
 public class DefaultNodeOperationContainer {
 
@@ -42,7 +44,8 @@
 	}
 
 	public void unconvert(NodeOperation op) throws IOException {
-		MessagePack msgpack = new MessagePack();
+//		MessagePack msgpack = new MessagePack();
+		MessagePack msgpack = SingletonMessage.getInstance();
 		pos = op.getPosition();
 		key = op.getKey();
 		value = null;
@@ -59,7 +62,8 @@
 	}
 	
 	public NodeOperation convert() throws IOException{
-		MessagePack msgpack = new MessagePack();
+//		MessagePack msgpack = new MessagePack();
+		MessagePack msgpack = SingletonMessage.getInstance();
 		msgpack.register(Command.class, new OrdinalEnumTemplate(Command.class));
 		Command c = msgpack.convert(commandValue, Command.class);
 		ByteBuffer b = null;
--- a/src/alice/jungle/datasegment/store/operations/DefaultNodePathContainer.java	Mon Jul 15 18:26:10 2013 +0900
+++ b/src/alice/jungle/datasegment/store/operations/DefaultNodePathContainer.java	Fri Jul 19 11:08:04 2013 +0900
@@ -13,6 +13,8 @@
 import org.msgpack.template.ListTemplate;
 import org.msgpack.type.Value;
 
+import alice.codesegment.SingletonMessage;
+
 @Message
 public class DefaultNodePathContainer {
 
@@ -41,7 +43,6 @@
 		}
 		/* Remove first Element(-1). */
 		list.remove(0);
-		msgpack.register(List.class, new ListTemplate(IntegerTemplate.getInstance()));
 		Value v = msgpack.unconvert(list);
 		pathValue = v;
 	}
--- a/src/alice/jungle/datasegment/store/operations/DefaultTreeOperationContainer.java	Mon Jul 15 18:26:10 2013 +0900
+++ b/src/alice/jungle/datasegment/store/operations/DefaultTreeOperationContainer.java	Fri Jul 19 11:08:04 2013 +0900
@@ -15,6 +15,8 @@
 import org.msgpack.annotation.Message;
 import org.msgpack.type.Value;
 
+import alice.codesegment.SingletonMessage;
+
 @Message
 public class DefaultTreeOperationContainer {
 
@@ -81,13 +83,15 @@
 
 	public void unconvert(DefaultNodeOperationContainer _op,
 			DefaultNodePathContainer _path) throws IOException {
-		MessagePack msgpack = new MessagePack();
+//		MessagePack msgpack = new MessagePack();
+		MessagePack msgpack = SingletonMessage.getInstance();
 		pathValue = msgpack.unconvert(_path);
 		opValue = msgpack.unconvert(_op);
 	}
 
 	public TreeOperation convert() throws IOException {
-		MessagePack msgpack = new MessagePack();
+//		MessagePack msgpack = new MessagePack();
+		MessagePack msgpack = SingletonMessage.getInstance();
 		DefaultNodePathContainer pathContainer = msgpack.convert(pathValue, DefaultNodePathContainer.class);
 		DefaultNodeOperationContainer opContainer = msgpack.convert(opValue, DefaultNodeOperationContainer.class);
 		return new DefaultTreeOperation(pathContainer.convert(), opContainer.convert());
--- a/src/alice/jungle/datasegment/store/operations/DefaultTreeOperationLogContainer.java	Mon Jul 15 18:26:10 2013 +0900
+++ b/src/alice/jungle/datasegment/store/operations/DefaultTreeOperationLogContainer.java	Fri Jul 19 11:08:04 2013 +0900
@@ -22,6 +22,8 @@
 import org.msgpack.template.ValueTemplate;
 import org.msgpack.type.Value;
 
+import alice.codesegment.SingletonMessage;
+
 @Message
 public class DefaultTreeOperationLogContainer {
 
@@ -92,7 +94,8 @@
 	}
 	
 	public void unconvert(Iterable<TreeOperation> _log) throws IOException {
-		MessagePack msgpack = new MessagePack();
+//		MessagePack msgpack = new MessagePack();
+		MessagePack msgpack = SingletonMessage.getInstance();
 		List<Value> list = new LinkedList<Value>();
 		for(TreeOperation op : _log) {
 			NodeOperation nOp = op.getNodeOperation();
@@ -108,7 +111,8 @@
 	}
 	
 	public DefaultTreeOperationLog convert() throws IOException {
-		MessagePack msgpack = new MessagePack();
+//		MessagePack msgpack = new MessagePack();
+		MessagePack msgpack = SingletonMessage.getInstance();
 		msgpack.register(List.class, new ListTemplate(ValueTemplate.getInstance()));
 		List<Value> listValue = msgpack.convert(logValue, List.class);
 		List<TreeOperation> logList = new LinkedList<TreeOperation>();