compile(File, Writer) now uses Context error Writer

Squareys · Squareys · commit 6ed621642adc · 2014-08-29T11:21:54.000+02:00
compile(File, Writer) is now compile(File) since we now use the
Context error writer, also this method now returns the compiled
main class for consistency.

A makeClassLoader(MavenProject) method was added, since this code was
used in compile(Reader), compile(File).
diff --git a/src/main/java/org/scijava/plugins/scripting/java/JavaEngine.java b/src/main/java/org/scijava/plugins/scripting/java/JavaEngine.java
@@ -196,15 +196,7 @@ public Class<?> compile(Reader reader) throws ScriptException {
 					}
 				}
 
-				// make class loader
-				String[] paths = project.getClassPath(false).split(
-						File.pathSeparator);
-				URL[] urls = new URL[paths.length];
-				for (int i = 0; i < urls.length; i++)
-					urls[i] = new URL("file:" + paths[i]
-							+ (paths[i].endsWith(".jar") ? "" : "/"));
-				URLClassLoader classLoader = new URLClassLoader(urls,
-						Thread.currentThread().getContextClassLoader());
+				ClassLoader classLoader = makeClassLoader(project);
 
 				// needed for annotation processing
 				Thread.currentThread().setContextClassLoader(classLoader);
@@ -231,20 +223,53 @@ public Class<?> compile(Reader reader) throws ScriptException {
 	/**
 	 * Compiles the specified {@code .java} file.
 	 * 
-	 * @param file the source code
-	 * @param errorWriter where to write the errors
+	 * @param file
+	 *            the source code
 	 */
-	public void compile(final File file, final Writer errorWriter) {
+	public Class<?> compile(final File file) {
+		final Writer errorWriter = getContext().getErrorWriter();
 		try {
 			final Builder builder = new Builder(file, null, errorWriter);
+			final MavenProject project = builder.project;
 			try {
-				builder.project.build();
+				project.build();
+
+				final String mainClass = project.getMainClass();
+				if (mainClass == null) {
+					throw new ScriptException("No main class found for file "
+							+ file);
+				}
+
+				// load main class
+				return makeClassLoader(project).loadClass(mainClass);
 			} finally {
 				builder.cleanup();
 			}
 		} catch (Throwable t) {
 			printOrThrow(t, errorWriter);
 		}
+		return null;
+	}
+
+	/**
+	 * Create ClassLoader for maven project.
+	 * 
+	 * @param project
+	 *            maven project to create the ClassLoader for.
+	 * @return the newly created ClassLoader.
+	 * @throws IOException
+	 * @throws ParserConfigurationException
+	 * @throws SAXException
+	 */
+	private ClassLoader makeClassLoader(MavenProject project)
+			throws IOException, ParserConfigurationException, SAXException {
+		String[] paths = project.getClassPath(false).split(File.pathSeparator);
+		URL[] urls = new URL[paths.length];
+		for (int i = 0; i < urls.length; i++)
+			urls[i] = new URL("file:" + paths[i]
+					+ (paths[i].endsWith(".jar") ? "" : "/"));
+		return new URLClassLoader(urls, Thread.currentThread()
+				.getContextClassLoader());
 	}
 
 	/**
