hummel
/
PR1-Spreadsheet
2
1
Fork 10
Code Issues Pull Requests Packages Projects Releases Activity

das vorherige

ERANZER 2024-01-09 13:40:01 +01:00
parent f3af3f39e0
commit 1c024fdbfc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -264,10 +264,10 @@ 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()) if((int)s.charAt(0)>=(int)'A'&&(int)s.charAt(0)<=(int)'Z' && get(s).isEmpty())
continue; 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(get(s));
first=false; first=false;
}else if(first) { }else if(first) {
res=Integer.parseInt(s); res=Integer.parseInt(s);
@ -283,16 +283,16 @@ public class Spreadsheet {
}else if((int)s.charAt(0)>=(int)'A'&&(int)s.charAt(0)<=(int)'Z'){ }else if((int)s.charAt(0)>=(int)'A'&&(int)s.charAt(0)<=(int)'Z'){
switch(operation) { switch(operation) {
case("+"): case("+"):
res+=Integer.parseInt(cells[(Integer.parseInt(s.substring(1)))-1][(int)s.charAt(0)-(int)'A'].getValue()); res+=Integer.parseInt(get(s));
break; break;
case("-"): case("-"):
res-=Integer.parseInt(cells[(Integer.parseInt(s.substring(1)))-1][(int)s.charAt(0)-(int)'A'].getValue()); res-=Integer.parseInt(get(s));
break; break;
case("*"): case("*"):
res*=Integer.parseInt(cells[(Integer.parseInt(s.substring(1)))-1][(int)s.charAt(0)-(int)'A'].getValue()); res*=Integer.parseInt(get(s));
break; break;
case("/"): case("/"):
res/=Integer.parseInt(cells[(Integer.parseInt(s.substring(1)))-1][(int)s.charAt(0)-(int)'A'].getValue()); res/=Integer.parseInt(get(s));
break; break;
} }
}else { }else {