Program commands

Added program commands like saving, loading, exiting a file or clearing the table, added example file including formulas

Axel/resources/zahlen.csv

@@ -1,4 +1,11 @@
-1,2
+1,5,=SUMME(A1:B4),,,,,,,,200
-3,4
+2,6,,,,,,,,,
-5,6
+3,7,,,,,,,,,
-7,8
+4,8,,=1+4*A2,,,2,,,4,
+,,,,,3,3,,,,
+,,,,,,,,,,
+,,,,,,,,,,
+,,,,,,,,,,
+,,,,,,,,,,
+,,,,,,,,69,,
+,,,,,,,=STABW(K1:K11),,,100

Axel/src/de/hs_mannheim/informatik/spreadsheet/Axel.java

@@ -1,5 +1,6 @@
 package de.hs_mannheim.informatik.spreadsheet;
 
+import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.Scanner;
@@ -14,32 +15,17 @@ import java.util.regex.Pattern;
 public class Axel {
 	static Scanner keyboard = new Scanner(System.in);
 	static Spreadsheet spr = new Spreadsheet(11, 11);
+	static String saveFilePath = "Axel\\resources\\zahlen.csv";
 
 	public static void main(String[] args) throws FileNotFoundException {
 		System.out.println("Welcome to Axel (Totally not Excel)");
 		System.out.println();
-		/*
-		spr.put("A1", "1");
-		spr.put("A2", "1");	
-		spr.put("A3", "123");
-		spr.put("B1", "2");
-		spr.put("B2", "4");
-		spr.put("B3", "1");
 
-		spr.put("B4", "=41+A2");
+		spr.loadSpecialTable();
-		spr.put("C5", "=7*6");
-		spr.put("D1", "=3/2");
-		 */
-
-		progLoad();
 		System.out.println(spr);
 
 		// spr.saveCsv("/tmp/test.csv");
 
-		// DONE: You might want to put "UI loop" for entering value and formulas here resp. in some UI methods.
-		// TODO ME: Implement program commands
-
-
 		while (true) {
 			String userCommandPositionInput = userCommandPositionInput();
 			if (userCommandPositionInput.charAt(0) == '*') {
@@ -63,7 +49,7 @@ public class Axel {
 	public static String userCommandPositionInput() {
 		System.out.println();
 		System.out.println("Input a command for the program or a position");
-		System.out.printf("List of program commands: *exit, *save, *load or *help %nFormat for position: A1 or B14%n");
+		System.out.printf("List of program commands: *clear, *load, *save, *exit or *help %nFormat for position: A1 or B14%n");
 		System.out.print("Input: ");
 		String userCommandPositionInput = keyboard.nextLine();
 
@@ -102,10 +88,10 @@ public class Axel {
 
 	public static boolean userCommandErrorCheck(String CommandToCheck) {
 		//? true if valid
-		//? valid inputs are: *exit, *save, *load, *help (and all upper case variants)
+		//? valid inputs are: *clear, *exit, *save, *load, *help (and all upper case variants)
 
 		CommandToCheck = CommandToCheck.toLowerCase();
-		if (CommandToCheck.equals("*exit") || CommandToCheck.equals("*save") || CommandToCheck.equals("*load") || CommandToCheck.equals("*help")){
+		if (CommandToCheck.equals("*clear") || CommandToCheck.equals("*exit") || CommandToCheck.equals("*save") || CommandToCheck.equals("*load") || CommandToCheck.equals("*help")) {
 			return true;
 		}
 		return false;
@@ -188,9 +174,6 @@ public class Axel {
 		//? true if valid
 		//? valid inputs are: =7*6, =SUM(A1:A3), =A1, =A1+A2, =A1-A2, ... (and all lower case variants)
 
-		//TODO ME: Formula format check, maybe too much work
-		//TODO ME: Check if formula vars are in bounds
-
 		//? remove '=' at the beginning and make everything upper case
 		formulaToCheck = formulaToCheck.toUpperCase().substring(1);
 
@@ -245,7 +228,7 @@ public class Axel {
 	}
 
 	public static boolean userFormulaExpressionErrorCheck(String expressionToCheck) {
-
+		//TODO ME: Maybe not worth the time
 		return true;
 	}
 
@@ -260,45 +243,61 @@ public class Axel {
 		if (!(valueToCheck.matches(digitCheckRegex))) {
 			return false;
 		}
-
 		return true;
 	}
 
 
-	public static void executeCommand(String command) {
+	public static void executeCommand(String command) throws FileNotFoundException {
-		System.out.printf("Executing command: %s%n", command);
-		//TODO ME:
 		switch (command) {
+			case "*clear":
+				progClear();
+				break;
+
 			case "*load":
 				progLoad();
 				break;
+
+			case "*save":
+				progSave();
+				break;
+
+			case "*exit":
+				progExit();
+				break;
 		}
 	}
 
-	private static void progLoad(){
+	private static void progClear(){
-		int rows = spr.getRowsLCount();
+		System.out.println("Are you sure you want to clear the table? (yes/no)");
-		int cols = spr.getColsCount();
+		System.out.print("Input: ");
+		String userClearInput = keyboard.nextLine().toLowerCase();
 
-		for (int r = 0; r < rows; r++){
+		if (userClearInput.equals("yes") || userClearInput.equals("y")){
-			for (int c = 0; c < cols; c++){
+			spr.clearTable();
-				spr.cells[r][c].setValue("");
+			System.out.println("Table cleared!");
 		}
 	}
-		spr.put("A1", "1");
+
-		spr.put("A2", "2");
+	private static void progLoad() throws FileNotFoundException {
-		spr.put("A3", "3");
+		spr.readCsv(saveFilePath, ",", "Amogus");
-		spr.put("A4", "4");
+		System.out.println("File loaded!");
-		spr.put("B1", "5");
+	}
-		spr.put("B2", "6");
+
-		spr.put("B3", "7");
+	private static void progSave() throws FileNotFoundException {
-		spr.put("B4", "8");
+		String savePath = saveFilePath;
-		spr.put("K1", "200");
+		spr.saveCsv(savePath);
-		spr.put("K11", "100");
+		System.out.println("File saved");
-		spr.put("J4", "4");
+	}
-		spr.put("I10", "69");
+
-		spr.put("F5", "3");
+	private static void progExit() throws FileNotFoundException {
-		spr.put("G4", "2");
+		System.out.println("Do you want to save befor you exit? (yes/no)");
-		spr.put("G5", "3");
+		System.out.print("Input: ");
+		String userExitInput = keyboard.nextLine().toLowerCase();
+
+		if (userExitInput.equals("yes") || userExitInput.equals("y")) {
+			progSave();
+		}
+		System.out.println("Goodbye!");
+	}
 
 }
-}

Axel/src/de/hs_mannheim/informatik/spreadsheet/Spreadsheet.java

@@ -1,10 +1,12 @@
 package de.hs_mannheim.informatik.spreadsheet;
 
 import javax.naming.ldap.spi.LdapDnsProviderResult;
+import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.ArrayList;
+import java.util.Scanner;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -24,8 +26,6 @@ public class Spreadsheet {
 	 */
 	public Spreadsheet(int rows, int cols) {
 
-		// TODO limit the maximum size on 99 (1..99) rows and 26 (A..Z) columns
-
 		if (rows > 99){
 			System.out.printf("Row size %d is bigger then 99, value will be set to 99! %n", rows);
 			rows = 99;
@@ -58,6 +58,7 @@ public class Spreadsheet {
 		if (!value.startsWith("="))
 			cells[row][col].setValue(value);
 		else {
+			System.out.printf("Formula: %s %n", value);
 			cells[row][col].setFormula(value);
 			evaluateCell(row, col);
 		}
@@ -85,24 +86,62 @@ public class Spreadsheet {
 
 	/**
 	 * A method for reading in data from a CSV file.
-	 * @param path The file to read.
+	 * @param filePath The file to read.
 	 * @param separator The char used to split up the input, e.g. a comma or a semicolon.
 	 * @param startCellName The upper left cell where data from the CSV file should be inserted.
 	 * @return Nothing.
 	 * @exception IOException If path does not exist.
 	 */
-	public void readCsv(String path, char separator, String startCellName) throws FileNotFoundException {
+	public void readCsv(String filePath, String separator, String startCellName) throws FileNotFoundException {
-		// TODO: implement this
+		ArrayList<String> fileRows = new ArrayList<>();
+		Scanner sc = new Scanner(new File(filePath));
+
+		while (sc.hasNextLine()) {
+			fileRows.add(sc.nextLine());
+		}
+		clearTable();
+
+		ArrayList <int[]> formulas = new ArrayList<>();
+
+		for (int rowI = 0; rowI < fileRows.size(); rowI++) {
+			String row = fileRows.get(rowI);
+			String[] cells = row.split(separator);
+
+			for (int colI = 0; colI < cells.length; colI++) {
+				String cellContent = cells[colI].toUpperCase();
+
+				if (cellContent.startsWith("=")){
+					formulas.add(new int[]{rowI, colI});
+				}
+				else {
+					put(rowI, colI, cellContent);
+				}
+
+			}
+		}
+
+		for (int[] formulaPos : formulas){
+			int rowI = formulaPos[0];
+			int colI = formulaPos[1];
+			System.out.printf("Formula at %d-%d %n", rowI, colI);
+
+			String row = fileRows.get(rowI);
+			String formulaToFill = row.split(separator)[colI];
+
+			put(rowI, colI, formulaToFill);
+		}
+
+		sc.close();
 	}
 
 	/**
 	 * A method for saving data to a CSV file.
-	 * @param path The file to write.
+	 * @param filePath The file to write.
 	 * @return Nothing.
-	 * @exception IOException If path does not exist.
+	 * @exception FileNotFoundException If path does not exist.
 	 */
-	public void saveCsv(String path) throws FileNotFoundException {
+	public void saveCsv(String filePath) throws FileNotFoundException {
-		PrintWriter out = new PrintWriter(path);
+		PrintWriter out = new PrintWriter(filePath);
 
 		for (Cell[] row : cells) {
 			for (Cell cell : row) {
@@ -129,6 +168,7 @@ public class Spreadsheet {
 
 	private void evaluateCell(int row, int col) {
 		String formula = cells[row][col].getFormula();
+		System.out.printf("Formel in eval: %s %n", formula);
 		String result = "";
 
 		if (formula.startsWith("SUMME("))  // e.g. SUMME(A3:A8)
@@ -451,6 +491,36 @@ public class Spreadsheet {
 		return cells[0].length;
 	}
 
+	public void clearTable() {
+		int rows = getRowsLCount();
+		int cols = getColsCount();
+
+		for (int r = 0; r < rows; r++) {
+			for (int c = 0; c < cols; c++) {
+				cells[r][c].setValue("");
+			}
+		}
+	}
+
+	public void loadSpecialTable(){
+		clearTable();
+
+		put("A1", "1");
+		put("A2", "2");
+		put("A3", "3");
+		put("A4", "4");
+		put("B1", "5");
+		put("B2", "6");
+		put("B3", "7");
+		put("B4", "8");
+		put("K1", "200");
+		put("K11", "100");
+		put("J4", "4");
+		put("I10", "69");
+		put("F5", "3");
+		put("G4", "2");
+		put("G5", "3");
+	}
 
 	public String toString() {
 		StringBuilder sb = new StringBuilder();