Logik

.gitignore

@@ -9,4 +9,4 @@ bin/application/logik/Logik.class
 *.classpath
 .classpath
 .project
-.settings/
+.settings/

src/FileHandling/Code.java

@@ -1,7 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2016 The Fellowship of the String and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Marcel Beek - initial API and implementation
+ *     Patrick Pirig - initial API and implementation
+ *     Phillippe Weise - initial API and implementation
+ *     Sabine Timmer - initial API and implementation
+ *******************************************************************************/
 package FileHandling;
 
-
 import vk.core.api.CompilationUnit;
+import vk.core.api.CompileError;
 import vk.core.api.CompilerFactory;
 
 import vk.core.api.CompilerResult;
@@ -18,30 +31,29 @@ public class Code {
 	private String className;
 	private CompilationUnit compilationUnitCode;
 	private boolean compilable;
-
-
-	public Code(String className,String code){
-		this.code=code;
-		this.className=className;
-		this.compilationUnitCode = new CompilationUnit(className, code, false );
+
+	public Code(String className, String code) {
+		this.code = code;
+		this.className = className;
+		this.compilationUnitCode = new CompilationUnit(className, code, false);
 		this.compilable = testingCompilationUnit();
 
 	}
-	
-	public boolean testingCompilationUnit(){
+
+	public boolean testingCompilationUnit() {
 		JavaStringCompiler compiler = CompilerFactory.getCompiler(compilationUnitCode);
 		compiler.compileAndRunTests();
 		CompilerResult result = compiler.getCompilerResult();
-
-		if(result.hasCompileErrors() == true) compilable = true;	
-
-		else{
-			TestHelpers.getErrorMessages(compiler, result);
+
+		if (result.hasCompileErrors() == true) {
+			System.out.println(TestHelpers.getErrorMessages(compiler, result));
 			compilable = false;
 		}
-
+
+		else if (result.hasCompileErrors() == false)
+			compilable = true;
+
 		return compilable;
 	}
-
-
+
 }

src/FileHandling/CodeList.java

@@ -1,28 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2016 The Fellowship of the String and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Marcel Beek - initial API and implementation
+ *     Patrick Pirig - initial API and implementation
+ *     Phillippe Weise - initial API and implementation
+ *     Sabine Timmer - initial API and implementation
+ *******************************************************************************/
 package FileHandling;
 
 import java.util.ArrayList;
 
-public class CodeList extends ArrayList<Code>{
-	
+public class CodeList extends ArrayList<Code> {
+
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
 	private boolean compilable;
 
-
-	public CodeList(){
+	public CodeList() {
 		super();
 	}
-
-	public boolean compilable(){
-
-		Code[] codeArray =  (Code[]) this.toArray();
-
-		for(int i = 0; i< codeArray.length; i++){
-			compilable = codeArray[i].testingCompilationUnit();
-
-			if(compilable == false) return false;
+
+	public boolean compilable() {
+
+		Object[] codeArray = this.toArray();
+
+		for (int i = 0; i < codeArray.length; i++) {
+			compilable = ((Code) codeArray[i]).testingCompilationUnit();
+
+			if (compilable == false)
+				return false;
 		}
 		return true;
 	}

src/FileHandling/Exercise.java

@@ -1,33 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2016 The Fellowship of the String and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Marcel Beek - initial API and implementation
+ *     Patrick Pirig - initial API and implementation
+ *     Phillippe Weise - initial API and implementation
+ *     Sabine Timmer - initial API and implementation
+ *******************************************************************************/
 package FileHandling;
 
 public class Exercise {
-	
+
 	private String description;
 	private CodeList klassen;
 	private TestList tests;
-	private boolean baby,timer;
-
-
-	public Exercise(String description,CodeList klassen,TestList tests,boolean baby,boolean timer){
-		this.description=description;
-		this.klassen=klassen;
-		this.tests=tests;
-		this.baby=baby;
-		this.timer=timer;
+	private boolean baby, timer;
+
+	public Exercise(String description, CodeList klassen, TestList tests, boolean baby, boolean timer) {
+		this.description = description;
+		this.klassen = klassen;
+		this.tests = tests;
+		this.baby = baby;
+		this.timer = timer;
 	}
-
-	public Exercise(){
-
-
+
+	public Exercise() {
+
 	}
-	public boolean codeCompiles(){
-
+
+	public boolean codeCompiles() {
+
 		return this.klassen.compilable();
 
 	}
-	
-	public boolean testsRunning(){
-		
+
+	public boolean testsRunning() {
+
 		return this.tests.allPassing();
 	}
 

src/FileHandling/Loader.java

@@ -1,4 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2016 The Fellowship of the String and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Marcel Beek - initial API and implementation
+ *     Patrick Pirig - initial API and implementation
+ *     Phillippe Weise - initial API and implementation
+ *     Sabine Timmer - initial API and implementation
+ *******************************************************************************/
 package FileHandling;
+
 import org.xml.sax.*;
 
 import javafx.scene.Scene;
@@ -13,49 +27,42 @@
 
 import javax.xml.parsers.*;
 
-
 public class Loader {
-
-	public Exercise loadExcercise(){
-		Stage loadStage= new Stage();
-		TextField fileName=new TextField("Katalogdatei");
-		Label anzeige=new Label("");
-
-
-
-
-		Button laden=new Button("Katalog laden");
-		laden.setOnAction(e-> laden(fileName.getText(),anzeige,loadStage));
-
+
+	public Exercise loadExcercise() {
+		Stage loadStage = new Stage();
+		TextField fileName = new TextField("Katalogdatei");
+		Label anzeige = new Label("");
+
+		Button laden = new Button("Katalog laden");
+		laden.setOnAction(e -> laden(fileName.getText(), anzeige, loadStage));
+
 		return null;
 	}
 
-	private void laden(String filename,Label anzeige,Stage stage) {
+	private void laden(String filename, Label anzeige, Stage stage) {
 		try {
-			Document xmldoc=loadDoc(filename);
-			Scene choiseScreen=katalogView(xmldoc);
-			
+			Document xmldoc = loadDoc(filename);
+			Scene choiseScreen = katalogView(xmldoc);
+
 		} catch (SAXException | IOException e) {
 			anzeige.setText("Datei nicht vorhanden oder nicht kompatibel");
 			e.printStackTrace();
 		}
-
-
+
 	}
-
-
+
 	private Scene katalogView(Document xmldoc) {
-		
+
 		return null;
 	}
 
-	private Document loadDoc(String fileLocation) throws SAXException, IOException{
-		DocumentBuilderFactory factory=DocumentBuilderFactory.newInstance();
+	private Document loadDoc(String fileLocation) throws SAXException, IOException {
+		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 		Document toReturn;
 		factory.setIgnoringComments(true);
 		factory.setValidating(true);
-
-
+
 		DocumentBuilder builder;
 		try {
 			builder = factory.newDocumentBuilder();
@@ -64,10 +71,5 @@ private Document loadDoc(String fileLocation) throws SAXException, IOException{
 			e.printStackTrace();
 			return null;
 		}
-
-
-
-
-
 	}
 }

src/FileHandling/Store.java

@@ -1,3 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2016 The Fellowship of the String and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Marcel Beek - initial API and implementation
+ *     Patrick Pirig - initial API and implementation
+ *     Phillippe Weise - initial API and implementation
+ *     Sabine Timmer - initial API and implementation
+ *******************************************************************************/
 package FileHandling;
 
 public class Store {

src/FileHandling/Test.java

@@ -1,3 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2016 The Fellowship of the String and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Marcel Beek - initial API and implementation
+ *     Patrick Pirig - initial API and implementation
+ *     Phillippe Weise - initial API and implementation
+ *     Sabine Timmer - initial API and implementation
+ *******************************************************************************/
 package FileHandling;
 
 import vk.core.api.CompilationUnit;
@@ -10,30 +23,33 @@
 public class Test {
 	private String testCode;
 	private CompilationUnit compilationUnitTest;
-	
-	public Test(String testCode, String testName){
-		this.testCode=testCode;
-		this.compilationUnitTest= new CompilationUnit(testName, testCode, true);
+
+	public Test(String testCode, String testName) {
+		this.testCode = testCode;
+		this.compilationUnitTest = new CompilationUnit(testName, testCode, true);
 	}
-	
-	public boolean oneTestFailing(){
+
+	public boolean oneTestFailing() {
 		JavaStringCompiler compiler = CompilerFactory.getCompiler(compilationUnitTest);
 		compiler.compileAndRunTests();
 		TestResult result = compiler.getTestResult();
 		int fails = result.getNumberOfFailedTests();
-
-		if(fails == 1) return true;		
-		return false;		//mehr als ein test schl�gt fehl sollte nicht sein im tddt kreislauf
+
+		if (fails == 1)
+			return true;
+		return false; // mehr als ein test schlägt fehl sollte nicht sein im
+						// tddt kreislauf
 	}
-	
-	public boolean allTestsPassing(){
+
+	public boolean allTestsPassing() {
 		JavaStringCompiler compiler = CompilerFactory.getCompiler(compilationUnitTest);
 		compiler.compileAndRunTests();
 		TestResult result = compiler.getTestResult();
 		int fails = result.getNumberOfFailedTests();
-
-		if(fails == 0) return true;		
+
+		if (fails == 0)
+			return true;
 		return false;
-		
+
 	}
 }