# HG changeset patch # User one # Date 1381400241 -32400 # Node ID 89e39301ccaa061a4eecdefa9e9e5af54a0a7d3f # Parent 29127ac788a65d2768cb44fc73bd122baf5b134a remove some warning diff -r 29127ac788a6 -r 89e39301ccaa .classpath --- a/.classpath Tue Aug 20 17:38:09 2013 +0900 +++ b/.classpath Thu Oct 10 19:17:21 2013 +0900 @@ -2,6 +2,7 @@ + diff -r 29127ac788a6 -r 89e39301ccaa src/alice/jungle/datasegment/store/operations/DefaultNodePathContainer.java --- 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 { diff -r 29127ac788a6 -r 89e39301ccaa src/alice/jungle/datasegment/store/operations/DefaultTreeOperationLogContainer.java --- 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 _log) throws IOException { -// MessagePack msgpack = new MessagePack(); MessagePack msgpack = SingletonMessage.getInstance(); List list = new LinkedList(); 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 listValue = msgpack.convert(logValue, List.class); diff -r 29127ac788a6 -r 89e39301ccaa src/alice/jungle/operations/NetworkNodePath.java --- 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 path; diff -r 29127ac788a6 -r 89e39301ccaa src/alice/jungle/transaction/NetworkDefaultJungleTree.java --- 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(); } + + } diff -r 29127ac788a6 -r 89e39301ccaa src/alice/jungle/transaction/NetworkTransactionManager.java --- 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> implements TransactionManager { diff -r 29127ac788a6 -r 89e39301ccaa src/jungle/app/bbs/JungleManager.java --- 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;