From 9514f0397e651902c0b20e8be69a56e1bdaaa983 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 16 Sep 2011 15:38:40 +0200 Subject: [PATCH] fix wrong line number --- .../sonia/scm/repository/HgBlameViewer.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgBlameViewer.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgBlameViewer.java index fceceed0b2..22b92a5429 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgBlameViewer.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgBlameViewer.java @@ -118,8 +118,7 @@ public class HgBlameViewer implements BlameViewer * @throws IOException */ @Override - public BlameResult getBlame(String revision, String path) - throws IOException + public BlameResult getBlame(String revision, String path) throws IOException { AssertUtil.assertIsNotEmpty(path); @@ -173,15 +172,15 @@ public class HgBlameViewer implements BlameViewer * * @throws IOException */ - private BlameResult parseBlameInput(BufferedReader reader) - throws IOException + private BlameResult parseBlameInput(BufferedReader reader) throws IOException { List blameLines = new ArrayList(); String line = reader.readLine(); + int i = 1; while (line != null) { - BlameLine blameLine = parseBlameLine(line); + BlameLine blameLine = parseBlameLine(i, line); if (blameLine != null) { @@ -189,6 +188,7 @@ public class HgBlameViewer implements BlameViewer } line = reader.readLine(); + i++; } return new BlameResult(blameLines.size(), blameLines); @@ -198,11 +198,13 @@ public class HgBlameViewer implements BlameViewer * Method description * * + * + * @param nr * @param line * * @return */ - private BlameLine parseBlameLine(String line) + private BlameLine parseBlameLine(int nr, String line) { BlameLine blameLine = null; Matcher m = REGEX_FIRSTPART.matcher(line); @@ -214,8 +216,7 @@ public class HgBlameViewer implements BlameViewer // todo parse date Long when = getDate(m.group(3)); - blameLine = new BlameLine(authorPerson, when, m.group(2), m.group(5), - Integer.parseInt(m.group(4))); + blameLine = new BlameLine(authorPerson, when, m.group(2), m.group(5), nr); } else if (logger.isWarnEnabled()) {