motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Correct CommitBuilder, TagBuilder method to be build()"

This commit is contained in:
Matthias Sohn 2010-12-05 08:19:58 -05:00 committed by Code Review
parent 40c2f68382 f996fb1796
commit c474813b0a
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevCommitParseTest.java
View File

@ -338,7 +338,7 @@ public void testParse_PublicParseMethod()
src.setCommitter(committer);
src.setMessage("Test commit\n\nThis is a test.\n");
RevCommit p = RevCommit.parse(src.format());
RevCommit p = RevCommit.parse(src.build());
assertEquals(src.getTreeId(), p.getTree());
assertEquals(0, p.getParentCount());
assertEquals(author, p.getAuthorIdent());

2
org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevTagParseTest.java
View File

@ -407,7 +407,7 @@ public void testParse_PublicParseMethod() throws CorruptObjectException {
src.setTag("a.test");
src.setMessage("Test tag\n\nThis is a test.\n");
RevTag p = RevTag.parse(src.format());
RevTag p = RevTag.parse(src.build());
assertEquals(src.getObjectId(), p.getObject());
assertEquals(committer, p.getTaggerIdent());
assertEquals("a.test", p.getTagName());

6
org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitBuilder.java
View File

@ -288,8 +288,8 @@ public Charset getEncoding() {
* the encoding specified by {@link #getEncoding()} is not
* supported by this Java runtime.
*/
public byte[] format() throws UnsupportedEncodingException {
return format(new ObjectInserter.Formatter());
public byte[] build() throws UnsupportedEncodingException {
return build(new ObjectInserter.Formatter());
}
/**
@ -308,7 +308,7 @@ public byte[] format() throws UnsupportedEncodingException {
* the encoding specified by {@link #getEncoding()} is not
* supported by this Java runtime.
*/
public byte[] format(ObjectInserter oi) throws UnsupportedEncodingException {
public byte[] build(ObjectInserter oi) throws UnsupportedEncodingException {
ByteArrayOutputStream os = new ByteArrayOutputStream();
OutputStreamWriter w = new OutputStreamWriter(os, getEncoding());
try {

4
org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectInserter.java
View File

@ -189,7 +189,7 @@ public ObjectId idFor(int objectType, long length, InputStream in)
* the object could not be stored.
*/
public final ObjectId insert(CommitBuilder builder) throws IOException {
return insert(Constants.OBJ_COMMIT, builder.format(this));
return insert(Constants.OBJ_COMMIT, builder.build(this));
}
/**
@ -205,7 +205,7 @@ public final ObjectId insert(CommitBuilder builder) throws IOException {
* the object could not be stored.
*/
public final ObjectId insert(TagBuilder builder) throws IOException {
return insert(Constants.OBJ_TAG, builder.format(this));
return insert(Constants.OBJ_TAG, builder.build(this));
}
/**

6
org.eclipse.jgit/src/org/eclipse/jgit/lib/TagBuilder.java
View File

@ -182,8 +182,8 @@ public void setMessage(final String newMessage) {
* @return this object in the canonical annotated tag format, suitable for
* storage in a repository.
*/
public byte[] format() {
return format(new ObjectInserter.Formatter());
public byte[] build() {
return build(new ObjectInserter.Formatter());
}
/**
@ -199,7 +199,7 @@ public byte[] format() {
* @return this object in the canonical annotated tag format, suitable for
* storage in a repository.
*/
public byte[] format(ObjectInserter oi) {
public byte[] build(ObjectInserter oi) {
ByteArrayOutputStream os = new ByteArrayOutputStream();
OutputStreamWriter w = new OutputStreamWriter(os, Constants.CHARSET);
try {