motiejus
/
jgit
1
Fork 0
Code Releases Activity

Fix Javadoc errors with Java 8 

Bug: 440414
Change-Id: Icce87bd23a3698513b76246677f1d45ddbcaab47
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Robin Stocker 2014-07-27 15:13:36 +10:00 committed by Matthias Sohn
parent adbf0541dc
commit 66909cd7a6
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java
View File

@ -483,10 +483,10 @@ public void addConflict(String path, org.eclipse.jgit.merge.MergeResult<?> lowLe
* for (String path : allConflicts.keySet()) { * for (String path : allConflicts.keySet()) {
* int[][] c = allConflicts.get(path); * int[][] c = allConflicts.get(path);
* System.out.println("Conflicts in file " + path); * System.out.println("Conflicts in file " + path);
* for (int i = 0; i < c.length; ++i) { * for (int i = 0; i &lt; c.length; ++i) {
* System.out.println(" Conflict #" + i); * System.out.println(" Conflict #" + i);
* for (int j = 0; j &lt; (c[i].length) - 1; ++j) { * for (int j = 0; j &lt; (c[i].length) - 1; ++j) {
* if (c[i][j] >= 0) * if (c[i][j] &gt;= 0)
* System.out.println(" Chunk for " * System.out.println(" Chunk for "
* + m.getMergedCommits()[j] + " starts on line #" * + m.getMergedCommits()[j] + " starts on line #"
* + c[i][j]); * + c[i][j]);

15
org.eclipse.jgit/src/org/eclipse/jgit/diff/Edit.java
View File

@ -51,16 +51,15 @@
* Regions should be specified using 0 based notation, so add 1 to the start and * Regions should be specified using 0 based notation, so add 1 to the start and
* end marks for line numbers in a file. * end marks for line numbers in a file.
* <p> * <p>
* An edit where <code>beginA == endA && beginB &lt; endB</code> is an insert * An edit where {@code beginA == endA && beginB < endB} is an insert edit, that
* edit, that is sequence B inserted the elements in region * is sequence B inserted the elements in region <code>[beginB, endB)</code> at
* <code>[beginB, endB)</code> at <code>beginA</code>. * <code>beginA</code>.
* <p> * <p>
* An edit where <code>beginA &lt; endA && beginB == endB</code> is a delete * An edit where {@code beginA < endA && beginB == endB} is a delete edit, that
* edit, that is sequence B has removed the elements between * is sequence B has removed the elements between <code>[beginA, endA)</code>.
* <code>[beginA, endA)</code>.
* <p> * <p>
* An edit where <code>beginA &lt; endA && beginB &lt; endB</code> is a replace * An edit where {@code beginA < endA && beginB < endB} is a replace edit, that
* edit, that is sequence B has replaced the range of elements between * is sequence B has replaced the range of elements between
* <code>[beginA, endA)</code> with those found in <code>[beginB, endB)</code>. * <code>[beginA, endA)</code> with those found in <code>[beginB, endB)</code>.
*/ */
public class Edit { public class Edit {

1
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
View File

@ -444,6 +444,7 @@ private DirCacheEntry keep(DirCacheEntry e) {
* conflict is detected the content-merge algorithm will try to write a * conflict is detected the content-merge algorithm will try to write a
* merged version into the working-tree. If the file is dirty we would * merged version into the working-tree. If the file is dirty we would
* override unsaved data.</li> * override unsaved data.</li>
* </ul>
* *
* @param base * @param base
* the common base for ours and theirs * the common base for ours and theirs