Mercurial > hg4j
diff src/org/tmatesoft/hg/internal/BlameHelper.java @ 603:707b5c7c6fa4
Refactor HgBlameFacility: relevant action methods moved to proper home (HgDataFile), as facility doesn't provide anything but packaging of relevant methods/interfaces
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Mon, 06 May 2013 18:29:57 +0200 |
parents | c4fd1037bc6f |
children | b4948b159ab1 |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/internal/BlameHelper.java Mon May 06 17:11:29 2013 +0200 +++ b/src/org/tmatesoft/hg/internal/BlameHelper.java Mon May 06 18:29:57 2013 +0200 @@ -24,14 +24,13 @@ import org.tmatesoft.hg.core.HgCallbackTargetException; import org.tmatesoft.hg.internal.DiffHelper.LineSequence; import org.tmatesoft.hg.internal.DiffHelper.LineSequence.ByteChain; -import org.tmatesoft.hg.repo.HgBlameFacility.Block; -import org.tmatesoft.hg.repo.HgBlameFacility.BlockData; -import org.tmatesoft.hg.repo.HgBlameFacility.ChangeBlock; -import org.tmatesoft.hg.repo.HgBlameFacility.EqualBlock; -import org.tmatesoft.hg.repo.HgBlameFacility.Inspector; -import org.tmatesoft.hg.repo.HgBlameFacility.RevisionDescriptor; -import org.tmatesoft.hg.repo.HgBlameFacility.RevisionDescriptor.Recipient; -import org.tmatesoft.hg.repo.HgBlameFacility; +import org.tmatesoft.hg.repo.HgBlameInspector.Block; +import org.tmatesoft.hg.repo.HgBlameInspector.BlockData; +import org.tmatesoft.hg.repo.HgBlameInspector.ChangeBlock; +import org.tmatesoft.hg.repo.HgBlameInspector.EqualBlock; +import org.tmatesoft.hg.repo.HgBlameInspector.RevisionDescriptor; +import org.tmatesoft.hg.repo.HgBlameInspector.RevisionDescriptor.Recipient; +import org.tmatesoft.hg.repo.HgBlameInspector; import org.tmatesoft.hg.repo.HgDataFile; import org.tmatesoft.hg.repo.HgInvalidStateException; import org.tmatesoft.hg.util.Adaptable; @@ -40,18 +39,18 @@ /** * Blame implementation - * @see HgBlameFacility + * @see HgBlameInspector * @author Artem Tikhomirov * @author TMate Software Ltd. */ public class BlameHelper { - private final Inspector insp; + private final HgBlameInspector insp; private FileLinesCache linesCache; // FIXME exposing internals (use of FileLinesCache through cons arg and #useFileUpTo) smells bad, refactor! - public BlameHelper(Inspector inspector, int cacheHint) { + public BlameHelper(HgBlameInspector inspector, int cacheHint) { insp = inspector; linesCache = new FileLinesCache(cacheHint); } @@ -192,7 +191,7 @@ } private static class BlameBlockInspector extends DiffHelper.DeltaInspector<LineSequence> { - private final Inspector insp; + private final HgBlameInspector insp; private final int csetOrigin; private final int csetTarget; private EqualBlocksCollector p2MergeCommon; @@ -201,7 +200,7 @@ private final AnnotateRev annotatedRevision; private HgCallbackTargetException error; - public BlameBlockInspector(HgDataFile df, int fileRevIndex, Inspector inspector, int originCset, int targetCset) { + public BlameBlockInspector(HgDataFile df, int fileRevIndex, HgBlameInspector inspector, int originCset, int targetCset) { assert inspector != null; insp = inspector; annotatedRevision = new AnnotateRev();