1. Project Clover database Tue Dec 20 2016 21:24:09 CET
  2. Package org.xwiki.diff

File MergeResult.java

 

Code metrics

0
0
0
1
56
11
0
-
-
0
-

Classes

Class Line # Actions
MergeResult 30 0 - 0 0
-1.0 -
 

Contributing tests

No tests hitting this source file were found.

Source view

1    /*
2    * See the NOTICE file distributed with this work for additional
3    * information regarding copyright ownership.
4    *
5    * This is free software; you can redistribute it and/or modify it
6    * under the terms of the GNU Lesser General Public License as
7    * published by the Free Software Foundation; either version 2.1 of
8    * the License, or (at your option) any later version.
9    *
10    * This software is distributed in the hope that it will be useful,
11    * but WITHOUT ANY WARRANTY; without even the implied warranty of
12    * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13    * Lesser General Public License for more details.
14    *
15    * You should have received a copy of the GNU Lesser General Public
16    * License along with this software; if not, write to the Free
17    * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
18    * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
19    */
20    package org.xwiki.diff;
21   
22    import java.util.List;
23   
24    import org.xwiki.logging.LogQueue;
25   
26    /**
27    * @param <E> the type of compared elements
28    * @version $Id: 581d1542491a6630403088ae1bc03d32a1f70249 $
29    */
 
30    public interface MergeResult<E>
31    {
32    /**
33    * @return the common ancestor
34    */
35    List<E> getCommonAncestor();
36   
37    /**
38    * @return the new version
39    */
40    List<E> getNext();
41   
42    /**
43    * @return the current version
44    */
45    List<E> getCurrent();
46   
47    /**
48    * @return the log of what append during the merge execution
49    */
50    LogQueue getLog();
51   
52    /**
53    * @return the result of the 3 ways merge
54    */
55    List<E> getMerged();
56    }