diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2017-04-06 18:16:04 +0200 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2017-04-06 18:16:04 +0200 |
commit | 4e8655c74dc8dec620c58fb965e8fa836212aa4c (patch) | |
tree | 2b11381c418a969ee07bcfe68db3cfe629c0c245 | |
parent | e48dd364f8f04430892cf30b66f83eebe3cafb5e (diff) | |
download | jgit-4e8655c74dc8dec620c58fb965e8fa836212aa4c.tar.gz jgit-4e8655c74dc8dec620c58fb965e8fa836212aa4c.zip |
Fix @since tags of new API added after 4.7.0
Change-Id: I356f71cdef8e23a9b06cf0a4079060a116b9ed27
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
3 files changed, 10 insertions, 3 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/Edit.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/Edit.java index 3ac46ea121..a2e167fd20 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/Edit.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/Edit.java @@ -171,10 +171,11 @@ public class Edit { /** * Move the edit region by the specified amount. + * * @param amount - * the region is shifted by this amount, and can be - * positive or negative. - * @since 4.7 + * the region is shifted by this amount, and can be positive or + * negative. + * @since 4.8 */ public final void shift(int amount) { beginA += amount; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyResolve.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyResolve.java index 1691bf9e43..17044b53ae 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyResolve.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyResolve.java @@ -62,6 +62,9 @@ public class StrategyResolve extends ThreeWayMergeStrategy { return new ResolveMerger(db, inCore); } + /** + * @since 4.8 + */ @Override public ThreeWayMerger newMerger(ObjectInserter inserter, Config config) { return new ResolveMerger(inserter, config); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java index d05e2d4c8d..cd427bd8fb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java @@ -90,6 +90,9 @@ public class StrategySimpleTwoWayInCore extends ThreeWayMergeStrategy { return newMerger(db); } + /** + * @since 4.8 + */ @Override public ThreeWayMerger newMerger(ObjectInserter inserter, Config config) { return new InCoreMerger(inserter); |