Klasse ThreeWayMerger
java.lang.Object
org.apache.torque.generator.merge.ThreeWayMerger
Can execute a three-way merge. This class is thread safe.
- Version:
- $Id: ThreeWayMerger.java 1917241 2024-04-21 13:29:41Z tv $
-
Konstruktorübersicht
Konstruktoren -
Methodenübersicht
-
Konstruktordetails
-
ThreeWayMerger
public ThreeWayMerger()
-
-
Methodendetails
-
merge
public String merge(String base, String generated, String edited, Charset charSet) throws GeneratorException Performs a three-way merge.- Parameter:
base
- the base from which the other two versions are derived, not null.generated
- the newly generated text, not null.edited
- the possibly edited text, not null.charsetName
- the name of the character set, not null.- Gibt zurück:
- the merge result, not null.
- Löst aus:
GeneratorException
- if merging fails.
-