From 2464fa440f7585154c591d3a12f6778026da40ff Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 21 Dec 2017 01:36:18 +0100 Subject: Fix remaining javadoc errors raised by doclint For now ignore doclint "missing" warnings. Change-Id: I0e5af7a757f4d92ffeeb113f30576a35414d6781 Signed-off-by: Matthias Sohn --- .../tst/org/eclipse/jgit/api/CommitOnlyTest.java | 12 ++++++------ .../tst/org/eclipse/jgit/api/DescribeCommandTest.java | 16 ++++++++-------- .../tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java | 4 ++-- .../eclipse/jgit/revwalk/RevWalkFollowFilterTest.java | 3 ++- .../tst/org/eclipse/jgit/symlinks/SymlinksTest.java | 2 +- .../jgit/treewalk/FileTreeIteratorWithTimeControl.java | 8 ++++---- 6 files changed, 23 insertions(+), 22 deletions(-) (limited to 'org.eclipse.jgit.test/tst/org/eclipse') diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitOnlyTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitOnlyTest.java index 5f7434b41f..cc21b473ec 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitOnlyTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitOnlyTest.java @@ -70,19 +70,19 @@ import org.junit.Test; * --------------------------------------------------------------------- * | HEAD DirCache Worktree | HEAD DirCache * --------------------------------------------------------------------- - * f1_1 | - - c | => e: path unknown - * f1_2 | - c - | => no changes + * f1_1 | - - c | => e: path unknown + * f1_2 | - c - | => no changes * f1_3 | c - - | - - * f1_4 | - c c | c c * f1_5 | c c - | - - - * f1_6 | c - c | => no changes - * f1_7 | c c c | => no changes + * f1_6 | c - c | => no changes + * f1_7 | c c c | => no changes * --------------------------------------------------------------------- * f1_8 | - c c' | c' c' * f1_9 | c - c' | c' c' * f1_10 | c c' - | - - * f1_11 | c c c' | c' c' - * f1_12 | c c' c | => no changes + * f1_12 | c c' c | => no changes * f1_13 | c c' c' | c' c' * --------------------------------------------------------------------- * f1_14 | c c' c'' | c'' c'' @@ -97,7 +97,7 @@ import org.junit.Test; * --------------------------------------------------------------------------- * | HEAD DirCache Worktree | HEAD DirCache * --------------------------------------------------------------------------- - * f1_1_f2_14 | - - c | => e: path unknown + * f1_1_f2_14 | - - c | => e: path unknown * f1_2_f2_14 | - c - | - - * f1_6_f2_14 | c - c | c c * f1_7_f2_14 | c c c | c c diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/DescribeCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/DescribeCommandTest.java index 6a667830e8..d78a328402 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/DescribeCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/DescribeCommandTest.java @@ -158,9 +158,9 @@ public class DescribeCommandTest extends RepositoryTestCase { * Make sure it finds a tag when not all ancestries include a tag. * * 
-	 * c1 -+-> T  -
+	 * c1 -+-> T  -
 	 *     |       |
-	 *     +-> c3 -+-> c4
+	 *     +-> c3 -+-> c4
 	 *
* * @throws Exception @@ -193,9 +193,9 @@ public class DescribeCommandTest extends RepositoryTestCase { * When t2 dominates t1, it's clearly preferable to describe by using t2. * * 
-	 * t1 -+-> t2  -
+	 * t1 -+-> t2  -
 	 *     |       |
-	 *     +-> c3 -+-> c4
+	 *     +-> c3 -+-> c4
 	 *
* * @throws Exception @@ -225,9 +225,9 @@ public class DescribeCommandTest extends RepositoryTestCase { * When t1 is nearer than t2, t2 should be found * * 
-	 * c1 -+-> c2 -> t1 -+
+	 * c1 -+-> c2 -> t1 -+
 	 *     |             |
-	 *     +-> t2 -> c3 -+-> c4
+	 *     +-> t2 -> c3 -+-> c4
 	 *
* * @throws Exception @@ -254,9 +254,9 @@ public class DescribeCommandTest extends RepositoryTestCase { * paths * * 
-	 * c1 -+-> t1 -> c2 -+
+	 * c1 -+-> t1 -> c2 -+
 	 *     |             |
-	 *     +-> t2 -> c3 -+-> c4
+	 *     +-> t2 -> c3 -+-> c4
 	 *
* * @throws Exception diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java index 05573b9468..4d42bd19c5 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java @@ -218,8 +218,8 @@ public class DirCacheCheckoutTest extends RepositoryTestCase { /** * Reset hard from unclean condition. *

- * WorkDir: Empty
- * Index: f/g
+ * WorkDir: Empty
+ * Index: f/g
* Merge: x * * @throws Exception diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkFollowFilterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkFollowFilterTest.java index 1860185493..ab2705cbec 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkFollowFilterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkFollowFilterTest.java @@ -145,8 +145,9 @@ public class RevWalkFollowFilterTest extends RevWalkTestCase { /** * Assert which renames should have happened, in traversal order. + * * @param expectedRenames - * the rename specs, each one in the form "srcPath->destPath" + * the rename specs, each one in the form "srcPath->destPath" */ protected void assertRenames(String... expectedRenames) { Assert.assertEquals("Unexpected number of renames. Expected: " + diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/symlinks/SymlinksTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/symlinks/SymlinksTest.java index 274fa539cb..7d54399ef3 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/symlinks/SymlinksTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/symlinks/SymlinksTest.java @@ -206,7 +206,7 @@ public class SymlinksTest extends RepositoryTestCase { * Steps: 1.Add file 'b' 2.Commit 3.Create branch '1' 4.Add symlink 'a' * 5.Commit 6.Checkout branch '1' * - * The working tree should not contain 'a' -> FileMode.MISSING after the + * The working tree should not contain 'a' -> FileMode.MISSING after the * checkout. * * @throws Exception diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorWithTimeControl.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorWithTimeControl.java index ff5730e72f..717a2f3b2c 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorWithTimeControl.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorWithTimeControl.java @@ -58,10 +58,10 @@ import org.eclipse.jgit.util.FS; *

* This iterator is configured by a list of strictly increasing long values * t(0), t(1), ..., t(n). For each file with a modification between t(x) and - * t(x+1) [ t(x) <= time < t(x+1) ] this iterator will report t(x). For files - * with a modification time smaller t(0) a modification time of 0 is returned. - * For files with a modification time greater or equal t(n) t(n) will be - * returned. + * t(x+1) [ t(x) <= time < t(x+1) ] this iterator will report t(x). For + * files with a modification time smaller t(0) a modification time of 0 is + * returned. For files with a modification time greater or equal t(n) t(n) will + * be returned. *

* This class was written especially to test racy-git problems */ -- cgit v1.2.3