Mercurial > jhg
diff src/org/tmatesoft/hg/repo/HgManifest.java @ 431:12f668401613
FIXMEs: awkward API refactored, what need to be internal got hidden; public aspects got captured in slim interfaces
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Thu, 29 Mar 2012 20:54:04 +0200 |
| parents | 063b0663495a |
| children | 909306e412e2 |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/repo/HgManifest.java Thu Mar 29 18:48:23 2012 +0200 +++ b/src/org/tmatesoft/hg/repo/HgManifest.java Thu Mar 29 20:54:04 2012 +0200 @@ -33,7 +33,7 @@ import org.tmatesoft.hg.internal.IntMap; import org.tmatesoft.hg.internal.IterateControlMediator; import org.tmatesoft.hg.internal.Lifecycle; -import org.tmatesoft.hg.internal.Pool2; +import org.tmatesoft.hg.internal.IdentityPool; import org.tmatesoft.hg.internal.RevlogStream; import org.tmatesoft.hg.util.CancelSupport; import org.tmatesoft.hg.util.Path; @@ -436,8 +436,8 @@ private static class ManifestParser implements RevlogStream.Inspector, Lifecycle { private final Inspector inspector; - private Pool2<Nodeid> nodeidPool, thisRevPool; - private final Pool2<PathProxy> fnamePool; + private IdentityPool<Nodeid> nodeidPool, thisRevPool; + private final IdentityPool<PathProxy> fnamePool; private byte[] nodeidLookupBuffer = new byte[20]; // get reassigned each time new Nodeid is added to pool private final ProgressSupport progressHelper; private IterateControlMediator iterateControl; @@ -447,9 +447,9 @@ assert delegate != null; inspector = delegate; encHelper = eh; - nodeidPool = new Pool2<Nodeid>(); - fnamePool = new Pool2<PathProxy>(); - thisRevPool = new Pool2<Nodeid>(); + nodeidPool = new IdentityPool<Nodeid>(); + fnamePool = new IdentityPool<PathProxy>(); + thisRevPool = new IdentityPool<Nodeid>(); progressHelper = ProgressSupport.Factory.get(delegate); } @@ -518,7 +518,7 @@ // (next manifest is likely to refer to most of them, although in specific cases // like commit in another branch a lot may be useless) nodeidPool.clear(); - Pool2<Nodeid> t = nodeidPool; + IdentityPool<Nodeid> t = nodeidPool; nodeidPool = thisRevPool; thisRevPool = t; iterateControl.checkCancelled();