org.javersion.object.MergeObject Maven / Gradle / Ivy

Go to download

Show more of this group Show more artifacts with this name
Show all versions of javersion-object Show documentation

There is a newer version: 0.15.3

package org.javersion.object;

import java.util.Set;

import javax.annotation.concurrent.NotThreadSafe;

import org.javersion.core.Merge;
import org.javersion.core.Revision;
import org.javersion.core.VersionProperty;
import org.javersion.path.PropertyPath;
import org.javersion.util.Check;

import com.google.common.collect.Multimap;

@NotThreadSafe
public class MergeObject {

    public final T object;

    public final Merge merge;

    public MergeObject(T object, Merge merge) {
        this.object = object;
        this.merge = Check.notNull(merge, "merge");
    }

    public T getObject() {
        return object;
    }

    public Set getMergeHeads() {
        return merge.getMergeHeads();
    }

    public Multimap> getConflicts() {
        return merge.getConflicts();
    }

}