Mercurial > hg4j
diff src/org/tmatesoft/hg/internal/BlameHelper.java @ 629:5f52074707b2
Diff/blame methods as command, their residence in HgDataFile was a mistake
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Wed, 22 May 2013 16:46:15 +0200 |
| parents | 6526d8adbc0f |
| children | cce0387c6041 |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/internal/BlameHelper.java Wed May 22 15:52:31 2013 +0200 +++ b/src/org/tmatesoft/hg/internal/BlameHelper.java Wed May 22 16:46:15 2013 +0200 @@ -25,13 +25,8 @@ 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.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.core.HgBlameInspector; +import org.tmatesoft.hg.core.HgBlameInspector.*; import org.tmatesoft.hg.repo.HgDataFile; import org.tmatesoft.hg.repo.HgInvalidStateException; import org.tmatesoft.hg.repo.HgRuntimeException; @@ -253,7 +248,7 @@ ContentBlock targetContent = new ContentBlock(s2); annotatedRevision.set(originContent, targetContent); annotatedRevision.set(csetOrigin, csetTarget, p2MergeCommon != null ? csetMergeParent : NO_REVISION); - Recipient curious = Adaptable.Factory.getAdapter(insp, Recipient.class, null); + RevisionDescriptor.Recipient curious = Adaptable.Factory.getAdapter(insp, RevisionDescriptor.Recipient.class, null); if (curious != null) { try { curious.start(annotatedRevision); @@ -269,7 +264,7 @@ if (shallStop()) { return; } - Recipient curious = Adaptable.Factory.getAdapter(insp, Recipient.class, null); + RevisionDescriptor.Recipient curious = Adaptable.Factory.getAdapter(insp, RevisionDescriptor.Recipient.class, null); if (curious != null) { try { curious.done(annotatedRevision);