diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 92b411f..d7c8762 100644 Binary files a/bin/Spreadsheet.class and b/bin/Spreadsheet.class differ diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index e7086bd..8a3e2a9 100644 Binary files a/bin/SpreadsheetTest.class and b/bin/SpreadsheetTest.class differ diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index e4f120b..f3a2e3d 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -1,13 +1,49 @@ +import java.util.Arrays; public class Spreadsheet { + Object [ ] [ ] sheet = new Object [ 4 ] [ 5 ] ; + + + public class IntCell { + public int Integer; + + public IntCell (int a){ + a = Integer; + + } + } + + public class StringCell{ + public String Stringy; + + public StringCell (String a){ + a = Stringy; + } + } + public String get(String cell) { // to be implemented - return null; + return cell; } public void set(String cell, String value) { - // to be implemented + //A1 must be interpreted as [1] [A] = [1] [1] + + char columnchar = cell.charAt(0); + + char columnletter [] ={'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'L', 'M' }; + //int column [] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }; + + int column = Arrays.asList(columnletter).indexOf(columnchar); + + + if (value.contains("'")){ + StringCell s = new StringCell(value); + }else{ + int a = Integer.parseInt(value); + IntCell i = new IntCell(a); + } } public String evaluate(String cell) { diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 9e0936a..78a3164 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -11,5 +11,15 @@ public void test() { fail("Not yet implemented"); } + @Test + public void SetGetIntCell() { + + Spreadsheet spread = new Spreadsheet(); + spread.set("A1", "5"); + spread.get(cell); + + assertEquals("return value incorrect", "5", cell); + + } }