Mercurial > hg > Members > shoshi > TreeCMSv2
diff src/treecms/merger/ReplaceMerger.java @ 17:168deb591f21
commit
author | shoshi |
---|---|
date | Tue, 24 May 2011 00:33:12 +0900 |
parents | 5fa718b63cd5 |
children | 9cb971a68cc5 |
line wrap: on
line diff
--- a/src/treecms/merger/ReplaceMerger.java Sat May 21 04:46:00 2011 +0900 +++ b/src/treecms/merger/ReplaceMerger.java Tue May 24 00:33:12 2011 +0900 @@ -2,10 +2,10 @@ import treecms.api.Node; -public class ReplaceMerger implements Merger +public class ReplaceMerger<T extends Node<T>> implements Merger<T> { - public Node merge(Node _from,Node _to) + public T merge(T _tree1,T _tree2) { - return _from; + return _tree1; } }