fixing little bug - creating new terrain now possible via rest

Author: Hattinger04

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

@@ -79,7 +79,6 @@ public ResponseEntity<?> exisitingTerrain(@RequestBody String json) {
 		String hamsterPath = String.format("src/main/resources/hamster/%s/%s/%s.ham", SecurityContextHolder.getContext().getAuthentication().getName(), hamster.getProgramName(), hamster.getProgramName());
 		String terrainPath = String.format("src/main/resources/hamster/%s/%s/%s.ter", SecurityContextHolder.getContext().getAuthentication().getName(), hamster.getProgramName(), hamster.getTerrainName());
 		createNewFile(hamsterPath); 
-		createNewFile(terrainPath); // not sure if needed
 		writeTextToFile(new File(hamsterPath), hamster.getProgram());
 		wb.getJsonObject().clear(); 
 		return new ResponseEntity<>(wb.startProgram(hamsterPath, terrainPath), HttpStatus.OK);  
@@ -94,10 +93,9 @@ public ResponseEntity<?> newTerrain(@RequestBody String json) {
 		String hamsterPath = String.format("src/main/resources/hamster/%s/%s/%s.ham", SecurityContextHolder.getContext().getAuthentication().getName(), hamster.getProgramName(), hamster.getProgramName());
 		String terrainPath = String.format("src/main/resources/hamster/%s/%s/%s.ter", SecurityContextHolder.getContext().getAuthentication().getName(), hamster.getProgramName(), hamster.getTerrainName());
 		createNewFile(hamsterPath); 
-		createNewFile(terrainPath); 
 		writeTextToFile(new File(hamsterPath), hamster.getProgram());
 		wb.getJsonObject().clear(); 
 		return new ResponseEntity<>(wb.startProgram(hamsterPath, terrainPath, 
-				wb.new TerrainForm(hamster.getLeange(), hamster.getBreite(), hamster.getCorn(), hamster.getCornAnzahl(), hamster.getWall(), hamster.getX(), hamster.getY())), HttpStatus.OK);  
+				wb.new TerrainForm(hamster.getLaenge(), hamster.getBreite(), hamster.getCorn(), hamster.getCornAnzahl(), hamster.getWall(), hamster.getX(), hamster.getY())), HttpStatus.OK);  
 	}
 }

src/main/java/io/github/Hattinger04/hamster/model/Hamster.java

@@ -32,7 +32,7 @@ public Hamster(String program, String programName) {
 	private String programName; 
 	private String terrainName;
 	private String program; 
-	private int leange, breite, x, y;
+	private int laenge, breite, x, y;
 	private int[] cornAnzahl; 
 	private int[][] corn, wall; 
 }

src/main/java/io/github/Hattinger04/hamsterEvaluation/workbench/Workbench.java

@@ -91,7 +91,7 @@ protected Workbench(boolean simulatorOnly, SimulationModel simModel) {
 	@Getter @Setter
 	public class TerrainForm {
 
-		private int leange, breite, x, y;
+		private int laenge, breite, x, y;
 		private int[] cornAnzahl; 
 		private int[][] corn, wall;  
 
@@ -107,7 +107,7 @@ public class TerrainForm {
 		 * @param y
 		 */
 		public TerrainForm(int laenge, int breite, int[][] corn, int[] cornAnzahl, int[][] wall, int x, int y) {
-			this.leange = laenge; 
+			this.laenge = laenge; 
 			this.breite = breite; 
 			this.corn = corn; 
 			this.cornAnzahl = cornAnzahl; 
@@ -185,7 +185,7 @@ public boolean createTerrainFile(Terrain terrain, String path) {
 	}
 
 	public Terrain createTerrain(TerrainForm form) {
-		Terrain terrain = new Terrain(form.getLeange(), form.getBreite()); 
+		Terrain terrain = new Terrain(form.getLaenge(), form.getBreite()); 
 		int save = 0; 
 		for(int i = 0; i < form.getCorn().length; i++) {
 			for(int j = 0; j < form.getCorn()[i].length; j++) {

src/main/resources/allLogs.log

@@ -388,3 +388,5 @@ Okt. 31, 2022 7:05:21 PM io.github.Hattinger04.aop.LogAspect loginLog
 FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
 Okt. 31, 2022 7:45:42 PM io.github.Hattinger04.aop.LogAspect loginLog
 FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
+Nov. 01, 2022 8:14:49 PM io.github.Hattinger04.aop.LogAspect loginLog
+FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]

src/main/resources/hamster/admin/compiler.tmp

@@ -0,0 +1 @@
+void main() {linksUm();vor();}

src/main/resources/hamster/admin/test/test.class

@@ -0,0 +1 @@
+import io.github.Hattinger04.hamsterEvaluation.debugger.model.Territorium;import io.github.Hattinger04.hamsterEvaluation.debugger.model.Territory;import io.github.Hattinger04.hamsterEvaluation.model.HamsterException;import io.github.Hattinger04.hamsterEvaluation.model.HamsterInitialisierungsException;import io.github.Hattinger04.hamsterEvaluation.model.HamsterNichtInitialisiertException;import io.github.Hattinger04.hamsterEvaluation.model.KachelLeerException;import io.github.Hattinger04.hamsterEvaluation.model.MauerDaException;import io.github.Hattinger04.hamsterEvaluation.model.MaulLeerException;import io.github.Hattinger04.hamsterEvaluation.model.MouthEmptyException;import io.github.Hattinger04.hamsterEvaluation.model.WallInFrontException;import io.github.Hattinger04.hamsterEvaluation.model.TileEmptyException;public class test extends io.github.Hattinger04.hamsterEvaluation.debugger.model.IHamster implements io.github.Hattinger04.hamsterEvaluation.model.HamsterProgram {public void main() {linksUm();vor();}}

src/main/resources/hamster/admin/test/test.ham

@@ -0,0 +1,11 @@
+5
+5
+##   
+>    
+  *  
+  *  
+     
+0
+2
+1
+0

src/main/resources/hamster/admin/test/test.java

@@ -0,0 +1,4 @@
+hamster.MauerDaException (0, 0)
+	at io.github.Hattinger04.hamsterEvaluation.debugger.model.IHamster.vor(IHamster.java:94)
+	at test.main(test.java:1)
+	at io.github.Hattinger04.hamsterEvaluation.debugger.model.RemoteRunner.main(RemoteRunner.java:124)