From 655c42716faf4e5991bbead6ce223ca20ad54c9b Mon Sep 17 00:00:00 2001 From: benfry Date: Sat, 9 Apr 2011 17:41:13 +0000 Subject: [PATCH] fix folder for java file export (issue #570) --- app/src/processing/mode/java/JavaBuild.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/src/processing/mode/java/JavaBuild.java b/app/src/processing/mode/java/JavaBuild.java index 7ed80e58b..8ccfe7420 100644 --- a/app/src/processing/mode/java/JavaBuild.java +++ b/app/src/processing/mode/java/JavaBuild.java @@ -750,6 +750,14 @@ public class JavaBuild { e.printStackTrace(); // ho hum, just move on... } } + // move the .java file from the preproc there too + String preprocFilename = sketch.getName() + ".java"; + File preprocFile = new File(srcFolder, preprocFilename); + if (preprocFile.exists()) { + preprocFile.renameTo(new File(appletFolder, preprocFilename)); + } else { + System.err.println("Could not copy source file: " + preprocFile.getAbsolutePath()); + } // Use separate .jar files whenever a library or code folder is in use. boolean separateJar = @@ -1415,9 +1423,11 @@ public class JavaBuild { } // move the .java file from the preproc there too String preprocFilename = sketch.getName() + ".java"; - File preprocFile = new File(destFolder, preprocFilename); + File preprocFile = new File(srcFolder, preprocFilename); if (preprocFile.exists()) { preprocFile.renameTo(new File(sourceFolder, preprocFilename)); + } else { + System.err.println("Could not copy source file: " + preprocFile.getAbsolutePath()); }