diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2013-03-22 21:15:48 +0100 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2013-03-22 21:21:07 +0100 |
commit | dd6f41e4010680115c00dd8dc250b1674eb42f42 (patch) | |
tree | a6272aa76c72f2ac04b64366e3c638850ccb795a | |
parent | 48f30b8614cb174256c2cb4d5d25a5bf35464fec (diff) | |
download | jgit-dd6f41e4010680115c00dd8dc250b1674eb42f42.tar.gz jgit-dd6f41e4010680115c00dd8dc250b1674eb42f42.zip |
Add missing @since tags
Change-Id: I6b20d78e6bd1f245fdca331554c106f8bae44b9c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
10 files changed, 25 insertions, 4 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java index 3a396aa119..de14282cfd 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java @@ -1269,7 +1269,9 @@ public abstract class Repository { * @param refName * @return a {@link ReflogReader} for the supplied refname, or null if the * named ref does not exist. - * @throws IOException the ref could not be accessed. + * @throws IOException + * the ref could not be accessed. + * @since 3.0 */ public abstract ReflogReader getReflogReader(String refName) throws IOException; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeStrategy.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeStrategy.java index 3b64ddd361..c5e615ed87 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeStrategy.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeStrategy.java @@ -76,6 +76,7 @@ public abstract class MergeStrategy { /** * Recursive strategy to merge paths. It tries to merge also contents. * Multiple merge bases are supported + * @since 3.0 */ public static final ThreeWayMergeStrategy RECURSIVE = new StrategyRecursive(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java index 04c29e6e83..1346328761 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java @@ -197,6 +197,7 @@ public abstract class Merger { * one of the input objects is not a commit. * @throws IOException * objects are missing or multiple merge bases were found. + * @since 3.0 */ protected AbstractTreeIterator mergeBase(RevCommit a, RevCommit b) throws IOException { @@ -241,6 +242,7 @@ public abstract class Merger { * one of the input objects is not a commit. * @throws IOException * objects are missing or multiple merge bases were found. + * @since 3.0 */ protected RevCommit getBaseCommit(RevCommit a, RevCommit b) throws IncorrectObjectTypeException, IOException { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java index d68be35403..540d6a8c66 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java @@ -82,9 +82,8 @@ import org.eclipse.jgit.treewalk.WorkingTreeIterator; * - uses "Lists" instead of Arrays for chained types * * - recursively merges the merge bases together to compute a usable base - * + * @since 3.0 */ - public class RecursiveMerger extends ResolveMerger { static Logger log = Logger.getLogger(RecursiveMerger.class.toString()); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java index 213a1d4daa..2ea1160793 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -109,6 +109,8 @@ public class ResolveMerger extends ThreeWayMerger { /** * string versions of a list of commit SHA1s + * + * @since 3.0 */ protected String commitNames[]; @@ -126,6 +128,8 @@ public class ResolveMerger extends ThreeWayMerger { /** * merge result as tree + * + * @since 3.0 */ protected ObjectId resultTree; @@ -149,6 +153,7 @@ public class ResolveMerger extends ThreeWayMerger { * created as temporary files and a new empty, in-memory dircache will be * used instead the repo's one. Often used for bare repos where the repo * doesn't even have a workingtree and dircache. + * @since 3.0 */ protected boolean inCore; @@ -157,22 +162,26 @@ public class ResolveMerger extends ThreeWayMerger { * repository and should handle locking and unlocking of the dircache. If * this merger should work in-core or if an explicit dircache was specified * during construction then this field is set to false. + * @since 3.0 */ protected boolean implicitDirCache; /** * Directory cache + * @since 3.0 */ protected DirCache dircache; /** * The iterator to access the working tree. If set to <code>null</code> this * merger will not touch the working tree. + * @since 3.0 */ protected WorkingTreeIterator workingTreeIterator; /** * our merge algorithm + * @since 3.0 */ protected MergeAlgorithm mergeAlgorithm; @@ -893,6 +902,7 @@ public class ResolveMerger extends ThreeWayMerger { * @param mergeTree * @return whether the trees merged cleanly * @throws IOException + * @since 3.0 */ protected boolean mergeTrees(AbstractTreeIterator baseTree, RevTree headTree, RevTree mergeTree) throws IOException { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileRepositoryBuilder.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileRepositoryBuilder.java index 5efa2507a8..944fb4f5ea 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileRepositoryBuilder.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileRepositoryBuilder.java @@ -104,6 +104,7 @@ public class FileRepositoryBuilder extends * @throws IOException * the repository could not be accessed to configure the rest of * the builder's parameters. + * @since 3.0 */ public static Repository create(File gitDir) throws IOException { return new FileRepositoryBuilder().setGitDir(gitDir).readEnvironment() diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java index 50158d880d..e16cce0e3d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java @@ -428,6 +428,7 @@ public abstract class PackParser { * {@link #setLockMessage(String)}. * @throws IOException * the stream is malformed, or contains corrupt objects. + * @since 3.0 */ public final PackLock parse(ProgressMonitor progress) throws IOException { return parse(progress, progress); @@ -446,6 +447,7 @@ public abstract class PackParser { * {@link #setLockMessage(String)}. * @throws IOException * the stream is malformed, or contains corrupt objects. + * @since 3.0 */ public PackLock parse(ProgressMonitor receiving, ProgressMonitor resolving) throws IOException { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java index 01bc5b75ba..1377a37cd8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java @@ -537,6 +537,7 @@ public class UploadPack { * @return statistics about pack output, if a pack was sent. Null if no pack * was sent, such as during the negotation phase of a smart HTTP * connection, or if the client was already up-to-date. + * @since 3.0 */ public PackWriter.Statistics getPackStatistics() { return statistics; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPackLoggerChain.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPackLoggerChain.java index 0facfe0e48..3f14cc6f58 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPackLoggerChain.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPackLoggerChain.java @@ -78,6 +78,9 @@ public class UploadPackLoggerChain implements UploadPackLogger { return new UploadPackLoggerChain(newLoggers, i); } + /** + * @since 3.0 + */ public void onPackStatistics(PackWriter.Statistics stats) { for (int i = 0; i < count; i++) loggers[i].onPackStatistics(stats); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeOptions.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeOptions.java index 93590fd222..15bfb917db 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeOptions.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeOptions.java @@ -85,7 +85,7 @@ public class WorkingTreeOptions { /** * @return how stat data is compared - * @since 2.3 + * @since 3.0 */ public CheckStat getCheckStat() { return checkStat; |