SONAR-926 Merge Java package and directory concepts. Display full path of resources as name.

1 files changed, 4 insertions, 2 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/JavaFile.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/JavaFile.java
index bb8471c82d5..92c01f93d80 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/JavaFile.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/JavaFile.java
@@ -222,7 +222,8 @@ public class JavaFile extends Resource {
     javaFile.setKey(normalizedPath);
     javaFile.setPath(normalizedPath);
     String directoryKey = StringUtils.substringBeforeLast(normalizedPath, Directory.SEPARATOR);
-    javaFile.parent = JavaPackage.create(directoryKey);
+    javaFile.parent = new Directory();
+    javaFile.parent.setKey(directoryKey);
     return javaFile;
   }
 
@@ -239,14 +240,15 @@ public class JavaFile extends Resource {
       }
       javaFile.fullyQualifiedName = javaFile.packageFullyQualifiedName + "." + javaFile.className;
       javaFile.setDeprecatedKey(javaFile.fullyQualifiedName);
+      javaFile.parent.setDeprecatedKey(Directory.parseKey(StringUtils.substringBeforeLast(relativePathFromSourceDir, Directory.SEPARATOR)));
     } else {
       javaFile.packageFullyQualifiedName = JavaPackage.DEFAULT_PACKAGE_NAME;
       javaFile.className = StringUtils.removeEndIgnoreCase(relativePathFromSourceDir, JAVA_SUFFIX);
       javaFile.fullyQualifiedName = javaFile.className;
       javaFile.setDeprecatedKey(JavaPackage.DEFAULT_PACKAGE_NAME + "." + javaFile.className);
+      javaFile.parent.setDeprecatedKey(Directory.ROOT);
     }
     javaFile.unitTest = unitTest;
-    javaFile.parent.setDeprecatedKey(javaFile.packageFullyQualifiedName);
     return javaFile;
   }