diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/ApplyCommand.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/ApplyCommand.java index d22c8256f..25244568e 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/ApplyCommand.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/ApplyCommand.java @@ -53,7 +53,7 @@ import com.fr.third.eclipse.jgit.patch.HunkHeader; import com.fr.third.eclipse.jgit.patch.Patch; import com.fr.third.eclipse.jgit.util.FileUtils; import com.fr.third.eclipse.jgit.util.IO; -import org.eclipse.jgit.diff.DiffEntry.ChangeType; +import com.fr.third.eclipse.jgit.diff.DiffEntry.ChangeType; import java.io.File; import java.io.FileOutputStream; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/BlameCommand.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/BlameCommand.java index 71ea62525..52d84ff21 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/BlameCommand.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/BlameCommand.java @@ -57,7 +57,7 @@ import com.fr.third.eclipse.jgit.lib.Repository; import com.fr.third.eclipse.jgit.treewalk.WorkingTreeOptions; import com.fr.third.eclipse.jgit.util.IO; import com.fr.third.eclipse.jgit.util.io.EolCanonicalizingInputStream; -import org.eclipse.jgit.lib.CoreConfig.AutoCRLF; +import com.fr.third.eclipse.jgit.lib.CoreConfig.AutoCRLF; import java.io.File; import java.io.FileInputStream; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/CheckoutCommand.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/CheckoutCommand.java index 46ca2c1a5..c758f2751 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/CheckoutCommand.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/CheckoutCommand.java @@ -70,9 +70,9 @@ import com.fr.third.eclipse.jgit.revwalk.RevTree; import com.fr.third.eclipse.jgit.revwalk.RevWalk; import com.fr.third.eclipse.jgit.treewalk.TreeWalk; import com.fr.third.eclipse.jgit.treewalk.filter.PathFilterGroup; -import org.eclipse.jgit.api.CheckoutResult.Status; -import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit; -import org.eclipse.jgit.lib.RefUpdate.Result; +import com.fr.third.eclipse.jgit.api.CheckoutResult.Status; +import com.fr.third.eclipse.jgit.dircache.DirCacheEditor.PathEdit; +import com.fr.third.eclipse.jgit.lib.RefUpdate.Result; import java.io.IOException; import java.text.MessageFormat; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/CherryPickCommand.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/CherryPickCommand.java index 4cbb51254..fc12ffd5a 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/CherryPickCommand.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/CherryPickCommand.java @@ -65,7 +65,7 @@ import com.fr.third.eclipse.jgit.merge.ResolveMerger; import com.fr.third.eclipse.jgit.revwalk.RevCommit; import com.fr.third.eclipse.jgit.revwalk.RevWalk; import com.fr.third.eclipse.jgit.treewalk.FileTreeIterator; -import org.eclipse.jgit.lib.Ref.Storage; +import com.fr.third.eclipse.jgit.lib.Ref.Storage; import java.io.IOException; import java.text.MessageFormat; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/CherryPickResult.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/CherryPickResult.java index e6d2b5aa4..33542806f 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/CherryPickResult.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/CherryPickResult.java @@ -45,7 +45,7 @@ package com.fr.third.eclipse.jgit.api; import com.fr.third.eclipse.jgit.lib.Ref; import com.fr.third.eclipse.jgit.merge.ResolveMerger; import com.fr.third.eclipse.jgit.revwalk.RevCommit; -import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason; +import com.fr.third.eclipse.jgit.merge.ResolveMerger.MergeFailureReason; import java.util.List; import java.util.Map; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/CommitCommand.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/CommitCommand.java index 88f389933..ac8c044eb 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/CommitCommand.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/CommitCommand.java @@ -79,7 +79,7 @@ import com.fr.third.eclipse.jgit.util.ChangeIdUtil; import com.fr.third.eclipse.jgit.util.FS; import com.fr.third.eclipse.jgit.util.Hook; import com.fr.third.eclipse.jgit.util.ProcessResult; -import org.eclipse.jgit.lib.RefUpdate.Result; +import com.fr.third.eclipse.jgit.lib.RefUpdate.Result; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/CreateBranchCommand.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/CreateBranchCommand.java index 43d52e8ff..3f0802319 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/CreateBranchCommand.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/CreateBranchCommand.java @@ -59,7 +59,7 @@ import com.fr.third.eclipse.jgit.lib.Repository; import com.fr.third.eclipse.jgit.lib.StoredConfig; import com.fr.third.eclipse.jgit.revwalk.RevCommit; import com.fr.third.eclipse.jgit.revwalk.RevWalk; -import org.eclipse.jgit.lib.RefUpdate.Result; +import com.fr.third.eclipse.jgit.lib.RefUpdate.Result; import java.io.IOException; import java.text.MessageFormat; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/DeleteBranchCommand.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/DeleteBranchCommand.java index 4f7ca4aa8..fb67ba784 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/DeleteBranchCommand.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/DeleteBranchCommand.java @@ -56,7 +56,7 @@ import com.fr.third.eclipse.jgit.lib.Repository; import com.fr.third.eclipse.jgit.lib.StoredConfig; import com.fr.third.eclipse.jgit.revwalk.RevCommit; import com.fr.third.eclipse.jgit.revwalk.RevWalk; -import org.eclipse.jgit.lib.RefUpdate.Result; +import com.fr.third.eclipse.jgit.lib.RefUpdate.Result; import java.io.IOException; import java.text.MessageFormat; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/DeleteTagCommand.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/DeleteTagCommand.java index 8818457cc..9f23cdf2d 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/DeleteTagCommand.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/DeleteTagCommand.java @@ -48,7 +48,7 @@ import com.fr.third.eclipse.jgit.internal.JGitText; import com.fr.third.eclipse.jgit.lib.Ref; import com.fr.third.eclipse.jgit.lib.RefUpdate; import com.fr.third.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.lib.RefUpdate.Result; +import com.fr.third.eclipse.jgit.lib.RefUpdate.Result; import java.io.IOException; import java.text.MessageFormat; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/DescribeCommand.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/DescribeCommand.java index a78819f38..8aa592844 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/DescribeCommand.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/DescribeCommand.java @@ -66,7 +66,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.eclipse.jgit.lib.Constants.R_TAGS; +import static com.fr.third.eclipse.jgit.lib.Constants.R_TAGS; /** * Given a commit, show the most recent tag that is reachable from a commit. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/DiffCommand.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/DiffCommand.java index 6c48ffdd3..b9ac4bca8 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/DiffCommand.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/DiffCommand.java @@ -65,7 +65,7 @@ import java.io.IOException; import java.io.OutputStream; import java.util.List; -import static org.eclipse.jgit.lib.Constants.HEAD; +import static com.fr.third.eclipse.jgit.lib.Constants.HEAD; /** * Show changes between commits, commit and working tree, etc. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/GarbageCollectCommand.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/GarbageCollectCommand.java index b2995a8cf..f5f3f3de2 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/GarbageCollectCommand.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/GarbageCollectCommand.java @@ -55,7 +55,7 @@ import com.fr.third.eclipse.jgit.lib.Repository; import com.fr.third.eclipse.jgit.lib.StoredConfig; import com.fr.third.eclipse.jgit.storage.pack.PackConfig; import com.fr.third.eclipse.jgit.util.GitDateParser; -import org.eclipse.jgit.internal.storage.file.GC.RepoStatistics; +import com.fr.third.eclipse.jgit.internal.storage.file.GC.RepoStatistics; import java.io.IOException; import java.text.MessageFormat; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/GitCommand.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/GitCommand.java index 66d9ca850..03d0d2884 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/GitCommand.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/GitCommand.java @@ -46,7 +46,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; /** - * Common superclass of all commands in the package {@code org.eclipse.jgit.api} + * Common superclass of all commands in the package {@code com.fr.third.eclipse.jgit.api} *

* This class ensures that all commands fulfill the {@link Callable} interface. * It also has a property {@link #repo} holding a reference to the git diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/LogCommand.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/LogCommand.java index c01b91c3d..9112f43e0 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/LogCommand.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/LogCommand.java @@ -69,7 +69,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import static org.eclipse.jgit.lib.RefDatabase.ALL; +import static com.fr.third.eclipse.jgit.lib.RefDatabase.ALL; /** * A class used to execute a {@code Log} command. It has setters for all diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/MergeCommand.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/MergeCommand.java index 6518456b2..f9130b76e 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/MergeCommand.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/MergeCommand.java @@ -71,11 +71,11 @@ import com.fr.third.eclipse.jgit.revwalk.RevWalk; import com.fr.third.eclipse.jgit.revwalk.RevWalkUtils; import com.fr.third.eclipse.jgit.treewalk.FileTreeIterator; import com.fr.third.eclipse.jgit.util.StringUtils; -import org.eclipse.jgit.api.MergeResult.MergeStatus; -import org.eclipse.jgit.lib.Config.ConfigEnum; -import org.eclipse.jgit.lib.Ref.Storage; -import org.eclipse.jgit.lib.RefUpdate.Result; -import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason; +import com.fr.third.eclipse.jgit.api.MergeResult.MergeStatus; +import com.fr.third.eclipse.jgit.lib.Config.ConfigEnum; +import com.fr.third.eclipse.jgit.lib.Ref.Storage; +import com.fr.third.eclipse.jgit.lib.RefUpdate.Result; +import com.fr.third.eclipse.jgit.merge.ResolveMerger.MergeFailureReason; import java.io.IOException; import java.text.MessageFormat; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/MergeResult.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/MergeResult.java index fe95ea5c6..076659621 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/MergeResult.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/MergeResult.java @@ -48,8 +48,8 @@ import com.fr.third.eclipse.jgit.lib.ObjectId; import com.fr.third.eclipse.jgit.merge.MergeChunk; import com.fr.third.eclipse.jgit.merge.MergeStrategy; import com.fr.third.eclipse.jgit.merge.ResolveMerger; -import org.eclipse.jgit.merge.MergeChunk.ConflictState; -import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason; +import com.fr.third.eclipse.jgit.merge.MergeChunk.ConflictState; +import com.fr.third.eclipse.jgit.merge.ResolveMerger.MergeFailureReason; import java.text.MessageFormat; import java.util.HashMap; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/PullCommand.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/PullCommand.java index 02ff2aa35..db8af724d 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/PullCommand.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/PullCommand.java @@ -65,7 +65,7 @@ import com.fr.third.eclipse.jgit.lib.Repository; import com.fr.third.eclipse.jgit.lib.RepositoryState; import com.fr.third.eclipse.jgit.merge.MergeStrategy; import com.fr.third.eclipse.jgit.transport.FetchResult; -import org.eclipse.jgit.api.RebaseCommand.Operation; +import com.fr.third.eclipse.jgit.api.RebaseCommand.Operation; import java.io.IOException; import java.text.MessageFormat; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/RebaseCommand.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/RebaseCommand.java index 033382484..392e60cba 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/RebaseCommand.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/RebaseCommand.java @@ -83,11 +83,11 @@ import com.fr.third.eclipse.jgit.treewalk.filter.TreeFilter; import com.fr.third.eclipse.jgit.util.FileUtils; import com.fr.third.eclipse.jgit.util.IO; import com.fr.third.eclipse.jgit.util.RawParseUtils; -import org.eclipse.jgit.api.RebaseResult.Status; -import org.eclipse.jgit.api.ResetCommand.ResetType; -import org.eclipse.jgit.lib.RebaseTodoLine.Action; -import org.eclipse.jgit.lib.RefUpdate.Result; -import org.eclipse.jgit.submodule.SubmoduleWalk.IgnoreSubmoduleMode; +import com.fr.third.eclipse.jgit.api.RebaseResult.Status; +import com.fr.third.eclipse.jgit.api.ResetCommand.ResetType; +import com.fr.third.eclipse.jgit.lib.RebaseTodoLine.Action; +import com.fr.third.eclipse.jgit.lib.RefUpdate.Result; +import com.fr.third.eclipse.jgit.submodule.SubmoduleWalk.IgnoreSubmoduleMode; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/RebaseResult.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/RebaseResult.java index 0c3931d86..3f88c9552 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/RebaseResult.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/RebaseResult.java @@ -44,7 +44,7 @@ package com.fr.third.eclipse.jgit.api; import com.fr.third.eclipse.jgit.merge.ResolveMerger; import com.fr.third.eclipse.jgit.revwalk.RevCommit; -import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason; +import com.fr.third.eclipse.jgit.merge.ResolveMerger.MergeFailureReason; import java.util.List; import java.util.Map; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/RenameBranchCommand.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/RenameBranchCommand.java index 68eb651d1..03cc075f8 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/RenameBranchCommand.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/RenameBranchCommand.java @@ -57,7 +57,7 @@ import com.fr.third.eclipse.jgit.lib.Ref; import com.fr.third.eclipse.jgit.lib.RefRename; import com.fr.third.eclipse.jgit.lib.Repository; import com.fr.third.eclipse.jgit.lib.StoredConfig; -import org.eclipse.jgit.lib.RefUpdate.Result; +import com.fr.third.eclipse.jgit.lib.RefUpdate.Result; import java.io.IOException; import java.text.MessageFormat; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/RevertCommand.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/RevertCommand.java index b2732c1aa..dc716c7fa 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/RevertCommand.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/RevertCommand.java @@ -64,9 +64,9 @@ import com.fr.third.eclipse.jgit.merge.ResolveMerger; import com.fr.third.eclipse.jgit.revwalk.RevCommit; import com.fr.third.eclipse.jgit.revwalk.RevWalk; import com.fr.third.eclipse.jgit.treewalk.FileTreeIterator; -import org.eclipse.jgit.api.MergeResult.MergeStatus; -import org.eclipse.jgit.lib.Ref.Storage; -import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason; +import com.fr.third.eclipse.jgit.api.MergeResult.MergeStatus; +import com.fr.third.eclipse.jgit.lib.Ref.Storage; +import com.fr.third.eclipse.jgit.merge.ResolveMerger.MergeFailureReason; import java.io.IOException; import java.text.MessageFormat; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/StashCreateCommand.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/StashCreateCommand.java index 0194d28a7..be061a108 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/StashCreateCommand.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/StashCreateCommand.java @@ -73,9 +73,9 @@ import com.fr.third.eclipse.jgit.treewalk.filter.AndTreeFilter; import com.fr.third.eclipse.jgit.treewalk.filter.IndexDiffFilter; import com.fr.third.eclipse.jgit.treewalk.filter.SkipWorkTreeFilter; import com.fr.third.eclipse.jgit.util.FileUtils; -import org.eclipse.jgit.api.ResetCommand.ResetType; -import org.eclipse.jgit.dircache.DirCacheEditor.DeletePath; -import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit; +import com.fr.third.eclipse.jgit.api.ResetCommand.ResetType; +import com.fr.third.eclipse.jgit.dircache.DirCacheEditor.DeletePath; +import com.fr.third.eclipse.jgit.dircache.DirCacheEditor.PathEdit; import java.io.File; import java.io.IOException; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/StashDropCommand.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/StashDropCommand.java index aebb67040..7e3ceb6ce 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/StashDropCommand.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/StashDropCommand.java @@ -55,14 +55,14 @@ import com.fr.third.eclipse.jgit.lib.ReflogEntry; import com.fr.third.eclipse.jgit.lib.ReflogReader; import com.fr.third.eclipse.jgit.lib.Repository; import com.fr.third.eclipse.jgit.util.FileUtils; -import org.eclipse.jgit.lib.RefUpdate.Result; +import com.fr.third.eclipse.jgit.lib.RefUpdate.Result; import java.io.File; import java.io.IOException; import java.text.MessageFormat; import java.util.List; -import static org.eclipse.jgit.lib.Constants.R_STASH; +import static com.fr.third.eclipse.jgit.lib.Constants.R_STASH; /** * Command class to delete a stashed commit reference diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/Status.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/Status.java index a9de7be28..1c3b2e311 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/Status.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/Status.java @@ -43,7 +43,7 @@ package com.fr.third.eclipse.jgit.api; import com.fr.third.eclipse.jgit.lib.IndexDiff; -import org.eclipse.jgit.lib.IndexDiff.StageState; +import com.fr.third.eclipse.jgit.lib.IndexDiff.StageState; import java.util.Collections; import java.util.HashSet; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/StatusCommand.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/StatusCommand.java index e994440a6..7aed6fc5d 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/StatusCommand.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/StatusCommand.java @@ -52,7 +52,7 @@ import com.fr.third.eclipse.jgit.lib.Repository; import com.fr.third.eclipse.jgit.treewalk.FileTreeIterator; import com.fr.third.eclipse.jgit.treewalk.WorkingTreeIterator; import com.fr.third.eclipse.jgit.treewalk.filter.PathFilterGroup; -import org.eclipse.jgit.submodule.SubmoduleWalk.IgnoreSubmoduleMode; +import com.fr.third.eclipse.jgit.submodule.SubmoduleWalk.IgnoreSubmoduleMode; import java.io.IOException; import java.util.LinkedList; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/TagCommand.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/TagCommand.java index cf45000ac..26a96eff2 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/TagCommand.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/TagCommand.java @@ -60,7 +60,7 @@ import com.fr.third.eclipse.jgit.lib.RepositoryState; import com.fr.third.eclipse.jgit.lib.TagBuilder; import com.fr.third.eclipse.jgit.revwalk.RevObject; import com.fr.third.eclipse.jgit.revwalk.RevWalk; -import org.eclipse.jgit.lib.RefUpdate.Result; +import com.fr.third.eclipse.jgit.lib.RefUpdate.Result; import java.io.IOException; import java.text.MessageFormat; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/api/errors/GitAPIException.java b/fine-jgit/src/com/fr/third/eclipse/jgit/api/errors/GitAPIException.java index 7ac53d1ff..82efe785d 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/api/errors/GitAPIException.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/api/errors/GitAPIException.java @@ -39,7 +39,7 @@ package com.fr.third.eclipse.jgit.api.errors; /** * Superclass of all exceptions thrown by the API classes in - * {@code org.eclipse.jgit.api} + * {@code com.fr.third.eclipse.jgit.api} * */ public abstract class GitAPIException extends Exception { diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/attributes/AttributesRule.java b/fine-jgit/src/com/fr/third/eclipse/jgit/attributes/AttributesRule.java index 60972f5fc..afea0834a 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/attributes/AttributesRule.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/attributes/AttributesRule.java @@ -46,13 +46,13 @@ import com.fr.third.eclipse.jgit.errors.InvalidPatternException; import com.fr.third.eclipse.jgit.ignore.FastIgnoreRule; import com.fr.third.eclipse.jgit.ignore.internal.IMatcher; import com.fr.third.eclipse.jgit.ignore.internal.PathMatcher; -import org.eclipse.jgit.attributes.Attribute.State; +import com.fr.third.eclipse.jgit.attributes.Attribute.State; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static org.eclipse.jgit.ignore.internal.IMatcher.NO_MATCH; +import static com.fr.third.eclipse.jgit.ignore.internal.IMatcher.NO_MATCH; /** * A single attributes rule corresponding to one line in a .gitattributes file. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/blame/BlameGenerator.java b/fine-jgit/src/com/fr/third/eclipse/jgit/blame/BlameGenerator.java index 7f0414c6f..59997294e 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/blame/BlameGenerator.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/blame/BlameGenerator.java @@ -64,18 +64,18 @@ import com.fr.third.eclipse.jgit.revwalk.RevWalk; import com.fr.third.eclipse.jgit.treewalk.TreeWalk; import com.fr.third.eclipse.jgit.treewalk.filter.PathFilter; import com.fr.third.eclipse.jgit.treewalk.filter.TreeFilter; -import org.eclipse.jgit.blame.Candidate.BlobCandidate; -import org.eclipse.jgit.blame.Candidate.ReverseCandidate; -import org.eclipse.jgit.blame.ReverseWalk.ReverseCommit; -import org.eclipse.jgit.diff.DiffEntry.ChangeType; +import com.fr.third.eclipse.jgit.blame.Candidate.BlobCandidate; +import com.fr.third.eclipse.jgit.blame.Candidate.ReverseCandidate; +import com.fr.third.eclipse.jgit.blame.ReverseWalk.ReverseCommit; +import com.fr.third.eclipse.jgit.diff.DiffEntry.ChangeType; import java.io.IOException; import java.util.Collection; import java.util.Collections; -import static org.eclipse.jgit.lib.Constants.OBJ_BLOB; -import static org.eclipse.jgit.lib.FileMode.TYPE_FILE; -import static org.eclipse.jgit.lib.FileMode.TYPE_MASK; +import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_BLOB; +import static com.fr.third.eclipse.jgit.lib.FileMode.TYPE_FILE; +import static com.fr.third.eclipse.jgit.lib.FileMode.TYPE_MASK; /** * Generate author information for lines based on a provided file. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/blame/Candidate.java b/fine-jgit/src/com/fr/third/eclipse/jgit/blame/Candidate.java index 95c400b1c..dc0693fd3 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/blame/Candidate.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/blame/Candidate.java @@ -56,7 +56,7 @@ import com.fr.third.eclipse.jgit.revwalk.RevCommit; import com.fr.third.eclipse.jgit.revwalk.RevFlag; import com.fr.third.eclipse.jgit.revwalk.RevWalk; import com.fr.third.eclipse.jgit.treewalk.filter.PathFilter; -import org.eclipse.jgit.blame.ReverseWalk.ReverseCommit; +import com.fr.third.eclipse.jgit.blame.ReverseWalk.ReverseCommit; import java.io.IOException; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/diff/DiffConfig.java b/fine-jgit/src/com/fr/third/eclipse/jgit/diff/DiffConfig.java index 483803da0..7e719a77e 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/diff/DiffConfig.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/diff/DiffConfig.java @@ -47,7 +47,7 @@ import com.fr.third.eclipse.jgit.internal.JGitText; import com.fr.third.eclipse.jgit.lib.Config; import com.fr.third.eclipse.jgit.lib.ConfigConstants; import com.fr.third.eclipse.jgit.util.StringUtils; -import org.eclipse.jgit.lib.Config.SectionParser; +import com.fr.third.eclipse.jgit.lib.Config.SectionParser; import java.text.MessageFormat; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/diff/DiffFormatter.java b/fine-jgit/src/com/fr/third/eclipse/jgit/diff/DiffFormatter.java index eb19a5a99..c59bd7fd0 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/diff/DiffFormatter.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/diff/DiffFormatter.java @@ -79,9 +79,9 @@ import com.fr.third.eclipse.jgit.treewalk.filter.PathFilter; import com.fr.third.eclipse.jgit.treewalk.filter.TreeFilter; import com.fr.third.eclipse.jgit.util.QuotedString; import com.fr.third.eclipse.jgit.util.io.DisabledOutputStream; -import org.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm; -import org.eclipse.jgit.diff.DiffEntry.ChangeType; -import org.eclipse.jgit.patch.FileHeader.PatchType; +import com.fr.third.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm; +import com.fr.third.eclipse.jgit.diff.DiffEntry.ChangeType; +import com.fr.third.eclipse.jgit.patch.FileHeader.PatchType; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -90,16 +90,16 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import static org.eclipse.jgit.diff.DiffEntry.ChangeType.ADD; -import static org.eclipse.jgit.diff.DiffEntry.ChangeType.COPY; -import static org.eclipse.jgit.diff.DiffEntry.ChangeType.DELETE; -import static org.eclipse.jgit.diff.DiffEntry.ChangeType.MODIFY; -import static org.eclipse.jgit.diff.DiffEntry.ChangeType.RENAME; -import static org.eclipse.jgit.diff.DiffEntry.Side.NEW; -import static org.eclipse.jgit.diff.DiffEntry.Side.OLD; -import static org.eclipse.jgit.lib.Constants.encode; -import static org.eclipse.jgit.lib.Constants.encodeASCII; -import static org.eclipse.jgit.lib.FileMode.GITLINK; +import static com.fr.third.eclipse.jgit.diff.DiffEntry.ChangeType.ADD; +import static com.fr.third.eclipse.jgit.diff.DiffEntry.ChangeType.COPY; +import static com.fr.third.eclipse.jgit.diff.DiffEntry.ChangeType.DELETE; +import static com.fr.third.eclipse.jgit.diff.DiffEntry.ChangeType.MODIFY; +import static com.fr.third.eclipse.jgit.diff.DiffEntry.ChangeType.RENAME; +import static com.fr.third.eclipse.jgit.diff.DiffEntry.Side.NEW; +import static com.fr.third.eclipse.jgit.diff.DiffEntry.Side.OLD; +import static com.fr.third.eclipse.jgit.lib.Constants.encode; +import static com.fr.third.eclipse.jgit.lib.Constants.encodeASCII; +import static com.fr.third.eclipse.jgit.lib.FileMode.GITLINK; /** * Format a Git style patch script. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/diff/RawTextComparator.java b/fine-jgit/src/com/fr/third/eclipse/jgit/diff/RawTextComparator.java index 3d7a8f2ee..1a4e36b1e 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/diff/RawTextComparator.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/diff/RawTextComparator.java @@ -46,9 +46,9 @@ package com.fr.third.eclipse.jgit.diff; import com.fr.third.eclipse.jgit.util.IntList; -import static org.eclipse.jgit.util.RawCharUtil.isWhitespace; -import static org.eclipse.jgit.util.RawCharUtil.trimLeadingWhitespace; -import static org.eclipse.jgit.util.RawCharUtil.trimTrailingWhitespace; +import static com.fr.third.eclipse.jgit.util.RawCharUtil.isWhitespace; +import static com.fr.third.eclipse.jgit.util.RawCharUtil.trimLeadingWhitespace; +import static com.fr.third.eclipse.jgit.util.RawCharUtil.trimTrailingWhitespace; /** Equivalence function for {@link RawText}. */ public abstract class RawTextComparator extends SequenceComparator { diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/diff/RenameDetector.java b/fine-jgit/src/com/fr/third/eclipse/jgit/diff/RenameDetector.java index f1ea662b2..cc855a305 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/diff/RenameDetector.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/diff/RenameDetector.java @@ -50,8 +50,8 @@ import com.fr.third.eclipse.jgit.lib.NullProgressMonitor; import com.fr.third.eclipse.jgit.lib.ObjectReader; import com.fr.third.eclipse.jgit.lib.ProgressMonitor; import com.fr.third.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.diff.DiffEntry.ChangeType; -import org.eclipse.jgit.diff.SimilarityIndex.TableFullException; +import com.fr.third.eclipse.jgit.diff.DiffEntry.ChangeType; +import com.fr.third.eclipse.jgit.diff.SimilarityIndex.TableFullException; import java.io.IOException; import java.util.ArrayList; @@ -62,8 +62,8 @@ import java.util.Comparator; import java.util.HashMap; import java.util.List; -import static org.eclipse.jgit.diff.DiffEntry.Side.NEW; -import static org.eclipse.jgit.diff.DiffEntry.Side.OLD; +import static com.fr.third.eclipse.jgit.diff.DiffEntry.Side.NEW; +import static com.fr.third.eclipse.jgit.diff.DiffEntry.Side.OLD; /** Detect and resolve object renames. */ public class RenameDetector { diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/diff/SimilarityRenameDetector.java b/fine-jgit/src/com/fr/third/eclipse/jgit/diff/SimilarityRenameDetector.java index 78597f8b2..cde0f3e3b 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/diff/SimilarityRenameDetector.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/diff/SimilarityRenameDetector.java @@ -47,8 +47,8 @@ import com.fr.third.eclipse.jgit.internal.JGitText; import com.fr.third.eclipse.jgit.lib.FileMode; import com.fr.third.eclipse.jgit.lib.NullProgressMonitor; import com.fr.third.eclipse.jgit.lib.ProgressMonitor; -import org.eclipse.jgit.diff.DiffEntry.ChangeType; -import org.eclipse.jgit.diff.SimilarityIndex.TableFullException; +import com.fr.third.eclipse.jgit.diff.DiffEntry.ChangeType; +import com.fr.third.eclipse.jgit.diff.SimilarityIndex.TableFullException; import java.io.IOException; import java.util.ArrayList; @@ -56,8 +56,8 @@ import java.util.Arrays; import java.util.BitSet; import java.util.List; -import static org.eclipse.jgit.diff.DiffEntry.Side.NEW; -import static org.eclipse.jgit.diff.DiffEntry.Side.OLD; +import static com.fr.third.eclipse.jgit.diff.DiffEntry.Side.NEW; +import static com.fr.third.eclipse.jgit.diff.DiffEntry.Side.OLD; class SimilarityRenameDetector { /** diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/dircache/DirCacheCheckout.java b/fine-jgit/src/com/fr/third/eclipse/jgit/dircache/DirCacheCheckout.java index 35158d188..dcf21dba7 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/dircache/DirCacheCheckout.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/dircache/DirCacheCheckout.java @@ -68,8 +68,8 @@ import com.fr.third.eclipse.jgit.util.FileUtils; import com.fr.third.eclipse.jgit.util.RawParseUtils; import com.fr.third.eclipse.jgit.util.SystemReader; import com.fr.third.eclipse.jgit.util.io.AutoCRLFOutputStream; -import org.eclipse.jgit.lib.CoreConfig.AutoCRLF; -import org.eclipse.jgit.lib.CoreConfig.SymLinks; +import com.fr.third.eclipse.jgit.lib.CoreConfig.AutoCRLF; +import com.fr.third.eclipse.jgit.lib.CoreConfig.SymLinks; import java.io.File; import java.io.FileOutputStream; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/dircache/DirCacheTree.java b/fine-jgit/src/com/fr/third/eclipse/jgit/dircache/DirCacheTree.java index e002cefd2..d335a80ed 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/dircache/DirCacheTree.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/dircache/DirCacheTree.java @@ -58,8 +58,8 @@ import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Comparator; -import static org.eclipse.jgit.lib.FileMode.TREE; -import static org.eclipse.jgit.lib.TreeFormatter.entrySize; +import static com.fr.third.eclipse.jgit.lib.FileMode.TREE; +import static com.fr.third.eclipse.jgit.lib.TreeFormatter.entrySize; /** * Single tree record from the 'TREE' {@link DirCache} extension. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/gitrepo/RepoCommand.java b/fine-jgit/src/com/fr/third/eclipse/jgit/gitrepo/RepoCommand.java index 661db73c0..423e32e23 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/gitrepo/RepoCommand.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/gitrepo/RepoCommand.java @@ -70,7 +70,7 @@ import com.fr.third.eclipse.jgit.lib.Repository; import com.fr.third.eclipse.jgit.revwalk.RevCommit; import com.fr.third.eclipse.jgit.revwalk.RevWalk; import com.fr.third.eclipse.jgit.util.FileUtils; -import org.eclipse.jgit.lib.RefUpdate.Result; +import com.fr.third.eclipse.jgit.lib.RefUpdate.Result; import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.SAXException; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/ignore/FastIgnoreRule.java b/fine-jgit/src/com/fr/third/eclipse/jgit/ignore/FastIgnoreRule.java index ea4e8a4d0..3dceacebb 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/ignore/FastIgnoreRule.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/ignore/FastIgnoreRule.java @@ -46,8 +46,8 @@ import com.fr.third.eclipse.jgit.errors.InvalidPatternException; import com.fr.third.eclipse.jgit.ignore.internal.IMatcher; import com.fr.third.eclipse.jgit.ignore.internal.PathMatcher; -import static org.eclipse.jgit.ignore.internal.IMatcher.NO_MATCH; -import static org.eclipse.jgit.ignore.internal.Strings.stripTrailing; +import static com.fr.third.eclipse.jgit.ignore.internal.IMatcher.NO_MATCH; +import static com.fr.third.eclipse.jgit.ignore.internal.Strings.stripTrailing; /** * "Fast" (compared with IgnoreRule) git ignore rule implementation supporting diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/NameMatcher.java b/fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/NameMatcher.java index 6d2dc247f..a408cb251 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/NameMatcher.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/NameMatcher.java @@ -42,7 +42,7 @@ */ package com.fr.third.eclipse.jgit.ignore.internal; -import static org.eclipse.jgit.ignore.internal.Strings.getPathSeparator; +import static com.fr.third.eclipse.jgit.ignore.internal.Strings.getPathSeparator; /** * Matcher built from patterns for file names (single path segments). This class diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/PathMatcher.java b/fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/PathMatcher.java index ac29e3e77..58540fbae 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/PathMatcher.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/PathMatcher.java @@ -44,16 +44,16 @@ package com.fr.third.eclipse.jgit.ignore.internal; import com.fr.third.eclipse.jgit.errors.InvalidPatternException; import com.fr.third.eclipse.jgit.ignore.FastIgnoreRule; -import org.eclipse.jgit.ignore.internal.Strings.PatternState; +import com.fr.third.eclipse.jgit.ignore.internal.Strings.PatternState; import java.util.ArrayList; import java.util.List; -import static org.eclipse.jgit.ignore.internal.Strings.checkWildCards; -import static org.eclipse.jgit.ignore.internal.Strings.count; -import static org.eclipse.jgit.ignore.internal.Strings.getPathSeparator; -import static org.eclipse.jgit.ignore.internal.Strings.isWildCard; -import static org.eclipse.jgit.ignore.internal.Strings.split; +import static com.fr.third.eclipse.jgit.ignore.internal.Strings.checkWildCards; +import static com.fr.third.eclipse.jgit.ignore.internal.Strings.count; +import static com.fr.third.eclipse.jgit.ignore.internal.Strings.getPathSeparator; +import static com.fr.third.eclipse.jgit.ignore.internal.Strings.isWildCard; +import static com.fr.third.eclipse.jgit.ignore.internal.Strings.split; /** * Matcher built by patterns consists of multiple path segments. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/Strings.java b/fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/Strings.java index da5ec4deb..678707884 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/Strings.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/Strings.java @@ -177,7 +177,7 @@ public class Strings { "word" //$NON-NLS-1$ // [:word:] XXX I don't see it in // http://man7.org/linux/man-pages/man7/glob.7.html - // but this was in org.eclipse.jgit.fnmatch.GroupHead.java ??? + // but this was in com.fr.third.eclipse.jgit.fnmatch.GroupHead.java ??? ); private static final String DL = "\\p{javaDigit}\\p{javaLetter}"; //$NON-NLS-1$ @@ -201,7 +201,7 @@ public class Strings { /** * Conversion from glob to Java regex following two sources:

  • * http://man7.org/linux/man-pages/man7/glob.7.html
  • - * org.eclipse.jgit.fnmatch.FileNameMatcher.java Seems that there are + * com.fr.third.eclipse.jgit.fnmatch.FileNameMatcher.java Seems that there are * various ways to define what "glob" can be. * * @param pattern diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/WildCardMatcher.java b/fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/WildCardMatcher.java index 14a48d1ab..2b83644a9 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/WildCardMatcher.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/ignore/internal/WildCardMatcher.java @@ -46,7 +46,7 @@ import com.fr.third.eclipse.jgit.errors.InvalidPatternException; import java.util.regex.Pattern; -import static org.eclipse.jgit.ignore.internal.Strings.convertGlob; +import static com.fr.third.eclipse.jgit.ignore.internal.Strings.convertGlob; /** * Matcher built from path segments containing wildcards. This matcher converts diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java index c2e8a11c6..4cb46ffdd 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java @@ -45,10 +45,10 @@ package com.fr.third.eclipse.jgit.internal.storage.dfs; import com.fr.third.eclipse.jgit.lib.Config; -import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_CORE_SECTION; -import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_DFS_SECTION; -import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_BLOCK_LIMIT; -import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_BLOCK_SIZE; +import static com.fr.third.eclipse.jgit.lib.ConfigConstants.CONFIG_CORE_SECTION; +import static com.fr.third.eclipse.jgit.lib.ConfigConstants.CONFIG_DFS_SECTION; +import static com.fr.third.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_BLOCK_LIMIT; +import static com.fr.third.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_BLOCK_SIZE; /** Configuration parameters for {@link DfsBlockCache}. */ public class DfsBlockCacheConfig { diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java index fb4f36b21..8ef2db841 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java @@ -56,7 +56,7 @@ import com.fr.third.eclipse.jgit.lib.Ref; import com.fr.third.eclipse.jgit.revwalk.RevWalk; import com.fr.third.eclipse.jgit.storage.pack.PackConfig; import com.fr.third.eclipse.jgit.util.io.CountingOutputStream; -import org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource; +import com.fr.third.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource; import java.io.IOException; import java.util.ArrayList; @@ -66,12 +66,12 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.GC; -import static org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.UNREACHABLE_GARBAGE; -import static org.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX; -import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX; -import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK; -import static org.eclipse.jgit.lib.RefDatabase.ALL; +import static com.fr.third.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.GC; +import static com.fr.third.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.UNREACHABLE_GARBAGE; +import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX; +import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.INDEX; +import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.PACK; +import static com.fr.third.eclipse.jgit.lib.RefDatabase.ALL; /** Repack and garbage collect a repository. */ public class DfsGarbageCollector { diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsInserter.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsInserter.java index dd565516e..6f238b7aa 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsInserter.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsInserter.java @@ -85,10 +85,10 @@ import java.util.zip.DeflaterOutputStream; import java.util.zip.Inflater; import java.util.zip.InflaterInputStream; -import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX; -import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK; -import static org.eclipse.jgit.lib.Constants.OBJ_OFS_DELTA; -import static org.eclipse.jgit.lib.Constants.OBJ_REF_DELTA; +import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.INDEX; +import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.PACK; +import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_OFS_DELTA; +import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_REF_DELTA; /** Inserts objects into the DFS. */ public class DfsInserter extends ObjectInserter { diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsObjectRepresentation.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsObjectRepresentation.java index 8d613fda4..be96e719b 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsObjectRepresentation.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsObjectRepresentation.java @@ -46,7 +46,7 @@ package com.fr.third.eclipse.jgit.internal.storage.dfs; import com.fr.third.eclipse.jgit.internal.storage.pack.StoredObjectRepresentation; import com.fr.third.eclipse.jgit.lib.ObjectId; -import static org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.GC; +import static com.fr.third.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.GC; class DfsObjectRepresentation extends StoredObjectRepresentation { final DfsPackFile pack; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java index 37b1734aa..09bb85c89 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java @@ -65,10 +65,10 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import static org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.COMPACT; -import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX; -import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK; -import static org.eclipse.jgit.internal.storage.pack.StoredObjectRepresentation.PACK_DELTA; +import static com.fr.third.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.COMPACT; +import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.INDEX; +import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.PACK; +import static com.fr.third.eclipse.jgit.internal.storage.pack.StoredObjectRepresentation.PACK_DELTA; /** * Combine several pack files into one pack. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackDescription.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackDescription.java index 19628e57c..1f5ee7875 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackDescription.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackDescription.java @@ -45,12 +45,12 @@ package com.fr.third.eclipse.jgit.internal.storage.dfs; import com.fr.third.eclipse.jgit.internal.storage.pack.PackExt; import com.fr.third.eclipse.jgit.internal.storage.pack.PackWriter; -import org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource; +import com.fr.third.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource; import java.util.HashMap; import java.util.Map; -import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK; +import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.PACK; /** * Description of a DFS stored pack/index file. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackFile.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackFile.java index 352222dc5..c97e3e3b6 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackFile.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackFile.java @@ -78,10 +78,10 @@ import java.util.zip.CRC32; import java.util.zip.DataFormatException; import java.util.zip.Inflater; -import static org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.UNREACHABLE_GARBAGE; -import static org.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX; -import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX; -import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK; +import static com.fr.third.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.UNREACHABLE_GARBAGE; +import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX; +import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.INDEX; +import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.PACK; /** * A Git version 2 pack file representation. A pack file contains Git objects in diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackParser.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackParser.java index fd9294602..e0a0e6883 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackParser.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsPackParser.java @@ -61,7 +61,7 @@ import java.util.List; import java.util.zip.CRC32; import java.util.zip.Deflater; -import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK; +import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.PACK; /** Parses a pack stream into the DFS, by creating a new pack and index. */ public class DfsPackParser extends PackParser { diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsReader.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsReader.java index 4055ada44..857328fbf 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsReader.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsReader.java @@ -69,7 +69,7 @@ import com.fr.third.eclipse.jgit.lib.ObjectLoader; import com.fr.third.eclipse.jgit.lib.ObjectReader; import com.fr.third.eclipse.jgit.lib.ProgressMonitor; import com.fr.third.eclipse.jgit.util.BlockList; -import org.eclipse.jgit.lib.BitmapIndex.BitmapBuilder; +import com.fr.third.eclipse.jgit.lib.BitmapIndex.BitmapBuilder; import java.io.IOException; import java.security.MessageDigest; @@ -86,8 +86,8 @@ import java.util.Set; import java.util.zip.DataFormatException; import java.util.zip.Inflater; -import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK; -import static org.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH; +import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.PACK; +import static com.fr.third.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH; /** * Reader to access repository content through. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java index a8b96d78c..1904e7e13 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java @@ -47,10 +47,10 @@ import com.fr.third.eclipse.jgit.lib.Config; import com.fr.third.eclipse.jgit.lib.ObjectStream; import com.fr.third.eclipse.jgit.storage.pack.PackConfig; -import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_CORE_SECTION; -import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_DFS_SECTION; -import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_DELTA_BASE_CACHE_LIMIT; -import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_STREAM_FILE_TRESHOLD; +import static com.fr.third.eclipse.jgit.lib.ConfigConstants.CONFIG_CORE_SECTION; +import static com.fr.third.eclipse.jgit.lib.ConfigConstants.CONFIG_DFS_SECTION; +import static com.fr.third.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_DELTA_BASE_CACHE_LIMIT; +import static com.fr.third.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_STREAM_FILE_TRESHOLD; /** Options controlling how objects are read from a DFS stored repository. */ public class DfsReaderOptions { diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsRefDatabase.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsRefDatabase.java index 50e61119c..c1449e401 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsRefDatabase.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsRefDatabase.java @@ -62,7 +62,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; -import static org.eclipse.jgit.lib.Ref.Storage.NEW; +import static com.fr.third.eclipse.jgit.lib.Ref.Storage.NEW; /** */ public abstract class DfsRefDatabase extends RefDatabase { diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsRefRename.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsRefRename.java index 7ece9dbf0..fca4fb8e3 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsRefRename.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsRefRename.java @@ -46,7 +46,7 @@ package com.fr.third.eclipse.jgit.internal.storage.dfs; import com.fr.third.eclipse.jgit.lib.ObjectId; import com.fr.third.eclipse.jgit.lib.RefRename; import com.fr.third.eclipse.jgit.lib.RefUpdate; -import org.eclipse.jgit.lib.RefUpdate.Result; +import com.fr.third.eclipse.jgit.lib.RefUpdate.Result; import java.io.IOException; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsRefUpdate.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsRefUpdate.java index 92cb0bc89..0573d8d07 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsRefUpdate.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/DfsRefUpdate.java @@ -50,7 +50,7 @@ import com.fr.third.eclipse.jgit.lib.SymbolicRef; import com.fr.third.eclipse.jgit.revwalk.RevObject; import com.fr.third.eclipse.jgit.revwalk.RevTag; import com.fr.third.eclipse.jgit.revwalk.RevWalk; -import org.eclipse.jgit.lib.Ref.Storage; +import com.fr.third.eclipse.jgit.lib.Ref.Storage; import java.io.IOException; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/InMemoryRepository.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/InMemoryRepository.java index 7350d3161..c1c0ca023 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/InMemoryRepository.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/dfs/InMemoryRepository.java @@ -5,7 +5,7 @@ import com.fr.third.eclipse.jgit.lib.ObjectId; import com.fr.third.eclipse.jgit.lib.Ref; import com.fr.third.eclipse.jgit.revwalk.RevWalk; import com.fr.third.eclipse.jgit.util.RefList; -import org.eclipse.jgit.lib.Ref.Storage; +import com.fr.third.eclipse.jgit.lib.Ref.Storage; import java.io.ByteArrayOutputStream; import java.io.FileNotFoundException; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/FileRepository.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/FileRepository.java index bc328b8cc..e2387fd24 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/FileRepository.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/FileRepository.java @@ -66,10 +66,10 @@ import com.fr.third.eclipse.jgit.util.FS; import com.fr.third.eclipse.jgit.util.FileUtils; import com.fr.third.eclipse.jgit.util.StringUtils; import com.fr.third.eclipse.jgit.util.SystemReader; -import org.eclipse.jgit.internal.storage.file.ObjectDirectory.AlternateHandle; -import org.eclipse.jgit.internal.storage.file.ObjectDirectory.AlternateRepository; -import org.eclipse.jgit.lib.CoreConfig.HideDotFiles; -import org.eclipse.jgit.lib.CoreConfig.SymLinks; +import com.fr.third.eclipse.jgit.internal.storage.file.ObjectDirectory.AlternateHandle; +import com.fr.third.eclipse.jgit.internal.storage.file.ObjectDirectory.AlternateRepository; +import com.fr.third.eclipse.jgit.lib.CoreConfig.HideDotFiles; +import com.fr.third.eclipse.jgit.lib.CoreConfig.SymLinks; import java.io.File; import java.io.IOException; @@ -77,7 +77,7 @@ import java.text.MessageFormat; import java.util.HashSet; import java.util.Set; -import static org.eclipse.jgit.lib.RefDatabase.ALL; +import static com.fr.third.eclipse.jgit.lib.RefDatabase.ALL; /** * Represents a Git repository. A repository holds all objects and refs used for diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/GC.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/GC.java index cb3af7c7b..2e856451b 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/GC.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/GC.java @@ -70,8 +70,8 @@ import com.fr.third.eclipse.jgit.treewalk.filter.TreeFilter; import com.fr.third.eclipse.jgit.util.FileUtils; import com.fr.third.eclipse.jgit.util.GitDateParser; import com.fr.third.eclipse.jgit.util.SystemReader; -import org.eclipse.jgit.internal.storage.pack.PackWriter.ObjectIdSet; -import org.eclipse.jgit.lib.Ref.Storage; +import com.fr.third.eclipse.jgit.internal.storage.pack.PackWriter.ObjectIdSet; +import com.fr.third.eclipse.jgit.lib.Ref.Storage; import java.io.File; import java.io.FileOutputStream; @@ -96,9 +96,9 @@ import java.util.Map.Entry; import java.util.Set; import java.util.TreeMap; -import static org.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX; -import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX; -import static org.eclipse.jgit.lib.RefDatabase.ALL; +import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX; +import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.INDEX; +import static com.fr.third.eclipse.jgit.lib.RefDatabase.ALL; /** * A garbage collector for git {@link FileRepository}. Instances of this class diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ObjectDirectory.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ObjectDirectory.java index 1eb6d4605..b3fe82960 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ObjectDirectory.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ObjectDirectory.java @@ -61,7 +61,7 @@ import com.fr.third.eclipse.jgit.lib.ObjectLoader; import com.fr.third.eclipse.jgit.lib.RepositoryCache; import com.fr.third.eclipse.jgit.util.FS; import com.fr.third.eclipse.jgit.util.FileUtils; -import org.eclipse.jgit.lib.RepositoryCache.FileKey; +import com.fr.third.eclipse.jgit.lib.RepositoryCache.FileKey; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -83,8 +83,8 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; -import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX; -import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK; +import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.INDEX; +import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.PACK; /** * Traditional file system based {@link ObjectDatabase}. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackBitmapIndexBuilder.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackBitmapIndexBuilder.java index 5093ce351..fec58ad7a 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackBitmapIndexBuilder.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackBitmapIndexBuilder.java @@ -51,9 +51,9 @@ import com.fr.third.eclipse.jgit.lib.ObjectId; import com.fr.third.eclipse.jgit.lib.ObjectIdOwnerMap; import com.fr.third.eclipse.jgit.util.BlockList; import com.googlecode.javaewah.EWAHCompressedBitmap; -import org.eclipse.jgit.internal.storage.file.BitmapIndexImpl.CompressedBitmap; -import org.eclipse.jgit.lib.BitmapIndex.Bitmap; -import org.eclipse.jgit.lib.BitmapIndex.BitmapBuilder; +import com.fr.third.eclipse.jgit.internal.storage.file.BitmapIndexImpl.CompressedBitmap; +import com.fr.third.eclipse.jgit.lib.BitmapIndex.Bitmap; +import com.fr.third.eclipse.jgit.lib.BitmapIndex.BitmapBuilder; import java.text.MessageFormat; import java.util.Arrays; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java index 0b673caef..c896a5db5 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java @@ -49,7 +49,7 @@ import com.fr.third.eclipse.jgit.lib.ObjectId; import com.fr.third.eclipse.jgit.lib.ObjectIdOwnerMap; import com.googlecode.javaewah.EWAHCompressedBitmap; import com.googlecode.javaewah.IntIterator; -import org.eclipse.jgit.internal.storage.file.BasePackBitmapIndex.StoredBitmap; +import com.fr.third.eclipse.jgit.internal.storage.file.BasePackBitmapIndex.StoredBitmap; import java.util.Collections; import java.util.Iterator; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackBitmapIndexWriterV1.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackBitmapIndexWriterV1.java index cff74253a..70c5d0457 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackBitmapIndexWriterV1.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackBitmapIndexWriterV1.java @@ -47,7 +47,7 @@ import com.fr.third.eclipse.jgit.internal.JGitText; import com.fr.third.eclipse.jgit.lib.Constants; import com.fr.third.eclipse.jgit.util.io.SafeBufferedOutputStream; import com.googlecode.javaewah.EWAHCompressedBitmap; -import org.eclipse.jgit.internal.storage.file.PackBitmapIndexBuilder.StoredEntry; +import com.fr.third.eclipse.jgit.internal.storage.file.PackBitmapIndexBuilder.StoredEntry; import java.io.BufferedOutputStream; import java.io.DataOutput; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackFile.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackFile.java index 6a0318d92..edd3f3b17 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackFile.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackFile.java @@ -81,8 +81,8 @@ import java.util.zip.CRC32; import java.util.zip.DataFormatException; import java.util.zip.Inflater; -import static org.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX; -import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX; +import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX; +import static com.fr.third.eclipse.jgit.internal.storage.pack.PackExt.INDEX; /** * A Git version 2 pack file representation. A pack file contains Git objects in diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackReverseIndex.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackReverseIndex.java index abadd9d64..e82e53401 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackReverseIndex.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/PackReverseIndex.java @@ -46,7 +46,7 @@ package com.fr.third.eclipse.jgit.internal.storage.file; import com.fr.third.eclipse.jgit.errors.CorruptObjectException; import com.fr.third.eclipse.jgit.internal.JGitText; import com.fr.third.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry; +import com.fr.third.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry; import java.text.MessageFormat; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/RefDirectory.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/RefDirectory.java index a329221d3..d0ba6f6ae 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/RefDirectory.java @@ -88,16 +88,16 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import static org.eclipse.jgit.lib.Constants.CHARSET; -import static org.eclipse.jgit.lib.Constants.HEAD; -import static org.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH; -import static org.eclipse.jgit.lib.Constants.PACKED_REFS; -import static org.eclipse.jgit.lib.Constants.R_HEADS; -import static org.eclipse.jgit.lib.Constants.R_REFS; -import static org.eclipse.jgit.lib.Constants.R_TAGS; -import static org.eclipse.jgit.lib.Ref.Storage.LOOSE; -import static org.eclipse.jgit.lib.Ref.Storage.NEW; -import static org.eclipse.jgit.lib.Ref.Storage.PACKED; +import static com.fr.third.eclipse.jgit.lib.Constants.CHARSET; +import static com.fr.third.eclipse.jgit.lib.Constants.HEAD; +import static com.fr.third.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH; +import static com.fr.third.eclipse.jgit.lib.Constants.PACKED_REFS; +import static com.fr.third.eclipse.jgit.lib.Constants.R_HEADS; +import static com.fr.third.eclipse.jgit.lib.Constants.R_REFS; +import static com.fr.third.eclipse.jgit.lib.Constants.R_TAGS; +import static com.fr.third.eclipse.jgit.lib.Ref.Storage.LOOSE; +import static com.fr.third.eclipse.jgit.lib.Ref.Storage.NEW; +import static com.fr.third.eclipse.jgit.lib.Ref.Storage.PACKED; /** * Traditional file system based {@link RefDatabase}. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/RefDirectoryRename.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/RefDirectoryRename.java index 02352b49c..a8bf441d0 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/RefDirectoryRename.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/RefDirectoryRename.java @@ -50,7 +50,7 @@ import com.fr.third.eclipse.jgit.lib.RefRename; import com.fr.third.eclipse.jgit.lib.RefUpdate; import com.fr.third.eclipse.jgit.revwalk.RevWalk; import com.fr.third.eclipse.jgit.util.FileUtils; -import org.eclipse.jgit.lib.RefUpdate.Result; +import com.fr.third.eclipse.jgit.lib.RefUpdate.Result; import java.io.File; import java.io.IOException; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/RefDirectoryUpdate.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/RefDirectoryUpdate.java index 785872711..d84dd39d6 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/RefDirectoryUpdate.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/RefDirectoryUpdate.java @@ -50,7 +50,7 @@ import com.fr.third.eclipse.jgit.lib.Repository; import java.io.IOException; -import static org.eclipse.jgit.lib.Constants.encode; +import static com.fr.third.eclipse.jgit.lib.Constants.encode; /** Updates any reference stored by {@link RefDirectory}. */ class RefDirectoryUpdate extends RefUpdate { diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ReflogEntryImpl.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ReflogEntryImpl.java index fe42f0b88..878b2feab 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ReflogEntryImpl.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ReflogEntryImpl.java @@ -91,28 +91,28 @@ public class ReflogEntryImpl implements Serializable, ReflogEntry { } /* (non-Javadoc) - * @see org.eclipse.jgit.internal.storage.file.ReflogEntry#getOldId() + * @see com.fr.third.eclipse.jgit.internal.storage.file.ReflogEntry#getOldId() */ public ObjectId getOldId() { return oldId; } /* (non-Javadoc) - * @see org.eclipse.jgit.internal.storage.file.ReflogEntry#getNewId() + * @see com.fr.third.eclipse.jgit.internal.storage.file.ReflogEntry#getNewId() */ public ObjectId getNewId() { return newId; } /* (non-Javadoc) - * @see org.eclipse.jgit.internal.storage.file.ReflogEntry#getWho() + * @see com.fr.third.eclipse.jgit.internal.storage.file.ReflogEntry#getWho() */ public PersonIdent getWho() { return who; } /* (non-Javadoc) - * @see org.eclipse.jgit.internal.storage.file.ReflogEntry#getComment() + * @see com.fr.third.eclipse.jgit.internal.storage.file.ReflogEntry#getComment() */ public String getComment() { return comment; @@ -126,7 +126,7 @@ public class ReflogEntryImpl implements Serializable, ReflogEntry { } /* (non-Javadoc) - * @see org.eclipse.jgit.internal.storage.file.ReflogEntry#parseCheckout() + * @see com.fr.third.eclipse.jgit.internal.storage.file.ReflogEntry#parseCheckout() */ public CheckoutEntry parseCheckout() { if (getComment().startsWith(CheckoutEntryImpl.CHECKOUT_MOVING_FROM)) diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ReflogReaderImpl.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ReflogReaderImpl.java index 87ac74cdb..37d06167b 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ReflogReaderImpl.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ReflogReaderImpl.java @@ -72,21 +72,21 @@ class ReflogReaderImpl implements ReflogReader { } /* (non-Javadoc) - * @see org.eclipse.jgit.internal.storage.file.ReflogReaader#getLastEntry() + * @see com.fr.third.eclipse.jgit.internal.storage.file.ReflogReaader#getLastEntry() */ public ReflogEntry getLastEntry() throws IOException { return getReverseEntry(0); } /* (non-Javadoc) - * @see org.eclipse.jgit.internal.storage.file.ReflogReaader#getReverseEntries() + * @see com.fr.third.eclipse.jgit.internal.storage.file.ReflogReaader#getReverseEntries() */ public List getReverseEntries() throws IOException { return getReverseEntries(Integer.MAX_VALUE); } /* (non-Javadoc) - * @see org.eclipse.jgit.internal.storage.file.ReflogReaader#getReverseEntry(int) + * @see com.fr.third.eclipse.jgit.internal.storage.file.ReflogReaader#getReverseEntry(int) */ public ReflogEntry getReverseEntry(int number) throws IOException { if (number < 0) @@ -111,7 +111,7 @@ class ReflogReaderImpl implements ReflogReader { } /* (non-Javadoc) - * @see org.eclipse.jgit.internal.storage.file.ReflogReaader#getReverseEntries(int) + * @see com.fr.third.eclipse.jgit.internal.storage.file.ReflogReaader#getReverseEntries(int) */ public List getReverseEntries(int max) throws IOException { final byte[] log; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ReflogWriter.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ReflogWriter.java index 90100264d..d455130d7 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ReflogWriter.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/ReflogWriter.java @@ -65,12 +65,12 @@ import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.text.MessageFormat; -import static org.eclipse.jgit.lib.Constants.HEAD; -import static org.eclipse.jgit.lib.Constants.LOGS; -import static org.eclipse.jgit.lib.Constants.R_HEADS; -import static org.eclipse.jgit.lib.Constants.R_REFS; -import static org.eclipse.jgit.lib.Constants.R_REMOTES; -import static org.eclipse.jgit.lib.Constants.R_STASH; +import static com.fr.third.eclipse.jgit.lib.Constants.HEAD; +import static com.fr.third.eclipse.jgit.lib.Constants.LOGS; +import static com.fr.third.eclipse.jgit.lib.Constants.R_HEADS; +import static com.fr.third.eclipse.jgit.lib.Constants.R_REFS; +import static com.fr.third.eclipse.jgit.lib.Constants.R_REMOTES; +import static com.fr.third.eclipse.jgit.lib.Constants.R_STASH; /** * Utility for writing reflog entries diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/WindowCursor.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/WindowCursor.java index ef18cb21b..2df67620d 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/WindowCursor.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/WindowCursor.java @@ -62,7 +62,7 @@ import com.fr.third.eclipse.jgit.lib.ObjectId; import com.fr.third.eclipse.jgit.lib.ObjectLoader; import com.fr.third.eclipse.jgit.lib.ObjectReader; import com.fr.third.eclipse.jgit.lib.ProgressMonitor; -import org.eclipse.jgit.lib.BitmapIndex.BitmapBuilder; +import com.fr.third.eclipse.jgit.lib.BitmapIndex.BitmapBuilder; import java.io.IOException; import java.security.MessageDigest; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/WriteConfig.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/WriteConfig.java index 4c9032cc1..df8e1fc4d 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/WriteConfig.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/file/WriteConfig.java @@ -45,7 +45,7 @@ package com.fr.third.eclipse.jgit.internal.storage.file; import com.fr.third.eclipse.jgit.lib.Config; import com.fr.third.eclipse.jgit.lib.CoreConfig; -import org.eclipse.jgit.lib.Config.SectionParser; +import com.fr.third.eclipse.jgit.lib.Config.SectionParser; class WriteConfig { /** Key for {@link Config#get(SectionParser)}. */ diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/BaseSearch.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/BaseSearch.java index 6efbcf571..124f57e88 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/BaseSearch.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/BaseSearch.java @@ -60,8 +60,8 @@ import java.io.IOException; import java.util.List; import java.util.Set; -import static org.eclipse.jgit.lib.Constants.OBJ_BLOB; -import static org.eclipse.jgit.lib.Constants.OBJ_TREE; +import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_BLOB; +import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_TREE; class BaseSearch { private static final int M_BLOB = FileMode.REGULAR_FILE.getBits(); diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/ObjectReuseAsIs.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/ObjectReuseAsIs.java index 5610c75bf..97f59df7c 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/ObjectReuseAsIs.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/ObjectReuseAsIs.java @@ -48,7 +48,7 @@ import com.fr.third.eclipse.jgit.errors.StoredObjectRepresentationNotAvailableEx import com.fr.third.eclipse.jgit.lib.AnyObjectId; import com.fr.third.eclipse.jgit.lib.ObjectReader; import com.fr.third.eclipse.jgit.lib.ProgressMonitor; -import org.eclipse.jgit.lib.BitmapIndex.BitmapBuilder; +import com.fr.third.eclipse.jgit.lib.BitmapIndex.BitmapBuilder; import java.io.IOException; import java.util.Collection; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackOutputStream.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackOutputStream.java index 46881498b..dd3c67275 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackOutputStream.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackOutputStream.java @@ -53,9 +53,9 @@ import java.io.IOException; import java.io.OutputStream; import java.security.MessageDigest; -import static org.eclipse.jgit.lib.Constants.OBJ_OFS_DELTA; -import static org.eclipse.jgit.lib.Constants.OBJ_REF_DELTA; -import static org.eclipse.jgit.lib.Constants.PACK_SIGNATURE; +import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_OFS_DELTA; +import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_REF_DELTA; +import static com.fr.third.eclipse.jgit.lib.Constants.PACK_SIGNATURE; /** Custom output stream to support {@link PackWriter}. */ public final class PackOutputStream extends OutputStream { diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackWriter.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackWriter.java index b54d8a93c..5552566fe 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackWriter.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackWriter.java @@ -79,7 +79,7 @@ import com.fr.third.eclipse.jgit.revwalk.RevTree; import com.fr.third.eclipse.jgit.storage.pack.PackConfig; import com.fr.third.eclipse.jgit.util.BlockList; import com.fr.third.eclipse.jgit.util.TemporaryBuffer; -import org.eclipse.jgit.lib.BitmapIndex.BitmapBuilder; +import com.fr.third.eclipse.jgit.lib.BitmapIndex.BitmapBuilder; import java.io.IOException; import java.io.OutputStream; @@ -109,13 +109,13 @@ import java.util.zip.CheckedOutputStream; import java.util.zip.Deflater; import java.util.zip.DeflaterOutputStream; -import static org.eclipse.jgit.internal.storage.pack.StoredObjectRepresentation.PACK_DELTA; -import static org.eclipse.jgit.internal.storage.pack.StoredObjectRepresentation.PACK_WHOLE; -import static org.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH; -import static org.eclipse.jgit.lib.Constants.OBJ_BLOB; -import static org.eclipse.jgit.lib.Constants.OBJ_COMMIT; -import static org.eclipse.jgit.lib.Constants.OBJ_TAG; -import static org.eclipse.jgit.lib.Constants.OBJ_TREE; +import static com.fr.third.eclipse.jgit.internal.storage.pack.StoredObjectRepresentation.PACK_DELTA; +import static com.fr.third.eclipse.jgit.internal.storage.pack.StoredObjectRepresentation.PACK_WHOLE; +import static com.fr.third.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH; +import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_BLOB; +import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_COMMIT; +import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_TAG; +import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_TREE; /** *

    diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java index f06de7456..6f3d1fcd4 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java @@ -61,7 +61,7 @@ import com.fr.third.eclipse.jgit.revwalk.RevObject; import com.fr.third.eclipse.jgit.revwalk.RevWalk; import com.fr.third.eclipse.jgit.util.BlockList; import com.googlecode.javaewah.EWAHCompressedBitmap; -import org.eclipse.jgit.lib.BitmapIndex.BitmapBuilder; +import com.fr.third.eclipse.jgit.lib.BitmapIndex.BitmapBuilder; import java.io.IOException; import java.util.ArrayList; @@ -73,7 +73,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import static org.eclipse.jgit.internal.storage.file.PackBitmapIndex.FLAG_REUSE; +import static com.fr.third.eclipse.jgit.internal.storage.file.PackBitmapIndex.FLAG_REUSE; /** Helper class for the PackWriter to select commits for pack index bitmaps. */ class PackWriterBitmapPreparer { diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackWriterBitmapWalker.java b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackWriterBitmapWalker.java index 6874fc09e..8aa2d7bc8 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackWriterBitmapWalker.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/internal/storage/pack/PackWriterBitmapWalker.java @@ -56,8 +56,8 @@ import com.fr.third.eclipse.jgit.revwalk.RevFlag; import com.fr.third.eclipse.jgit.revwalk.RevObject; import com.fr.third.eclipse.jgit.revwalk.RevWalk; import com.fr.third.eclipse.jgit.revwalk.filter.RevFilter; -import org.eclipse.jgit.lib.BitmapIndex.Bitmap; -import org.eclipse.jgit.lib.BitmapIndex.BitmapBuilder; +import com.fr.third.eclipse.jgit.lib.BitmapIndex.Bitmap; +import com.fr.third.eclipse.jgit.lib.BitmapIndex.BitmapBuilder; import java.io.IOException; import java.util.Set; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/lib/BaseRepositoryBuilder.java b/fine-jgit/src/com/fr/third/eclipse/jgit/lib/BaseRepositoryBuilder.java index 3ae682533..339defb25 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/lib/BaseRepositoryBuilder.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/lib/BaseRepositoryBuilder.java @@ -53,7 +53,7 @@ import com.fr.third.eclipse.jgit.util.FS; import com.fr.third.eclipse.jgit.util.IO; import com.fr.third.eclipse.jgit.util.RawParseUtils; import com.fr.third.eclipse.jgit.util.SystemReader; -import org.eclipse.jgit.lib.RepositoryCache.FileKey; +import com.fr.third.eclipse.jgit.lib.RepositoryCache.FileKey; import java.io.File; import java.io.IOException; @@ -62,16 +62,16 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; -import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_CORE_SECTION; -import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_BARE; -import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_WORKTREE; -import static org.eclipse.jgit.lib.Constants.DOT_GIT; -import static org.eclipse.jgit.lib.Constants.GIT_ALTERNATE_OBJECT_DIRECTORIES_KEY; -import static org.eclipse.jgit.lib.Constants.GIT_CEILING_DIRECTORIES_KEY; -import static org.eclipse.jgit.lib.Constants.GIT_DIR_KEY; -import static org.eclipse.jgit.lib.Constants.GIT_INDEX_FILE_KEY; -import static org.eclipse.jgit.lib.Constants.GIT_OBJECT_DIRECTORY_KEY; -import static org.eclipse.jgit.lib.Constants.GIT_WORK_TREE_KEY; +import static com.fr.third.eclipse.jgit.lib.ConfigConstants.CONFIG_CORE_SECTION; +import static com.fr.third.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_BARE; +import static com.fr.third.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_WORKTREE; +import static com.fr.third.eclipse.jgit.lib.Constants.DOT_GIT; +import static com.fr.third.eclipse.jgit.lib.Constants.GIT_ALTERNATE_OBJECT_DIRECTORIES_KEY; +import static com.fr.third.eclipse.jgit.lib.Constants.GIT_CEILING_DIRECTORIES_KEY; +import static com.fr.third.eclipse.jgit.lib.Constants.GIT_DIR_KEY; +import static com.fr.third.eclipse.jgit.lib.Constants.GIT_INDEX_FILE_KEY; +import static com.fr.third.eclipse.jgit.lib.Constants.GIT_OBJECT_DIRECTORY_KEY; +import static com.fr.third.eclipse.jgit.lib.Constants.GIT_WORK_TREE_KEY; /** * Base builder to customize repository construction. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/lib/BatchRefUpdate.java b/fine-jgit/src/com/fr/third/eclipse/jgit/lib/BatchRefUpdate.java index f5746c1b8..fbdf2f1cc 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/lib/BatchRefUpdate.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/lib/BatchRefUpdate.java @@ -47,7 +47,7 @@ package com.fr.third.eclipse.jgit.lib; import com.fr.third.eclipse.jgit.internal.JGitText; import com.fr.third.eclipse.jgit.revwalk.RevWalk; import com.fr.third.eclipse.jgit.transport.ReceiveCommand; -import org.eclipse.jgit.lib.RefUpdate.Result; +import com.fr.third.eclipse.jgit.lib.RefUpdate.Result; import java.io.IOException; import java.text.MessageFormat; @@ -58,8 +58,8 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; -import static org.eclipse.jgit.transport.ReceiveCommand.Result.NOT_ATTEMPTED; -import static org.eclipse.jgit.transport.ReceiveCommand.Result.REJECTED_OTHER_REASON; +import static com.fr.third.eclipse.jgit.transport.ReceiveCommand.Result.NOT_ATTEMPTED; +import static com.fr.third.eclipse.jgit.transport.ReceiveCommand.Result.REJECTED_OTHER_REASON; /** * Batch of reference updates to be applied to a repository. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/lib/ConfigSnapshot.java b/fine-jgit/src/com/fr/third/eclipse/jgit/lib/ConfigSnapshot.java index 658cc1a3a..2e182f7d4 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/lib/ConfigSnapshot.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/lib/ConfigSnapshot.java @@ -65,9 +65,9 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import static org.eclipse.jgit.util.StringUtils.compareIgnoreCase; -import static org.eclipse.jgit.util.StringUtils.compareWithCase; -import static org.eclipse.jgit.util.StringUtils.toLowerCase; +import static com.fr.third.eclipse.jgit.util.StringUtils.compareIgnoreCase; +import static com.fr.third.eclipse.jgit.util.StringUtils.compareWithCase; +import static com.fr.third.eclipse.jgit.util.StringUtils.toLowerCase; class ConfigSnapshot { final List entryList; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/lib/CoreConfig.java b/fine-jgit/src/com/fr/third/eclipse/jgit/lib/CoreConfig.java index f35537393..7ec2069ba 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/lib/CoreConfig.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/lib/CoreConfig.java @@ -48,7 +48,7 @@ package com.fr.third.eclipse.jgit.lib; -import org.eclipse.jgit.lib.Config.SectionParser; +import com.fr.third.eclipse.jgit.lib.Config.SectionParser; import static java.util.zip.Deflater.DEFAULT_COMPRESSION; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/lib/IndexDiff.java b/fine-jgit/src/com/fr/third/eclipse/jgit/lib/IndexDiff.java index 79dc282e9..f1654c3bf 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/lib/IndexDiff.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/lib/IndexDiff.java @@ -66,7 +66,7 @@ import com.fr.third.eclipse.jgit.treewalk.filter.AndTreeFilter; import com.fr.third.eclipse.jgit.treewalk.filter.IndexDiffFilter; import com.fr.third.eclipse.jgit.treewalk.filter.SkipWorkTreeFilter; import com.fr.third.eclipse.jgit.treewalk.filter.TreeFilter; -import org.eclipse.jgit.submodule.SubmoduleWalk.IgnoreSubmoduleMode; +import com.fr.third.eclipse.jgit.submodule.SubmoduleWalk.IgnoreSubmoduleMode; import java.io.IOException; import java.util.ArrayList; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/lib/ObjectChecker.java b/fine-jgit/src/com/fr/third/eclipse/jgit/lib/ObjectChecker.java index 3ef60ec27..5d7171317 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/lib/ObjectChecker.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/lib/ObjectChecker.java @@ -56,9 +56,9 @@ import java.util.HashSet; import java.util.Locale; import java.util.Set; -import static org.eclipse.jgit.util.RawParseUtils.match; -import static org.eclipse.jgit.util.RawParseUtils.nextLF; -import static org.eclipse.jgit.util.RawParseUtils.parseBase10; +import static com.fr.third.eclipse.jgit.util.RawParseUtils.match; +import static com.fr.third.eclipse.jgit.util.RawParseUtils.nextLF; +import static com.fr.third.eclipse.jgit.util.RawParseUtils.parseBase10; /** * Verifies that an object is formatted correctly. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/lib/RebaseTodoFile.java b/fine-jgit/src/com/fr/third/eclipse/jgit/lib/RebaseTodoFile.java index ce58cf31f..7e95ef60e 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/lib/RebaseTodoFile.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/lib/RebaseTodoFile.java @@ -46,7 +46,7 @@ package com.fr.third.eclipse.jgit.lib; import com.fr.third.eclipse.jgit.util.IO; import com.fr.third.eclipse.jgit.util.RawParseUtils; import com.fr.third.eclipse.jgit.util.io.SafeBufferedOutputStream; -import org.eclipse.jgit.lib.RebaseTodoLine.Action; +import com.fr.third.eclipse.jgit.lib.RebaseTodoLine.Action; import java.io.File; import java.io.FileOutputStream; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/lib/RefRename.java b/fine-jgit/src/com/fr/third/eclipse/jgit/lib/RefRename.java index 1e7c1a4cc..0382b7f60 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/lib/RefRename.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/lib/RefRename.java @@ -46,7 +46,7 @@ package com.fr.third.eclipse.jgit.lib; -import org.eclipse.jgit.lib.RefUpdate.Result; +import com.fr.third.eclipse.jgit.lib.RefUpdate.Result; import java.io.IOException; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/lib/TreeFormatter.java b/fine-jgit/src/com/fr/third/eclipse/jgit/lib/TreeFormatter.java index da7b28b2e..92bbeb951 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/lib/TreeFormatter.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/lib/TreeFormatter.java @@ -52,12 +52,12 @@ import com.fr.third.eclipse.jgit.util.TemporaryBuffer; import java.io.IOException; -import static org.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH; -import static org.eclipse.jgit.lib.Constants.OBJ_TREE; -import static org.eclipse.jgit.lib.Constants.encode; -import static org.eclipse.jgit.lib.FileMode.GITLINK; -import static org.eclipse.jgit.lib.FileMode.REGULAR_FILE; -import static org.eclipse.jgit.lib.FileMode.TREE; +import static com.fr.third.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH; +import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_TREE; +import static com.fr.third.eclipse.jgit.lib.Constants.encode; +import static com.fr.third.eclipse.jgit.lib.FileMode.GITLINK; +import static com.fr.third.eclipse.jgit.lib.FileMode.REGULAR_FILE; +import static com.fr.third.eclipse.jgit.lib.FileMode.TREE; /** * Mutable formatter to construct a single tree object. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/lib/UserConfig.java b/fine-jgit/src/com/fr/third/eclipse/jgit/lib/UserConfig.java index acfb69231..57616812c 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/lib/UserConfig.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/lib/UserConfig.java @@ -46,7 +46,7 @@ package com.fr.third.eclipse.jgit.lib; import com.fr.third.eclipse.jgit.util.SystemReader; -import org.eclipse.jgit.lib.Config.SectionParser; +import com.fr.third.eclipse.jgit.lib.Config.SectionParser; /** The standard "user" configuration parameters. */ public class UserConfig { diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeAlgorithm.java b/fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeAlgorithm.java index 4cae9b6dc..fe3ca96d2 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeAlgorithm.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeAlgorithm.java @@ -49,7 +49,7 @@ import com.fr.third.eclipse.jgit.diff.EditList; import com.fr.third.eclipse.jgit.diff.HistogramDiff; import com.fr.third.eclipse.jgit.diff.Sequence; import com.fr.third.eclipse.jgit.diff.SequenceComparator; -import org.eclipse.jgit.merge.MergeChunk.ConflictState; +import com.fr.third.eclipse.jgit.merge.MergeChunk.ConflictState; import java.util.ArrayList; import java.util.Iterator; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeConfig.java b/fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeConfig.java index a3d050c81..957d79505 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeConfig.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeConfig.java @@ -45,8 +45,8 @@ package com.fr.third.eclipse.jgit.merge; import com.fr.third.eclipse.jgit.lib.Config; import com.fr.third.eclipse.jgit.lib.ConfigConstants; import com.fr.third.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.api.MergeCommand.FastForwardMode; -import org.eclipse.jgit.lib.Config.SectionParser; +import com.fr.third.eclipse.jgit.api.MergeCommand.FastForwardMode; +import com.fr.third.eclipse.jgit.lib.Config.SectionParser; import java.io.IOException; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeFormatter.java b/fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeFormatter.java index 66780e210..4368a8c18 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeFormatter.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeFormatter.java @@ -44,7 +44,7 @@ package com.fr.third.eclipse.jgit.merge; import com.fr.third.eclipse.jgit.diff.RawText; -import org.eclipse.jgit.merge.MergeChunk.ConflictState; +import com.fr.third.eclipse.jgit.merge.MergeChunk.ConflictState; import java.io.IOException; import java.io.OutputStream; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeResult.java b/fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeResult.java index 3f05bb778..a2ad9cd06 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeResult.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/merge/MergeResult.java @@ -45,7 +45,7 @@ package com.fr.third.eclipse.jgit.merge; import com.fr.third.eclipse.jgit.diff.Sequence; import com.fr.third.eclipse.jgit.util.IntList; -import org.eclipse.jgit.merge.MergeChunk.ConflictState; +import com.fr.third.eclipse.jgit.merge.MergeChunk.ConflictState; import java.util.Iterator; import java.util.List; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/merge/Merger.java b/fine-jgit/src/com/fr/third/eclipse/jgit/merge/Merger.java index 448bc45ae..098f0f5ba 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/merge/Merger.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/merge/Merger.java @@ -59,7 +59,7 @@ import com.fr.third.eclipse.jgit.revwalk.RevWalk; import com.fr.third.eclipse.jgit.revwalk.filter.RevFilter; import com.fr.third.eclipse.jgit.treewalk.AbstractTreeIterator; import com.fr.third.eclipse.jgit.treewalk.CanonicalTreeParser; -import org.eclipse.jgit.errors.NoMergeBaseException.MergeBaseFailureReason; +import com.fr.third.eclipse.jgit.errors.NoMergeBaseException.MergeBaseFailureReason; import java.io.IOException; import java.text.MessageFormat; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/merge/ResolveMerger.java b/fine-jgit/src/com/fr/third/eclipse/jgit/merge/ResolveMerger.java index 075a03165..d0a892771 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/merge/ResolveMerger.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/merge/ResolveMerger.java @@ -71,7 +71,7 @@ import com.fr.third.eclipse.jgit.treewalk.TreeWalk; import com.fr.third.eclipse.jgit.treewalk.WorkingTreeIterator; import com.fr.third.eclipse.jgit.util.FS; import com.fr.third.eclipse.jgit.util.TemporaryBuffer; -import org.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm; +import com.fr.third.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm; import java.io.File; import java.io.FileInputStream; @@ -88,8 +88,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import static org.eclipse.jgit.lib.Constants.CHARACTER_ENCODING; -import static org.eclipse.jgit.lib.Constants.OBJ_BLOB; +import static com.fr.third.eclipse.jgit.lib.Constants.CHARACTER_ENCODING; +import static com.fr.third.eclipse.jgit.lib.Constants.OBJ_BLOB; /** * A three-way merger performing a content-merge if necessary diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/merge/SquashMessageFormatter.java b/fine-jgit/src/com/fr/third/eclipse/jgit/merge/SquashMessageFormatter.java index d71fa0a07..a353420bb 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/merge/SquashMessageFormatter.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/merge/SquashMessageFormatter.java @@ -46,7 +46,7 @@ import com.fr.third.eclipse.jgit.lib.PersonIdent; import com.fr.third.eclipse.jgit.lib.Ref; import com.fr.third.eclipse.jgit.revwalk.RevCommit; import com.fr.third.eclipse.jgit.util.GitDateFormatter; -import org.eclipse.jgit.util.GitDateFormatter.Format; +import com.fr.third.eclipse.jgit.util.GitDateFormatter.Format; import java.util.List; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/notes/FanoutBucket.java b/fine-jgit/src/com/fr/third/eclipse/jgit/notes/FanoutBucket.java index b3e2796ff..d1d3e5e8d 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/notes/FanoutBucket.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/notes/FanoutBucket.java @@ -55,7 +55,7 @@ import java.io.IOException; import java.util.Iterator; import java.util.NoSuchElementException; -import static org.eclipse.jgit.lib.FileMode.TREE; +import static com.fr.third.eclipse.jgit.lib.FileMode.TREE; /** * A note tree holding only note subtrees, each named using a 2 digit hex name. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/notes/LeafBucket.java b/fine-jgit/src/com/fr/third/eclipse/jgit/notes/LeafBucket.java index 21eb199d9..134bf23cd 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/notes/LeafBucket.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/notes/LeafBucket.java @@ -53,8 +53,8 @@ import java.io.IOException; import java.util.Iterator; import java.util.NoSuchElementException; -import static org.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH; -import static org.eclipse.jgit.lib.FileMode.REGULAR_FILE; +import static com.fr.third.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH; +import static com.fr.third.eclipse.jgit.lib.FileMode.REGULAR_FILE; /** * A note tree holding only notes, with no subtrees. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/notes/NoteParser.java b/fine-jgit/src/com/fr/third/eclipse/jgit/notes/NoteParser.java index 05ad949e4..5e327e5c4 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/notes/NoteParser.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/notes/NoteParser.java @@ -53,10 +53,10 @@ import com.fr.third.eclipse.jgit.treewalk.CanonicalTreeParser; import java.io.IOException; -import static org.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH; -import static org.eclipse.jgit.lib.Constants.encodeASCII; -import static org.eclipse.jgit.lib.FileMode.TREE; -import static org.eclipse.jgit.util.RawParseUtils.parseHexInt4; +import static com.fr.third.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH; +import static com.fr.third.eclipse.jgit.lib.Constants.encodeASCII; +import static com.fr.third.eclipse.jgit.lib.FileMode.TREE; +import static com.fr.third.eclipse.jgit.util.RawParseUtils.parseHexInt4; /** Custom tree parser to select note bucket type and load it. */ final class NoteParser extends CanonicalTreeParser { diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/patch/BinaryHunk.java b/fine-jgit/src/com/fr/third/eclipse/jgit/patch/BinaryHunk.java index 99db97264..c560096b3 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/patch/BinaryHunk.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/patch/BinaryHunk.java @@ -44,10 +44,10 @@ package com.fr.third.eclipse.jgit.patch; -import static org.eclipse.jgit.lib.Constants.encodeASCII; -import static org.eclipse.jgit.util.RawParseUtils.match; -import static org.eclipse.jgit.util.RawParseUtils.nextLF; -import static org.eclipse.jgit.util.RawParseUtils.parseBase10; +import static com.fr.third.eclipse.jgit.lib.Constants.encodeASCII; +import static com.fr.third.eclipse.jgit.util.RawParseUtils.match; +import static com.fr.third.eclipse.jgit.util.RawParseUtils.nextLF; +import static com.fr.third.eclipse.jgit.util.RawParseUtils.parseBase10; /** Part of a "GIT binary patch" to describe the pre-image or post-image */ public class BinaryHunk { diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/patch/CombinedFileHeader.java b/fine-jgit/src/com/fr/third/eclipse/jgit/patch/CombinedFileHeader.java index 115c9f591..36ad0a029 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/patch/CombinedFileHeader.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/patch/CombinedFileHeader.java @@ -51,9 +51,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static org.eclipse.jgit.lib.Constants.encodeASCII; -import static org.eclipse.jgit.util.RawParseUtils.match; -import static org.eclipse.jgit.util.RawParseUtils.nextLF; +import static com.fr.third.eclipse.jgit.lib.Constants.encodeASCII; +import static com.fr.third.eclipse.jgit.util.RawParseUtils.match; +import static com.fr.third.eclipse.jgit.util.RawParseUtils.nextLF; /** * A file in the Git "diff --cc" or "diff --combined" format. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/patch/CombinedHunkHeader.java b/fine-jgit/src/com/fr/third/eclipse/jgit/patch/CombinedHunkHeader.java index f6c11e65d..a3faa95be 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/patch/CombinedHunkHeader.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/patch/CombinedHunkHeader.java @@ -51,8 +51,8 @@ import java.io.IOException; import java.io.OutputStream; import java.text.MessageFormat; -import static org.eclipse.jgit.util.RawParseUtils.nextLF; -import static org.eclipse.jgit.util.RawParseUtils.parseBase10; +import static com.fr.third.eclipse.jgit.util.RawParseUtils.nextLF; +import static com.fr.third.eclipse.jgit.util.RawParseUtils.parseBase10; /** Hunk header for a hunk appearing in a "diff --cc" style patch. */ public class CombinedHunkHeader extends HunkHeader { diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/patch/FileHeader.java b/fine-jgit/src/com/fr/third/eclipse/jgit/patch/FileHeader.java index a7fe91867..e0b48b0cc 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/patch/FileHeader.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/patch/FileHeader.java @@ -61,13 +61,13 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static org.eclipse.jgit.lib.Constants.encodeASCII; -import static org.eclipse.jgit.util.RawParseUtils.decode; -import static org.eclipse.jgit.util.RawParseUtils.decodeNoFallback; -import static org.eclipse.jgit.util.RawParseUtils.extractBinaryString; -import static org.eclipse.jgit.util.RawParseUtils.match; -import static org.eclipse.jgit.util.RawParseUtils.nextLF; -import static org.eclipse.jgit.util.RawParseUtils.parseBase10; +import static com.fr.third.eclipse.jgit.lib.Constants.encodeASCII; +import static com.fr.third.eclipse.jgit.util.RawParseUtils.decode; +import static com.fr.third.eclipse.jgit.util.RawParseUtils.decodeNoFallback; +import static com.fr.third.eclipse.jgit.util.RawParseUtils.extractBinaryString; +import static com.fr.third.eclipse.jgit.util.RawParseUtils.match; +import static com.fr.third.eclipse.jgit.util.RawParseUtils.nextLF; +import static com.fr.third.eclipse.jgit.util.RawParseUtils.parseBase10; /** Patch header describing an action for a single file path. */ public class FileHeader extends DiffEntry { diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/patch/HunkHeader.java b/fine-jgit/src/com/fr/third/eclipse/jgit/patch/HunkHeader.java index 5b547e9c2..f77f74c98 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/patch/HunkHeader.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/patch/HunkHeader.java @@ -53,9 +53,9 @@ import java.io.IOException; import java.io.OutputStream; import java.text.MessageFormat; -import static org.eclipse.jgit.util.RawParseUtils.match; -import static org.eclipse.jgit.util.RawParseUtils.nextLF; -import static org.eclipse.jgit.util.RawParseUtils.parseBase10; +import static com.fr.third.eclipse.jgit.util.RawParseUtils.match; +import static com.fr.third.eclipse.jgit.util.RawParseUtils.nextLF; +import static com.fr.third.eclipse.jgit.util.RawParseUtils.parseBase10; /** Hunk header describing the layout of a single block of lines */ public class HunkHeader { diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/patch/Patch.java b/fine-jgit/src/com/fr/third/eclipse/jgit/patch/Patch.java index 05527d10e..34745c24e 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/patch/Patch.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/patch/Patch.java @@ -51,12 +51,12 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import static org.eclipse.jgit.lib.Constants.encodeASCII; -import static org.eclipse.jgit.patch.FileHeader.NEW_NAME; -import static org.eclipse.jgit.patch.FileHeader.OLD_NAME; -import static org.eclipse.jgit.patch.FileHeader.isHunkHdr; -import static org.eclipse.jgit.util.RawParseUtils.match; -import static org.eclipse.jgit.util.RawParseUtils.nextLF; +import static com.fr.third.eclipse.jgit.lib.Constants.encodeASCII; +import static com.fr.third.eclipse.jgit.patch.FileHeader.NEW_NAME; +import static com.fr.third.eclipse.jgit.patch.FileHeader.OLD_NAME; +import static com.fr.third.eclipse.jgit.patch.FileHeader.isHunkHdr; +import static com.fr.third.eclipse.jgit.util.RawParseUtils.match; +import static com.fr.third.eclipse.jgit.util.RawParseUtils.nextLF; /** A parsed collection of {@link FileHeader}s from a unified diff patch file */ public class Patch { diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/revplot/PlotWalk.java b/fine-jgit/src/com/fr/third/eclipse/jgit/revplot/PlotWalk.java index 40d45587e..57cb2ee9b 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/revplot/PlotWalk.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/revplot/PlotWalk.java @@ -66,9 +66,9 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import static org.eclipse.jgit.lib.Constants.R_HEADS; -import static org.eclipse.jgit.lib.Constants.R_REMOTES; -import static org.eclipse.jgit.lib.Constants.R_TAGS; +import static com.fr.third.eclipse.jgit.lib.Constants.R_HEADS; +import static com.fr.third.eclipse.jgit.lib.Constants.R_REMOTES; +import static com.fr.third.eclipse.jgit.lib.Constants.R_TAGS; /** Specialized RevWalk for visualization of a commit graph. */ public class PlotWalk extends RevWalk { diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/revwalk/TreeRevFilter.java b/fine-jgit/src/com/fr/third/eclipse/jgit/revwalk/TreeRevFilter.java index 02cadd8b5..2329b3677 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/revwalk/TreeRevFilter.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/revwalk/TreeRevFilter.java @@ -54,7 +54,7 @@ import com.fr.third.eclipse.jgit.lib.ObjectId; import com.fr.third.eclipse.jgit.revwalk.filter.RevFilter; import com.fr.third.eclipse.jgit.treewalk.TreeWalk; import com.fr.third.eclipse.jgit.treewalk.filter.TreeFilter; -import org.eclipse.jgit.diff.DiffEntry.ChangeType; +import com.fr.third.eclipse.jgit.diff.DiffEntry.ChangeType; import java.io.IOException; import java.util.List; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/BasePackFetchConnection.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/BasePackFetchConnection.java index 71682f2ff..1737995ad 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/BasePackFetchConnection.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/BasePackFetchConnection.java @@ -67,9 +67,9 @@ import com.fr.third.eclipse.jgit.revwalk.RevWalk; import com.fr.third.eclipse.jgit.revwalk.filter.CommitTimeRevFilter; import com.fr.third.eclipse.jgit.revwalk.filter.RevFilter; import com.fr.third.eclipse.jgit.util.TemporaryBuffer; -import org.eclipse.jgit.lib.Config.SectionParser; -import org.eclipse.jgit.transport.GitProtocolConstants.MultiAck; -import org.eclipse.jgit.transport.PacketLineIn.AckNackResult; +import com.fr.third.eclipse.jgit.lib.Config.SectionParser; +import com.fr.third.eclipse.jgit.transport.GitProtocolConstants.MultiAck; +import com.fr.third.eclipse.jgit.transport.PacketLineIn.AckNackResult; import java.io.IOException; import java.io.InputStream; @@ -81,7 +81,7 @@ import java.util.Date; import java.util.Map; import java.util.Set; -import static org.eclipse.jgit.lib.RefDatabase.ALL; +import static com.fr.third.eclipse.jgit.lib.RefDatabase.ALL; /** * Fetch implementation using the native Git pack transfer service. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/BasePackPushConnection.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/BasePackPushConnection.java index 8fcf34c33..4b491d66a 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/BasePackPushConnection.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/BasePackPushConnection.java @@ -53,7 +53,7 @@ import com.fr.third.eclipse.jgit.internal.storage.pack.PackWriter; import com.fr.third.eclipse.jgit.lib.ObjectId; import com.fr.third.eclipse.jgit.lib.ProgressMonitor; import com.fr.third.eclipse.jgit.lib.Ref; -import org.eclipse.jgit.transport.RemoteRefUpdate.Status; +import com.fr.third.eclipse.jgit.transport.RemoteRefUpdate.Status; import java.io.IOException; import java.io.OutputStream; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/BaseReceivePack.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/BaseReceivePack.java index 811981623..f17daa650 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/BaseReceivePack.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/BaseReceivePack.java @@ -72,8 +72,8 @@ import com.fr.third.eclipse.jgit.util.io.InterruptTimer; import com.fr.third.eclipse.jgit.util.io.LimitedInputStream; import com.fr.third.eclipse.jgit.util.io.TimeoutInputStream; import com.fr.third.eclipse.jgit.util.io.TimeoutOutputStream; -import org.eclipse.jgit.lib.Config.SectionParser; -import org.eclipse.jgit.transport.ReceiveCommand.Result; +import com.fr.third.eclipse.jgit.lib.Config.SectionParser; +import com.fr.third.eclipse.jgit.transport.ReceiveCommand.Result; import java.io.EOFException; import java.io.IOException; @@ -88,14 +88,14 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import static org.eclipse.jgit.transport.GitProtocolConstants.CAPABILITY_ATOMIC; -import static org.eclipse.jgit.transport.GitProtocolConstants.CAPABILITY_DELETE_REFS; -import static org.eclipse.jgit.transport.GitProtocolConstants.CAPABILITY_OFS_DELTA; -import static org.eclipse.jgit.transport.GitProtocolConstants.CAPABILITY_REPORT_STATUS; -import static org.eclipse.jgit.transport.GitProtocolConstants.CAPABILITY_SIDE_BAND_64K; -import static org.eclipse.jgit.transport.SideBandOutputStream.CH_DATA; -import static org.eclipse.jgit.transport.SideBandOutputStream.CH_PROGRESS; -import static org.eclipse.jgit.transport.SideBandOutputStream.MAX_BUF; +import static com.fr.third.eclipse.jgit.transport.GitProtocolConstants.CAPABILITY_ATOMIC; +import static com.fr.third.eclipse.jgit.transport.GitProtocolConstants.CAPABILITY_DELETE_REFS; +import static com.fr.third.eclipse.jgit.transport.GitProtocolConstants.CAPABILITY_OFS_DELTA; +import static com.fr.third.eclipse.jgit.transport.GitProtocolConstants.CAPABILITY_REPORT_STATUS; +import static com.fr.third.eclipse.jgit.transport.GitProtocolConstants.CAPABILITY_SIDE_BAND_64K; +import static com.fr.third.eclipse.jgit.transport.SideBandOutputStream.CH_DATA; +import static com.fr.third.eclipse.jgit.transport.SideBandOutputStream.CH_PROGRESS; +import static com.fr.third.eclipse.jgit.transport.SideBandOutputStream.MAX_BUF; /** * Base implementation of the side of a push connection that receives objects. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/BundleFetchConnection.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/BundleFetchConnection.java index 01add74da..b8b57dc3c 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/BundleFetchConnection.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/BundleFetchConnection.java @@ -80,7 +80,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.eclipse.jgit.lib.RefDatabase.ALL; +import static com.fr.third.eclipse.jgit.lib.RefDatabase.ALL; /** * Fetch connection for bundle based classes. It used by diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/DaemonService.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/DaemonService.java index 2a18596d9..ed1ccc4b6 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/DaemonService.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/DaemonService.java @@ -48,7 +48,7 @@ import com.fr.third.eclipse.jgit.lib.Config; import com.fr.third.eclipse.jgit.lib.Repository; import com.fr.third.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException; import com.fr.third.eclipse.jgit.transport.resolver.ServiceNotEnabledException; -import org.eclipse.jgit.lib.Config.SectionParser; +import com.fr.third.eclipse.jgit.lib.Config.SectionParser; import java.io.IOException; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/FetchHeadRecord.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/FetchHeadRecord.java index c783cc355..1477a14c8 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/FetchHeadRecord.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/FetchHeadRecord.java @@ -50,9 +50,9 @@ import com.fr.third.eclipse.jgit.lib.ObjectId; import java.io.IOException; import java.io.Writer; -import static org.eclipse.jgit.lib.Constants.R_HEADS; -import static org.eclipse.jgit.lib.Constants.R_REMOTES; -import static org.eclipse.jgit.lib.Constants.R_TAGS; +import static com.fr.third.eclipse.jgit.lib.Constants.R_HEADS; +import static com.fr.third.eclipse.jgit.lib.Constants.R_REMOTES; +import static com.fr.third.eclipse.jgit.lib.Constants.R_TAGS; class FetchHeadRecord { ObjectId newValue; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/FetchProcess.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/FetchProcess.java index 4768893aa..c15ba88d9 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/FetchProcess.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/FetchProcess.java @@ -75,10 +75,10 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import static org.eclipse.jgit.transport.ReceiveCommand.Result.NOT_ATTEMPTED; -import static org.eclipse.jgit.transport.ReceiveCommand.Result.OK; -import static org.eclipse.jgit.transport.ReceiveCommand.Result.REJECTED_NONFASTFORWARD; -import static org.eclipse.jgit.transport.ReceiveCommand.Type.UPDATE_NONFASTFORWARD; +import static com.fr.third.eclipse.jgit.transport.ReceiveCommand.Result.NOT_ATTEMPTED; +import static com.fr.third.eclipse.jgit.transport.ReceiveCommand.Result.OK; +import static com.fr.third.eclipse.jgit.transport.ReceiveCommand.Result.REJECTED_NONFASTFORWARD; +import static com.fr.third.eclipse.jgit.transport.ReceiveCommand.Type.UPDATE_NONFASTFORWARD; class FetchProcess { /** Transport we will fetch over. */ diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/HttpAuthMethod.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/HttpAuthMethod.java index 9345e5fac..952929a3e 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/HttpAuthMethod.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/HttpAuthMethod.java @@ -65,8 +65,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Random; -import static org.eclipse.jgit.util.HttpSupport.HDR_AUTHORIZATION; -import static org.eclipse.jgit.util.HttpSupport.HDR_WWW_AUTHENTICATE; +import static com.fr.third.eclipse.jgit.util.HttpSupport.HDR_AUTHORIZATION; +import static com.fr.third.eclipse.jgit.util.HttpSupport.HDR_WWW_AUTHENTICATE; /** * Support class to populate user authentication data on a connection. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/NetRCCredentialsProvider.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/NetRCCredentialsProvider.java index e7597575f..fb49889e8 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/NetRCCredentialsProvider.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/NetRCCredentialsProvider.java @@ -42,7 +42,7 @@ package com.fr.third.eclipse.jgit.transport; import com.fr.third.eclipse.jgit.errors.UnsupportedCredentialItem; -import org.eclipse.jgit.transport.NetRC.NetRCEntry; +import com.fr.third.eclipse.jgit.transport.NetRC.NetRCEntry; /** * Simple .netrc credentials provider. It can lookup the first machine entry diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/PushConnection.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/PushConnection.java index 8bc6b93ab..13fa23026 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/PushConnection.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/PushConnection.java @@ -46,7 +46,7 @@ package com.fr.third.eclipse.jgit.transport; import com.fr.third.eclipse.jgit.errors.TransportException; import com.fr.third.eclipse.jgit.lib.ProgressMonitor; -import org.eclipse.jgit.transport.RemoteRefUpdate.Status; +import com.fr.third.eclipse.jgit.transport.RemoteRefUpdate.Status; import java.io.OutputStream; import java.util.Map; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/PushProcess.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/PushProcess.java index 98ec12695..07575e189 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/PushProcess.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/PushProcess.java @@ -53,7 +53,7 @@ import com.fr.third.eclipse.jgit.lib.Ref; import com.fr.third.eclipse.jgit.revwalk.RevCommit; import com.fr.third.eclipse.jgit.revwalk.RevObject; import com.fr.third.eclipse.jgit.revwalk.RevWalk; -import org.eclipse.jgit.transport.RemoteRefUpdate.Status; +import com.fr.third.eclipse.jgit.transport.RemoteRefUpdate.Status; import java.io.IOException; import java.io.OutputStream; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/ReceivePack.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/ReceivePack.java index 3f9144a93..e807acc2c 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/ReceivePack.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/ReceivePack.java @@ -46,15 +46,15 @@ package com.fr.third.eclipse.jgit.transport; import com.fr.third.eclipse.jgit.errors.UnpackException; import com.fr.third.eclipse.jgit.lib.Constants; import com.fr.third.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.transport.ReceiveCommand.Result; -import org.eclipse.jgit.transport.RefAdvertiser.PacketLineOutRefAdvertiser; +import com.fr.third.eclipse.jgit.transport.ReceiveCommand.Result; +import com.fr.third.eclipse.jgit.transport.RefAdvertiser.PacketLineOutRefAdvertiser; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import static org.eclipse.jgit.transport.GitProtocolConstants.CAPABILITY_ATOMIC; -import static org.eclipse.jgit.transport.GitProtocolConstants.CAPABILITY_REPORT_STATUS; +import static com.fr.third.eclipse.jgit.transport.GitProtocolConstants.CAPABILITY_ATOMIC; +import static com.fr.third.eclipse.jgit.transport.GitProtocolConstants.CAPABILITY_REPORT_STATUS; /** * Implements the server side of a push connection, receiving objects. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/RefAdvertiser.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/RefAdvertiser.java index 1f24637a4..7169e3cb5 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/RefAdvertiser.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/RefAdvertiser.java @@ -58,7 +58,7 @@ import java.util.Map; import java.util.Set; import java.util.SortedMap; -import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_SYMREF; +import static com.fr.third.eclipse.jgit.transport.GitProtocolConstants.OPTION_SYMREF; /** Support for the start of {@link UploadPack} and {@link ReceivePack}. */ public abstract class RefAdvertiser { diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/SideBandInputStream.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/SideBandInputStream.java index f76cb8cc8..2997cf3ab 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/SideBandInputStream.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/SideBandInputStream.java @@ -60,7 +60,7 @@ import java.text.MessageFormat; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.eclipse.jgit.transport.SideBandOutputStream.HDR_SIZE; +import static com.fr.third.eclipse.jgit.transport.SideBandOutputStream.HDR_SIZE; /** * Unmultiplexes the data portion of a side-band channel. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/TransferConfig.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/TransferConfig.java index 60e69bd58..4111a27e6 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/TransferConfig.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/TransferConfig.java @@ -48,7 +48,7 @@ import com.fr.third.eclipse.jgit.lib.ObjectChecker; import com.fr.third.eclipse.jgit.lib.Ref; import com.fr.third.eclipse.jgit.lib.Repository; import com.fr.third.eclipse.jgit.util.SystemReader; -import org.eclipse.jgit.lib.Config.SectionParser; +import com.fr.third.eclipse.jgit.lib.Config.SectionParser; import java.util.HashMap; import java.util.Map; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/Transport.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/Transport.java index b9f6e732a..5ee934447 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/Transport.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/Transport.java @@ -79,7 +79,7 @@ import java.util.Map; import java.util.Vector; import java.util.concurrent.CopyOnWriteArrayList; -import static org.eclipse.jgit.lib.RefDatabase.ALL; +import static com.fr.third.eclipse.jgit.lib.RefDatabase.ALL; /** * Connects two Git repositories together and copies objects between them. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/TransportAmazonS3.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/TransportAmazonS3.java index f1fe39284..8a0b53eec 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/TransportAmazonS3.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/TransportAmazonS3.java @@ -53,7 +53,7 @@ import com.fr.third.eclipse.jgit.lib.ProgressMonitor; import com.fr.third.eclipse.jgit.lib.Ref; import com.fr.third.eclipse.jgit.lib.Repository; import com.fr.third.eclipse.jgit.lib.SymbolicRef; -import org.eclipse.jgit.lib.Ref.Storage; +import com.fr.third.eclipse.jgit.lib.Ref.Storage; import java.io.BufferedReader; import java.io.File; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/TransportHttp.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/TransportHttp.java index c9b840d42..b2caad494 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/TransportHttp.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/TransportHttp.java @@ -66,7 +66,7 @@ import com.fr.third.eclipse.jgit.util.RawParseUtils; import com.fr.third.eclipse.jgit.util.TemporaryBuffer; import com.fr.third.eclipse.jgit.util.io.DisabledOutputStream; import com.fr.third.eclipse.jgit.util.io.UnionInputStream; -import org.eclipse.jgit.lib.Config.SectionParser; +import com.fr.third.eclipse.jgit.lib.Config.SectionParser; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLSession; @@ -99,16 +99,16 @@ import java.util.TreeMap; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import static org.eclipse.jgit.util.HttpSupport.ENCODING_GZIP; -import static org.eclipse.jgit.util.HttpSupport.HDR_ACCEPT; -import static org.eclipse.jgit.util.HttpSupport.HDR_ACCEPT_ENCODING; -import static org.eclipse.jgit.util.HttpSupport.HDR_CONTENT_ENCODING; -import static org.eclipse.jgit.util.HttpSupport.HDR_CONTENT_TYPE; -import static org.eclipse.jgit.util.HttpSupport.HDR_PRAGMA; -import static org.eclipse.jgit.util.HttpSupport.HDR_USER_AGENT; -import static org.eclipse.jgit.util.HttpSupport.HDR_WWW_AUTHENTICATE; -import static org.eclipse.jgit.util.HttpSupport.METHOD_GET; -import static org.eclipse.jgit.util.HttpSupport.METHOD_POST; +import static com.fr.third.eclipse.jgit.util.HttpSupport.ENCODING_GZIP; +import static com.fr.third.eclipse.jgit.util.HttpSupport.HDR_ACCEPT; +import static com.fr.third.eclipse.jgit.util.HttpSupport.HDR_ACCEPT_ENCODING; +import static com.fr.third.eclipse.jgit.util.HttpSupport.HDR_CONTENT_ENCODING; +import static com.fr.third.eclipse.jgit.util.HttpSupport.HDR_CONTENT_TYPE; +import static com.fr.third.eclipse.jgit.util.HttpSupport.HDR_PRAGMA; +import static com.fr.third.eclipse.jgit.util.HttpSupport.HDR_USER_AGENT; +import static com.fr.third.eclipse.jgit.util.HttpSupport.HDR_WWW_AUTHENTICATE; +import static com.fr.third.eclipse.jgit.util.HttpSupport.METHOD_GET; +import static com.fr.third.eclipse.jgit.util.HttpSupport.METHOD_POST; /** * Transport over HTTP and FTP protocols. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/TransportProtocol.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/TransportProtocol.java index 51b538b89..be819a0a0 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/TransportProtocol.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/TransportProtocol.java @@ -80,7 +80,7 @@ import java.util.Set; *

    * Applications may automatically register additional protocols by filling in * the names of their TransportProtocol defining classes using the services file - * {@code META-INF/services/org.eclipse.jgit.transport.Transport}. For each + * {@code META-INF/services/com.fr.third.eclipse.jgit.transport.Transport}. For each * class name listed in the services file, any static fields of type * {@code TransportProtocol} will be automatically registered. For the above * example the string {@code com.example.my_transport.MyTransport} should be diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/TransportSftp.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/TransportSftp.java index 334a4bebd..d2e2b265f 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/TransportSftp.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/TransportSftp.java @@ -58,7 +58,7 @@ import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.JSchException; import com.jcraft.jsch.SftpATTRS; import com.jcraft.jsch.SftpException; -import org.eclipse.jgit.lib.Ref.Storage; +import com.fr.third.eclipse.jgit.lib.Ref.Storage; import java.io.BufferedReader; import java.io.FileNotFoundException; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/UploadPack.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/UploadPack.java index 9dc40cb76..4d831fa35 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/UploadPack.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/UploadPack.java @@ -70,8 +70,8 @@ import com.fr.third.eclipse.jgit.util.io.InterruptTimer; import com.fr.third.eclipse.jgit.util.io.NullOutputStream; import com.fr.third.eclipse.jgit.util.io.TimeoutInputStream; import com.fr.third.eclipse.jgit.util.io.TimeoutOutputStream; -import org.eclipse.jgit.transport.GitProtocolConstants.MultiAck; -import org.eclipse.jgit.transport.RefAdvertiser.PacketLineOutRefAdvertiser; +import com.fr.third.eclipse.jgit.transport.GitProtocolConstants.MultiAck; +import com.fr.third.eclipse.jgit.transport.RefAdvertiser.PacketLineOutRefAdvertiser; import java.io.EOFException; import java.io.IOException; @@ -86,18 +86,18 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.eclipse.jgit.lib.RefDatabase.ALL; -import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_ALLOW_TIP_SHA1_IN_WANT; -import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_INCLUDE_TAG; -import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_MULTI_ACK; -import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_MULTI_ACK_DETAILED; -import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_NO_DONE; -import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_NO_PROGRESS; -import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_OFS_DELTA; -import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_SHALLOW; -import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_SIDE_BAND; -import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_SIDE_BAND_64K; -import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_THIN_PACK; +import static com.fr.third.eclipse.jgit.lib.RefDatabase.ALL; +import static com.fr.third.eclipse.jgit.transport.GitProtocolConstants.OPTION_ALLOW_TIP_SHA1_IN_WANT; +import static com.fr.third.eclipse.jgit.transport.GitProtocolConstants.OPTION_INCLUDE_TAG; +import static com.fr.third.eclipse.jgit.transport.GitProtocolConstants.OPTION_MULTI_ACK; +import static com.fr.third.eclipse.jgit.transport.GitProtocolConstants.OPTION_MULTI_ACK_DETAILED; +import static com.fr.third.eclipse.jgit.transport.GitProtocolConstants.OPTION_NO_DONE; +import static com.fr.third.eclipse.jgit.transport.GitProtocolConstants.OPTION_NO_PROGRESS; +import static com.fr.third.eclipse.jgit.transport.GitProtocolConstants.OPTION_OFS_DELTA; +import static com.fr.third.eclipse.jgit.transport.GitProtocolConstants.OPTION_SHALLOW; +import static com.fr.third.eclipse.jgit.transport.GitProtocolConstants.OPTION_SIDE_BAND; +import static com.fr.third.eclipse.jgit.transport.GitProtocolConstants.OPTION_SIDE_BAND_64K; +import static com.fr.third.eclipse.jgit.transport.GitProtocolConstants.OPTION_THIN_PACK; /** * Implements the server side of a fetch connection, transmitting objects. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/WalkFetchConnection.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/WalkFetchConnection.java index ab09ba103..00c495fe6 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/WalkFetchConnection.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/WalkFetchConnection.java @@ -90,7 +90,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.eclipse.jgit.lib.RefDatabase.ALL; +import static com.fr.third.eclipse.jgit.lib.RefDatabase.ALL; /** * Generic fetch support for dumb transport protocols. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/WalkPushConnection.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/WalkPushConnection.java index 21b3ba55a..a020d10b8 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/WalkPushConnection.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/WalkPushConnection.java @@ -55,8 +55,8 @@ import com.fr.third.eclipse.jgit.lib.Ref; import com.fr.third.eclipse.jgit.lib.RefWriter; import com.fr.third.eclipse.jgit.lib.Repository; import com.fr.third.eclipse.jgit.util.io.SafeBufferedOutputStream; -import org.eclipse.jgit.lib.Ref.Storage; -import org.eclipse.jgit.transport.RemoteRefUpdate.Status; +import com.fr.third.eclipse.jgit.lib.Ref.Storage; +import com.fr.third.eclipse.jgit.transport.RemoteRefUpdate.Status; import java.io.IOException; import java.io.OutputStream; @@ -69,7 +69,7 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import static org.eclipse.jgit.transport.WalkRemoteObjectDatabase.ROOT_DIR; +import static com.fr.third.eclipse.jgit.transport.WalkRemoteObjectDatabase.ROOT_DIR; /** * Generic push support for dumb transport protocols. diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/resolver/FileResolver.java b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/resolver/FileResolver.java index 911bc4fab..62bcfc951 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/transport/resolver/FileResolver.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/transport/resolver/FileResolver.java @@ -48,7 +48,7 @@ import com.fr.third.eclipse.jgit.lib.Constants; import com.fr.third.eclipse.jgit.lib.Repository; import com.fr.third.eclipse.jgit.lib.RepositoryCache; import com.fr.third.eclipse.jgit.util.FS; -import org.eclipse.jgit.lib.RepositoryCache.FileKey; +import com.fr.third.eclipse.jgit.lib.RepositoryCache.FileKey; import java.io.File; import java.io.IOException; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/treewalk/WorkingTreeIterator.java b/fine-jgit/src/com/fr/third/eclipse/jgit/treewalk/WorkingTreeIterator.java index d38240e09..85b9dff53 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/treewalk/WorkingTreeIterator.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/treewalk/WorkingTreeIterator.java @@ -71,8 +71,8 @@ import com.fr.third.eclipse.jgit.util.FS; import com.fr.third.eclipse.jgit.util.IO; import com.fr.third.eclipse.jgit.util.RawParseUtils; import com.fr.third.eclipse.jgit.util.io.EolCanonicalizingInputStream; -import org.eclipse.jgit.lib.CoreConfig.CheckStat; -import org.eclipse.jgit.lib.CoreConfig.SymLinks; +import com.fr.third.eclipse.jgit.lib.CoreConfig.CheckStat; +import com.fr.third.eclipse.jgit.lib.CoreConfig.SymLinks; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/treewalk/WorkingTreeOptions.java b/fine-jgit/src/com/fr/third/eclipse/jgit/treewalk/WorkingTreeOptions.java index 4bca92826..b13dd04d6 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/treewalk/WorkingTreeOptions.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/treewalk/WorkingTreeOptions.java @@ -45,11 +45,11 @@ package com.fr.third.eclipse.jgit.treewalk; import com.fr.third.eclipse.jgit.lib.Config; import com.fr.third.eclipse.jgit.lib.ConfigConstants; -import org.eclipse.jgit.lib.Config.SectionParser; -import org.eclipse.jgit.lib.CoreConfig.AutoCRLF; -import org.eclipse.jgit.lib.CoreConfig.CheckStat; -import org.eclipse.jgit.lib.CoreConfig.HideDotFiles; -import org.eclipse.jgit.lib.CoreConfig.SymLinks; +import com.fr.third.eclipse.jgit.lib.Config.SectionParser; +import com.fr.third.eclipse.jgit.lib.CoreConfig.AutoCRLF; +import com.fr.third.eclipse.jgit.lib.CoreConfig.CheckStat; +import com.fr.third.eclipse.jgit.lib.CoreConfig.HideDotFiles; +import com.fr.third.eclipse.jgit.lib.CoreConfig.SymLinks; /** Options used by the {@link WorkingTreeIterator}. */ public class WorkingTreeOptions { diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/treewalk/filter/PathFilterGroup.java b/fine-jgit/src/com/fr/third/eclipse/jgit/treewalk/filter/PathFilterGroup.java index e04ef6fc5..e2e79f2bc 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/treewalk/filter/PathFilterGroup.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/treewalk/filter/PathFilterGroup.java @@ -48,7 +48,7 @@ import com.fr.third.eclipse.jgit.errors.StopWalkException; import com.fr.third.eclipse.jgit.internal.JGitText; import com.fr.third.eclipse.jgit.treewalk.TreeWalk; import com.fr.third.eclipse.jgit.util.RawParseUtils; -import org.eclipse.jgit.treewalk.filter.ByteArraySet.Hasher; +import com.fr.third.eclipse.jgit.treewalk.filter.ByteArraySet.Hasher; import java.util.Collection; diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/util/FS.java b/fine-jgit/src/com/fr/third/eclipse/jgit/util/FS.java index 1b8e6334d..a43df504e 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/util/FS.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/util/FS.java @@ -150,7 +150,7 @@ public abstract class FS { if (factory == null) { try { Class activatorClass = Class - .forName("org.eclipse.jgit.util.Java7FSFactory"); //$NON-NLS-1$ + .forName("com.fr.third.eclipse.jgit.util.Java7FSFactory"); //$NON-NLS-1$ // found Java7 factory = (FSFactory) activatorClass.newInstance(); } catch (ClassNotFoundException e) { diff --git a/fine-jgit/src/com/fr/third/eclipse/jgit/util/RawParseUtils.java b/fine-jgit/src/com/fr/third/eclipse/jgit/util/RawParseUtils.java index 21f7bb337..4bfedb909 100755 --- a/fine-jgit/src/com/fr/third/eclipse/jgit/util/RawParseUtils.java +++ b/fine-jgit/src/com/fr/third/eclipse/jgit/util/RawParseUtils.java @@ -58,10 +58,10 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import static org.eclipse.jgit.lib.ObjectChecker.author; -import static org.eclipse.jgit.lib.ObjectChecker.committer; -import static org.eclipse.jgit.lib.ObjectChecker.encoding; -import static org.eclipse.jgit.lib.ObjectChecker.tagger; +import static com.fr.third.eclipse.jgit.lib.ObjectChecker.author; +import static com.fr.third.eclipse.jgit.lib.ObjectChecker.committer; +import static com.fr.third.eclipse.jgit.lib.ObjectChecker.encoding; +import static com.fr.third.eclipse.jgit.lib.ObjectChecker.tagger; /** Handy utility functions to parse raw object contents. */ public final class RawParseUtils {