motiejus
/
jgit
1
Fork 0
Code Releases Activity

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
This commit is contained in:
Shawn Pearce 2013-03-06 12:47:37 -08:00
parent c660362768
commit 88c962484f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsPackFile.java
View File

@ -276,7 +276,7 @@ else if (bs <= 0)
}
}
PackBitmapIndex getPackBitmapIndex(DfsReader ctx) throws IOException {
PackBitmapIndex getBitmapIndex(DfsReader ctx) throws IOException {
DfsBlockCache.Ref<PackBitmapIndex> idxref = bitmapIndex;
if (idxref != null) {
PackBitmapIndex idx = idxref.get();

4
org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsReader.java
View File

@ -146,7 +146,7 @@ public ObjectReader newReader() {
@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 BitmapIndex getBitmapIndex() throws IOException {
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));