From cab01ac39897c39b0b669c04823da607c376c93e Mon Sep 17 00:00:00 2001 From: Evgeny Mandrikov Date: Thu, 3 Nov 2011 12:32:03 +0400 Subject: [PATCH] Fix violations --- .../java/ast/visitor/ComplexityVisitor.java | 4 +-- .../colorizer/JavaAnnotationTokenizer.java | 5 ++- .../sonar/colorizer/KeywordsTokenizer.java | 6 ++-- .../org/sonar/api/utils/WildcardPattern.java | 2 +- .../api/utils/command/CommandExecutor.java | 32 ++++++++----------- 5 files changed, 22 insertions(+), 27 deletions(-) diff --git a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/visitor/ComplexityVisitor.java b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/visitor/ComplexityVisitor.java index 07b9e0b9c18..60aef739ef9 100644 --- a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/visitor/ComplexityVisitor.java +++ b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/ast/visitor/ComplexityVisitor.java @@ -32,7 +32,7 @@ public class ComplexityVisitor extends JavaAstVisitor { @Override public List getWantedTokens() { - return wantedTokens; + return WANTED_TOKENS; } @Override @@ -41,6 +41,6 @@ public class ComplexityVisitor extends JavaAstVisitor { res.setMeasure(Metric.COMPLEXITY, res.getInt(Metric.COMPLEXITY) + res.getInt(Metric.BRANCHES) + 1); } - private static final List wantedTokens = Arrays.asList(TokenTypes.CTOR_DEF, TokenTypes.METHOD_DEF, TokenTypes.INSTANCE_INIT, + private static final List WANTED_TOKENS = Arrays.asList(TokenTypes.CTOR_DEF, TokenTypes.METHOD_DEF, TokenTypes.INSTANCE_INIT, TokenTypes.STATIC_INIT); } diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaAnnotationTokenizer.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaAnnotationTokenizer.java index 554e0613fac..1a5489e75f5 100644 --- a/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaAnnotationTokenizer.java +++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaAnnotationTokenizer.java @@ -32,8 +32,7 @@ public class JavaAnnotationTokenizer extends Tokenizer { this.tagAfter = tagAfter; } - private static final EndMatcher endTokenMatcher = new EndMatcher() { - + private static final EndMatcher END_TOKEN_MATCHER = new EndMatcher() { public boolean match(int endFlag) { return !Character.isJavaIdentifierPart(endFlag); } @@ -43,7 +42,7 @@ public class JavaAnnotationTokenizer extends Tokenizer { public boolean consume(CodeReader code, HtmlCodeBuilder codeBuilder) { if (code.peek() == '@') { codeBuilder.appendWithoutTransforming(tagBefore); - code.popTo(endTokenMatcher, codeBuilder); + code.popTo(END_TOKEN_MATCHER, codeBuilder); codeBuilder.appendWithoutTransforming(tagAfter); return true; } else { diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/KeywordsTokenizer.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/KeywordsTokenizer.java index 3152b41161f..9bf9225461c 100644 --- a/sonar-colorizer/src/main/java/org/sonar/colorizer/KeywordsTokenizer.java +++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/KeywordsTokenizer.java @@ -37,12 +37,12 @@ public class KeywordsTokenizer extends NotThreadSafeTokenizer { private boolean caseInsensitive = false; private Matcher matcher; private final StringBuilder tmpBuilder = new StringBuilder(); - private final static String defaultRegex = "[a-zA-Z_][a-zA-Z0-9_]*+"; + private final static String DEFAULT_REGEX = "[a-zA-Z_][a-zA-Z0-9_]*+"; private Set keywords = new HashSet(); public KeywordsTokenizer(String tagBefore, String tagAfter, Set keywords) { - this(tagBefore, tagAfter, keywords, defaultRegex); + this(tagBefore, tagAfter, keywords, DEFAULT_REGEX); } public KeywordsTokenizer(String tagBefore, String tagAfter, Set keywords, String regex) { @@ -56,7 +56,7 @@ public class KeywordsTokenizer extends NotThreadSafeTokenizer { this.tagBefore = tagBefore; this.tagAfter = tagAfter; Collections.addAll(this.keywords, keywords); - this.matcher = Pattern.compile(defaultRegex).matcher(""); + this.matcher = Pattern.compile(DEFAULT_REGEX).matcher(""); } public boolean consume(CodeReader code, HtmlCodeBuilder codeBuilder) { diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/WildcardPattern.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/WildcardPattern.java index e6bb142a5c2..268111244d4 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/WildcardPattern.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/WildcardPattern.java @@ -53,7 +53,7 @@ import org.apache.commons.lang.StringUtils; *

*

* Another implementation, which is also based on Java Regular Expressions, can be found in - * FileUtil + * FileUtil * from IntelliJ OpenAPI. *

* diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/command/CommandExecutor.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/command/CommandExecutor.java index 1980f870c3d..26c719cddd9 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/command/CommandExecutor.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/command/CommandExecutor.java @@ -86,17 +86,9 @@ public final class CommandExecutor { throw new CommandException(command, e); } finally { - if (outputGobbler != null) { - waitUntilFinish(outputGobbler); - } - - if (errorGobbler != null) { - waitUntilFinish(errorGobbler); - } - - if (process != null) { - closeStreams(process); - } + waitUntilFinish(outputGobbler); + waitUntilFinish(errorGobbler); + closeStreams(process); if (executorService != null) { executorService.shutdown(); @@ -105,16 +97,20 @@ public final class CommandExecutor { } private void closeStreams(Process process) { - IOUtils.closeQuietly(process.getInputStream()); - IOUtils.closeQuietly(process.getOutputStream()); - IOUtils.closeQuietly(process.getErrorStream()); + if (process != null) { + IOUtils.closeQuietly(process.getInputStream()); + IOUtils.closeQuietly(process.getOutputStream()); + IOUtils.closeQuietly(process.getErrorStream()); + } } private void waitUntilFinish(StreamGobbler thread) { - try { - thread.join(); - } catch (InterruptedException e) { - // ignore + if (thread != null) { + try { + thread.join(); + } catch (InterruptedException e) { + // ignore + } } } -- 2.39.5