From 9441508682b7d7c935dd976e4082cacff4a5efeb Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 19 Dec 2017 11:13:48 +0900 Subject: [PATCH] Fix misspelled class name: EmtpyCommitException -> EmptyCommitException Change-Id: I55196020146f26951988988c14ac9a6f85061ae2 Signed-off-by: David Pursehouse --- .../tst/org/eclipse/jgit/api/CommitCommandTest.java | 6 +++--- .../src/org/eclipse/jgit/api/CommitCommand.java | 4 ++-- ...ommitException.java => EmptyCommitException.java} | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) rename org.eclipse.jgit/src/org/eclipse/jgit/api/errors/{EmtpyCommitException.java => EmptyCommitException.java} (88%) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java index 0dd374933..3a13aa5a4 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java @@ -54,7 +54,7 @@ import java.util.List; import java.util.TimeZone; -import org.eclipse.jgit.api.errors.EmtpyCommitException; +import org.eclipse.jgit.api.errors.EmptyCommitException; import org.eclipse.jgit.api.errors.WrongRepositoryStateException; import org.eclipse.jgit.diff.DiffEntry; import org.eclipse.jgit.dircache.DirCache; @@ -553,8 +553,8 @@ public void commitEmptyCommits() throws Exception { git.commit().setAuthor("New Author", "newauthor@example.org") .setMessage("again no change").setAllowEmpty(false) .call(); - fail("Didn't get the expected EmtpyCommitException"); - } catch (EmtpyCommitException e) { + fail("Didn't get the expected EmptyCommitException"); + } catch (EmptyCommitException e) { // expect this exception } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java index f2572835f..d07532c09 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java @@ -54,7 +54,7 @@ import org.eclipse.jgit.api.errors.AbortedByHookException; import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException; -import org.eclipse.jgit.api.errors.EmtpyCommitException; +import org.eclipse.jgit.api.errors.EmptyCommitException; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.JGitInternalException; import org.eclipse.jgit.api.errors.NoFilepatternException; @@ -238,7 +238,7 @@ public RevCommit call() throws GitAPIException, NoHeadException, RevCommit headCommit = rw.parseCommit(headId); headCommit.getTree(); if (indexTreeId.equals(headCommit.getTree())) { - throw new EmtpyCommitException( + throw new EmptyCommitException( JGitText.get().emptyCommit); } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/EmtpyCommitException.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/EmptyCommitException.java similarity index 88% rename from org.eclipse.jgit/src/org/eclipse/jgit/api/errors/EmtpyCommitException.java rename to org.eclipse.jgit/src/org/eclipse/jgit/api/errors/EmptyCommitException.java index ea0e7183c..87e1a6af9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/EmtpyCommitException.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/EmptyCommitException.java @@ -40,30 +40,30 @@ /** * Exception thrown when a newly created commit does not contain any changes * - * @since 4.2 + * @since 5.0 */ -public class EmtpyCommitException extends GitAPIException { // TODO: Correct spelling of this class name in 5.0 +public class EmptyCommitException extends GitAPIException { private static final long serialVersionUID = 1L; /** - * Constructor for EmtpyCommitException + * Constructor for EmptyCommitException * * @param message * error message * @param cause * a {@link java.lang.Throwable} */ - public EmtpyCommitException(String message, Throwable cause) { + public EmptyCommitException(String message, Throwable cause) { super(message, cause); } /** - * Constructor for EmtpyCommitException. + * Constructor for EmptyCommitException. * * @param message * error message */ - public EmtpyCommitException(String message) { + public EmptyCommitException(String message) { super(message); } }