JavaBuild: fix output path when java tabs have package declaration

JakubValtar · JakubValtar · commit ff9811307c94 · 2016-05-06T00:19:50.000+02:00
diff --git a/java/src/processing/mode/java/JavaBuild.java b/java/src/processing/mode/java/JavaBuild.java
@@ -523,11 +523,11 @@ public String preprocess(File srcFolder,
           } else {
             if (packageMatch == null) {
               // use the default package name, since mixing with package-less code will break
-              packageMatch = new String[] { packageName };
+              packageMatch = new String[] { "", packageName };
               // add the package name to the source before writing it
               javaCode = "package " + packageName + ";" + javaCode;
             }
-            File packageFolder = new File(srcFolder, packageMatch[0].replace('.', '/'));
+            File packageFolder = new File(srcFolder, packageMatch[1].replace('.', File.separatorChar));
             packageFolder.mkdirs();
             Util.saveFile(javaCode, new File(packageFolder, filename));
           }

Original file line number	Diff line number	Diff line change
`@@ -523,11 +523,11 @@ public String preprocess(File srcFolder,`
`523`	`523`	`} else {`
`524`	`524`	`if (packageMatch == null) {`
`525`	`525`	`// use the default package name, since mixing with package-less code will break`
`526`		`- packageMatch = new String[] { packageName };`
	`526`	`+ packageMatch = new String[] { "", packageName };`
`527`	`527`	`// add the package name to the source before writing it`
`528`	`528`	`javaCode = "package " + packageName + ";" + javaCode;`
`529`	`529`	`}`
`530`		`- File packageFolder = new File(srcFolder, packageMatch[0].replace('.', '/'));`
	`530`	`+ File packageFolder = new File(srcFolder, packageMatch[1].replace('.', File.separatorChar));`
`531`	`531`	`packageFolder.mkdirs();`
`532`	`532`	`Util.saveFile(javaCode, new File(packageFolder, filename));`
`533`	`533`	`}`