From 1e3e002055460411b9520f360b816b407e8e8088 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Mon, 23 Jun 2008 22:10:01 -0400 Subject: [PATCH] Rename ObjectEntry to PackedObjectInfo Technically this class contains information about a packed object, data which is necessary to access it or to create the index record to support random access to the object's information. Calling it just ObjectEntry is no longer a very sufficient name. Signed-off-by: Shawn O. Pearce Signed-off-by: Robin Rosenberg --- .../src/org/spearce/jgit/transport/IndexPack.java | 26 +++++++++++----------- .../{ObjectEntry.java => PackedObjectInfo.java} | 4 ++-- 2 files changed, 15 insertions(+), 15 deletions(-) rename org.spearce.jgit/src/org/spearce/jgit/transport/{ObjectEntry.java => PackedObjectInfo.java} (94%) diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/IndexPack.java b/org.spearce.jgit/src/org/spearce/jgit/transport/IndexPack.java index 19a4b7b3..ad4bcae5 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/transport/IndexPack.java +++ b/org.spearce.jgit/src/org/spearce/jgit/transport/IndexPack.java @@ -129,7 +129,7 @@ public class IndexPack { private long objectCount; - private ObjectEntry[] entries; + private PackedObjectInfo[] entries; private int deltaCount; @@ -208,7 +208,7 @@ public class IndexPack { try { readPackHeader(); - entries = new ObjectEntry[(int) objectCount]; + entries = new PackedObjectInfo[(int) objectCount]; baseById = new ObjectIdMap>(); baseByPos = new HashMap>(); @@ -280,14 +280,14 @@ public class IndexPack { progress.endTask(); } - private void resolveDeltas(final ObjectEntry oe) throws IOException { + private void resolveDeltas(final PackedObjectInfo oe) throws IOException { if (baseById.containsKey(oe) || baseByPos.containsKey(new Long(oe.getOffset()))) resolveDeltas(oe.getOffset(), Constants.OBJ_BAD, null, oe); } private void resolveDeltas(final long pos, int type, byte[] data, - ObjectEntry oe) throws IOException { + PackedObjectInfo oe) throws IOException { position(pos); int c = readFromFile(); final int typeCode = (c >> 4) & 7; @@ -331,7 +331,7 @@ public class IndexPack { objectDigest.update((byte) 0); objectDigest.update(data); tempObjectId.fromRaw(objectDigest.digest(), 0); - oe = new ObjectEntry(pos, tempObjectId); + oe = new PackedObjectInfo(pos, tempObjectId); entries[entryCount++] = oe; } @@ -339,7 +339,7 @@ public class IndexPack { } private void resolveChildDeltas(final long pos, int type, byte[] data, - ObjectEntry oe) throws IOException { + PackedObjectInfo oe) throws IOException { final ArrayList a = baseById.remove(oe); final ArrayList b = baseByPos.remove(new Long(pos)); int ai = 0, bi = 0; @@ -374,9 +374,9 @@ public class IndexPack { final ObjectLoader ldr = repo.openObject(baseId); final byte[] data = ldr.getBytes(); final int typeCode = ldr.getType(); - final ObjectEntry oe; + final PackedObjectInfo oe; - oe = new ObjectEntry(end, baseId); + oe = new PackedObjectInfo(end, baseId); entries[entryCount++] = oe; packOut.seek(end); writeWhole(def, typeCode, data); @@ -432,9 +432,9 @@ public class IndexPack { } private void growEntries() { - final ObjectEntry[] ne; + final PackedObjectInfo[] ne; - ne = new ObjectEntry[(int) objectCount + baseById.size()]; + ne = new PackedObjectInfo[(int) objectCount + baseById.size()]; System.arraycopy(entries, 0, ne, 0, entryCount); entries = ne; } @@ -458,7 +458,7 @@ public class IndexPack { d.update(rawoe, 0, 4); } for (int i = 0; i < entryCount; i++) { - final ObjectEntry oe = entries[i]; + final PackedObjectInfo oe = entries[i]; if (oe.getOffset() >>> 1 > Integer.MAX_VALUE) throw new IOException("Pack too large for index version 1"); NB.encodeInt32(rawoe, 0, (int) oe.getOffset()); @@ -578,7 +578,7 @@ public class IndexPack { objectDigest.update((byte) 0); inflateFromInput(true); tempObjectId.fromRaw(objectDigest.digest(), 0); - entries[entryCount++] = new ObjectEntry(pos, tempObjectId); + entries[entryCount++] = new PackedObjectInfo(pos, tempObjectId); } // Current position of {@link #bOffset} within the entire file. @@ -739,7 +739,7 @@ public class IndexPack { final MessageDigest d = Constants.newMessageDigest(); final byte[] oeBytes = new byte[Constants.OBJECT_ID_LENGTH]; for (int i = 0; i < entryCount; i++) { - final ObjectEntry oe = entries[i]; + final PackedObjectInfo oe = entries[i]; oe.copyRawTo(oeBytes, 0); d.update(oeBytes); } diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/ObjectEntry.java b/org.spearce.jgit/src/org/spearce/jgit/transport/PackedObjectInfo.java similarity index 94% rename from org.spearce.jgit/src/org/spearce/jgit/transport/ObjectEntry.java rename to org.spearce.jgit/src/org/spearce/jgit/transport/PackedObjectInfo.java index 10a8f4da..eaedee94 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/transport/ObjectEntry.java +++ b/org.spearce.jgit/src/org/spearce/jgit/transport/PackedObjectInfo.java @@ -41,10 +41,10 @@ package org.spearce.jgit.transport; import org.spearce.jgit.lib.AnyObjectId; import org.spearce.jgit.lib.ObjectId; -class ObjectEntry extends ObjectId { +class PackedObjectInfo extends ObjectId { private long offset; - ObjectEntry(final long headerOffset, final AnyObjectId id) { + PackedObjectInfo(final long headerOffset, final AnyObjectId id) { super(id); offset = headerOffset; } -- 2.11.4.GIT