More Core/UI refactoring

core/src/main/java/org/adoptopenjdk/jitwatch/core/HotSpotLogParser.java

@@ -272,12 +272,11 @@ public void processLogFile(File hotspotLog, ILogParseErrorListener errorListener
 			logSplitStats();
 		}
 
-		parseLogFile();
-
-		cleanup();
+		parseLogFile();		
 	}
 
-	private void cleanup()
+	@Override
+	public void discardParsedLogs()
 	{
 		splitLog.clear();
 		splitLog = new SplitLog();

core/src/main/java/org/adoptopenjdk/jitwatch/core/ILogParser.java

@@ -35,4 +35,6 @@ public interface ILogParser
 	boolean isTweakVMLog();
 
 	String getVMCommand();
+
+	void discardParsedLogs();
 }

ui/src/main/java/org/adoptopenjdk/jitwatch/sandbox/LanguageManager.java → core/src/main/java/org/adoptopenjdk/jitwatch/jvmlang/LanguageManager.java

@@ -3,7 +3,7 @@
  * Licensed under https://github.com/AdoptOpenJDK/jitwatch/blob/master/LICENSE-BSD
  * Instructions: https://github.com/AdoptOpenJDK/jitwatch/wiki
  */
-package org.adoptopenjdk.jitwatch.sandbox;
+package org.adoptopenjdk.jitwatch.jvmlang;
 
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.C_DOT;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.S_EMPTY;

ui/src/main/java/org/adoptopenjdk/jitwatch/loader/ResourceLoader.java → core/src/main/java/org/adoptopenjdk/jitwatch/loader/ResourceLoader.java

@@ -23,7 +23,7 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import org.adoptopenjdk.jitwatch.sandbox.LanguageManager;
+import org.adoptopenjdk.jitwatch.jvmlang.LanguageManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

ui/src/main/java/org/adoptopenjdk/jitwatch/process/runtime/RuntimeKotlin.java → core/src/main/java/org/adoptopenjdk/jitwatch/process/runtime/RuntimeKotlin.java

@@ -19,13 +19,13 @@
 import org.adoptopenjdk.jitwatch.logger.ILogListener;
 import org.adoptopenjdk.jitwatch.process.AbstractProcess;
 import org.adoptopenjdk.jitwatch.process.compiler.CompilerKotlin;
-import org.adoptopenjdk.jitwatch.sandbox.Sandbox;
 
 public class RuntimeKotlin extends AbstractProcess implements IRuntime
 {
 	private Path runtimePath;
 
-	private final Path pathToRuntimeJar = Paths.get(Sandbox.SANDBOX_CLASS_DIR.toString(), CompilerKotlin.KOTLIN_EXECUTABLE_JAR);
+	//TODO how did this used to work?
+	private final Path pathToRuntimeJar = Paths.get(CompilerKotlin.KOTLIN_EXECUTABLE_JAR);
 
 	private final String RUNTIME_NAME = "java" + getExecutableSuffix();
 

ui/src/test/java/org/adoptopenjdk/jitwatch/test/TestCompilationUtil.java → core/src/test/java/org/adoptopenjdk/jitwatch/test/TestCompilationUtil.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015 Chris Newland.
+ * Copyright (c) 2013-2016 Chris Newland.
  * Licensed under https://github.com/AdoptOpenJDK/jitwatch/blob/master/LICENSE-BSD
  * Instructions: https://github.com/AdoptOpenJDK/jitwatch/wiki
  */
@@ -9,42 +9,59 @@
 import static org.junit.Assert.fail;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.adoptopenjdk.jitwatch.logger.NullLogListener;
 import org.adoptopenjdk.jitwatch.process.compiler.CompilerJava;
-import org.adoptopenjdk.jitwatch.sandbox.Sandbox;
 import org.adoptopenjdk.jitwatch.util.FileUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
 public class TestCompilationUtil
 {
-	private static final File TEST_SOURCE_FILE = new File(Sandbox.SANDBOX_SOURCE_DIR.toFile(), "org" + File.separator + "adoptopenjdk"
-			+ File.separator + "jitwatch" + File.separator + "compiletest" + File.separator + "CompileTest.java");
-
-	private static final File TEST_CLASS_FILE = new File(Sandbox.SANDBOX_CLASS_DIR.toFile(), "org" + File.separator + "adoptopenjdk" + File.separator
-			+ "jitwatch" + File.separator + "compiletest" + File.separator + "CompileTest.class");
+	private Path tempDirPath;
+	private File testSourceFile;
+	private File testClassFile;
 
 	@Before
 	public void setUp()
 	{
-		deleteFile(TEST_SOURCE_FILE);
-		deleteFile(TEST_CLASS_FILE);
+		try
+		{
+			tempDirPath = Files.createTempDirectory("test_compilation_util");
+			tempDirPath.toFile().deleteOnExit();
+		}
+		catch (IOException e)
+		{
+			e.printStackTrace();
+		}
+
+		testSourceFile = Paths.get(tempDirPath.toString(), "org", "adoptopenjdk", "jitwatch", "compiletest", "CompileTest.java")
+				.toFile();
+
+		testClassFile = Paths.get(tempDirPath.toString(), "org", "adoptopenjdk", "jitwatch", "compiletest", "CompileTest.class")
+				.toFile();
+
+		deleteFile(testSourceFile);
+		deleteFile(testClassFile);
 	}
 
 	@After
 	public void tearDown()
 	{
-		deleteFile(TEST_SOURCE_FILE);
-		deleteFile(TEST_CLASS_FILE);
+		deleteFile(testSourceFile);
+		deleteFile(testClassFile);
 	}
 
 	private void deleteFile(File file)
 	{
-		if (file.exists() && file.isFile())
+		if (file != null && file.exists() && file.isFile())
 		{
 			file.delete();
 		}
@@ -64,9 +81,10 @@ public void testCompileSimple()
 
 		try
 		{
-			File f = FileUtil.writeSource(Sandbox.SANDBOX_SOURCE_DIR.toFile(), "org.adoptopenjdk.jitwatch.compiletest.CompileTest", builder.toString());
+			File f = FileUtil.writeSource(tempDirPath.toFile(), "org.adoptopenjdk.jitwatch.compiletest.CompileTest",
+					builder.toString());
 
-			assertTrue(TEST_SOURCE_FILE.exists());
+			assertTrue(testSourceFile.exists());
 
 			List<File> sources = new ArrayList<>();
 			sources.add(f);
@@ -75,15 +93,15 @@ public void testCompileSimple()
 
 			List<String> compileClasspath = new ArrayList<>();
 
-			boolean success = compiler.compile(sources, compileClasspath, Sandbox.SANDBOX_CLASS_DIR.toFile(),  new NullLogListener());
+			boolean success = compiler.compile(sources, compileClasspath, tempDirPath.toFile(), new NullLogListener());
 
 			if (!success)
 			{
 				System.err.println(compiler.getErrorStream());
 				fail();
 			}
 
-			assertTrue(TEST_CLASS_FILE.exists());
+			assertTrue(testClassFile.exists());
 		}
 		catch (Exception e)
 		{

ui/src/main/java/org/adoptopenjdk/jitwatch/sandbox/Sandbox.java

@@ -22,6 +22,7 @@
 import org.adoptopenjdk.jitwatch.core.JITWatchConfig.CompressedOops;
 import org.adoptopenjdk.jitwatch.core.JITWatchConfig.OnStackReplacement;
 import org.adoptopenjdk.jitwatch.core.JITWatchConfig.TieredCompilation;
+import org.adoptopenjdk.jitwatch.jvmlang.LanguageManager;
 import org.adoptopenjdk.jitwatch.core.JITWatchConstants;
 import org.adoptopenjdk.jitwatch.logger.ILogListener;
 import org.adoptopenjdk.jitwatch.model.IMetaMember;

ui/src/main/java/org/adoptopenjdk/jitwatch/ui/JITWatchUI.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015 Chris Newland.
+ * Copyright (c) 2013-2016 Chris Newland.
  * Licensed under https://github.com/AdoptOpenJDK/jitwatch/blob/master/LICENSE-BSD
  * Instructions: https://github.com/AdoptOpenJDK/jitwatch/wiki
  */
@@ -20,34 +20,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javafx.animation.Animation;
-import javafx.animation.KeyFrame;
-import javafx.animation.Timeline;
-import javafx.application.Application;
-import javafx.application.Platform;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
-import javafx.geometry.Insets;
-import javafx.geometry.Orientation;
-import javafx.scene.Scene;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.control.SplitPane;
-import javafx.scene.control.TableView;
-import javafx.scene.control.TextArea;
-import javafx.scene.control.TreeItem;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Priority;
-import javafx.scene.layout.Region;
-import javafx.scene.text.Text;
-import javafx.stage.FileChooser;
-import javafx.stage.Stage;
-import javafx.stage.WindowEvent;
-import javafx.util.Duration;
-
 import org.adoptopenjdk.jitwatch.chain.CompileChainWalker;
 import org.adoptopenjdk.jitwatch.chain.CompileNode;
 import org.adoptopenjdk.jitwatch.core.ErrorLog;
@@ -81,6 +53,34 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javafx.animation.Animation;
+import javafx.animation.KeyFrame;
+import javafx.animation.Timeline;
+import javafx.application.Application;
+import javafx.application.Platform;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.geometry.Insets;
+import javafx.geometry.Orientation;
+import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.SplitPane;
+import javafx.scene.control.TableView;
+import javafx.scene.control.TextArea;
+import javafx.scene.control.TreeItem;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.Region;
+import javafx.scene.text.Text;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
+import javafx.stage.WindowEvent;
+import javafx.util.Duration;
+
 public class JITWatchUI extends Application implements IJITListener, ILogParseErrorListener, IStageCloseListener, IStageAccessProxy
 {
 	private static final Logger logger = LoggerFactory.getLogger(JITWatchUI.class);
@@ -243,6 +243,8 @@ public void run()
 	public void handleReadComplete()
 	{
 		log("Finished reading log file.");
+
+		logParser.discardParsedLogs();
 
 		isReadingLogFile = false;
 

ui/src/main/java/org/adoptopenjdk/jitwatch/ui/sandbox/SandboxStage.java

@@ -54,10 +54,10 @@
 import org.adoptopenjdk.jitwatch.core.ILogParser;
 import org.adoptopenjdk.jitwatch.core.JITWatchConfig;
 import org.adoptopenjdk.jitwatch.core.JITWatchConstants;
+import org.adoptopenjdk.jitwatch.jvmlang.LanguageManager;
 import org.adoptopenjdk.jitwatch.logger.ILogListener;
 import org.adoptopenjdk.jitwatch.model.IMetaMember;
 import org.adoptopenjdk.jitwatch.process.IExternalProcess;
-import org.adoptopenjdk.jitwatch.sandbox.LanguageManager;
 import org.adoptopenjdk.jitwatch.sandbox.Sandbox;
 import org.adoptopenjdk.jitwatch.ui.Dialogs;
 import org.adoptopenjdk.jitwatch.ui.Dialogs.Response;

ui/src/main/java/org/adoptopenjdk/jitwatch/ui/sandbox/VMLanguageList.java

@@ -16,7 +16,7 @@
 import javafx.stage.Stage;
 
 import org.adoptopenjdk.jitwatch.core.JITWatchConfig;
-import org.adoptopenjdk.jitwatch.sandbox.LanguageManager;
+import org.adoptopenjdk.jitwatch.jvmlang.LanguageManager;
 import org.adoptopenjdk.jitwatch.ui.IStageCloseListener;
 import org.adoptopenjdk.jitwatch.ui.StageManager;
 

ui/src/main/java/org/adoptopenjdk/jitwatch/util/UserInterfaceUtil.java

@@ -1,22 +1,22 @@
 /*
- * Copyright (c) 2013-2015 Chris Newland.
+ * Copyright (c) 2013-2016 Chris Newland.
  * Licensed under https://github.com/AdoptOpenJDK/jitwatch/blob/master/LICENSE-BSD
  * Instructions: https://github.com/AdoptOpenJDK/jitwatch/wiki
  */
 package org.adoptopenjdk.jitwatch.util;
 
 import java.io.InputStream;
 
+import org.adoptopenjdk.jitwatch.model.bytecode.BCAnnotationType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
 import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
 
-import org.adoptopenjdk.jitwatch.model.bytecode.BCAnnotationType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public final class UserInterfaceUtil
 {
 	private static final Logger logger = LoggerFactory.getLogger(UserInterfaceUtil.class);