Mercurial > hg > Members > nobuyasu > jungle-network
comparison src/alice/jungle/core/NetworkDefaultJungle.java @ 42:4419ac56cbfd
implemented serverName filed
author | one |
---|---|
date | Thu, 11 Jul 2013 19:58:36 +0900 |
parents | bf696a6334b2 |
children | 686057add8a4 |
comparison
equal
deleted
inserted
replaced
41:b8b9668da13c | 42:4419ac56cbfd |
---|---|
22 public class NetworkDefaultJungle implements Jungle { | 22 public class NetworkDefaultJungle implements Jungle { |
23 private Journal journal; | 23 private Journal journal; |
24 private ConcurrentHashMap<String,JungleTree> trees; | 24 private ConcurrentHashMap<String,JungleTree> trees; |
25 private String uuid; | 25 private String uuid; |
26 private TreeEditor editor; | 26 private TreeEditor editor; |
27 private String serverName; | |
27 | 28 |
28 public NetworkDefaultJungle(Journal _journal,String _uuid,TreeEditor _editor) | 29 public NetworkDefaultJungle(Journal _journal,String _uuid,TreeEditor _editor, String _serverName) |
29 { | 30 { |
30 journal = new AliceJournal(); | 31 journal = new AliceJournal(); |
31 trees = new ConcurrentHashMap<String,JungleTree>(); | 32 trees = new ConcurrentHashMap<String,JungleTree>(); |
32 uuid = _uuid; | 33 uuid = _uuid; |
33 editor = _editor; | 34 editor = _editor; |
35 serverName = _serverName; | |
34 } | 36 } |
35 | 37 |
36 @Override | 38 @Override |
37 public JungleTree getTreeByName(String _name) | 39 public JungleTree getTreeByName(String _name) |
38 { | 40 { |
50 } | 52 } |
51 }; | 53 }; |
52 DefaultTreeNode root = new DefaultTreeNode(); | 54 DefaultTreeNode root = new DefaultTreeNode(); |
53 ChangeSet set = new DefaultChangeSet(root.getAsNode(),null,list,uuid,0); | 55 ChangeSet set = new DefaultChangeSet(root.getAsNode(),null,list,uuid,0); |
54 DefaultTreeContext<DefaultTreeNode> tc = new DefaultTreeContext<DefaultTreeNode>(root,set); | 56 DefaultTreeContext<DefaultTreeNode> tc = new DefaultTreeContext<DefaultTreeNode>(root,set); |
55 JungleTree newTree = new NetworkDefaultJungleTree<DefaultTreeNode>(_name, tc,uuid,journal.getWriter(),editor); | 57 JungleTree newTree = new NetworkDefaultJungleTree<DefaultTreeNode>(_name, tc,uuid,journal.getWriter(),editor, serverName); |
56 if(trees.putIfAbsent(_name,newTree) != null){ | 58 if(trees.putIfAbsent(_name,newTree) != null){ |
57 return null; | 59 return null; |
58 } | 60 } |
59 return newTree; | 61 return newTree; |
60 } | 62 } |