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

NeoSuit/src/main/java/controller/LazyQueryController.java

@@ -120,13 +120,13 @@ public class LazyQueryController {
 			}
 		}
 		this.numberOfMatches = patternMatches.get(activeCandidatePattern).size();
-		System.out.println("Matches : " + numberOfMatches);
+		Logger.info("Matches : " + numberOfMatches);
 		return patternMatches.get(activeCandidatePattern);
 	}
 
 	public String getNormalCode(int index, String matchedClass) {
 		if (!patternCode.containsKey(activeCandidatePattern)) {
-			System.out.println("Matches : " + numberOfMatches);
+			Logger.info("Matches : " + numberOfMatches);
 			patternCode.put(activeCandidatePattern, new String[numberOfMatches]);
 		}
 
@@ -149,10 +149,9 @@ public class LazyQueryController {
 		if (patternCodeOptimized.get(activeCandidatePattern).get(activeUpdatePattern)[index] == null) {
 			GraphDatabaseService db = DatabaseController.getInstance().startDB();
 
-			System.out.println(activeUpdatePattern.getQueries().size());
 			for (Query q : activeUpdatePattern.getQueries()) {
 				String queryString = q.generateQueryString();
-				System.out.println("update query string : " + queryString);
+				Logger.info("update query string : " + queryString);
 				Map<String, Object> parameters = patternParameters.get(activeCandidatePattern).get(index);
 				Node node = patternNodes.get(activeCandidatePattern).get(index);
 
@@ -176,14 +175,14 @@ public class LazyQueryController {
 	}
 
 	public void applyParallelizationPattern(int index) {
-		GraphDatabaseService db = DatabaseController.getInstance().startDB();
+		GraphDatabaseService database = DatabaseController.getInstance().startDB();
 
-		for (Query q : activeUpdatePattern.getQueries()) {
-			String queryString = q.generateQueryString();
+		for (Query query : activeUpdatePattern.getQueries()) {
+			String queryString = query.generateQueryString();
 			Map<String, Object> parameters = patternParameters.get(activeCandidatePattern).get(index);
 
-			try (Transaction tx = db.beginTx(); Result result = db.execute(queryString, parameters)) {
-				tx.success();
+			try (Transaction transaction = database.beginTx(); Result result = database.execute(queryString, parameters)) {
+				transaction.success();
 			}
 		}
 	}