Rename DfsPackFile getBitmap method to match PackFile

There is no reason for these to differ in name. Match the
shorter name used by PackFile.

Change-Id: I2d3a299069acc5ce276b1b5439ff2258903c6ff3

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 735e36670a697f0e999e9e2dce5b382855f42864..ed6628596a306370a4049fd3676fdf488aafd7b1 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsPackFile.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsPackFile.java
@@ -276,7 +276,7 @@ public final class DfsPackFile {
                }
        }
 
-       PackBitmapIndex getPackBitmapIndex(DfsReader ctx) throws IOException {
+       PackBitmapIndex getBitmapIndex(DfsReader ctx) throws IOException {
                DfsBlockCache.Ref<PackBitmapIndex> idxref = bitmapIndex;
                if (idxref != null) {
                        PackBitmapIndex idx = idxref.get();

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsReader.java
index 6d131abe19cd64915d5d46529feb7d85be5dbfec..7d5fb5b2a5b4c18a1b9612f8c275e096cc91f9bc 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsReader.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsReader.java
@@ -146,7 +146,7 @@ public final class DfsReader extends ObjectReader implements ObjectReuseAsIs {
        @Override
        public BitmapIndex getBitmapIndex() throws IOException {
                for (DfsPackFile pack : db.getPacks()) {
-                       PackBitmapIndex bitmapIndex = pack.getPackBitmapIndex(this);
+                       PackBitmapIndex bitmapIndex = pack.getBitmapIndex(this);
                        if (bitmapIndex != null)
                                return new BitmapIndexImpl(bitmapIndex);
                }
@@ -156,7 +156,7 @@ public final class DfsReader extends ObjectReader implements ObjectReuseAsIs {
        public Collection<CachedPack> getCachedPacksAndUpdate(
                BitmapBuilder needBitmap) throws IOException {
                for (DfsPackFile pack : db.getPacks()) {
-                       PackBitmapIndex bitmapIndex = pack.getPackBitmapIndex(this);
+                       PackBitmapIndex bitmapIndex = pack.getBitmapIndex(this);
                        if (needBitmap.removeAllOrNone(bitmapIndex))
                                return Collections.<CachedPack> singletonList(
                                                new DfsCachedPack(pack));