Merge branch 'master' of build.se.informatik.uni-kiel.de:chw/integration-project

NeoSuit/src/examples/de/mzl/examples/HelloWorld.java

+package de.mzl.examples;
+
+public class HelloWorld {
+
+	public static void main(String... args) {
+		System.out.println("Hello World!");
+	}
+
+}

NeoSuit/src/main/java/controller/DBController.java

@@ -36,8 +36,8 @@ public class DBController {
 	}
 
 	public void setPath(String path) {
+		stopDB();
 		this.path = path;
-		this.db = null;
 	}
 
 	public GraphDatabaseService startDB() {
@@ -54,19 +54,17 @@ public class DBController {
 		return db;
 	}
 
-	public void setDB(GraphDatabaseService newDb) {
+	public final void setDB(GraphDatabaseService newDb) {
 		stopDB();
 		this.db = newDb;
 	}
 
-	public void stopDB() {
-		try {
+	public final void stopDB() {
+		if (db != null) {
 			db.shutdown();
-		} catch (Exception e) {
-
-		}
 			this.db = null;
 		}
+	}
 
 	private static void registerShutdownHook(final GraphDatabaseService database) {
 		Runtime.getRuntime().addShutdownHook(new Thread() {

NeoSuit/src/main/java/controller/LazyTransformer.java

@@ -14,6 +14,7 @@ import org.neo4j.kernel.impl.core.NodeProxy;
 import de.chw.parallax.java.GeneratorExecutor;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import logging.Logger;
 import model.ParallelizationPattern;
 import model.Pattern;
 import model.Query;
@@ -22,11 +23,12 @@ public class LazyTransformer {
 
 	private Pattern activeCandidatePattern;
 	private ParallelizationPattern activeUpdatePattern;
+	private int numberOfMatches;
 	private Map<Pattern, ObservableList<String>> patternMatches;
 	private Map<Pattern, List<Node>> patternNodes;
 	private Map<Pattern, List<Map<String, Object>>> patternParameters;
-	private Map<Pattern, List<String>> patternCode;
-	private Map<Pattern, Map<ParallelizationPattern, List<String>>> patternCodeOptimized;
+	private Map<Pattern, String[]> patternCode;
+	private Map<Pattern, Map<ParallelizationPattern, String[]>> patternCodeOptimized;
 
 	private static LazyTransformer instance;
 
@@ -47,8 +49,8 @@ public class LazyTransformer {
 		this.patternMatches = new HashMap<Pattern, ObservableList<String>>();
 		this.patternNodes = new HashMap<Pattern, List<Node>>();
 		this.patternParameters = new HashMap<Pattern, List<Map<String, Object>>>();
-		this.patternCode = new HashMap<Pattern, List<String>>();
-		this.patternCodeOptimized = new HashMap<Pattern, Map<ParallelizationPattern, List<String>>>();
+		this.patternCode = new HashMap<Pattern, String[]>();
+		this.patternCodeOptimized = new HashMap<Pattern, Map<ParallelizationPattern, String[]>>();
 	}
 
 	public Pattern getActiveCandidatePattern() {
@@ -77,7 +79,7 @@ public class LazyTransformer {
 
 			GraphDatabaseService db = DBController.getInstance().startDB();
 
-			System.out.println("Querying: " + name + " (" + query + ")");
+			Logger.info("Querying: " + name + " (" + query + ")");
 
 			try (Transaction tx = db.beginTx(); Result results = db.execute(query)) {
 
@@ -109,41 +111,38 @@ public class LazyTransformer {
 				patternParameters.put(activeCandidatePattern, updateParameters);
 				tx.success();
 
-				System.out.println("Calculated Matches!");
+				Logger.info("Calculated Matches!");
 			}
 		}
+		this.numberOfMatches = patternMatches.get(activeCandidatePattern).size();
+		System.out.println("Matches : " + numberOfMatches);
 		return patternMatches.get(activeCandidatePattern);
 	}
 
 	public String getNormalCode(int index, String matchedClass) {
 		if (!patternCode.containsKey(activeCandidatePattern)) {
-			patternCode.put(activeCandidatePattern, new ArrayList<String>());
+			System.out.println("Matches : " + numberOfMatches);
+			patternCode.put(activeCandidatePattern, new String[numberOfMatches]);
 		}
 
-		try {
-			return patternCode.get(activeCandidatePattern).get(index);
-		} catch (IndexOutOfBoundsException e) {
+		if (patternCode.get(activeCandidatePattern)[index] == null) {
 			String code = SourceFinder.getInstance().locateSourceCode(matchedClass);
-			patternCode.get(activeCandidatePattern).add(index, code);
-			return patternCode.get(activeCandidatePattern).get(index);
+			patternCode.get(activeCandidatePattern)[index] = code;
 		}
+		return patternCode.get(activeCandidatePattern)[index];
 	}
 
 	public String getOptimizedCode(int index) {
 		if (!patternCodeOptimized.containsKey(activeCandidatePattern)) {
-			patternCodeOptimized.put(activeCandidatePattern, new HashMap<ParallelizationPattern, List<String>>());
+			patternCodeOptimized.put(activeCandidatePattern, new HashMap<ParallelizationPattern, String[]>());
 		}
 
 		if (!patternCodeOptimized.get(activeCandidatePattern).containsKey(activeUpdatePattern)) {
-			patternCodeOptimized.get(activeCandidatePattern).put(activeUpdatePattern, new ArrayList<String>());
+			patternCodeOptimized.get(activeCandidatePattern).put(activeUpdatePattern, new String[numberOfMatches]);
 		}
 
-		try {
-			return patternCodeOptimized.get(activeCandidatePattern).get(activeUpdatePattern).get(index);
-		} catch (IndexOutOfBoundsException e) {
-
+		if (patternCodeOptimized.get(activeCandidatePattern).get(activeUpdatePattern)[index] == null) {
 			GraphDatabaseService db = DBController.getInstance().startDB();
-			System.out.println("Started : " + db.isAvailable(500));
 
 			for (Query q : activeUpdatePattern.getQueries()) {
 				String queryString = q.generateQueryString();
@@ -157,17 +156,16 @@ public class LazyTransformer {
 					// exportController.toSourceCode(node);
 
 					GeneratorExecutor codeGenerator = new GeneratorExecutor(db);
-					System.out.println("Within : " + db.isAvailable(500));
+
 					String optimizedCode = codeGenerator.toCode(node);
-					patternCodeOptimized.get(activeCandidatePattern).get(activeUpdatePattern).add(index, optimizedCode);
+					patternCodeOptimized.get(activeCandidatePattern).get(activeUpdatePattern)[index] = optimizedCode;
 					tx.failure();
 				}
 			}
-
-			System.out.println("Stopped : " + db.isAvailable(500));
-			return patternCodeOptimized.get(activeCandidatePattern).get(activeUpdatePattern).get(index);
 		}
 
+		return patternCodeOptimized.get(activeCandidatePattern).get(activeUpdatePattern)[index];
+
 	}
 
 	public void applyParallelizationPattern(int index) {

NeoSuit/src/main/java/controller/Matcher.java

@@ -68,8 +68,8 @@ public class Matcher {
 
 		Map<String, Object> candidateResult = match.getCandidateResultForUpdate();
 
-		Logger.info("Running update query " + p.getName() + " for " + match.getPattern().getName() + ", Commit changes = "
-				+ commitChanges);
+		Logger.info("Running update query " + p.getName() + " for " + match.getPattern().getName()
+				+ ", Commit changes = " + commitChanges);
 
 		String code = "An error occured!";
 
@@ -119,14 +119,14 @@ public class Matcher {
 		String name = pattern.getName();
 		String query = pattern.getCandidateQuery().generateQueryString();
 
-		Logger.info("Querying: " + name + " (" + query + ")");
+		Logger.info("Running candidate pattern " + name);
 
 		try (Transaction tx = db.beginTx(); Result result = db.execute(query, Query.getMinExecutionTimeParams())) {
 
 			List<CandidatePatternResult> queryResults = extractQueryResults(result);
 
 			for (CandidatePatternResult queryResult : queryResults) {
-				ExportController export = ExportController.getInstance();
+				// ExportController export = ExportController.getInstance();
 				String code = "Enable candidate pattern code generation in Matcher.java!";// export.toSourceCode(queryResult.getDisplayNode());
 				queryResult.setCode(code);
 				matches.add(new Match(pattern, queryResult));

NeoSuit/src/main/java/controller/SootController.java

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.SystemUtils;
 import org.neo4j.graphdb.GraphDatabaseService;
 
 import de.chw.sdg.Sdg;
+import logging.Logger;
 
 public class SootController {
 
@@ -28,7 +29,7 @@ public class SootController {
 			for (int i = 0; i < listOfFiles.length; i++) {
 				File f = listOfFiles[i];
 				if (f.isFile() && f.getName().endsWith(".jar")) {
-					System.out.println("File " + f.getName());
+					Logger.info("File " + f.getName());
 					input += f.getAbsolutePath();
 					input += ";";
 				}
@@ -42,8 +43,8 @@ public class SootController {
 			input = input.replace(";", ":");
 		}
 
-		System.out.println("Src Folder for Soot : " + input);
-		System.out.println("Main Class for Soot : " + mainClass);
+		Logger.info("Src Folder for Soot : " + input);
+		Logger.info("Main Class for Soot : " + mainClass);
 
 		args.add(input);
 		args.add("-pp");
@@ -63,7 +64,7 @@ public class SootController {
 		args.add(mainClass);
 		args.add(mainClass);
 
-		System.out.println("Arguments for Soot : " + args.toString());
+		Logger.info("Arguments for Soot : " + args.toString());
 
 		String[] argArray = new String[args.size()];
 		argArray = args.toArray(argArray);

NeoSuit/src/main/java/de/johl/TempNeo4jInstance.java

@@ -14,6 +14,8 @@ import org.neo4j.graphdb.factory.GraphDatabaseFactory;
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
 import org.neo4j.io.fs.FileUtils;
 
+import logging.Logger;
+
 public class TempNeo4jInstance {
 	private GraphDatabaseService databaseService = null;
 	private Path tempDatabasePath = null;
@@ -43,7 +45,7 @@ public class TempNeo4jInstance {
 				try {
 					deleteRecursive(path.toFile());
 				} catch (FileNotFoundException e) {
-
+					Logger.exception(e);
 				}
 			}
 		};
@@ -168,7 +170,7 @@ public class TempNeo4jInstance {
 		return databaseService;
 	}
 
-	public static void main(String[] args) throws IOException {
+	public static void main(String... args) throws IOException {
 
 		String src = args[0];
 		String dst = args[1];

NeoSuit/src/main/java/logging/GraphicLogger.java

+package logging;
+
+public interface GraphicLogger extends LoggerInterface {
+	void clear();
+}

NeoSuit/src/main/java/logging/LabelLogger.java

+package logging;
+
+import javafx.scene.control.Label;
+
+public class LabelLogger implements GraphicLogger {
+
+	private final Label textField;
+
+	public LabelLogger(final Label errorTextField) {
+		this.textField = errorTextField;
+	}
+
+	@Override
+	public void warn(final String text) {
+		textField.setText(text);
+		Logger.warning(text);
+	}
+
+	@Override
+	public void error(final String text) {
+		textField.setText(text);
+		Logger.error(text);
+	}
+
+	@Override
+	public void exception(final String reason, final Throwable exception) {
+		textField.setText(reason);
+		Logger.exception(reason, exception);
+	}
+
+	@Override
+	public void info(final String text) {
+		textField.setText(text);
+		Logger.info(text);
+	}
+
+	@Override
+	public void clear() {
+		textField.setText("");
+	}
+
+	@Override
+	public void exception(Throwable exception) {
+		textField.setText(exception.getMessage());
+		Logger.exception(exception);
+	}
+
+}

NeoSuit/src/main/java/logging/Logger.java

@@ -2,15 +2,13 @@ package logging;
 
 import java.io.PrintStream;
 
+import logging.LoggerInterface.Level;
+
 public final class Logger {
 
 	private Logger() {
 	}
 
-	private enum Level {
-		INFO, WARNING, ERROR
-	}
-
 	public static void info(final String text) {
 		log(Level.INFO, text);
 	}
@@ -23,6 +21,11 @@ public final class Logger {
 		log(Level.WARNING, text);
 	}
 
+	public static void exception(final String reason, final Throwable exception) {
+		PrintStream printStream = log(Level.ERROR, reason);
+		exception.printStackTrace(printStream);
+	}
+
 	public static void exception(final Throwable exception) {
 		PrintStream printStream = log(Level.ERROR, exception.getMessage());
 		exception.printStackTrace(printStream);

NeoSuit/src/main/java/logging/LoggerInterface.java

+package logging;
+
+public interface LoggerInterface {
+	public enum Level {
+		INFO, WARNING, ERROR
+	}
+
+	void warn(final String reason);
+
+	void error(final String reason);
+
+	void exception(final String reason, final Throwable exception);
+
+	void exception(final Throwable exception);
+
+	void info(final String reason);
+}

NeoSuit/src/main/java/model/CompareState.java

@@ -10,8 +10,6 @@ import org.neo4j.graphdb.Transaction;
 import controller.DBController;
 import controller.Matcher;
 import de.chw.parallax.java.GeneratorExecutor;
-import javafx.concurrent.WorkerStateEvent;
-import javafx.event.EventHandler;
 import logging.Logger;
 import preferences.PrefCons;
 import preferences.Prefs;
@@ -64,7 +62,7 @@ public class CompareState {
 	}
 
 	public void chooseMatch(final int match_id) {
-		matchID = Math.max(0, Math.min(match_id, patternMatches.size() - 1));
+		matchID = Math.max(0, Math.min(match_id, patternMatches.get(patternMatchID).getMatches().size() - 1));
 	}
 
 	public void chooseUpdatePatternVersion(final String ppName) {
@@ -135,30 +133,32 @@ public class CompareState {
 		String mainClass = Prefs.getInstance().getValue(PrefCons.DEFAULT_CLASS);
 		final Java2SDGTask java2sdg = new Java2SDGTask(targetSourceDir.getAbsolutePath(), classpath, pathToDB,
 				mainClass);
-		java2sdg.setOnSucceeded(new EventHandler<WorkerStateEvent>() {
-			@Override
-			public void handle(final WorkerStateEvent arg0) {
+		java2sdg.run();
+		// java2sdg.setOnSucceeded(new EventHandler<WorkerStateEvent>() {
+		// @Override
+		// public void handle(final WorkerStateEvent arg0) {
 		List<Pattern> matchedPatterns = new ArrayList<>();
 		for (CandidatePatternMatches pm : patternMatches) {
 			matchedPatterns.add(pm.getPattern());
 		}
 		Logger.info("Running candidate patterns");
 		init(matchedPatterns);
-			}
-		});
-		java2sdg.setOnFailed(new EventHandler<WorkerStateEvent>() {
-			@Override
-			public void handle(final WorkerStateEvent arg0) {
-				Logger.exception(java2sdg.getException());
-			}
-		});
-		Thread java2sdgThread = new Thread(java2sdg);
-		java2sdgThread.start();
-		try {
-			java2sdgThread.join();
-		} catch (InterruptedException e) {
-			Logger.exception(e);
-		}
+		// }
+		// });
+		// java2sdg.setOnFailed(new EventHandler<WorkerStateEvent>() {
+		// @Override
+		// public void handle(final WorkerStateEvent arg0) {
+		// Logger.exception(java2sdg.getException());
+		// throw new IllegalStateException(java2sdg.getException());
+		// }
+		// });
+		// Thread t = new Thread(java2sdg);
+		// t.start();
+		// try {
+		// t.join();
+		// } catch (InterruptedException e) {
+		// throw new IllegalStateException(e);
+		// }
 	}
 
 }

NeoSuit/src/main/java/model/Match.java

@@ -2,8 +2,10 @@ package model;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 
 public class Match {
+	private final String matchId = UUID.randomUUID().toString();
 	private Pattern pattern;
 	private CandidatePatternResult candidateResult;
 	private Map<String, String> updateResults;
@@ -30,7 +32,7 @@ public class Match {
 		return pattern;
 	}
 
-	public void setPattern(final Pattern pattern) {
+	public final void setPattern(final Pattern pattern) {
 		this.pattern = pattern;
 	}
 
@@ -38,7 +40,7 @@ public class Match {
 		return candidateResult;
 	}
 
-	public void setCandidateResult(final CandidatePatternResult queryResult) {
+	public final void setCandidateResult(final CandidatePatternResult queryResult) {
 		this.candidateResult = queryResult;
 	}
 
@@ -47,4 +49,8 @@ public class Match {
 		result.putAll(candidateResult.getResults());
 		return result;
 	}
+
+	public String getId() {
+		return matchId;
+	}
 }