Browse Source

Fix @since tags of new API added after 4.7.0

Change-Id: I356f71cdef8e23a9b06cf0a4079060a116b9ed27
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
stable-4.8
Matthias Sohn 8 years ago
parent
commit
4e8655c74d
  1. 7
      org.eclipse.jgit/src/org/eclipse/jgit/diff/Edit.java
  2. 3
      org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyResolve.java
  3. 3
      org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java

7
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;

3
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);

3
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);

Loading…
Cancel
Save