fixing big bug

Author: Hattinger04

src/main/java/io/github/Hattinger04/configuration/SecurityConfiguration.java

@@ -27,7 +27,7 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
 
 	@Override
 	public void addCorsMappings(CorsRegistry registry) {
-		// TODO: delete not needed origins when publising 
+		// TODO: delete not needed origins when publishing 
 		registry.addMapping("/**").allowedOrigins("https://localhost", "https://192.168.0.42", "https://93.82.91.106", "https://192.168.31.65", "https://192.168.31.64").allowedMethods("GET", "POST", "OPTIONS")
 		.allowCredentials(true).allowedHeaders("*").exposedHeaders("set-cookie").maxAge(3600); 
 	}

src/main/java/io/github/Hattinger04/hamster/HamsterController.java

@@ -38,7 +38,7 @@ public class HamsterController {
 	private File createNewFile(String path) {
 		try {
 			File file = new File(path); 
-			file.getParentFile().mkdir(); 
+			new File(path.substring(0, path.lastIndexOf("/"))).mkdirs();
 			file.createNewFile();
 			return file; 
 		} catch (IOException e) {

src/main/java/io/github/Hattinger04/hamsterEvaluation/compiler/controller/CompilerController.java

@@ -75,12 +75,7 @@ public boolean ensureCompiled(HamsterFile file) {
 					System.out.println("Ensuring Compiled...");
 					return this.compilerModel.compile(file); // dibo 15.11.2010
 				} catch (IOException e) { // dibo 25.10.2011
-					String msg = Utils.getResource("compiler.msg.rights1")
-							+ Utils.HOME
-							+ Utils.getResource("compiler.msg.rights2");
-					String title = Utils.getResource("compiler.msg.title");
-					System.out.println(title);
-					System.out.println(msg);
+					System.out.println("Compiling error! " + e.getMessage());
 				}
 			} 
 		return true;

src/main/java/io/github/Hattinger04/hamsterEvaluation/compiler/model/JavaCompiler.java

@@ -11,6 +11,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.springframework.security.core.context.SecurityContextHolder;
+
 import com.sun.tools.javac.Main;
 
 import io.github.Hattinger04.hamsterEvaluation.model.HamsterFile;
@@ -30,7 +32,7 @@ public class JavaCompiler {
 	 * In diese Temporaere Datei werden die javac-Fehlermeldungen geschrieben,
 	 * bevor sie dann wieder eingelesen werden.
 	 */
-	public static final String TEMP_FILE = "compiler.tmp";
+	public static final String TEMP_FILE = "compiler.tmp"; // TODO: very ugly programming by myself -> make better someday
 
 	/**
 	 * Der Classpath waehrend der Compilierung
@@ -95,7 +97,7 @@ public static String readTempFile() throws IOException {
 
 		FileInputStream input = null;
 		try {
-			input = new FileInputStream(Utils.HOME + Utils.FSEP + TEMP_FILE);
+			input = new FileInputStream(Utils.HOME + Utils.FSEP + SecurityContextHolder.getContext().getAuthentication().getName() + Utils.FSEP + TEMP_FILE);
 			buffer = new byte[input.available()];
 			input.read(buffer);
 		} finally {
@@ -128,7 +130,7 @@ public List compile(HamsterFile file) throws IOException {
 		PrintWriter writer = null;
 		FileWriter fwriter = null;
 		try {
-			fwriter = new FileWriter(Utils.HOME + Utils.FSEP + TEMP_FILE);
+			fwriter = new FileWriter(Utils.HOME +  Utils.FSEP + SecurityContextHolder.getContext().getAuthentication().getName() + Utils.FSEP + TEMP_FILE); 
 
 			writer = new PrintWriter(fwriter);
 			Main.compile(args, writer);

src/main/java/io/github/Hattinger04/hamsterEvaluation/lego/model/KornDaException.java

@@ -31,7 +31,7 @@ public int getSpalte() {
         }
 
         public String toString() {
-                return Utils.getResource("hamster.KornDaException") + " (" + reihe + ", " + spalte + ")";
+                return "hamster.KornDaException" + " (" + reihe + ", " + spalte + ")";
         }
 
 

src/main/java/io/github/Hattinger04/hamsterEvaluation/lego/model/MaulNichtLeerException.java

@@ -20,7 +20,7 @@ public MaulNichtLeerException(Hamster hamster) {
         }
 
         public String toString() {
-                return Utils.getResource("hamster.MaulNichtLeerException");
+                return "hamster.MaulNichtLeerException";
         }
 
 

src/main/java/io/github/Hattinger04/hamsterEvaluation/model/HamsterFile.java

@@ -114,10 +114,10 @@ public HamsterFile(char type) {
 		changeSupport = new PropertyChangeSupport(this);
 		this.type = type;
 		file = new File(Utils.HOME + Utils.FSEP
-				+ Utils.getResource("model.neuerhamster") + count++);
+				+ "model.neuerhamster" + count++);
 		while (file.exists())
 			file = new File(Utils.HOME + Utils.FSEP
-					+ Utils.getResource("model.neuerhamster") + count++);
+					+ "model.neuerhamster" + count++);
 	}
 
 	public HamsterFile(String code, char type) {
@@ -407,7 +407,7 @@ public String load() {
 			} else if (type == OBJECT) {
 				return "void main() {\n    \n}\n";
 			} else if (type == HAMSTERCLASS) {
-				return "class " + Utils.getResource("model.meinhamster")
+				return "class " + "model.meinhamster"
 						+ " extends Hamster {\n    \n}\n";
 			} else if (type == SCHEMEPROGRAM) { // Martin
 				return "(define (start Territorium)\n()\n)";

src/main/java/io/github/Hattinger04/hamsterEvaluation/model/HamsterInitialisierungsException.java

@@ -16,6 +16,6 @@ public HamsterInitialisierungsException(Hamster hamster) {
 	}
 
 	public String toString() {
-		return Utils.getResource("hamster.HamsterInitialisierungsException");
+		return "hamster.HamsterInitialisierungsException";
 	}
 }

src/main/java/io/github/Hattinger04/hamsterEvaluation/model/HamsterInstruction.java

@@ -52,27 +52,27 @@ public int getHamster() {
 	public String toString() {
 		switch (getType()) {
 		case FORWARD:
-			return Utils.getResource("hamster.vor") + "()";
+			return "hamster.vor" + "()";
 		case TURN_LEFT:
-			return Utils.getResource("hamster.linksUm") + "()";
+			return "hamster.linksUm" + "()";
 		case LAY_DOWN:
-			return Utils.getResource("hamster.gib") + "()";
+			return "hamster.gib" + "()";
 		case PICK_UP:
-			return Utils.getResource("hamster.nimm") + "()";
+			return "hamster.nimm" + "()";
 		case FREE:
-			return Utils.getResource("hamster.vornFrei") + "()";
+			return "hamster.vornFrei" + "()";
 		case CORN_AVAILABLE:
-			return Utils.getResource("hamster.kornDa") + "()";
+			return "hamster.kornDa" + "()";
 		case MOUTH_EMPTY:
-			return Utils.getResource("hamster.maulLeer") + "()";
+			return "hamster.maulLeer" + "()";
 		case GET_ROW:
-			return Utils.getResource("hamster.getReihe") + "()";
+			return "hamster.getReihe" + "()";
 		case GET_COL:
-			return Utils.getResource("hamster.getSpalte") + "()";
+			return "hamster.getSpalte" + "()";
 		case GET_DIR:
-			return Utils.getResource("hamster.getBlickrichtung") + "()";
+			return "hamster.getBlickrichtung" + "()";
 		case GET_MOUTH:
-			return Utils.getResource("hamster.getAnzahlKoerner") + "()";
+			return "hamster.getAnzahlKoerner" + "()";
 
 		case GET_DATA:
 			return "";

src/main/java/io/github/Hattinger04/hamsterEvaluation/model/HamsterNichtInitialisiertException.java

@@ -16,6 +16,6 @@ public HamsterNichtInitialisiertException(Hamster hamster) {
 	}
 
 	public String toString() {
-		return Utils.getResource("hamster.HamsterNichtInitialisiertException");
+		return "hamster.HamsterNichtInitialisiertException";
 	}
 }