PatchApplier: missing @since, and minor formatting
Change-Id: I561ca2f522579571b29d3e6f35f24e201d1c1663 Signed-off-by: Thomas Wolf <twolf@apache.org>
This commit is contained in:
parent
a7f8f66523
commit
d33b9ab5d3
|
@ -152,13 +152,16 @@ public static class Result {
|
||||||
/**
|
/**
|
||||||
* A wrapper for a patch applying error that affects a given file.
|
* A wrapper for a patch applying error that affects a given file.
|
||||||
*
|
*
|
||||||
|
* @since 6.6
|
||||||
*/
|
*/
|
||||||
public static class Error {
|
public static class Error {
|
||||||
|
|
||||||
private String msg;
|
private String msg;
|
||||||
private String oldFileName;
|
private String oldFileName;
|
||||||
private @Nullable HunkHeader hh;
|
private @Nullable HunkHeader hh;
|
||||||
|
|
||||||
private Error(String msg,String oldFileName, @Nullable HunkHeader hh) {
|
private Error(String msg, String oldFileName,
|
||||||
|
@Nullable HunkHeader hh) {
|
||||||
this.msg = msg;
|
this.msg = msg;
|
||||||
this.oldFileName = oldFileName;
|
this.oldFileName = oldFileName;
|
||||||
this.hh = hh;
|
this.hh = hh;
|
||||||
|
@ -166,7 +169,7 @@ private Error(String msg,String oldFileName, @Nullable HunkHeader hh) {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
if(hh != null) {
|
if (hh != null) {
|
||||||
return MessageFormat.format(JGitText.get().patchApplyErrorWithHunk,
|
return MessageFormat.format(JGitText.get().patchApplyErrorWithHunk,
|
||||||
oldFileName, hh, msg);
|
oldFileName, hh, msg);
|
||||||
}
|
}
|
||||||
|
@ -198,6 +201,8 @@ public ObjectId getTreeId() {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Errors occurred while applying the patch.
|
* @return Errors occurred while applying the patch.
|
||||||
|
*
|
||||||
|
* @since 6.6
|
||||||
*/
|
*/
|
||||||
public List<Error> getErrors() {
|
public List<Error> getErrors() {
|
||||||
return errors;
|
return errors;
|
||||||
|
@ -241,6 +246,7 @@ public Result applyPatch(InputStream patchInput)
|
||||||
* the patch to apply.
|
* the patch to apply.
|
||||||
* @return the result of the patch
|
* @return the result of the patch
|
||||||
* @throws IOException
|
* @throws IOException
|
||||||
|
* @since 6.6
|
||||||
*/
|
*/
|
||||||
public Result applyPatch(Patch p) throws IOException {
|
public Result applyPatch(Patch p) throws IOException {
|
||||||
Result result = new Result();
|
Result result = new Result();
|
||||||
|
|
Loading…
Reference in New Issue