Mercurial > hg > Members > shoshi > TreeCMSv2

annotate src/treecms/merger/ReplaceMerger.java @ 27:aecc55e87143 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test commit
author Shoshi TAMAKI <shoshi@cr.ie.u-ryukyu.ac.jp>
date Thu, 18 Aug 2011 17:37:03 +0900
parents 9cb971a68cc5
children
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
27
aecc55e87143 test commit
Shoshi TAMAKI <shoshi@cr.ie.u-ryukyu.ac.jp>
parents: 26
diff changeset
3 import treecms.api.Node;
3
5fa718b63cd5 finished treecms.memory basic implementation ( not tested yet. )
shoshi
parents:
diff changeset
4
27
aecc55e87143 test commit
Shoshi TAMAKI <shoshi@cr.ie.u-ryukyu.ac.jp>
parents: 26
diff changeset
5 public class ReplaceMerger<T extends Node> 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 }