From f10415dec8e4fd9d2ab3c7071f2364932542e1e0 Mon Sep 17 00:00:00 2001
From: "Dr.Janson" <Dr.Janson@DESKTOP-AD348NI.fritz.box>
Date: Sun, 7 Jan 2024 10:36:27 +0100
Subject: [PATCH] =?UTF-8?q?Regex=20f=C3=BCr=20fehlerhafte=20eingaben?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../informatik/spreadsheet/Axel.java          | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/Axel/src/de/hs_mannheim/informatik/spreadsheet/Axel.java b/Axel/src/de/hs_mannheim/informatik/spreadsheet/Axel.java
index ab8a5ed..831f11a 100644
--- a/Axel/src/de/hs_mannheim/informatik/spreadsheet/Axel.java
+++ b/Axel/src/de/hs_mannheim/informatik/spreadsheet/Axel.java
@@ -18,6 +18,7 @@ public class Axel {
 		spr.put("A3", "123");
 		
 		spr.put("B9", "=41+A2+10-2/3");
+		spr.put("B9", "2");
 		
 		System.out.println("Schreibe 'stop' zum anhalten.");
 		do{
@@ -28,26 +29,27 @@ public class Axel {
 			System.out.println(spr);
 			System.out.println("Befehl (z.B. D4_=7*6): ");
 			command = input.nextLine();
-			if(command.contentEquals("stop"))
-				break;
-			for(int i = 0; i<command.length();i++) {
-				if(command.charAt(i)=='_') {
-					cellTRUE = false;
-					continue;
+			if(command.matches("[A-Za-z][1-9][0-9]?_=((([A-Za-z][1-9][0-9]?)|([0-9]+))(\\*|\\+|\\-|\\/))*(([A-Za-z][1-9][0-9]?)|([0-9]+))")) {
+				for(int i = 0; i<command.length();i++) {
+					if(command.charAt(i)=='_') {
+						cellTRUE = false;
+						continue;
+					}
+					if(cellTRUE) {
+						cell+=command.charAt(i);
+					}else {
+						form+=command.charAt(i);
+					}
 				}
-				if(cellTRUE) {
-					cell+=command.charAt(i);
-				}else {
-					form+=command.charAt(i);
-				}
-			}
-			spr.put(cell, form);
-			
+				spr.put(cell, form);
+            }else if(command.matches("stop")){
+            	break;
+            }else {
+            	System.out.println("Die Eingabe war nicht korrekt. Die Tabelle bleibt auf folgendem stand:");
+            }
 		}while(true);
 		
 		spr.saveCsv("tmp/test.csv");
-		
-		// TODO: You might want to put "UI loop" for entering value and formulas here resp. in some UI methods.
 	}
 
 }
\ No newline at end of file