aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org
diff options
context:
space:
mode:
Diffstat (limited to 'org.eclipse.jgit/src/org')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java1
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/BeforeDfsPackIndexLoadedListener.java6
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsPackFile.java5
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/util/io/ThrowingPrintWriter.java2
5 files changed, 14 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java
index 0b269b0d7c..95bc1129c3 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java
@@ -450,6 +450,7 @@ public class DirCacheEntry {
* Returns whether this entry is in the fully-merged stage (0).
*
* @return true if this entry is merged
+ * @since 2.2
*/
public boolean isMerged() {
return getStage() == STAGE_0;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/BeforeDfsPackIndexLoadedListener.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/BeforeDfsPackIndexLoadedListener.java
index e0ddf4138f..ab9dd42820 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/BeforeDfsPackIndexLoadedListener.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/BeforeDfsPackIndexLoadedListener.java
@@ -45,7 +45,11 @@ package org.eclipse.jgit.storage.dfs;
import org.eclipse.jgit.events.RepositoryListener;
-/** Receives {@link BeforeDfsPackIndexLoadedEvent}s. */
+/**
+ * Receives {@link BeforeDfsPackIndexLoadedEvent}s.
+ *
+ * @since 2.2
+ */
public interface BeforeDfsPackIndexLoadedListener extends RepositoryListener {
/**
* Invoked just before a pack index is loaded from the block cache.
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsPackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsPackFile.java
index 3dabb9fc74..ea8aa73cf0 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsPackFile.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsPackFile.java
@@ -172,7 +172,10 @@ public final class DfsPackFile {
return packDesc;
}
- /** @return whether the pack index file is loaded and cached in memory. */
+ /**
+ * @return whether the pack index file is loaded and cached in memory.
+ * @since 2.2
+ */
public boolean isIndexLoaded() {
DfsBlockCache.Ref<PackIndex> idxref = index;
return idxref != null && idxref.get() != null;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java
index 89fbeed890..c20474d11c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java
@@ -67,6 +67,8 @@ import org.eclipse.jgit.lib.PersonIdent;
public final class RawParseUtils {
/**
* UTF-8 charset constant.
+ *
+ * @since 2.2
*/
public static final Charset UTF8_CHARSET = Charset.forName("UTF-8");
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/ThrowingPrintWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/ThrowingPrintWriter.java
index 1c5c2b6b48..e4a8fc080e 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/ThrowingPrintWriter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/ThrowingPrintWriter.java
@@ -51,6 +51,8 @@ import org.eclipse.jgit.util.SystemReader;
/**
* An alternative PrintWriter that doesn't catch exceptions.
+ *
+ * @since 2.2
*/
public class ThrowingPrintWriter extends Writer {