Mercurial > hg > Database > jungle-network
comparison src/alice/jungle/core/NetworkDefaultJungle.java @ 91:2c7b3f2b2ee1
Removed serverName field
author | one |
---|---|
date | Mon, 11 Nov 2013 19:22:47 +0900 |
parents | eef737ab3b2c |
children |
comparison
equal
deleted
inserted
replaced
90:eef737ab3b2c | 91:2c7b3f2b2ee1 |
---|---|
20 public class NetworkDefaultJungle implements Jungle { | 20 public class NetworkDefaultJungle implements Jungle { |
21 private Journal journal; | 21 private Journal journal; |
22 private ConcurrentHashMap<String,JungleTree> trees; | 22 private ConcurrentHashMap<String,JungleTree> trees; |
23 private String uuid; | 23 private String uuid; |
24 private TreeEditor editor; | 24 private TreeEditor editor; |
25 private String serverName; | |
26 | 25 |
27 public NetworkDefaultJungle(Journal _journal,String _uuid,TreeEditor _editor, String _serverName) | 26 public NetworkDefaultJungle(Journal _journal,String _uuid,TreeEditor _editor) |
28 { | 27 { |
29 journal = _journal; | 28 journal = _journal; |
30 trees = new ConcurrentHashMap<String,JungleTree>(); | 29 trees = new ConcurrentHashMap<String,JungleTree>(); |
31 uuid = _uuid; | 30 uuid = _uuid; |
32 editor = _editor; | 31 editor = _editor; |
33 serverName = _serverName; | |
34 } | 32 } |
35 | 33 |
36 @Override | 34 @Override |
37 public JungleTree getTreeByName(String _name) | 35 public JungleTree getTreeByName(String _name) |
38 { | 36 { |
58 } | 56 } |
59 }; | 57 }; |
60 DefaultTreeNode root = new DefaultTreeNode(); | 58 DefaultTreeNode root = new DefaultTreeNode(); |
61 ChangeSet set = new DefaultChangeSet(root.getAsNode(),null,list,uuid,_name, 0); | 59 ChangeSet set = new DefaultChangeSet(root.getAsNode(),null,list,uuid,_name, 0); |
62 DefaultTreeContext<DefaultTreeNode> tc = new DefaultTreeContext<DefaultTreeNode>(root,set); | 60 DefaultTreeContext<DefaultTreeNode> tc = new DefaultTreeContext<DefaultTreeNode>(root,set); |
63 JungleTree newTree = new NetworkDefaultJungleTree<DefaultTreeNode>(_name, tc,uuid,journal.getWriter(),editor, serverName); | 61 JungleTree newTree = new NetworkDefaultJungleTree<DefaultTreeNode>(_name, tc,uuid,journal.getWriter(),editor); |
64 if(trees.putIfAbsent(_name,newTree) != null){ | 62 if(trees.putIfAbsent(_name,newTree) != null){ |
65 return null; | 63 return null; |
66 } | 64 } |
67 return newTree; | 65 return newTree; |
68 } | 66 } |