From 9a3d6d33cb3fb6d58e922ac53e72a72682d55333 Mon Sep 17 00:00:00 2001 From: David Gageot Date: Tue, 17 Jul 2012 21:34:41 +0200 Subject: [PATCH] Fix Indentation violations --- .../plugins/core/sensors/AlertUtils.java | 22 +++++++++---------- .../design/ui/libraries/client/Library.java | 4 +--- .../org/sonar/colorizer/GroovyKeywords.java | 7 +++--- .../org/sonar/colorizer/JavaKeywords.java | 15 +++++++------ .../charts/deprecated/CustomBarRenderer.java | 7 +++--- 5 files changed, 27 insertions(+), 28 deletions(-) diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AlertUtils.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AlertUtils.java index bd1fee2b1e7..9fe246f5fdf 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AlertUtils.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AlertUtils.java @@ -63,25 +63,23 @@ public final class AlertUtils { int comparison = metricValue.compareTo(criteriaValue); return !(// NOSONAR complexity of this boolean expression is under control - (alert.isNotEqualsOperator() && comparison == 0) || - (alert.isGreaterOperator() && comparison != 1) || - (alert.isSmallerOperator() && comparison != -1) || - (alert.isEqualsOperator() && comparison != 0) - ); + (alert.isNotEqualsOperator() && comparison == 0) + || (alert.isGreaterOperator() && comparison != 1) + || (alert.isSmallerOperator() && comparison != -1) + || (alert.isEqualsOperator() && comparison != 0)); } - private static Comparable getValueForComparison(Metric metric, String value) { if (metric.getType() == Metric.ValueType.FLOAT || - metric.getType() == Metric.ValueType.PERCENT) { + metric.getType() == Metric.ValueType.PERCENT) { return Double.parseDouble(value); } if (metric.getType() == Metric.ValueType.INT || - metric.getType() == Metric.ValueType.MILLISEC) { + metric.getType() == Metric.ValueType.MILLISEC) { return value.contains(".") ? Integer.parseInt(value.substring(0, value.indexOf('.'))) : Integer.parseInt(value); } if (metric.getType() == Metric.ValueType.STRING || - metric.getType() == Metric.ValueType.LEVEL) { + metric.getType() == Metric.ValueType.LEVEL) { return value; } if (metric.getType() == Metric.ValueType.BOOL) { @@ -95,15 +93,15 @@ public final class AlertUtils { private static Comparable getMeasureValue(Metric metric, Measure measure) { if (metric.getType() == Metric.ValueType.FLOAT || - metric.getType() == Metric.ValueType.PERCENT) { + metric.getType() == Metric.ValueType.PERCENT) { return measure.getValue(); } if (metric.getType() == Metric.ValueType.INT || - metric.getType() == Metric.ValueType.MILLISEC) { + metric.getType() == Metric.ValueType.MILLISEC) { return measure.getValue().intValue(); } if (metric.getType() == Metric.ValueType.STRING || - metric.getType() == Metric.ValueType.LEVEL) { + metric.getType() == Metric.ValueType.LEVEL) { return measure.getData(); } if (metric.getType() == Metric.ValueType.BOOL) { diff --git a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/libraries/client/Library.java b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/libraries/client/Library.java index c81ae7d2c61..e8cbb3746eb 100644 --- a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/libraries/client/Library.java +++ b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/libraries/client/Library.java @@ -47,7 +47,6 @@ public class Library extends TreeItem { return text.toUpperCase(); } - /** * @param keyword upper-case keyword */ @@ -74,7 +73,6 @@ public class Library extends TreeItem { return html; } - public boolean filter(String keyword, boolean testFiltered) { if (testFiltered && "test".equals(usage)) { setVisible(false); @@ -88,7 +86,7 @@ public class Library extends TreeItem { boolean hasVisibleChild = false; for (int index = 0; index < getChildCount(); index++) { - hasVisibleChild |= !((Library) getChild(index)).filter(keyword, testFiltered); + hasVisibleChild |= !((Library) getChild(index)).filter(keyword, testFiltered); } boolean visible = !filtered || hasVisibleChild; diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/GroovyKeywords.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/GroovyKeywords.java index d22f0c06a22..e12f8558dfd 100644 --- a/sonar-colorizer/src/main/java/org/sonar/colorizer/GroovyKeywords.java +++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/GroovyKeywords.java @@ -27,9 +27,10 @@ public final class GroovyKeywords { private static final Set KEYWORDS = new HashSet(); - private static final String[] GROOVY_KEYWORDS = new String[]{"as", "assert", "break", "case", "catch", "class", "continue", "def", - "default", "do", "else", "extends", "finally", "for", "if", "in", "implements", "import", "instanceof", "interface", "new", "package", - "property", "return", "switch", "throw", "throws", "try", "while"}; + private static final String[] GROOVY_KEYWORDS = { + "as", "assert", "break", "case", "catch", "class", "continue", "def", + "default", "do", "else", "extends", "finally", "for", "if", "in", "implements", "import", "instanceof", "interface", "new", "package", + "property", "return", "switch", "throw", "throws", "try", "while"}; static { Collections.addAll(KEYWORDS, GROOVY_KEYWORDS); diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaKeywords.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaKeywords.java index a9f00b5f1cd..3057db57679 100644 --- a/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaKeywords.java +++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/JavaKeywords.java @@ -27,13 +27,14 @@ public final class JavaKeywords { private static final Set KEYWORDS = new HashSet(); - private static final String[] JAVA_KEYWORDS = new String[]{"abstract", "assert", "boolean", "break", "byte", "case", "catch", "char", - "class", "const", "continue", "default", - "do", "double", "else", "enum", "extends", "false", "final", "finally", "float", "for", - "goto", "if", "implements", "import", "instanceof", - "int", "interface", "long", "native", "new", "null", "package", "private", - "protected", "public", "return", "short", "static", "strictfp", - "super", "switch", "synchronized", "this", "throw", "throws", "transient", "true", "try", "void", "volatile", "while"}; + private static final String[] JAVA_KEYWORDS = { + "abstract", "assert", "boolean", "break", "byte", "case", "catch", "char", + "class", "const", "continue", "default", + "do", "double", "else", "enum", "extends", "false", "final", "finally", "float", "for", + "goto", "if", "implements", "import", "instanceof", + "int", "interface", "long", "native", "new", "null", "package", "private", + "protected", "public", "return", "short", "static", "strictfp", + "super", "switch", "synchronized", "this", "throw", "throws", "transient", "true", "try", "void", "volatile", "while"}; static { Collections.addAll(KEYWORDS, JAVA_KEYWORDS); diff --git a/sonar-server/src/main/java/org/sonar/server/charts/deprecated/CustomBarRenderer.java b/sonar-server/src/main/java/org/sonar/server/charts/deprecated/CustomBarRenderer.java index a421a05ef3f..4241b343238 100644 --- a/sonar-server/src/main/java/org/sonar/server/charts/deprecated/CustomBarRenderer.java +++ b/sonar-server/src/main/java/org/sonar/server/charts/deprecated/CustomBarRenderer.java @@ -25,9 +25,10 @@ import java.awt.*; public class CustomBarRenderer extends BarRenderer { - public static final Paint[] COLORS = new Paint[]{Color.red, Color.blue, Color.green, - Color.yellow, Color.orange, Color.cyan, - Color.magenta, Color.blue}; + public static final Paint[] COLORS = { + Color.red, Color.blue, Color.green, + Color.yellow, Color.orange, Color.cyan, + Color.magenta, Color.blue}; /** * The colors. -- 2.39.5