[style] Shorten line lengths and import order in bitmap code

Change-Id: I420fcd308a97e30b8c74026d74b93ed3ec74bb3f
Signed-off-by: Terry Parker <tparker@google.com>

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 9ab62d3c228a64c368eec0a8b8d777bc8ccb0e83..e378b4e82dbb53298bb2beae3453ca8f8833498c 100644 (file)
--- 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 ccee1893fe87556890a9cd7f2a719c00ccaab403..d9ac9ef16bcfc4e81ebb9afd5bae0c7735724698 100644 (file)
--- 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);