Mercurial > hg > Database > jungle-network
comparison src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java @ 46:fd3643699f83
modified pom.xml. fix conflict log4j libraries
author | one |
---|---|
date | Fri, 12 Jul 2013 11:27:00 +0900 |
parents | 12d87bb4b84d |
children | a89c3539bff2 |
comparison
equal
deleted
inserted
replaced
45:bf3dc481cc9b | 46:fd3643699f83 |
---|---|
35 private final TransactionManager<T> txManager; | 35 private final TransactionManager<T> txManager; |
36 private final T root; | 36 private final T root; |
37 private final String treeName; | 37 private final String treeName; |
38 private final TreeEditor editor; | 38 private final TreeEditor editor; |
39 private final TreeOperationLog log; | 39 private final TreeOperationLog log; |
40 private final String serverName; | |
40 | 41 |
41 public NetworkDefaultJungleTreeEditor(String _treeName, T _root,TransactionManager<T> _txManager,TreeEditor _editor) | 42 public NetworkDefaultJungleTreeEditor(String _serverName, String _treeName, T _root,TransactionManager<T> _txManager,TreeEditor _editor) |
42 { | 43 { |
43 this(_treeName, _root,_txManager,_editor,new DefaultTreeOperationLog()); | 44 this(_serverName, _treeName, _root,_txManager,_editor,new DefaultTreeOperationLog()); |
44 } | 45 } |
45 | 46 |
46 public NetworkDefaultJungleTreeEditor(String _treeName, T _root,TransactionManager<T> _txManager,TreeEditor _editor,TreeOperationLog _log) | 47 public NetworkDefaultJungleTreeEditor(String _serverName, String _treeName, T _root,TransactionManager<T> _txManager,TreeEditor _editor, TreeOperationLog _log) |
47 { | 48 { |
49 serverName = _serverName; | |
48 treeName = _treeName; | 50 treeName = _treeName; |
49 root = _root; | 51 root = _root; |
50 txManager = _txManager; | 52 txManager = _txManager; |
51 editor = _editor; | 53 editor = _editor; |
52 log = _log; | 54 log = _log; |
72 | 74 |
73 Iterable<TreeOperation> iterable = new IterableConverter<TreeOperation,NodeOperation>(newLog,converter); | 75 Iterable<TreeOperation> iterable = new IterableConverter<TreeOperation,NodeOperation>(newLog,converter); |
74 DefaultTreeOperationLog treeOperationLog = new DefaultTreeOperationLog(iterable,newLog.length()); | 76 DefaultTreeOperationLog treeOperationLog = new DefaultTreeOperationLog(iterable,newLog.length()); |
75 TreeOperationLog newTreeOpLog = log.append(treeOperationLog); | 77 TreeOperationLog newTreeOpLog = log.append(treeOperationLog); |
76 | 78 |
77 JungleTreeEditor newEditor = new NetworkDefaultJungleTreeEditor<T>(treeName, newNode,txManager,editor,newTreeOpLog); | 79 JungleTreeEditor newEditor = new NetworkDefaultJungleTreeEditor<T>(serverName, treeName, newNode,txManager,editor,newTreeOpLog); |
78 return DefaultEither.newB(newEditor); | 80 return DefaultEither.newB(newEditor); |
79 } | 81 } |
80 | 82 |
81 @Override | 83 @Override |
82 public Either<Error,JungleTreeEditor> addNewChildAt(NodePath _path, int _pos) | 84 public Either<Error,JungleTreeEditor> addNewChildAt(NodePath _path, int _pos) |
119 if(either.isA()){ | 121 if(either.isA()){ |
120 return DefaultEither.newA(either.a()); | 122 return DefaultEither.newA(either.a()); |
121 } | 123 } |
122 | 124 |
123 TransactionManager<T> newTxManager = either.b(); | 125 TransactionManager<T> newTxManager = either.b(); |
124 JungleTreeEditor newTreeEditor = new NetworkDefaultJungleTreeEditor<T>(treeName, root,newTxManager,editor); | 126 JungleTreeEditor newTreeEditor = new NetworkDefaultJungleTreeEditor<T>(serverName, treeName, root,newTxManager,editor); |
125 | 127 |
126 return DefaultEither.newB(newTreeEditor); | 128 return DefaultEither.newB(newTreeEditor); |
127 } | 129 } |
128 | 130 |
129 @Override | 131 @Override |
145 } | 147 } |
146 | 148 |
147 public TreeOperationLog getTreeOperationLog() { | 149 public TreeOperationLog getTreeOperationLog() { |
148 return log; | 150 return log; |
149 } | 151 } |
152 | |
153 public String getTreeName() { | |
154 return treeName; | |
155 } | |
156 | |
157 public String getServerName() { | |
158 return serverName; | |
159 } | |
150 | 160 |
151 | 161 |
152 } | 162 } |