Imbus/xl-project
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cell now properly differentiates between formula and displayValue

Browse source
This commit is contained in:
Imbus 2024-06-13 16:41:02 +02:00
parent 6475fa67a0
commit d130907159
6 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/xl/model/BombCell.java
View file

@ -15,7 +15,7 @@ public class BombCell implements Cell {
throw XLException.ERROR_RECURSIVE; throw XLException.ERROR_RECURSIVE;
} }
public String displayValue() { public String displayValue(Environment e) {
throw XLException.ERROR_RECURSIVE; throw XLException.ERROR_RECURSIVE;
} }

2
app/src/main/java/xl/model/Cell.java
View file

@ -7,6 +7,6 @@ import xl.expr.Environment;
*/ */
public interface Cell { public interface Cell {
public double cellValue(Environment e); public double cellValue(Environment e);
public String displayValue(); public String displayValue(Environment e);
public String formula(); public String formula();
} }

2
app/src/main/java/xl/model/CommentCell.java
View file

@ -15,7 +15,7 @@ public class CommentCell implements Cell {
return 0; return 0;
} }
public String displayValue() { public String displayValue(Environment e) {
return "# " + commentText; return "# " + commentText;
} }

4
app/src/main/java/xl/model/ExpressionCell.java
View file

@ -17,8 +17,8 @@ public class ExpressionCell implements Cell {
return expr.value(env); return expr.value(env);
} }
public String displayValue() { public String displayValue(Environment e) {
return Double.toString(cellValue(ENVIRON)); return Double.toString(cellValue(e));
} }
public String formula() { public String formula() {

4
app/src/main/java/xl/model/XLModel.java
View file

@ -99,7 +99,7 @@ public class XLModel extends Observable implements Environment {
public void save(String path) { public void save(String path) {
try (XLPrintStream xlPrintStream = new XLPrintStream(path)) { try (XLPrintStream xlPrintStream = new XLPrintStream(path)) {
xlPrintStream.save(map.entrySet()); xlPrintStream.save(this, map.entrySet());
} catch (IOException e) { } catch (IOException e) {
status = "Error saving file"; status = "Error saving file";
} }
@ -107,7 +107,7 @@ public class XLModel extends Observable implements Environment {
public String getAddressValue(String address) { public String getAddressValue(String address) {
if (map.containsKey(address)) { if (map.containsKey(address)) {
return map.get(address).displayValue(); return map.get(address).displayValue(this);
} }
return ""; return "";
} }

12
app/src/main/java/xl/model/XLPrintStream.java
View file

@ -3,6 +3,9 @@ package xl.model;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.PrintStream; import java.io.PrintStream;
import java.util.Map.Entry; import java.util.Map.Entry;
import xl.expr.Environment;
import java.util.Set; import java.util.Set;
/** /**
@ -14,16 +17,11 @@ public class XLPrintStream extends PrintStream {
super(fileName); super(fileName);
} }
public void save(Set<Entry<String, Cell>> set) { public void save(Environment e, Set<Entry<String, Cell>> set) {
for (Entry<String, Cell> entry : set) { for (Entry<String, Cell> entry : set) {
print(entry.getKey()); print(entry.getKey());
print('='); print('=');
Cell cell = entry.getValue(); println(entry.getValue().displayValue(e));
if (cell instanceof CommentCell) {
println("#" + cell.displayValue());
} else {
println(cell.displayValue());
}
} }
flush(); flush();
close(); close();