# HG changeset patch
# User one
# Date 1373590042 -32400
# Node ID bf3dc481cc9bad9f438a6e690bc4858f796bafc2
# Parent  9202247e6077015ff76bf1b17653b7924c0388f1
modified JungleManager to singleton

diff -r 9202247e6077 -r bf3dc481cc9b src/jungle/test/bbs/JungleManager.java
--- a/src/jungle/test/bbs/JungleManager.java	Fri Jul 12 09:14:23 2013 +0900
+++ b/src/jungle/test/bbs/JungleManager.java	Fri Jul 12 09:47:22 2013 +0900
@@ -18,21 +18,15 @@
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error;
 
 public class JungleManager {
-	private static JungleManager jm;
+	private static JungleManager jm = new JungleManager();
 	private Jungle jungle;
 
-	private JungleManager(Jungle _jungle) {
-		jungle = _jungle;
-	}
+	private JungleManager() {
 
-	public JungleManager(String _serverName) {
-		Jungle _j = new NetworkDefaultJungle(null,"hoge",new DefaultTreeEditor(new DefaultTraverser()), _serverName);	
-		jm = new JungleManager(_j);
 	}
 	
-	public static JungleManager init(String _serverName) {
-		jm = new JungleManager(_serverName);
-		return jm;
+	public static void setJungle(Jungle _j) {
+		jm.jungle = _j;
 	}
 	
 	public static Jungle getJungle() {
diff -r 9202247e6077 -r bf3dc481cc9b src/jungle/test/bbs/NetworkJungleBulletinBoard.java
--- a/src/jungle/test/bbs/NetworkJungleBulletinBoard.java	Fri Jul 12 09:14:23 2013 +0900
+++ b/src/jungle/test/bbs/NetworkJungleBulletinBoard.java	Fri Jul 12 09:47:22 2013 +0900
@@ -27,8 +27,9 @@
 	
 	public NetworkJungleBulletinBoard(String _serverName)
 	{
-		jm = JungleManager.init(_serverName);
-		jungle = JungleManager.getJungle();
+		Jungle _j = new NetworkDefaultJungle(null,"hoge",new DefaultTreeEditor(new DefaultTraverser()), _serverName);	
+		JungleManager.setJungle(_j);
+		jungle = jm.getJungle();
 		jungle.createNewTree("boards");
 	}
 
diff -r 9202247e6077 -r bf3dc481cc9b src/jungle/test/bbs/codesegment/StartBBSCodeSegment.java
--- a/src/jungle/test/bbs/codesegment/StartBBSCodeSegment.java	Fri Jul 12 09:14:23 2013 +0900
+++ b/src/jungle/test/bbs/codesegment/StartBBSCodeSegment.java	Fri Jul 12 09:47:22 2013 +0900
@@ -52,8 +52,7 @@
     	Servlet index = new ShowBoardsServlet(cassaBBS,createBoardPath,showBoardMessagePath);
     	Servlet board = new ShowBoardMessageServlet(cassaBBS,createBoardMessagePath,editMessagePath);
     	
-    	Server serv = null;
-   		serv = new Server(9090);
+    	Server serv = new Server(8080);
     	ServletHandler context = new ServletHandler();
     	context.addServletWithMapping(new ServletHolder(createBoardMessage),createBoardMessagePath);
     	context.addServletWithMapping(new ServletHolder(createBoard),createBoardPath);
diff -r 9202247e6077 -r bf3dc481cc9b src/jungle/test/codesegment/log/practice/TestCodeSegment.java
--- a/src/jungle/test/codesegment/log/practice/TestCodeSegment.java	Fri Jul 12 09:14:23 2013 +0900
+++ b/src/jungle/test/codesegment/log/practice/TestCodeSegment.java	Fri Jul 12 09:47:22 2013 +0900
@@ -32,7 +32,7 @@
 
 public class TestCodeSegment extends CodeSegment {
 	
-	static Jungle jungle = new NetworkDefaultJungle(null,"hoge",new DefaultTreeEditor(new DefaultTraverser()));
+	static Jungle jungle = new NetworkDefaultJungle(null,"hoge",new DefaultTreeEditor(new DefaultTraverser()), "serverName");
 	
 	// create input datasegment arg1
 	Receiver arg1 = ids.create(CommandType.PEEK);
@@ -60,11 +60,14 @@
 
 		JungleTree tree = jungle.getTreeByName("tree");
 		NetworkDefaultJungleTreeEditor editor = (NetworkDefaultJungleTreeEditor) tree.getTreeEditor();
+/*
 		JungleTreeEditor tEditor = editor.setNewLogAndGetEditor(convertedLog);
+
 		Either<Error,JungleTreeEditor> either = tEditor.success();
 		if (either.isA()) {
 			throw new IllegalStateException();
 		}
+*/
 		System.exit(0);
 	}
 	
diff -r 9202247e6077 -r bf3dc481cc9b src/jungle/test/codesegment/operation/ShowAttribute.java
--- a/src/jungle/test/codesegment/operation/ShowAttribute.java	Fri Jul 12 09:14:23 2013 +0900
+++ b/src/jungle/test/codesegment/operation/ShowAttribute.java	Fri Jul 12 09:47:22 2013 +0900
@@ -26,7 +26,7 @@
 	public void run() {
 		System.out.println("--ShowAttribute--");
 		
-		Jungle jungle = new JungleManager().getJungle();
+		Jungle jungle = JungleManager.getJungle();
 		JungleTree tree = jungle.getTreeByName("tree");
 		Node node = tree.getRootNode();
 		Children<Node> chs = node.getChildren();
diff -r 9202247e6077 -r bf3dc481cc9b src/jungle/test/codesegment/operation/StartJungleCodeSegment.java
--- a/src/jungle/test/codesegment/operation/StartJungleCodeSegment.java	Fri Jul 12 09:14:23 2013 +0900
+++ b/src/jungle/test/codesegment/operation/StartJungleCodeSegment.java	Fri Jul 12 09:47:22 2013 +0900
@@ -17,8 +17,7 @@
 	public static void main(String[] args) {
 		System.out.println("--StartJungleCodeSegment--");
 		
-		JungleManager jm = new JungleManager();
-		JungleTree tree = jm.createNewTree("tree");
+		JungleTree tree = JungleManager.createNewTree("tree");
 		JungleTreeEditor editor = tree.getTreeEditor();
 		DefaultNodePath path = new DefaultNodePath();
 		path = path.add(0);
diff -r 9202247e6077 -r bf3dc481cc9b src/jungle/test/codesegment/operation/TestPutAttributeCodeSegment.java
--- a/src/jungle/test/codesegment/operation/TestPutAttributeCodeSegment.java	Fri Jul 12 09:14:23 2013 +0900
+++ b/src/jungle/test/codesegment/operation/TestPutAttributeCodeSegment.java	Fri Jul 12 09:47:22 2013 +0900
@@ -46,7 +46,7 @@
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-		Jungle jungle = new JungleManager().getJungle();
+		Jungle jungle = JungleManager.getJungle();
 		JungleTree tree = jungle.getTreeByName("tree");
 		JungleTreeEditor editor = tree.getTreeEditor();
 		DefaultNodePath root = new DefaultNodePath();
diff -r 9202247e6077 -r bf3dc481cc9b src/jungle/test/codesegment/persistence/TestJungle.java
--- a/src/jungle/test/codesegment/persistence/TestJungle.java	Fri Jul 12 09:14:23 2013 +0900
+++ b/src/jungle/test/codesegment/persistence/TestJungle.java	Fri Jul 12 09:47:22 2013 +0900
@@ -10,8 +10,7 @@
 public class TestJungle {
 	
 	public static void main(String[] args) {
-		JungleManager jm = new JungleManager();
-		JungleTree tree = jm.createNewTree("tree1");
+		JungleTree tree = JungleManager.createNewTree("tree1");
 		JungleTreeEditor editor = tree.getTreeEditor();
 
 		new TestPutAttributeCodeSegment().execute();