diff options
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java index ec21954aa2..2f472b5c0a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java @@ -18,6 +18,7 @@ import static org.eclipse.jgit.diff.DiffEntry.ChangeType.MODIFY; import static org.eclipse.jgit.diff.DiffEntry.ChangeType.RENAME; import static org.eclipse.jgit.diff.DiffEntry.Side.NEW; import static org.eclipse.jgit.diff.DiffEntry.Side.OLD; +import static org.eclipse.jgit.lib.Constants.OBJECT_ID_ABBREV_STRING_LENGTH; import static org.eclipse.jgit.lib.Constants.encode; import static org.eclipse.jgit.lib.Constants.encodeASCII; import static org.eclipse.jgit.lib.FileMode.GITLINK; @@ -29,12 +30,12 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import org.eclipse.jgit.api.errors.CanceledException; import org.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm; import org.eclipse.jgit.diff.DiffEntry.ChangeType; import org.eclipse.jgit.dircache.DirCacheIterator; import org.eclipse.jgit.errors.AmbiguousObjectException; import org.eclipse.jgit.errors.BinaryBlobException; -import org.eclipse.jgit.errors.CancelledException; import org.eclipse.jgit.errors.CorruptObjectException; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; @@ -90,7 +91,7 @@ public class DiffFormatter implements AutoCloseable { private int context = 3; - private int abbreviationLength = 7; + private int abbreviationLength = OBJECT_ID_ABBREV_STRING_LENGTH; private DiffAlgorithm diffAlgorithm; @@ -578,7 +579,7 @@ public class DiffFormatter implements AutoCloseable { renameDetector.addAll(files); try { return renameDetector.compute(reader, progressMonitor); - } catch (CancelledException e) { + } catch (CanceledException e) { // TODO: consider propagating once bug 536323 is tackled // (making DiffEntry.scan() and DiffFormatter.scan() and // format() cancellable). @@ -776,6 +777,7 @@ public class DiffFormatter implements AutoCloseable { * @param b * the text B which was compared * @throws java.io.IOException + * if an IO error occurred */ public void format(EditList edits, RawText a, RawText b) throws IOException { @@ -824,6 +826,7 @@ public class DiffFormatter implements AutoCloseable { * @param line * the line number within text * @throws java.io.IOException + * if an IO error occurred */ protected void writeContextLine(RawText text, int line) throws IOException { @@ -842,6 +845,7 @@ public class DiffFormatter implements AutoCloseable { * @param line * the line number within text * @throws java.io.IOException + * if an IO error occurred */ protected void writeAddedLine(RawText text, int line) throws IOException { @@ -856,6 +860,7 @@ public class DiffFormatter implements AutoCloseable { * @param line * the line number within text * @throws java.io.IOException + * if an IO error occurred */ protected void writeRemovedLine(RawText text, int line) throws IOException { @@ -874,6 +879,7 @@ public class DiffFormatter implements AutoCloseable { * @param bEndLine * within second source * @throws java.io.IOException + * if an IO error occurred */ protected void writeHunkHeader(int aStartLine, int aEndLine, int bStartLine, int bEndLine) throws IOException { |