Merge pull request github#110 from github/smowton/admin/style-fixed

Fix Kotlin style snags

Author: smowton

java/kotlin-extractor/src/main/java/com/semmle/extractor/java/PopulateFile.java

@@ -73,15 +73,22 @@ public static String escapeKey(String s) {
 		}
 	}
 
-  public Label populateFile(File absoluteFile) {
-    String databasePath = transformer.fileAsDatabaseString(absoluteFile);
-    // Ensure the rewritten path is used from now on.
-    File normalisedFile = new File(databasePath);
-    Label result = tw.getLabelFor("@\"" + escapeKey(databasePath) + ";sourcefile" + "\"");
-    KotlinExtractorDbSchemeKt.writeFiles(tw, result, databasePath);
-    populateParents(normalisedFile, result);
-    return result;
-  }
+    public Label populateFile(File absoluteFile) {
+        return getFileLabel(absoluteFile, true);
+    }
+
+    public Label getFileLabel(File absoluteFile, boolean populateTables) {
+        String databasePath = transformer.fileAsDatabaseString(absoluteFile);
+        Label result = tw.getLabelFor("@\"" + escapeKey(databasePath) + ";sourcefile" + "\"");
+        // Ensure the rewritten path is used from now on.
+
+        if(populateTables) {
+            KotlinExtractorDbSchemeKt.writeFiles(tw, result, databasePath);
+            populateParents(new File(databasePath), result);
+        }
+
+        return result;
+    }
 
 	private Label addFolderTuple(String databasePath) {
 		Label result = tw.getLabelFor("@\"" + escapeKey(databasePath) + ";folder" + "\"");
@@ -104,15 +111,22 @@ private void populateParents(File normalisedFile, Label label) {
 		KotlinExtractorDbSchemeKt.writeContainerparent(tw, parentLabel, label);
 	}
 
-	public Label relativeFileId(File jarFile, String pathWithinJar) {
+    public Label relativeFileId(File jarFile, String pathWithinJar) {
+        return getFileInJarLabel(jarFile, pathWithinJar, true);
+    }
+
+	public Label getFileInJarLabel(File jarFile, String pathWithinJar, boolean populateTables) {
 		if (pathWithinJar.contains("\\"))
 			throw new CatastrophicError("Invalid jar path: '" + pathWithinJar + "' should not contain '\\'.");
 
+        String databasePath = transformer.fileAsDatabaseString(jarFile);
+        if(!populateTables)
+            return tw.getLabelFor("@\"" + databasePath + "/" + pathWithinJar + ";jarFile\"");
+
 		Label jarFileId = this.populateFile(jarFile);
-		Label jarFileLocation = tw.getLocation(jarFileId,0,0,0,0);
-		KotlinExtractorDbSchemeKt.writeHasLocation(tw, jarFileId, jarFileLocation);
+        Label jarFileLocation = tw.getLocation(jarFileId, 0, 0, 0, 0);
+        KotlinExtractorDbSchemeKt.writeHasLocation(tw, jarFileId, jarFileLocation);
 
-		String databasePath = transformer.fileAsDatabaseString(jarFile);
 		StringBuilder fullName = new StringBuilder(databasePath);
 		String[] split = pathWithinJar.split("/");
 		Label current = jarFileId;