org.xwiki.diff.MergeResult Maven / Gradle / Ivy

Go to download

Show more of this group Show more artifacts with this name
Show all versions of xwiki-commons-diff-api Show documentation

XWiki Commons - Diff API

The newest version!

/*
 * See the NOTICE file distributed with this work for additional
 * information regarding copyright ownership.
 *
 * This is free software; you can redistribute it and/or modify it
 * under the terms of the GNU Lesser General Public License as
 * published by the Free Software Foundation; either version 2.1 of
 * the License, or (at your option) any later version.
 *
 * This software is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this software; if not, write to the Free
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */
package org.xwiki.diff;

import java.util.List;

import org.xwiki.logging.LogQueue;

/**
 * @param  the type of compared elements
 * @version $Id: 581d1542491a6630403088ae1bc03d32a1f70249 $
 */
public interface MergeResult
{
    /**
     * @return the common ancestor
     */
    List getCommonAncestor();

    /**
     * @return the new version
     */
    List getNext();

    /**
     * @return the current version
     */
    List getCurrent();

    /**
     * @return the log of what append during the merge execution
     */
    LogQueue getLog();

    /**
     * @return the result of the 3 ways merge
     */
    List getMerged();
}