Mercurial > hg > Database > jungle-network

changeset 67:89e39301ccaa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove some warning
author one
date Thu, 10 Oct 2013 19:17:21 +0900
parents 29127ac788a6
children b0af3960917f
files .classpath src/alice/jungle/datasegment/store/operations/DefaultNodePathContainer.java src/alice/jungle/datasegment/store/operations/DefaultTreeOperationLogContainer.java src/alice/jungle/operations/NetworkNodePath.java src/alice/jungle/transaction/NetworkDefaultJungleTree.java src/alice/jungle/transaction/NetworkTransactionManager.java src/jungle/app/bbs/JungleManager.java
diffstat 7 files changed, 5 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/.classpath	Tue Aug 20 17:38:09 2013 +0900
+++ b/.classpath	Thu Oct 10 19:17:21 2013 +0900
@@ -2,6 +2,7 @@
 <classpath>
 	<classpathentry including="**/*.java" kind="src" path="src"/>
 	<classpathentry kind="src" path="src/test/"/>
+	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
--- a/src/alice/jungle/datasegment/store/operations/DefaultNodePathContainer.java	Tue Aug 20 17:38:09 2013 +0900
+++ b/src/alice/jungle/datasegment/store/operations/DefaultNodePathContainer.java	Thu Oct 10 19:17:21 2013 +0900
@@ -13,8 +13,6 @@
 import org.msgpack.template.ListTemplate;
 import org.msgpack.type.Value;
 
-import alice.codesegment.SingletonMessage;
-
 @Message
 public class DefaultNodePathContainer {
 
--- a/src/alice/jungle/datasegment/store/operations/DefaultTreeOperationLogContainer.java	Tue Aug 20 17:38:09 2013 +0900
+++ b/src/alice/jungle/datasegment/store/operations/DefaultTreeOperationLogContainer.java	Thu Oct 10 19:17:21 2013 +0900
@@ -88,7 +88,6 @@
 	}
 	
 	public void unconvert(Iterable<TreeOperation> _log) throws IOException {
-//		MessagePack msgpack = new MessagePack();
 		MessagePack msgpack = SingletonMessage.getInstance();
 		List<Value> list = new LinkedList<Value>();
 		for(TreeOperation op : _log) {
@@ -105,7 +104,6 @@
 	}
 	
 	public DefaultTreeOperationLog convert() throws IOException {
-//		MessagePack msgpack = new MessagePack();
 		MessagePack msgpack = SingletonMessage.getInstance();
 		msgpack.register(List.class, new ListTemplate(ValueTemplate.getInstance()));
 		List<Value> listValue = msgpack.convert(logValue, List.class);
--- a/src/alice/jungle/operations/NetworkNodePath.java	Tue Aug 20 17:38:09 2013 +0900
+++ b/src/alice/jungle/operations/NetworkNodePath.java	Thu Oct 10 19:17:21 2013 +0900
@@ -6,6 +6,7 @@
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.NodePath;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Pair;
 
+@Message
 public class NetworkNodePath implements NodePath
 {
 	LinkedList<Integer> path;
--- a/src/alice/jungle/transaction/NetworkDefaultJungleTree.java	Tue Aug 20 17:38:09 2013 +0900
+++ b/src/alice/jungle/transaction/NetworkDefaultJungleTree.java	Thu Oct 10 19:17:21 2013 +0900
@@ -44,4 +44,6 @@
 		ChangeSet cs = tc.getChangeSet();
 		return cs.getRoot();
 	}
+
+
 }
--- a/src/alice/jungle/transaction/NetworkTransactionManager.java	Tue Aug 20 17:38:09 2013 +0900
+++ b/src/alice/jungle/transaction/NetworkTransactionManager.java	Thu Oct 10 19:17:21 2013 +0900
@@ -1,10 +1,7 @@
 package alice.jungle.transaction;
 
-import java.io.IOException;
 import java.util.Iterator;
 
-import alice.jungle.datasegment.store.operations.DefaultTreeOperationLogContainer;
-
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.core.Node;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeList;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeListWriter;
@@ -23,8 +20,6 @@
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.DefaultError;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error;
-import jungle.app.bbs.codesegment.LogUpdateCodeSegment;
-import jungle.app.bbs.codesegment.NullCodeSegmentForUpdate;
 
 public class NetworkTransactionManager<T extends TreeNode<T>> implements TransactionManager<T> 
 {
--- a/src/jungle/app/bbs/JungleManager.java	Tue Aug 20 17:38:09 2013 +0900
+++ b/src/jungle/app/bbs/JungleManager.java	Thu Oct 10 19:17:21 2013 +0900
@@ -97,13 +97,11 @@
 		editor = either.b();
 		either = editor.success();
 		if(either.isA()) {
-			throw new IllegalStateException();			
+			throw new IllegalStateException();
 		}
 		return either;
 	}
 	
-	
-	
 	private static int checkTimeStamp(Node node, long newNodeTimeStamp, int containerPosition) {
 		int count = 0;
 		long childTimeStamp = 0;