From 6d19f5dc8f54106b16ad42fc8e69d7c49b681d73 Mon Sep 17 00:00:00 2001 From: Terry Parker Date: Sat, 7 Nov 2015 10:31:15 -0800 Subject: [PATCH] [style] Shorten line lengths and import order in bitmap code Change-Id: I420fcd308a97e30b8c74026d74b93ed3ec74bb3f Signed-off-by: Terry Parker --- .../internal/storage/pack/PackWriterBitmapPreparer.java | 2 +- .../jgit/internal/storage/pack/PackWriterBitmapWalker.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java index 9ab62d3c22..e378b4e82d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java @@ -65,11 +65,11 @@ import org.eclipse.jgit.internal.storage.file.PackBitmapIndexBuilder; import org.eclipse.jgit.internal.storage.file.PackBitmapIndexRemapper; import org.eclipse.jgit.internal.storage.pack.PackWriterBitmapWalker.AddUnseenToBitmapFilter; import org.eclipse.jgit.lib.AnyObjectId; +import org.eclipse.jgit.lib.BitmapIndex.BitmapBuilder; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.ProgressMonitor; -import org.eclipse.jgit.lib.BitmapIndex.BitmapBuilder; import org.eclipse.jgit.revwalk.ObjectWalk; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevObject; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapWalker.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapWalker.java index ccee1893fe..d9ac9ef16b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapWalker.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapWalker.java @@ -168,7 +168,8 @@ final class PackWriterBitmapWalker { if (bitmap.contains(cmit)) { // already included - } else if ((visitedBitmap = bitmap.getBitmapIndex().getBitmap(cmit)) != null) { + } else if ((visitedBitmap = bitmap.getBitmapIndex() + .getBitmap(cmit)) != null) { bitmap.or(visitedBitmap); } else { bitmap.addObject(cmit, Constants.OBJ_COMMIT); @@ -221,7 +222,8 @@ final class PackWriterBitmapWalker { if (seen.contains(cmit) || bitmap.contains(cmit)) { // already seen or included - } else if ((visitedBitmap = bitmap.getBitmapIndex().getBitmap(cmit)) != null) { + } else if ((visitedBitmap = bitmap.getBitmapIndex() + .getBitmap(cmit)) != null) { bitmap.or(visitedBitmap); } else { bitmap.addObject(cmit, Constants.OBJ_COMMIT); -- 2.39.5