# HG changeset patch
# User tatsuki
# Date 1466972748 -32400
# Node ID f3d30646c863f5cc2b86f1fd910ef0bb12cca914
# Parent  3c188a5b69ef40e8d61213c7da2c093ef73b8d4a
fix error

diff -r 3c188a5b69ef -r f3d30646c863 src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/BulletinBoardJungleManager.java
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/BulletinBoardJungleManager.java	Mon Jun 27 05:06:19 2016 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/BulletinBoardJungleManager.java	Mon Jun 27 05:25:48 2016 +0900
@@ -55,7 +55,7 @@
 
 	public static Either<Error, JungleTreeEditor> update(NetworkTreeOperationLog netLog) {
 		String treeName = netLog.getTreeName();
-		Jungle jungle = jp.ac.u_ryukyu.ie.cr.jungleNetwork.bbs.BulletinBoardJungleManager.getJungle();
+		Jungle jungle = BulletinBoardJungleManager.getJungle();
 		if (jungle.getTreeByName(treeName) == null) {
 			if(null == jungle.createNewTree(treeName)){
 				throw new IllegalStateException();
diff -r 3c188a5b69ef -r f3d30646c863 src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/DistributeApp.java
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/DistributeApp.java	Mon Jun 27 05:06:19 2016 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/DistributeApp.java	Mon Jun 27 05:25:48 2016 +0900
@@ -1,7 +1,7 @@
 package jp.ac.u_ryukyu.ie.cr.bbs.network;
 
 import alice.topology.node.TopologyNode;
-import jp.ac.u_ryukyu.ie.cr.jungleNetwork.bbs.codesegment.StartBBSCodeSegment;
+import jp.ac.u_ryukyu.ie.cr.bbs.network.codesegment.StartBBSCodeSegment;
 import jp.ac.u_ryukyu.ie.cr.jungleNetwork.remote.RemoteConfig;
 
 public class DistributeApp {
diff -r 3c188a5b69ef -r f3d30646c863 src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/NetworkBulletinBoard.java
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/NetworkBulletinBoard.java	Mon Jun 27 05:06:19 2016 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/NetworkBulletinBoard.java	Mon Jun 27 05:25:48 2016 +0900
@@ -1,7 +1,7 @@
 package jp.ac.u_ryukyu.ie.cr.bbs.network;
 
 
-import jp.ac.u_ryukyu.ie.cr.jungle.bbs.BulletinBoard;
+import jp.ac.u_ryukyu.ie.cr.bbs.local.BulletinBoard;
 
 public interface NetworkBulletinBoard extends BulletinBoard {
 	public void init();
diff -r 3c188a5b69ef -r f3d30646c863 src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/NetworkJungleBulletinBoard.java
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/NetworkJungleBulletinBoard.java	Mon Jun 27 05:06:19 2016 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/NetworkJungleBulletinBoard.java	Mon Jun 27 05:25:48 2016 +0900
@@ -1,12 +1,12 @@
 package jp.ac.u_ryukyu.ie.cr.bbs.network;
 
 
+import jp.ac.u_ryukyu.ie.cr.bbs.local.BoardMessage;
+import jp.ac.u_ryukyu.ie.cr.bbs.local.GetAttributeImp;
+import jp.ac.u_ryukyu.ie.cr.bbs.local.IterableConverter;
 import jp.ac.u_ryukyu.ie.cr.jungle.Jungle;
 import jp.ac.u_ryukyu.ie.cr.jungle.JungleTree;
 import jp.ac.u_ryukyu.ie.cr.jungle.JungleTreeEditor;
-import jp.ac.u_ryukyu.ie.cr.jungle.bbs.BoardMessage;
-import jp.ac.u_ryukyu.ie.cr.jungle.bbs.GetAttributeImp;
-import jp.ac.u_ryukyu.ie.cr.jungle.bbs.IterableConverter;
 import jp.ac.u_ryukyu.ie.cr.jungle.core.Children;
 import jp.ac.u_ryukyu.ie.cr.jungle.persistent.ChangeList;
 import jp.ac.u_ryukyu.ie.cr.jungle.persistent.ChangeListReader;
@@ -23,8 +23,6 @@
 import jp.ac.u_ryukyu.ie.cr.jungle.util.DefaultEither;
 import jp.ac.u_ryukyu.ie.cr.jungle.util.Either;
 import jp.ac.u_ryukyu.ie.cr.jungle.util.Error;
-import jp.ac.u_ryukyu.ie.cr.jungleNetwork.bbs.BulletinBoardJungleManager;
-import jp.ac.u_ryukyu.ie.cr.jungleNetwork.bbs.NetworkBulletinBoard;
 import jp.ac.u_ryukyu.ie.cr.jungleNetwork.core.NetworkDefaultJungle;
 import jp.ac.u_ryukyu.ie.cr.jungleNetwork.persistent.AliceJournal;
 import jp.ac.u_ryukyu.ie.cr.jungleNetwork.persistent.NetworkJournal;
diff -r 3c188a5b69ef -r f3d30646c863 src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/RequestNumCheckServlet.java
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/RequestNumCheckServlet.java	Mon Jun 27 05:06:19 2016 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/RequestNumCheckServlet.java	Mon Jun 27 05:25:48 2016 +0900
@@ -1,6 +1,5 @@
 package jp.ac.u_ryukyu.ie.cr.bbs.network;
 
-import jp.ac.u_ryukyu.ie.cr.jungleNetwork.bbs.NetworkBulletinBoard;
 
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
diff -r 3c188a5b69ef -r f3d30646c863 src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/ShowMessageWithTimeStampServlet.java
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/ShowMessageWithTimeStampServlet.java	Mon Jun 27 05:06:19 2016 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/ShowMessageWithTimeStampServlet.java	Mon Jun 27 05:25:48 2016 +0900
@@ -1,7 +1,6 @@
 package jp.ac.u_ryukyu.ie.cr.bbs.network;
 
-import jp.ac.u_ryukyu.ie.cr.jungle.bbs.GetAttributeImp;
-import jp.ac.u_ryukyu.ie.cr.jungleNetwork.bbs.NetworkBulletinBoard;
+import jp.ac.u_ryukyu.ie.cr.bbs.local.GetAttributeImp;
 import org.eclipse.jetty.util.thread.ThreadPool;
 
 import javax.servlet.http.HttpServlet;
@@ -15,7 +14,7 @@
      *
      */
     private static final long serialVersionUID = 1L;
-    private final jp.ac.u_ryukyu.ie.cr.jungleNetwork.bbs.NetworkBulletinBoard bbs;
+    private final jp.ac.u_ryukyu.ie.cr.bbs.network.NetworkBulletinBoard bbs;
     private final String createBoardMessagePath;
 
     private static final String PARAM_BOARD_NAME = "bname";
diff -r 3c188a5b69ef -r f3d30646c863 src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/codesegment/LogUpdateCodeSegment.java
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/codesegment/LogUpdateCodeSegment.java	Mon Jun 27 05:06:19 2016 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/codesegment/LogUpdateCodeSegment.java	Mon Jun 27 05:25:48 2016 +0900
@@ -6,7 +6,7 @@
 import jp.ac.u_ryukyu.ie.cr.jungle.JungleTreeEditor;
 import jp.ac.u_ryukyu.ie.cr.jungle.util.Either;
 import jp.ac.u_ryukyu.ie.cr.jungle.util.Error;
-import jp.ac.u_ryukyu.ie.cr.jungleNetwork.bbs.BulletinBoardJungleManager;
+import jp.ac.u_ryukyu.ie.cr.bbs.network.BulletinBoardJungleManager;
 import jp.ac.u_ryukyu.ie.cr.jungleNetwork.operations.NetworkTreeOperationLog;
 
 import java.util.List;
@@ -28,7 +28,7 @@
 	
 	public void run() {
 		int index = log.index;
-		new jp.ac.u_ryukyu.ie.cr.jungleNetwork.bbs.codesegment.LogUpdateCodeSegment();
+		new LogUpdateCodeSegment();
 		NetworkTreeOperationLog netLog = log.asClass(NetworkTreeOperationLog.class);
 		@SuppressWarnings("unchecked")
 		List<String> list = clist.asClass(List.class);
@@ -40,7 +40,7 @@
 		if (!log.from.equals("local")) {
 			Either<Error, JungleTreeEditor> either = BulletinBoardJungleManager.update(netLog);
 			if(either.isA()) {
-				new jp.ac.u_ryukyu.ie.cr.jungleNetwork.bbs.codesegment.LogUpdateCodeSegment(index);
+				new LogUpdateCodeSegment(index);
 				throw new IllegalStateException();				
 			}
 		}
diff -r 3c188a5b69ef -r f3d30646c863 src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/codesegment/StartBBSCodeSegment.java
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/codesegment/StartBBSCodeSegment.java	Mon Jun 27 05:06:19 2016 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/codesegment/StartBBSCodeSegment.java	Mon Jun 27 05:25:48 2016 +0900
@@ -3,11 +3,10 @@
 import alice.codesegment.CodeSegment;
 import alice.datasegment.CommandType;
 import alice.datasegment.Receiver;
-import jp.ac.u_ryukyu.ie.cr.jungle.bbs.*;
-import jp.ac.u_ryukyu.ie.cr.jungleNetwork.bbs.NetworkBulletinBoard;
-import jp.ac.u_ryukyu.ie.cr.jungleNetwork.bbs.NetworkJungleBulletinBoard;
-import jp.ac.u_ryukyu.ie.cr.jungleNetwork.bbs.RequestNumCheckServlet;
-import jp.ac.u_ryukyu.ie.cr.jungleNetwork.bbs.codesegment.LogUpdateCodeSegment;
+import jp.ac.u_ryukyu.ie.cr.bbs.local.*;
+import jp.ac.u_ryukyu.ie.cr.bbs.network.NetworkBulletinBoard;
+import jp.ac.u_ryukyu.ie.cr.bbs.network.NetworkJungleBulletinBoard;
+import jp.ac.u_ryukyu.ie.cr.bbs.network.RequestNumCheckServlet;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.ServletHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
@@ -42,11 +41,10 @@
         Matcher matcher = pattern.matcher(name);
         matcher.find();
         //		String type = matcher.group(1);
-        for(String arg: args) {
-            if(arg.equals("-persistent")){
+        for(String arg: args)
+            if (arg.equals("-persistent")) {
                 persistentFlag = true;
             }
-        }
         NetworkBulletinBoard cassaBBS = null;
         if(persistentFlag) {
             System.out.println("log loading...");