Robin RosenbergI thought the previous batch was the last 'safe' one, but this one proably is too as it only adds display of tags and branch to the history view and no user accessible modifying codde.
In order to do that I had to teach the core more about funny tags and packed refs.
-- robin
Robin Rosenberg[PATCH] Implement simple tags
This is just a reference in <gitdir>/refs/tags with the SHA-1 of the tagged object.
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> --- .../src/org/spearce/jgit/lib/Repository.java | 14 +++++++------- org.spearce.jgit/src/org/spearce/jgit/lib/Tag.java | 20 ++++++++++++++++---- .../tst/org/spearce/jgit/lib/T0003_Basic.java | 13 +++++++++++++ 3 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java b/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java index 482f41d..76191be 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java @@ -262,17 +262,17 @@ public class Repository { public Tag mapTag(String revstr) throws IOException { final ObjectId id = resolve(revstr); - return id != null ? mapTag(id) : null; + return id != null ? mapTag(revstr, id) : null; } - public Tag mapTag(final ObjectId id) throws IOException { + public Tag mapTag(final String refName, final ObjectId id) throws IOException { final ObjectLoader or = openObject(id); if (or == null) return null; final byte[] raw = or.getBytes(); if (Constants.TYPE_TAG.equals(or.getType())) - return new Tag(this, id, raw); - throw new IncorrectObjectTypeException(id, Constants.TYPE_TAG); + return new Tag(this, id, refName, raw); + return new Tag(this, id, refName, null); } public RefLock lockRef(final String ref) throws IOException { @@ -469,7 +469,7 @@ public class Repository { return listFilesRecursively(new File(refsDir, "heads"), null); } - public Collection getTags() { + public Collection<String> getTags() { return listFilesRecursively(new File(refsDir, "tags"), null); } @@ -535,10 +535,10 @@ public class Repository { return ret; } - private Collection listFilesRecursively(File root, File start) { + private Collection<String> listFilesRecursively(File root, File start) { if (start == null) start = root; - Collection ret = new ArrayList(); + Collection<String> ret = new ArrayList(); File[] files = start.listFiles(); for (int i = 0; i < files.length; ++i) { if (files[i].isDirectory()) diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/Tag.java b/org.spearce.jgit/src/org/spearce/jgit/lib/Tag.java index 877c440..d5c6b54 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/lib/Tag.java +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/Tag.java @@ -44,10 +44,16 @@ public class Tag { objdb = db; } - public Tag(final Repository db, final ObjectId id, final byte[] raw) { + public Tag(final Repository db, final ObjectId id, String refName, final byte[] raw) { objdb = db; - tagId = id; - objId = ObjectId.fromString(raw, 7); + if (raw != null) { + tagId = id; + objId = ObjectId.fromString(raw, 7); + } else + objId = id; + if (refName.startsWith("refs/tags/")) + refName = refName.substring(10); + tag = refName; this.raw = raw; } @@ -119,7 +125,13 @@ public class Tag { public void tag() throws IOException { if (getTagId() != null) throw new IllegalStateException("exists " + getTagId()); - setTagId(new ObjectWriter(objdb).writeTag(this)); + if (tagger!=null || message!=null || type!=null) { + ObjectId tagid = new ObjectWriter(objdb).writeTag(this); + setTagId(tagid); + objdb.writeRef("refs/heads/"+getTag(),tagid); + } else { + objdb.writeRef("refs/heads/"+getTag(),objId); + } } public String toString() { diff --git a/org.spearce.jgit/tst/org/spearce/jgit/lib/T0003_Basic.java b/org.spearce.jgit/tst/org/spearce/jgit/lib/T0003_Basic.java index 0302a45..115e391 100644 --- a/org.spearce.jgit/tst/org/spearce/jgit/lib/T0003_Basic.java +++ b/org.spearce.jgit/tst/org/spearce/jgit/lib/T0003_Basic.java @@ -338,6 +338,19 @@ public class T0003_Basic extends RepositoryTestCase { assertEquals("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391", mapTag.getObjId().toString()); } + public void test020b_createBlobPlainTag() throws IOException { + test020_createBlobTag(); + Tag t = new Tag(db); + t.setTag("test020b"); + t.setObjId(new ObjectId("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391")); + t.tag(); + + Tag mapTag = db.mapTag("test020b"); + assertEquals("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391", mapTag.getObjId().toString()); + + // We do not repeat the plain tag test for other object types + } + public void test021_createTreeTag() throws IOException { final ObjectId emptyId = new ObjectWriter(db).writeBlob(new byte[0]); final Tree almostEmptyTree = new Tree(db);
-- 1.5.1.1
Robin Rosenberg[PATCH] Write refs when creating tags
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> --- org.spearce.jgit/src/org/spearce/jgit/lib/Tag.java | 4 ++-- .../tst/org/spearce/jgit/lib/T0003_Basic.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/Tag.java b/org.spearce.jgit/src/org/spearce/jgit/lib/Tag.java index d5c6b54..d2a1b2b 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/lib/Tag.java +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/Tag.java @@ -128,9 +128,9 @@ public class Tag { if (tagger!=null || message!=null || type!=null) { ObjectId tagid = new ObjectWriter(objdb).writeTag(this); setTagId(tagid); - objdb.writeRef("refs/heads/"+getTag(),tagid); + objdb.writeRef("refs/tags/"+getTag(),tagid); } else { - objdb.writeRef("refs/heads/"+getTag(),objId); + objdb.writeRef("refs/tags/"+getTag(),objId); } } diff --git a/org.spearce.jgit/tst/org/spearce/jgit/lib/T0003_Basic.java b/org.spearce.jgit/tst/org/spearce/jgit/lib/T0003_Basic.java index 115e391..2f76907 100644 --- a/org.spearce.jgit/tst/org/spearce/jgit/lib/T0003_Basic.java +++ b/org.spearce.jgit/tst/org/spearce/jgit/lib/T0003_Basic.java @@ -331,7 +331,7 @@ public class T0003_Basic extends RepositoryTestCase { t.tag(); assertEquals("6759556b09fbb4fd8ae5e315134481cc25d46954", t.getTagId().toString()); - Tag mapTag = db.mapTag("6759556b09fbb4fd8ae5e315134481cc25d46954"); + Tag mapTag = db.mapTag("test020"); assertEquals("blob", mapTag.getType()); assertEquals("test020 tagged\n", mapTag.getMessage()); assertEquals(new PersonIdent(jauthor, 1154236443000L, -4 * 60), mapTag.getAuthor()); @@ -365,7 +365,7 @@ public class T0003_Basic extends RepositoryTestCase { t.tag(); assertEquals("b0517bc8dbe2096b419d42424cd7030733f4abe5", t.getTagId().toString()); - Tag mapTag = db.mapTag("b0517bc8dbe2096b419d42424cd7030733f4abe5"); + Tag mapTag = db.mapTag("test021"); assertEquals("tree", mapTag.getType()); assertEquals("test021 tagged\n", mapTag.getMessage()); assertEquals(new PersonIdent(jauthor, 1154236443000L, -4 * 60), mapTag.getAuthor()); @@ -392,7 +392,7 @@ public class T0003_Basic extends RepositoryTestCase { t.tag(); assertEquals("0ce2ebdb36076ef0b38adbe077a07d43b43e3807", t.getTagId().toString()); - Tag mapTag = db.mapTag("0ce2ebdb36076ef0b38adbe077a07d43b43e3807"); + Tag mapTag = db.mapTag("test022"); assertEquals("commit", mapTag.getType()); assertEquals("test022 tagged\n", mapTag.getMessage()); assertEquals(new PersonIdent(jauthor, 1154236443000L, -4 * 60), mapTag.getAuthor());
-- 1.5.1.1
Robin Rosenberg[PATCH] Implement packed refs
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> --- .../src/org/spearce/jgit/lib/Repository.java | 48 +++++++++++++++++++- .../tst/org/spearce/jgit/lib/T0003_Basic.java | 44 ++++++++++++++++++ 2 files changed, 91 insertions(+), 1 deletions(-)
diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java b/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java index 76191be..3b2a82c 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java @@ -399,6 +399,7 @@ public class Repository { private Ref readRef(final String revstr, final boolean missingOk) throws IOException { + refreshPackredRefsCache(); for (int k = 0; k < refSearchPaths.length; k++) { final Ref r = readRefBasic(refSearchPaths[k] + revstr); if (missingOk || r.getObjectId() != null) { @@ -411,6 +412,10 @@ public class Repository { private Ref readRefBasic(String name) throws IOException { int depth = 0; REF_READING: do { + ObjectId id = packedRefs.get(name); + if (id != null) + return new Ref(null, id); + final File f = new File(getDirectory(), name); if (!f.isFile()) { return new Ref(f, null); @@ -470,7 +475,43 @@ public class Repository { } public Collection<String> getTags() { - return listFilesRecursively(new File(refsDir, "tags"), null); + Collection<String> tags = listFilesRecursively(new File(refsDir, "tags"), null); + refreshPackredRefsCache(); + tags.addAll(packedRefs.keySet()); + return tags; + } + + private Map<String,ObjectId> packedRefs = new HashMap<String,ObjectId>(); + private long packedrefstime = 0; + + private void refreshPackredRefsCache() { + File file = new File(gitDir, "packed-refs"); + if (!file.exists()) { + if (packedRefs.size() > 0) + packedRefs = new HashMap(); + return; + } + if (file.lastModified() == packedrefstime) + return; + Map newPackedRefs = new HashMap(); + try { + BufferedReader b=new BufferedReader(new FileReader(file)); + String p; + while ((p = b.readLine()) != null) { + if (p.charAt(0) == '#') + continue; + if (p.charAt(0) == '^') { + continue; + } + int spos = p.indexOf(' '); + ObjectId id = new ObjectId(p.substring(0,spos)); + String name = p.substring(spos+1); + newPackedRefs.put(name, id); + } + } catch (IOException e) { + e.printStackTrace(); + } + packedRefs = newPackedRefs; } /** @@ -551,4 +592,9 @@ public class Repository { } return ret; } + + /** Clean up stale caches */ + public void refreshFromDisk() { + packedRefs = null; + } } diff --git a/org.spearce.jgit/tst/org/spearce/jgit/lib/T0003_Basic.java b/org.spearce.jgit/tst/org/spearce/jgit/lib/T0003_Basic.java index 2f76907..02ecabf 100644 --- a/org.spearce.jgit/tst/org/spearce/jgit/lib/T0003_Basic.java +++ b/org.spearce.jgit/tst/org/spearce/jgit/lib/T0003_Basic.java @@ -21,6 +21,7 @@ import java.io.FileInputStream; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; +import java.io.PrintWriter; public class T0003_Basic extends RepositoryTestCase { public void test001_Initalize() { @@ -428,4 +429,47 @@ public class T0003_Basic extends RepositoryTestCase { ObjectId cid = new ObjectWriter(db).writeCommit(commit); assertEquals("2979b39d385014b33287054b87f77bcb3ecb5ebf", cid.toString()); } + + public void test025_packedRefs() throws IOException { + test020_createBlobTag(); + test021_createTreeTag(); + test022_createCommitTag(); + + if (!new File(db.getDirectory(),"refs/tags/test020").delete()) throw new Error("Cannot delete unpacked tag"); + if (!new File(db.getDirectory(),"refs/tags/test021").delete()) throw new Error("Cannot delete unpacked tag"); + if (!new File(db.getDirectory(),"refs/tags/test022").delete()) throw new Error("Cannot delete unpacked tag"); + + // We cannot resolve it now, since we have no ref + Tag mapTag20missing = db.mapTag("test020"); + assertNull(mapTag20missing); + + // Construct packed refs file + PrintWriter w = new PrintWriter(new FileWriter(new File(db.getDirectory(), "packed-refs"))); + w.println("# packed-refs with: peeled"); + w.println("6759556b09fbb4fd8ae5e315134481cc25d46954 refs/tags/test020"); + w.println("^e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"); + w.println("b0517bc8dbe2096b419d42424cd7030733f4abe5 refs/tags/test021"); + w.println("^417c01c8795a35b8e835113a85a5c0c1c77f67fb"); + w.println("0ce2ebdb36076ef0b38adbe077a07d43b43e3807 refs/tags/test022"); + w.println("^b5d3b45a96b340441f5abb9080411705c51cc86c"); + w.close(); + + Tag mapTag20 = db.mapTag("test020"); + assertEquals("blob", mapTag20.getType()); + assertEquals("test020 tagged\n", mapTag20.getMessage()); + assertEquals(new PersonIdent(jauthor, 1154236443000L, -4 * 60), mapTag20.getAuthor()); + assertEquals("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391", mapTag20.getObjId().toString()); + + Tag mapTag21 = db.mapTag("test021"); + assertEquals("tree", mapTag21.getType()); + assertEquals("test021 tagged\n", mapTag21.getMessage()); + assertEquals(new PersonIdent(jauthor, 1154236443000L, -4 * 60), mapTag21.getAuthor()); + assertEquals("417c01c8795a35b8e835113a85a5c0c1c77f67fb", mapTag21.getObjId().toString()); + + Tag mapTag22 = db.mapTag("test022"); + assertEquals("commit", mapTag22.getType()); + assertEquals("test022 tagged\n", mapTag22.getMessage()); + assertEquals(new PersonIdent(jauthor, 1154236443000L, -4 * 60), mapTag22.getAuthor()); + assertEquals("b5d3b45a96b340441f5abb9080411705c51cc86c", mapTag22.getObjId().toString()); + } }
-- 1.5.1.1
Robin Rosenberg[PATCH] Show tags in history view
Put some content into the Tags field in the history browser. Besides tags we put matching branch names there too.
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> --- .../src/org/spearce/egit/ui/GitHistoryPage.java | 85 ++++++++++++++++++- .../src/org/spearce/jgit/lib/Repository.java | 2 +- 2 files changed, 81 insertions(+), 6 deletions(-)
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/GitHistoryPage.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/GitHistoryPage.java index e5d92fe..8850405 100644 --- a/org.spearce.egit.ui/src/org/spearce/egit/ui/GitHistoryPage.java +++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/GitHistoryPage.java @@ -18,6 +18,7 @@ package org.spearce.egit.ui; import java.io.IOException; import java.util.Date; +import java.util.HashMap; import java.util.Map; import org.eclipse.compare.CompareConfiguration; @@ -78,6 +79,7 @@ import org.spearce.egit.core.project.RepositoryMapping; import org.spearce.egit.ui.internal.actions.GitCompareRevisionAction; import org.spearce.jgit.lib.Commit; import org.spearce.jgit.lib.ObjectId; +import org.spearce.jgit.lib.Tag; import org.spearce.jgit.lib.Repository.StGitPatch; public class GitHistoryPage extends HistoryPage implements IAdaptable, @@ -145,7 +147,7 @@ public class GitHistoryPage extends HistoryPage implements IAdaptable, if (item != null && item!=lastItem) { IFileRevision rev = (IFileRevision) item.getData(); String commitStr=null; - if (appliedPatches!=null) { + if (rev!=null && appliedPatches!=null) { String id = rev.getContentIdentifier(); if (!id.equals("Workspace")) { StGitPatch patch = (StGitPatch) appliedPatches.get(new ObjectId(id)); @@ -275,8 +277,34 @@ public class GitHistoryPage extends HistoryPage implements IAdaptable, return id + "@.." + rs; } - if (columnIndex == 2) - return ""; // TAGS + if (columnIndex == 2) { + String id = ((IFileRevision)element).getContentIdentifier(); + ObjectId oid = new ObjectId(id); + StringBuilder b=new StringBuilder(); + if (tags != null) { + Tag[] matching = tags.get(oid); + if (matching != null) { + for (Tag t : matching) { + if (b.length() > 0) + b.append(' '); + b.append(t.getTag()); + } + } + } + if (branches != null) { + if (b.length() >0) + b.append('\n'); + String[] matching = branches.get(oid); + if (matching != null) { + for (String t : matching) { + if (b.length() > 0) + b.append(' '); + b.append(t); + } + } + } + return b.toString(); + } if (columnIndex == 3) { Date d = new Date(((IFileRevision) element).getTimestamp()); @@ -352,6 +380,8 @@ public class GitHistoryPage extends HistoryPage implements IAdaptable, } private Map appliedPatches; + private Map<ObjectId,Tag[]> tags; + private Map<ObjectId, String[]> branches; class HistoryRefreshJob extends Job { @@ -373,6 +403,48 @@ public class GitHistoryPage extends HistoryPage implements IAdaptable, // TODO Auto-generated catch block e.printStackTrace(); } + Map<ObjectId,Tag[]> newtags = new HashMap<ObjectId,Tag[]>(); + try { + for (String name : repositoryMapping.getRepository().getTags()) { + Tag t = repositoryMapping.getRepository().mapTag(name); + Tag[] samecommit = newtags.get(t.getObjId()); + if (samecommit==null) { + samecommit = new Tag[] { t }; + } else { + Tag[] n=new Tag[samecommit.length+1]; + for (int j=0; j<samecommit.length; ++j) + n[j] = samecommit[j]; + n[n.length-1] = t; + samecommit = n; + } + newtags.put(t.getObjId(), samecommit); + } + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + Map<ObjectId, String[]> newBranches = new HashMap<ObjectId, String[]>(); + try { + for (String branch : repositoryMapping.getRepository().getBranches()) { + ObjectId id = repositoryMapping.getRepository().resolve("refs/heads/"+branch); + String[] samecommit = newBranches.get(id); + if (samecommit == null) { + samecommit = new String[] { branch }; + } else { + String[] n=new String[samecommit.length + 1]; + for (int j=0; j<samecommit.length; ++j) + n[j] = samecommit[j]; + n[n.length-1] = branch; + samecommit = n; + } + newBranches.put(id, samecommit); + } + branches = newBranches; + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + IFileHistoryProvider fileHistoryProvider = provider .getFileHistoryProvider(); IFileHistory fileHistoryFor = fileHistoryProvider @@ -380,7 +452,9 @@ public class GitHistoryPage extends HistoryPage implements IAdaptable, IFileHistoryProvider.SINGLE_LINE_OF_DESCENT, monitor); fileRevisions = fileHistoryFor.getFileRevisions(); - final Map fnewappliedPatches = newappliedPatches; + final Map fnewappliedPatches = newappliedPatches; + final Map<ObjectId,Tag[]> ftags = newtags; + tree.getDisplay().asyncExec(new Runnable() { public void run() { @@ -389,8 +463,9 @@ public class GitHistoryPage extends HistoryPage implements IAdaptable, tree.setData(fileRevisions); tree.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true)); System.out.println("inputchanged, invoking refresh"); - viewer.refresh(); appliedPatches = fnewappliedPatches; + tags = ftags; + viewer.refresh(); done(Status.OK_STATUS); } diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java b/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java index 3b2a82c..12beb88 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java @@ -470,7 +470,7 @@ public class Repository { return ref; } - public Collection getBranches() { + public Collection<String> getBranches() { return listFilesRecursively(new File(refsDir, "heads"), null); }
-- 1.5.1.1
Shawn O. PearceRe: [PATCH] Implement packed refs
Robin Rosenberg <robin.rosenberg@dewire.com> wrote:
> diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java b/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java
> index 76191be..3b2a82c 100644
> @@ -411,6 +412,10 @@ public class Repository {
> private Ref readRefBasic(String name) throws IOException {
> int depth = 0;
> REF_READING: do {
> + ObjectId id = packedRefs.get(name);
> + if (id != null)
> + return new Ref(null, id);
> +
> final File f = new File(getDirectory(), name);
> if (!f.isFile()) {
> return new Ref(f, null);This is actually backwards. Git checks the loose ref first, and then the packed ref. The reason is so that users can pack all of their refs (git pack-refs --all) and then just create new ref files for those that they change, rather than rewriting the entire packed-refs file over again.
I'm adding a commit after your series to correct this.
> + } catch (IOException e) {
> + e.printStackTrace();
> + }We really should be throwing exceptions back to the caller, especially on things that could indicate corruption or other problems with reading the repository contents.
-- Shawn.
Robin RosenbergRe: [PATCH] Implement packed refs
tisdag 15 maj 2007 skrev Shawn O. Pearce:
> Robin Rosenberg <robin.rosenberg@dewire.com> wrote:
> > diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java b/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java
> > index 76191be..3b2a82c 100644
> > @@ -411,6 +412,10 @@ public class Repository {
> > private Ref readRefBasic(String name) throws IOException {
> > int depth = 0;
> > REF_READING: do {
> > + ObjectId id = packedRefs.get(name);
> > + if (id != null)
> > + return new Ref(null, id);
> > +
> > final File f = new File(getDirectory(), name);
> > if (!f.isFile()) {
> > return new Ref(f, null);
>
> This is actually backwards. Git checks the loose ref first, and
> then the packed ref. The reason is so that users can pack all
> of their refs (git pack-refs --all) and then just create new ref
> files for those that they change, rather than rewriting the entire
> packed-refs file over again.
>
> I'm adding a commit after your series to correct this.Thanks.
> > + } catch (IOException e) {
> > + e.printStackTrace();
> > + }
>
> We really should be throwing exceptions back to the caller,
> especially on things that could indicate corruption or other
> problems with reading the repository contents.Well, [looking for something to blame]...
-- robin
Robin Rosenberg[PATCH] Require JDK1.5
This changes project settings to requre Java 5 and also tightens some compiler settings.
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> --- .../.settings/org.eclipse.jdt.core.prefs | 22 ++++++++++--------- .../.settings/org.eclipse.jdt.ui.prefs | 5 +-- .../.settings/org.eclipse.jdt.core.prefs | 22 ++++++++++--------- .../.settings/org.eclipse.jdt.ui.prefs | 5 +-- .../.settings/org.eclipse.jdt.core.prefs | 22 ++++++++++--------- .../.settings/org.eclipse.jdt.ui.prefs | 5 +-- .../.settings/org.eclipse.jdt.core.prefs | 22 ++++++++++--------- .../.settings/org.eclipse.jdt.ui.prefs | 3 +- .../src/org/spearce/jgit/lib/ObjectIdMap.java | 4 +- 9 files changed, 57 insertions(+), 53 deletions(-)
diff --git a/org.spearce.egit.core.test/.settings/org.eclipse.jdt.core.prefs b/org.spearce.egit.core.test/.settings/org.eclipse.jdt.core.prefs index 16fbddc..261f937 100644 --- a/org.spearce.egit.core.test/.settings/org.eclipse.jdt.core.prefs +++ b/org.spearce.egit.core.test/.settings/org.eclipse.jdt.core.prefs @@ -1,16 +1,16 @@ -#Mon Jan 29 20:50:25 EST 2007 +#Wed May 09 00:26:39 CEST 2007 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.autoboxing=warning org.eclipse.jdt.core.compiler.problem.deprecation=warning org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled @@ -24,7 +24,7 @@ org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=error org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled @@ -45,11 +45,13 @@ org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullReference=error org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error +org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled @@ -60,7 +62,7 @@ org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=warning org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled org.eclipse.jdt.core.compiler.problem.unusedImport=error @@ -71,7 +73,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error -org.eclipse.jdt.core.compiler.source=1.4 +org.eclipse.jdt.core.compiler.source=1.5 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/org.spearce.egit.core.test/.settings/org.eclipse.jdt.ui.prefs b/org.spearce.egit.core.test/.settings/org.eclipse.jdt.ui.prefs index 273e64b..709a440 100644 --- a/org.spearce.egit.core.test/.settings/org.eclipse.jdt.ui.prefs +++ b/org.spearce.egit.core.test/.settings/org.eclipse.jdt.ui.prefs @@ -1,8 +1,7 @@ -#Mon Jan 29 20:38:19 EST 2007 +#Wed May 09 00:20:24 CEST 2007 eclipse.preferences.version=1 -formatter_profile=_EGit +formatter_profile=_JGit formatter_settings_version=10 -internal.default.compliance=user org.eclipse.jdt.ui.ignorelowercasenames=true org.eclipse.jdt.ui.importorder=java;javax;org;com; org.eclipse.jdt.ui.ondemandthreshold=99 diff --git a/org.spearce.egit.core/.settings/org.eclipse.jdt.core.prefs b/org.spearce.egit.core/.settings/org.eclipse.jdt.core.prefs index 16fbddc..261f937 100644 --- a/org.spearce.egit.core/.settings/org.eclipse.jdt.core.prefs +++ b/org.spearce.egit.core/.settings/org.eclipse.jdt.core.prefs @@ -1,16 +1,16 @@ -#Mon Jan 29 20:50:25 EST 2007 +#Wed May 09 00:26:39 CEST 2007 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.autoboxing=warning org.eclipse.jdt.core.compiler.problem.deprecation=warning org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled @@ -24,7 +24,7 @@ org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=error org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled @@ -45,11 +45,13 @@ org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullReference=error org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error +org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled @@ -60,7 +62,7 @@ org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=warning org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled org.eclipse.jdt.core.compiler.problem.unusedImport=error @@ -71,7 +73,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error -org.eclipse.jdt.core.compiler.source=1.4 +org.eclipse.jdt.core.compiler.source=1.5 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/org.spearce.egit.core/.settings/org.eclipse.jdt.ui.prefs b/org.spearce.egit.core/.settings/org.eclipse.jdt.ui.prefs index 273e64b..709a440 100644 --- a/org.spearce.egit.core/.settings/org.eclipse.jdt.ui.prefs +++ b/org.spearce.egit.core/.settings/org.eclipse.jdt.ui.prefs @@ -1,8 +1,7 @@ -#Mon Jan 29 20:38:19 EST 2007 +#Wed May 09 00:20:24 CEST 2007 eclipse.preferences.version=1 -formatter_profile=_EGit +formatter_profile=_JGit formatter_settings_version=10 -internal.default.compliance=user org.eclipse.jdt.ui.ignorelowercasenames=true org.eclipse.jdt.ui.importorder=java;javax;org;com; org.eclipse.jdt.ui.ondemandthreshold=99 diff --git a/org.spearce.egit.ui/.settings/org.eclipse.jdt.core.prefs b/org.spearce.egit.ui/.settings/org.eclipse.jdt.core.prefs index 71b6be1..261f937 100644 --- a/org.spearce.egit.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.spearce.egit.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,16 +1,16 @@ -#Mon Jan 29 20:50:36 EST 2007 +#Wed May 09 00:26:39 CEST 2007 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.autoboxing=warning org.eclipse.jdt.core.compiler.problem.deprecation=warning org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled @@ -24,7 +24,7 @@ org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=error org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled @@ -45,11 +45,13 @@ org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullReference=error org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error +org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled @@ -60,7 +62,7 @@ org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=warning org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled org.eclipse.jdt.core.compiler.problem.unusedImport=error @@ -71,7 +73,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error -org.eclipse.jdt.core.compiler.source=1.4 +org.eclipse.jdt.core.compiler.source=1.5 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/org.spearce.egit.ui/.settings/org.eclipse.jdt.ui.prefs b/org.spearce.egit.ui/.settings/org.eclipse.jdt.ui.prefs index e6430e9..709a440 100644 --- a/org.spearce.egit.ui/.settings/org.eclipse.jdt.ui.prefs +++ b/org.spearce.egit.ui/.settings/org.eclipse.jdt.ui.prefs @@ -1,8 +1,7 @@ -#Mon Jan 29 20:38:13 EST 2007 +#Wed May 09 00:20:24 CEST 2007 eclipse.preferences.version=1 -formatter_profile=_EGit +formatter_profile=_JGit formatter_settings_version=10 -internal.default.compliance=user org.eclipse.jdt.ui.ignorelowercasenames=true org.eclipse.jdt.ui.importorder=java;javax;org;com; org.eclipse.jdt.ui.ondemandthreshold=99 diff --git a/org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs b/org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs index bfbc85d..261f937 100644 --- a/org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs +++ b/org.spearce.jgit/.settings/org.eclipse.jdt.core.prefs @@ -1,16 +1,16 @@ -#Mon Jan 29 20:50:45 EST 2007 +#Wed May 09 00:26:39 CEST 2007 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.autoboxing=warning org.eclipse.jdt.core.compiler.problem.deprecation=warning org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled @@ -24,7 +24,7 @@ org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=error org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled @@ -45,11 +45,13 @@ org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullReference=error org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error +org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled @@ -60,7 +62,7 @@ org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=warning org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled org.eclipse.jdt.core.compiler.problem.unusedImport=error @@ -71,7 +73,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error -org.eclipse.jdt.core.compiler.source=1.4 +org.eclipse.jdt.core.compiler.source=1.5 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/org.spearce.jgit/.settings/org.eclipse.jdt.ui.prefs b/org.spearce.jgit/.settings/org.eclipse.jdt.ui.prefs index 126418a..709a440 100644 --- a/org.spearce.jgit/.settings/org.eclipse.jdt.ui.prefs +++ b/org.spearce.jgit/.settings/org.eclipse.jdt.ui.prefs @@ -1,8 +1,7 @@ -#Mon Jan 29 20:38:06 EST 2007 +#Wed May 09 00:20:24 CEST 2007 eclipse.preferences.version=1 formatter_profile=_JGit formatter_settings_version=10 -internal.default.compliance=user org.eclipse.jdt.ui.ignorelowercasenames=true org.eclipse.jdt.ui.importorder=java;javax;org;com; org.eclipse.jdt.ui.ondemandthreshold=99 diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectIdMap.java b/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectIdMap.java index c397a0d..63796fd 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectIdMap.java +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectIdMap.java @@ -50,9 +50,9 @@ public class ObjectIdMap implements Map { public ObjectIdMap(Map sample) { try { - Method m=sample.getClass().getMethod("clone", null); + Method m=sample.getClass().getMethod("clone", (Class[])null); for (int i=0; i<256; ++i) { - level0[i] = (Map)m.invoke(sample, null); + level0[i] = (Map)m.invoke(sample, (Object[])null); } } catch (IllegalAccessException e) { throw new IllegalArgumentException(e);
-- 1.5.1.1
Re: [PATCH] Require JDK1.5
On Mon, 14 May 2007, Robin Rosenberg wrote:
> This changes project settings to requre Java 5 and > also tightens some compiler settings. > > Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> > --- > .../.settings/org.eclipse.jdt.core.prefs | 22 ++++++++++--------- > .../.settings/org.eclipse.jdt.ui.prefs | 5 +-- > .../.settings/org.eclipse.jdt.core.prefs | 22 ++++++++++--------- > .../.settings/org.eclipse.jdt.ui.prefs | 5 +-- > .../.settings/org.eclipse.jdt.core.prefs | 22 ++++++++++--------- > .../.settings/org.eclipse.jdt.ui.prefs | 5 +-- > .../.settings/org.eclipse.jdt.core.prefs | 22 ++++++++++--------- > .../.settings/org.eclipse.jdt.ui.prefs | 3 +- > .../src/org/spearce/jgit/lib/ObjectIdMap.java | 4 +- > 9 files changed, 57 insertions(+), 53 deletions(-)
[snip]
> diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectIdMap.java b/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectIdMap.java
> index c397a0d..63796fd 100644
> --- a/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectIdMap.java
> +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectIdMap.java
> @@ -50,9 +50,9 @@ public class ObjectIdMap implements Map {
>
> public ObjectIdMap(Map sample) {
> try {
> - Method m=sample.getClass().getMethod("clone", null);
> + Method m=sample.getClass().getMethod("clone", (Class[])null);
> for (int i=0; i<256; ++i) {
> - level0[i] = (Map)m.invoke(sample, null);
> + level0[i] = (Map)m.invoke(sample, (Object[])null);
> }
> } catch (IllegalAccessException e) {
> throw new IllegalArgumentException(e);I wonder why one would need changes like this?
These casts are not needed for anything as far as I can see and your IDE should easily tell you what type that parameter is. No?
Thanks,
Grzegorz Kulewski
Re: [PATCH] Require JDK1.5
>> diff --git
>> a/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectIdMap.java
>> b/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectIdMap.java
>> index c397a0d..63796fd 100644
>> --- a/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectIdMap.java
>> +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectIdMap.java
>> @@ -50,9 +50,9 @@ public class ObjectIdMap implements Map {
>>
>> public ObjectIdMap(Map sample) {
>> try {
>> - Method m=sample.getClass().getMethod("clone", null);
>> + Method m=sample.getClass().getMethod("clone",
>> (Class[])null);
>> for (int i=0; i<256; ++i) {
>> - level0[i] = (Map)m.invoke(sample, null);
>> + level0[i] = (Map)m.invoke(sample, (Object[])null);
>> }
>> } catch (IllegalAccessException e) {
>> throw new IllegalArgumentException(e);
>
> I wonder why one would need changes like this?
>
> These casts are not needed for anything as far as I can see and your
> IDE should easily tell you what type that parameter is. No?
>Those are varargs parameters, so when compiling under 1.5 you sometimes have to tell the compiler the difference between passing a varargs array and passing one parameter.
Disclaimer: http://www.peralex.com/disclaimer.html
Robin RosenbergRe: [PATCH] Require JDK1.5
måndag 14 maj 2007 skrev Noel Grandin:
>
> >> diff --git
> >> a/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectIdMap.java
> >> b/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectIdMap.java
> >> index c397a0d..63796fd 100644
> >> --- a/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectIdMap.java
> >> +++ b/org.spearce.jgit/src/org/spearce/jgit/lib/ObjectIdMap.java
> >> @@ -50,9 +50,9 @@ public class ObjectIdMap implements Map {
> >>
> >> public ObjectIdMap(Map sample) {
> >> try {
> >> - Method m=sample.getClass().getMethod("clone", null);
> >> + Method m=sample.getClass().getMethod("clone",
> >> (Class[])null);
> >> for (int i=0; i<256; ++i) {
> >> - level0[i] = (Map)m.invoke(sample, null);
> >> + level0[i] = (Map)m.invoke(sample, (Object[])null);
> >> }
> >> } catch (IllegalAccessException e) {
> >> throw new IllegalArgumentException(e);
> >
> > I wonder why one would need changes like this?
> >
> > These casts are not needed for anything as far as I can see and your
> > IDE should easily tell you what type that parameter is. No?
> >
> Those are varargs parameters, so when compiling under 1.5 you sometimes
> have to tell the compiler the difference between passing a varargs array
> and passing one parameter.The compiler does the right thing by default in this case, but I don't like seeing warnings for code that is perfectly fine, hence the cast.
I noticed I dropped using this class just before sending the previous set of patches, so it isn't really necessary in the current code, but I think I will start using it soon so it can stay.
-- robin
Robin Rosenberg[PATCH] Set required execution enviroment
This is required to be able to export the plugin to jar files, at least using Eclipse 3.3 M7, otherwise the compiler assumes 1.4 syntax and compilation fails.
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> --- org.spearce.egit.core.test/META-INF/MANIFEST.MF | 1 + org.spearce.egit.core/META-INF/MANIFEST.MF | 1 + org.spearce.egit.ui/META-INF/MANIFEST.MF | 1 + org.spearce.jgit/META-INF/MANIFEST.MF | 1 + 4 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/org.spearce.egit.core.test/META-INF/MANIFEST.MF b/org.spearce.egit.core.test/META-INF/MANIFEST.MF index e553c1e..b0f365d 100644 --- a/org.spearce.egit.core.test/META-INF/MANIFEST.MF +++ b/org.spearce.egit.core.test/META-INF/MANIFEST.MF @@ -17,3 +17,4 @@ Import-Package: org.eclipse.core.resources, org.eclipse.jdt.junit, org.eclipse.jdt.launching Export-Package: org.spearce.egit.core.internal.mapping +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/org.spearce.egit.core/META-INF/MANIFEST.MF b/org.spearce.egit.core/META-INF/MANIFEST.MF index e3cfc13..384b87e 100644 --- a/org.spearce.egit.core/META-INF/MANIFEST.MF +++ b/org.spearce.egit.core/META-INF/MANIFEST.MF @@ -17,3 +17,4 @@ Export-Package: org.spearce.egit.core.internal.mapping;x-friends:="org.spearce.e org.spearce.egit.core.op, org.spearce.egit.core.project Eclipse-LazyStart: true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/org.spearce.egit.ui/META-INF/MANIFEST.MF b/org.spearce.egit.ui/META-INF/MANIFEST.MF index 9857e3f..e1dcc12 100644 --- a/org.spearce.egit.ui/META-INF/MANIFEST.MF +++ b/org.spearce.egit.ui/META-INF/MANIFEST.MF @@ -19,3 +19,4 @@ Require-Bundle: org.eclipse.core.runtime, org.spearce.jgit, org.spearce.egit.core Eclipse-LazyStart: true +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/org.spearce.jgit/META-INF/MANIFEST.MF b/org.spearce.jgit/META-INF/MANIFEST.MF index 3f9d29c..c5c0e0a 100644 --- a/org.spearce.jgit/META-INF/MANIFEST.MF +++ b/org.spearce.jgit/META-INF/MANIFEST.MF @@ -9,3 +9,4 @@ Export-Package: org.spearce.jgit.errors, org.spearce.jgit.lib Require-Bundle: org.junit Eclipse-LazyStart: true +Bundle-RequiredExecutionEnvironment: J2SE-1.5
-- 1.5.1.1