--- a/src/alice/codesegment/OutputDataSegment.java	Tue Aug 06 02:14:40 2013 +0900
+++ b/src/alice/codesegment/OutputDataSegment.java	Tue Aug 13 06:02:55 2013 +0900
@@ -1,11 +1,5 @@
 package alice.codesegment;
 
-import java.io.IOException;
-
-
-import org.msgpack.type.Value;
-import org.msgpack.type.ValueFactory;
-
 import alice.datasegment.DataSegment;
 import alice.datasegment.Receiver;
 
@@ -17,70 +11,31 @@
 
 	public void flip(Receiver receiver) {
 		receiver.managerKey=null;
-		DataSegment.getLocal().putObject(receiver.key, receiver.getObj());
-	}
-
-	public void put(String key, String val) {
-		DataSegment.getLocal().putObject(key, val);
+		DataSegment.getLocal().put(receiver.key, receiver.getObj());
 	}
 
 	public void put(String key, byte[] val) {
-		DataSegment.getLocal().putObject(key, val);
-	}
-
-	public void put(String key, int val) {
-		DataSegment.getLocal().putObject(key, val);
+		DataSegment.getLocal().put(key, val);
 	}
 
 	public <T> void put(String key, T val) {
-		DataSegment.getLocal().putObject(key, val);
-	}
-
-	public void update(String key, String val) {
-		DataSegment.getLocal().updateObject(key, val);
+		DataSegment.getLocal().put(key, val);
 	}
 
 	public void update(String key, byte[] val) {
-		DataSegment.getLocal().updateObject(key, val);
-	}
-
-	public void update(String key, int val) {
-		DataSegment.getLocal().updateObject(key, val);
+		DataSegment.getLocal().update(key, val);
 	}
 
 	public <T> void update(String key, T val) {
-		DataSegment.getLocal().updateObject(key, val);
+		DataSegment.getLocal().update(key, val);
 	}
 
-
 	/**
 	 * for remote
 	 */
-
-	public void put(String managerKey, String key, Value val) {
-		DataSegment.get(managerKey).put(key, val);
-	}
-
-	public void put(String managerKey, String key, String val) {
-		if (!managerKey.equals("local")){
-			DataSegment.get(managerKey).put(key, ValueFactory.createRawValue(val));
-		} else {
-			put(key, val);
-		}
-
-	}
-
 	public void put(String managerKey, String key, byte[] val) {
 		if (!managerKey.equals("local")){
-			DataSegment.get(managerKey).put(key, ValueFactory.createRawValue(val, true));
-		} else {
-			put(key, val);
-		}
-	}
-
-	public void put(String managerKey, String key, int val) {
-		if (!managerKey.equals("local")){
-			DataSegment.get(managerKey).put(key, ValueFactory.createIntegerValue(val));
+			DataSegment.get(managerKey).put(key,val);
 		} else {
 			put(key, val);
 		}
@@ -88,39 +43,15 @@
 
 	public <T> void put(String managerKey, String key, T val) {
 		if (!managerKey.equals("local")){
-			try {
-				DataSegment.get(managerKey).put(key, SingletonMessage.getInstance().unconvert(val));
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
+			DataSegment.get(managerKey).put(key, val);
 		} else {
 			put(key, val);
 		}
 	}
 
-	public void update(String managerKey, String key, Value val) {
-		DataSegment.get(managerKey).update(key, val);
-	}
-
-	public void update(String managerKey, String key, String val) {
-		if (!managerKey.equals("local")){
-			DataSegment.get(managerKey).update(key, ValueFactory.createRawValue(val));
-		} else {
-			update(key, val);
-		}
-	}
-
 	public void update(String managerKey, String key, byte[] val) {
 		if (!managerKey.equals("local")){
-			DataSegment.get(managerKey).update(key, ValueFactory.createRawValue(val, true));
-		} else {
-			update(key, val);
-		}
-	}
-
-	public void update(String managerKey, String key, int val) {
-		if (!managerKey.equals("local")){
-			DataSegment.get(managerKey).update(key, ValueFactory.createIntegerValue(val));
+			DataSegment.get(managerKey).update(key, val);
 		} else {
 			update(key, val);
 		}
@@ -128,11 +59,7 @@
 
 	public <T> void update(String managerKey, String key, T val) {
 		if (!managerKey.equals("local")){
-			try {
-				DataSegment.get(managerKey).update(key, SingletonMessage.getInstance().unconvert(val));
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
+			DataSegment.get(managerKey).update(key, val);
 		} else {
 			update(key, val);
 		}
@@ -157,9 +84,5 @@
 	public void close(String managerKey) {
 		DataSegment.get(managerKey).close();
 	}
-
-
-
-
-
+	
 }