Mercurial > hg > Members > shoshi > TreeCMSv2

annotate src/treecms/merger/ReplaceMerger.java @ 17:168deb591f21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit
author shoshi
date Tue, 24 May 2011 00:33:12 +0900
parents 5fa718b63cd5
children 9cb971a68cc5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3
5fa718b63cd5 finished treecms.memory basic implementation ( not tested yet. )
shoshi
parents:
diff changeset
1 package treecms.merger;
5fa718b63cd5 finished treecms.memory basic implementation ( not tested yet. )
shoshi
parents:
diff changeset
2
5fa718b63cd5 finished treecms.memory basic implementation ( not tested yet. )
shoshi
parents:
diff changeset
3 import treecms.api.Node;
5fa718b63cd5 finished treecms.memory basic implementation ( not tested yet. )
shoshi
parents:
diff changeset
4
17
shoshi
parents: 3
diff changeset
5 public class ReplaceMerger<T extends Node<T>> implements Merger<T>
3
5fa718b63cd5 finished treecms.memory basic implementation ( not tested yet. )
shoshi
parents:
diff changeset
6 {
17
shoshi
parents: 3
diff changeset
7 public T merge(T _tree1,T _tree2)
3
5fa718b63cd5 finished treecms.memory basic implementation ( not tested yet. )
shoshi
parents:
diff changeset
8 {
17
shoshi
parents: 3
diff changeset
9 return _tree1;
3
5fa718b63cd5 finished treecms.memory basic implementation ( not tested yet. )
shoshi
parents:
diff changeset
10 }
5fa718b63cd5 finished treecms.memory basic implementation ( not tested yet. )
shoshi
parents:
diff changeset
11 }