com.devonfw.cobigen.javaplugin.merger

Class JavaMerger

java.lang.Object

com.devonfw.cobigen.javaplugin.merger.JavaMerger

All Implemented Interfaces:

com.devonfw.cobigen.api.extension.Merger

public class JavaMerger
extends Object
implements com.devonfw.cobigen.api.extension.Merger

The JavaMerger merges a patch and the base file of the same class. This merge is a structural merge considering code blocks of fields, methods and inner classes. There will be no merging on statement level

Author:

mbrunnli (19.03.2013)

Constructor Summary

Constructors

Constructor and Description
JavaMerger(String type, boolean patchOverrides) Creates a new JavaMerger

Method Summary

Modifier and Type	Method and Description
String	getType()
String	merge(File base, String patch, String targetCharset)

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Detail

JavaMerger

public JavaMerger(String type,
                  boolean patchOverrides)

Creates a new JavaMerger

Parameters:

type - merger type

patchOverrides - if true, conflicts will be resolved by using the patch contents
if false, conflicts will be resolved by using the base contents

Method Detail

getType

public String getType()

Specified by:

getType in interface com.devonfw.cobigen.api.extension.Merger

merge

public String merge(File base,
                    String patch,
                    String targetCharset)
             throws com.devonfw.cobigen.api.exception.MergeException

Specified by:

merge in interface com.devonfw.cobigen.api.extension.Merger

Throws:

com.devonfw.cobigen.api.exception.MergeException