From 37dc7ea307e00451bdb09ffca55e97b9e1fe20ac Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Fri, 3 Oct 2014 15:19:38 +0200 Subject: Fix some quality flaws --- .../java/org/sonar/plugins/scm/svn/SvnBlameCommand.java | 17 +---------------- .../org/sonar/plugins/scm/svn/SvnBlameConsumer.java | 9 +++------ .../main/java/org/sonar/plugins/scm/svn/SvnPlugin.java | 2 +- 3 files changed, 5 insertions(+), 23 deletions(-) (limited to 'plugins/sonar-svn-plugin') diff --git a/plugins/sonar-svn-plugin/src/main/java/org/sonar/plugins/scm/svn/SvnBlameCommand.java b/plugins/sonar-svn-plugin/src/main/java/org/sonar/plugins/scm/svn/SvnBlameCommand.java index 8f668141c76..4a9f2ba0e27 100644 --- a/plugins/sonar-svn-plugin/src/main/java/org/sonar/plugins/scm/svn/SvnBlameCommand.java +++ b/plugins/sonar-svn-plugin/src/main/java/org/sonar/plugins/scm/svn/SvnBlameCommand.java @@ -29,6 +29,7 @@ import org.sonar.api.batch.scm.BlameCommand; import org.sonar.api.utils.command.Command; import org.sonar.api.utils.command.CommandExecutor; import org.sonar.api.utils.command.StreamConsumer; +import org.sonar.api.utils.command.StringStreamConsumer; import java.io.File; import java.util.ArrayList; @@ -133,20 +134,4 @@ public class SvnBlameCommand implements BlameCommand, BatchComponent { } return cl; } - - private static class StringStreamConsumer implements StreamConsumer { - private StringBuffer string = new StringBuffer(); - - private String ls = System.getProperty("line.separator"); - - @Override - public void consumeLine(String line) { - string.append(line + ls); - } - - public String getOutput() { - return string.toString(); - } - } - } diff --git a/plugins/sonar-svn-plugin/src/main/java/org/sonar/plugins/scm/svn/SvnBlameConsumer.java b/plugins/sonar-svn-plugin/src/main/java/org/sonar/plugins/scm/svn/SvnBlameConsumer.java index b0ca1932fb2..05699981b63 100644 --- a/plugins/sonar-svn-plugin/src/main/java/org/sonar/plugins/scm/svn/SvnBlameConsumer.java +++ b/plugins/sonar-svn-plugin/src/main/java/org/sonar/plugins/scm/svn/SvnBlameConsumer.java @@ -93,14 +93,11 @@ public class SvnBlameConsumer implements StreamConsumer { } String lineNumberStr = matcher.group(1); lineNumber = Integer.parseInt(lineNumberStr); - } - else if ((matcher = REVISION_PATTERN.matcher(line)).find()) { + } else if ((matcher = REVISION_PATTERN.matcher(line)).find()) { revision = matcher.group(1); - } - else if ((matcher = AUTHOR_PATTERN.matcher(line)).find()) { + } else if ((matcher = AUTHOR_PATTERN.matcher(line)).find()) { author = matcher.group(1); - } - else if ((matcher = DATE_PATTERN.matcher(line)).find()) { + } else if ((matcher = DATE_PATTERN.matcher(line)).find()) { String date = matcher.group(1); String time = matcher.group(2); Date dateTime = parseDateTime(date + " " + time); diff --git a/plugins/sonar-svn-plugin/src/main/java/org/sonar/plugins/scm/svn/SvnPlugin.java b/plugins/sonar-svn-plugin/src/main/java/org/sonar/plugins/scm/svn/SvnPlugin.java index bf628688eb7..d8815d8dd60 100644 --- a/plugins/sonar-svn-plugin/src/main/java/org/sonar/plugins/scm/svn/SvnPlugin.java +++ b/plugins/sonar-svn-plugin/src/main/java/org/sonar/plugins/scm/svn/SvnPlugin.java @@ -28,7 +28,7 @@ import java.util.List; public final class SvnPlugin extends SonarPlugin { public List getExtensions() { - ArrayList result = new ArrayList(); + List result = new ArrayList(); result.addAll(ImmutableList.of( SvnScmProvider.class, SvnBlameCommand.class, -- cgit v1.2.3