3012775
/
PR1-Spreadsheet
forked from hummel/PR1-Spreadsheet
1
0
Fork 0
Code Pull Requests Activity

update regex für leere zellen

main
ERANZER 2024-01-09 13:39:15 +01:00
parent 365b569a67
commit f3af3f39e0
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Axel/src/de/hs_mannheim/informatik/spreadsheet/Axel.java
View File

@ -20,7 +20,7 @@ public class Axel {
cols=Integer.parseInt(kb.nextLine()); cols=Integer.parseInt(kb.nextLine());
Spreadsheet spr=new Spreadsheet(rows,cols); Spreadsheet spr=new Spreadsheet(rows,cols);
//spr.put("A3", "3"); //spr.put("A3", "3");
spr.put("A2", "2"); //spr.put("A2", "2");
spr.put("A1","=19+4"); spr.put("A1","=19+4");
spr.put("B9", "=41+A2"); spr.put("B9", "=41+A2");
spr.put("J5", "=7*6"); spr.put("J5", "=7*6");

2
Axel/src/de/hs_mannheim/informatik/spreadsheet/Spreadsheet.java
View File

@ -264,6 +264,8 @@ public class Spreadsheet {
while (m.find()) { // m.find() must always be used before m.group() while (m.find()) { // m.find() must always be used before m.group()
String s = m.group(); String s = m.group();
if(!s.isEmpty()) { if(!s.isEmpty()) {
if((int)s.charAt(0)>=(int)'A'&&(int)s.charAt(0)<=(int)'Z' && cells[(Integer.parseInt(s.substring(1)))-1][(int)s.charAt(0)-(int)'A'].isEmpty())
continue;
if(first && (int)s.charAt(0)>=(int)'A'&&(int)s.charAt(0)<=(int)'Z') { if(first && (int)s.charAt(0)>=(int)'A'&&(int)s.charAt(0)<=(int)'Z') {
res=Integer.parseInt(cells[(Integer.parseInt(s.substring(1)))-1][(int)s.charAt(0)-(int)-'A'].getValue()); res=Integer.parseInt(cells[(Integer.parseInt(s.substring(1)))-1][(int)s.charAt(0)-(int)-'A'].getValue());
first=false; first=false;