From 71fba38c4f5cfe22803b3a253e07772a76d9219e Mon Sep 17 00:00:00 2001
From: Godin <mandrikov@gmail.com>
Date: Wed, 20 Oct 2010 11:16:32 +0000
Subject: SONAR-1808: Add CoberturaUtils

---
 .../org/sonar/plugins/cobertura/CoberturaMavenPluginHandler.java | 9 +++------
 .../java/org/sonar/plugins/cobertura/api/CoberturaUtils.java     | 7 +++++--
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'plugins/sonar-cobertura-plugin/src/main/java')

diff --git a/plugins/sonar-cobertura-plugin/src/main/java/org/sonar/plugins/cobertura/CoberturaMavenPluginHandler.java b/plugins/sonar-cobertura-plugin/src/main/java/org/sonar/plugins/cobertura/CoberturaMavenPluginHandler.java
index 0e044eff8ae..8bf085f5325 100644
--- a/plugins/sonar-cobertura-plugin/src/main/java/org/sonar/plugins/cobertura/CoberturaMavenPluginHandler.java
+++ b/plugins/sonar-cobertura-plugin/src/main/java/org/sonar/plugins/cobertura/CoberturaMavenPluginHandler.java
@@ -24,20 +24,17 @@ import org.sonar.api.CoreProperties;
 import org.sonar.api.batch.maven.MavenPlugin;
 import org.sonar.api.batch.maven.MavenPluginHandler;
 import org.sonar.api.batch.maven.MavenSurefireUtils;
-import org.sonar.api.batch.maven.MavenUtils;
 import org.sonar.api.resources.Project;
+import org.sonar.plugins.cobertura.api.CoberturaUtils;
 
 public class CoberturaMavenPluginHandler implements MavenPluginHandler {
 
-  public static final String GROUP_ID = MavenUtils.GROUP_ID_CODEHAUS_MOJO;
-  public static final String ARTIFACT_ID = "cobertura-maven-plugin";
-
   public String getGroupId() {
-    return GROUP_ID;
+    return CoberturaUtils.COBERTURA_GROUP_ID;
   }
 
   public String getArtifactId() {
-    return ARTIFACT_ID;
+    return CoberturaUtils.COBERTURA_ARTIFACT_ID;
   }
 
   public String getVersion() {
diff --git a/plugins/sonar-cobertura-plugin/src/main/java/org/sonar/plugins/cobertura/api/CoberturaUtils.java b/plugins/sonar-cobertura-plugin/src/main/java/org/sonar/plugins/cobertura/api/CoberturaUtils.java
index e8d7cc1bcce..adf4c5bb27d 100644
--- a/plugins/sonar-cobertura-plugin/src/main/java/org/sonar/plugins/cobertura/api/CoberturaUtils.java
+++ b/plugins/sonar-cobertura-plugin/src/main/java/org/sonar/plugins/cobertura/api/CoberturaUtils.java
@@ -2,9 +2,9 @@ package org.sonar.plugins.cobertura.api;
 
 import org.sonar.api.CoreProperties;
 import org.sonar.api.batch.maven.MavenPlugin;
+import org.sonar.api.batch.maven.MavenUtils;
 import org.sonar.api.resources.Project;
 import org.sonar.api.utils.Logs;
-import org.sonar.plugins.cobertura.CoberturaMavenPluginHandler;
 
 import java.io.File;
 
@@ -13,6 +13,9 @@ import java.io.File;
  */
 public final class CoberturaUtils {
 
+  public static String COBERTURA_GROUP_ID = MavenUtils.GROUP_ID_CODEHAUS_MOJO;
+  public static String COBERTURA_ARTIFACT_ID = "cobertura-maven-plugin";
+
   public static File getReport(Project project) {
     File report = getReportFromProperty(project);
     if (report == null) {
@@ -38,7 +41,7 @@ public final class CoberturaUtils {
   }
 
   private static File getReportFromPluginConfiguration(Project project) {
-    MavenPlugin mavenPlugin = MavenPlugin.getPlugin(project.getPom(), CoberturaMavenPluginHandler.GROUP_ID, CoberturaMavenPluginHandler.ARTIFACT_ID);
+    MavenPlugin mavenPlugin = MavenPlugin.getPlugin(project.getPom(), COBERTURA_GROUP_ID, COBERTURA_ARTIFACT_ID);
     if (mavenPlugin != null) {
       String path = mavenPlugin.getParameter("outputDirectory");
       if (path != null) {
-- 
cgit v1.2.3