Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-02 19:45:51 +01:00
Code Issues Packages Projects Releases Activity

rename BlamePagingResult to BlameResult

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-09-16 09:05:06 +02:00
parent 0e82fc1ffe
commit 668600b65d
8 changed files with 65 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitBlameViewer.java
View File

@@ -38,6 +38,7 @@ package sonia.scm.repository;
import org.eclipse.jgit.api.BlameCommand;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.blame.BlameResult;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -53,8 +54,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.jgit.lib.ObjectId;
import sonia.scm.util.Util;
/**
* Class description
@@ -96,12 +95,12 @@ public class GitBlameViewer implements BlameViewer
* @return
*/
@Override
public BlamePagingResult getBlame(String revision, String path)
public sonia.scm.repository.BlameResult getBlame(String revision, String path)
{
AssertUtil.assertIsNotEmpty(path);
BlameResult blameResult = null;
BlamePagingResult blamePagingResult = null;
BlameResult gitBlameResult = null;
sonia.scm.repository.BlameResult blameResult = null;
org.eclipse.jgit.lib.Repository gr = null;
File directory = handler.getDirectory(repository);
Git git = null;
@@ -112,28 +111,28 @@ public class GitBlameViewer implements BlameViewer
git = new Git(gr);
BlameCommand blame = git.blame();
blame.setFilePath(path);
ObjectId revId = GitUtil.getRevisionId(gr, revision);
blame.setStartCommit(revId);
blameResult = blame.call();
AssertUtil.assertIsNotNull(blameResult);
blame.setFilePath(path);
ObjectId revId = GitUtil.getRevisionId(gr, revision);
blame.setStartCommit(revId);
gitBlameResult = blame.call();
AssertUtil.assertIsNotNull(gitBlameResult);
List<BlameLine> blameLines = new ArrayList<BlameLine>();
int total = blameResult.getResultContents().size();
int total = gitBlameResult.getResultContents().size();
for (int i = 0; i < total; i++)
{
PersonIdent author = blameResult.getSourceAuthor(i);
PersonIdent author = gitBlameResult.getSourceAuthor(i);
BlameLine blameLine = new BlameLine();
blameLine.setLineNumber(i + 1);
blameLine.setAuthor(new Person(author.getName(),
author.getEmailAddress()));
RevCommit commit = blameResult.getSourceCommit(i);
RevCommit commit = gitBlameResult.getSourceCommit(i);
long when = GitUtil.getCommitTime(commit);
blameLine.setWhen(when);
@@ -142,20 +141,20 @@ public class GitBlameViewer implements BlameViewer
blameLine.setRevision(rev);
String content = blameResult.getResultContents().getString(i);
String content = gitBlameResult.getResultContents().getString(i);
blameLine.setCode(content);
blameLines.add(blameLine);
}
blamePagingResult = new BlamePagingResult(total, blameLines);
blameResult = new sonia.scm.repository.BlameResult(total, blameLines);
}
catch (IOException ex)
{
logger.error("could not open repository", ex);
}
return blamePagingResult;
return blameResult;
}
//~--- fields ---------------------------------------------------------------