From 6868445024428519bd3b42dd65646e828ddd8248 Mon Sep 17 00:00:00 2001 From: Godin Date: Thu, 21 Oct 2010 22:56:53 +0000 Subject: [PATCH] SONAR-1772: Minor fixes --- .../java/org/sonar/plugins/findbugs/FindbugsConfiguration.java | 2 +- .../java/org/sonar/plugins/findbugs/FindbugsConstants.java | 1 - .../main/java/org/sonar/plugins/findbugs/FindbugsPlugin.java | 3 ++- .../java/org/sonar/plugins/findbugs/FindbugsExecutorTest.java | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsConfiguration.java b/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsConfiguration.java index 5541701a6e1..3505002353e 100644 --- a/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsConfiguration.java +++ b/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsConfiguration.java @@ -82,6 +82,6 @@ public class FindbugsConfiguration implements BatchExtension { } public long getTimeout() { - return project.getConfiguration().getLong(CoreProperties.FINDBUGS_TIMEOUT_PROPERTY, FindbugsConstants.FINDBUGS_TIMEOUT_DEFAULT_VALUE); + return project.getConfiguration().getLong(CoreProperties.FINDBUGS_TIMEOUT_PROPERTY, CoreProperties.FINDBUGS_TIMEOUT_DEFAULT_VALUE); } } diff --git a/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsConstants.java b/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsConstants.java index 9ca7b8de47a..d9dd6c4cb5f 100644 --- a/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsConstants.java +++ b/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsConstants.java @@ -33,5 +33,4 @@ public final class FindbugsConstants { */ public static final String GENERATE_XML_KEY = "sonar.findbugs.generateXml"; public static final boolean GENERATE_XML_DEFAULT_VALUE = true; // TODO should be false - see SONAR-1880 - public static final long FINDBUGS_TIMEOUT_DEFAULT_VALUE = 600000; } diff --git a/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsPlugin.java b/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsPlugin.java index 6d07e3a961f..e01255a4e2d 100644 --- a/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsPlugin.java +++ b/plugins/sonar-findbugs-plugin/src/main/java/org/sonar/plugins/findbugs/FindbugsPlugin.java @@ -39,7 +39,7 @@ import org.sonar.api.Property; global = true), @Property( key = CoreProperties.FINDBUGS_MAXHEAP_PROPERTY, - defaultValue = CoreProperties.FINDBUGS_MAXHEAP_DEFAULT_VALUE+"", + defaultValue = CoreProperties.FINDBUGS_MAXHEAP_DEFAULT_VALUE + "", name = "Max Heap", description = "Maximum Java heap size in megabytes (default=512).", project = true, @@ -47,6 +47,7 @@ import org.sonar.api.Property; global = true), @Property( key = CoreProperties.FINDBUGS_TIMEOUT_PROPERTY, + defaultValue = CoreProperties.FINDBUGS_TIMEOUT_DEFAULT_VALUE + "", name = "Timeout", description = "Specifies the amount of time, in milliseconds, that FindBugs may run before it is assumed to be hung and is terminated. The default is 600,000 milliseconds, which is ten minutes.", project = true, diff --git a/plugins/sonar-findbugs-plugin/src/test/java/org/sonar/plugins/findbugs/FindbugsExecutorTest.java b/plugins/sonar-findbugs-plugin/src/test/java/org/sonar/plugins/findbugs/FindbugsExecutorTest.java index 68eb3ebac32..e03cde1a667 100644 --- a/plugins/sonar-findbugs-plugin/src/test/java/org/sonar/plugins/findbugs/FindbugsExecutorTest.java +++ b/plugins/sonar-findbugs-plugin/src/test/java/org/sonar/plugins/findbugs/FindbugsExecutorTest.java @@ -8,6 +8,7 @@ import static org.mockito.Mockito.when; import org.apache.commons.io.FileUtils; import org.junit.Test; +import org.sonar.api.CoreProperties; import org.sonar.api.resources.Project; import org.sonar.api.resources.ProjectFileSystem; import org.sonar.api.utils.SonarException; @@ -59,7 +60,7 @@ public class FindbugsExecutorTest { when(conf.saveExcludeConfigXml()).thenReturn(new File("test-resources/findbugs-exclude.xml")); when(conf.saveIncludeConfigXml()).thenReturn(new File("test-resources/findbugs-include.xml")); when(conf.getEffort()).thenReturn("default"); - when(conf.getTimeout()).thenReturn(FindbugsConstants.FINDBUGS_TIMEOUT_DEFAULT_VALUE); + when(conf.getTimeout()).thenReturn(CoreProperties.FINDBUGS_TIMEOUT_DEFAULT_VALUE); return conf; } -- 2.39.5