diff options
| author | Chris Aniszczyk <caniszczyk@gmail.com> | 2010-09-06 22:33:09 -0400 |
|---|---|---|
| committer | Code Review <codereview-daemon@eclipse.org> | 2010-09-06 22:33:09 -0400 |
| commit | 18aadc826dae7c6308c2a6c68d48ab75c8dd9b6d (patch) | |
| tree | dd8507709b654d3cf88adaf90fff68267eb5fca4 | |
| parent | ba984ba2e0a66a82952bca31c9deb5b9053563e8 (diff) | |
| parent | 6938f99ef3338ec51b528800caf561dad30d9cec (diff) | |
| download | jgit-18aadc826dae7c6308c2a6c68d48ab75c8dd9b6d.tar.gz jgit-18aadc826dae7c6308c2a6c68d48ab75c8dd9b6d.zip | |
Merge "Reduce compares in Edit.getType"
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/diff/Edit.java | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/Edit.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/Edit.java index 4a5de57b07..f0c7cdac5f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/Edit.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/Edit.java @@ -121,13 +121,18 @@ public class Edit { /** @return the type of this region */ public final Type getType() { - if (beginA == endA && beginB < endB) - return Type.INSERT; - if (beginA < endA && beginB == endB) - return Type.DELETE; - if (beginA == endA && beginB == endB) - return Type.EMPTY; - return Type.REPLACE; + if (beginA < endA) { + if (beginB < endB) + return Type.REPLACE; + else /* if (beginB == endB) */ + return Type.DELETE; + + } else /* if (beginA == endA) */{ + if (beginB < endB) + return Type.INSERT; + else /* if (beginB == endB) */ + return Type.EMPTY; + } } /** @return true if the edit is empty (lengths of both a and b is zero). */ |