SONAR-1643 move core widgets from sonar-server to sonar-core-plugin + improve UI

2 files changed, 19 insertions, 2 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/SquidUtils.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/SquidUtils.java
index d0ced27f6d9..e101640a6ee 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/SquidUtils.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/SquidUtils.java
@@ -19,6 +19,7 @@
  */
 package org.sonar.api.batch;
 
+import org.apache.commons.lang.StringUtils;
 import org.sonar.api.resources.JavaFile;
 import org.sonar.api.resources.JavaPackage;
 
@@ -49,4 +50,14 @@ public final class SquidUtils {
     String convertedKey = key.replace('/', '.');
     return new JavaPackage(convertedKey);
   }
+
+  public static String convertToSquidKeyFormat(JavaFile file) {
+    String key = file.getKey();
+    if (file.getParent()==null || file.getParent().isDefault()) {
+      key = StringUtils.substringAfterLast(file.getKey(), ".");
+    } else {
+      key = StringUtils.replace(key, ".", "/");
+    }
+    return  key + ".java";
+  }
 }
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/batch/SquidUtilsTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/batch/SquidUtilsTest.java
index e8888e54671..3b9d1a6ab6b 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/batch/SquidUtilsTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/batch/SquidUtilsTest.java
@@ -23,7 +23,9 @@ import org.junit.Test;
 import org.sonar.api.resources.JavaFile;
 import org.sonar.api.resources.JavaPackage;
 
+import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
 
 public class SquidUtilsTest {
 
@@ -36,11 +38,15 @@ public class SquidUtilsTest {
   }
 
   @Test
-  public void convertJavaPackageKeyFromSquidFormat() {
+  public void shouldConvertJavaPackageKeyFromSquidFormat() {
     assertEquals(new JavaPackage("java.lang"), SquidUtils.convertJavaPackageKeyFromSquidFormat("java/lang"));
     assertEquals(new JavaPackage(""), SquidUtils.convertJavaPackageKeyFromSquidFormat(""));
     assertEquals(new JavaPackage("singlepackage"), SquidUtils.convertJavaPackageKeyFromSquidFormat("singlepackage"));
   }
 
-
+  @Test
+  public void shouldConvertToSquidKeyFormat() {
+    assertThat(SquidUtils.convertToSquidKeyFormat(new JavaFile("com.foo.Bar")), is("com/foo/Bar.java"));
+    assertThat(SquidUtils.convertToSquidKeyFormat(new JavaFile("Bar")), is("Bar.java"));
+  }
 }
\ No newline at end of file