Overview | Package | Class | Use | Tree | Deprecated | Index | Help
PREV CLASS NEXT CLASS | FRAMES NO FRAMES
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD

## org.apache.torque.generator.merge
Class ThreeWayMerger

    java.lang.Object
      org.apache.torque.generator.merge.ThreeWayMerger

    public class ThreeWayMerger

extends Object

Can execute a three-way merge. This class is thread safe.

Version:
  $Id: ThreeWayMerger.java 1331190 2012-04-27 02:41:35Z tfischer $

Constructor Summary
`ThreeWayMerger()`

Method Summary
`String` | `merge(String base, String generated, String edited, String charsetName)` Performs a three-way merge.

Methods inherited from class java.lang.Object
`clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait`

Constructor Detail

### ThreeWayMerger

    public ThreeWayMerger()

Method Detail

### merge

    public String merge(String base,
                        String generated,
                        String edited,
                        String charsetName)
                 throws GeneratorException

  Performs a three-way merge.

  Parameters:
    `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.
  Returns:
    the merge result, not null.
  Throws:
    `GeneratorException` - if merging fails.

Overview | Package | Class | Use | Tree | Deprecated | Index | Help
PREV CLASS NEXT CLASS | FRAMES NO FRAMES
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD

Copyright © 2000-2013 The Apache Software Foundation. All Rights Reserved.