Refactorization, first part

src/com/github/miachm/sods/Cell.java

@@ -1,6 +1,6 @@
 package com.github.miachm.sods;
 
-class Cell implements Cloneable {
+class Cell extends TableItem {
     private Object value;
     private String formula;
     private Style style = new Style();
@@ -128,7 +128,7 @@ public String toString() {
     }
 
     @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
+    public boolean isBlank() {
+        return group == null && this.equals(new Cell());
     }
 }

src/com/github/miachm/sods/CellCollection.java

@@ -0,0 +1,19 @@
+package com.github.miachm.sods;
+
+class CellCollection extends TableCollection<Cell> {
+
+    public boolean isEmpty()
+    {
+        for (Cell cell : items.values()) {
+            if (!cell.isBlank())
+                return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    protected Cell createItem() {
+        return new Cell();
+    }
+}

src/com/github/miachm/sods/Column.java

@@ -0,0 +1,23 @@
+package com.github.miachm.sods;
+
+class Column extends TableItem {
+    private ColumnStyle style;
+
+    @Override
+    public Column clone() throws CloneNotSupportedException {
+        return (Column) super.clone();
+    }
+
+    @Override
+    public boolean isBlank() {
+        return style.isDefault();
+    }
+
+    public ColumnStyle getStyle() {
+        return style;
+    }
+
+    public void setStyle(ColumnStyle style) {
+        this.style = style;
+    }
+}

src/com/github/miachm/sods/ColumnCollection.java

@@ -0,0 +1,28 @@
+package com.github.miachm.sods;
+
+class ColumnCollection extends TableCollection<Column> {
+    private RowCollection rows;
+    public ColumnCollection(RowCollection rows)
+    {
+        this.rows = rows;
+    }
+
+    @Override
+    public void remove(int index, int howmany)
+    {
+        super.remove(index, howmany);
+        rows.deleteCells(index, howmany);
+    }
+
+    @Override
+    public void addItems(int index, int howmany)
+    {
+        super.addItems(index, howmany);
+        rows.addCells(index, howmany);
+    }
+
+    @Override
+    protected Column createItem() {
+        return new Column();
+    }
+}

src/com/github/miachm/sods/ColumnStyle.java

@@ -9,6 +9,11 @@ class ColumnStyle {
     private static final double EQUIVALENCE_PT = 72.0 / 25.4;
     private static final double EQUIVALENCE_PC = 6.0 / 25.4;
 
+    public boolean isDefault()
+    {
+        return this.equals(new ColumnStyle());
+    }
+
     public Double getWidth() {
         return width;
     }

src/com/github/miachm/sods/Row.java

@@ -0,0 +1,28 @@
+package com.github.miachm.sods;
+
+class Row extends TableItem {
+    private RowStyle style;
+    private CellCollection cells = new CellCollection();
+
+    public RowStyle getStyle() {
+        return style;
+    }
+
+    public void setStyle(RowStyle style) {
+        this.style = style;
+    }
+
+    public CellCollection getCells() {
+        return cells;
+    }
+
+    @Override
+    public Row clone() throws CloneNotSupportedException {
+        return (Row) super.clone();
+    }
+
+    @Override
+    public boolean isBlank() {
+        return style.isDefault() && cells.isEmpty();
+    }
+}

src/com/github/miachm/sods/RowCollection.java

@@ -0,0 +1,52 @@
+package com.github.miachm.sods;
+
+import java.util.Map;
+
+public class RowCollection extends TableCollection<Row> {
+    private int numColumns = 0;
+
+    @Override
+    public void addItems(int index, int howmany)
+    {
+        boolean isEmpty = items.isEmpty();
+        super.addItems(index, howmany);
+        if (isEmpty) {
+            addCells(0, numColumns);
+            numColumns /= 2; // Remove useless sum
+        }
+    }
+
+    public void deleteCells(int index, int howmany)
+    {
+        for (Map.Entry<Integer, Row> rowEntry : items.entrySet()) {
+            Row row = rowEntry.getValue();
+            CellCollection cells = row.getCells();
+            cells.remove(index, howmany);
+        }
+    }
+
+    public void addCells(int index, int howmany) {
+        for (Map.Entry<Integer, Row> rowEntry : items.entrySet()) {
+            Row row = rowEntry.getValue();
+            CellCollection cells = row.getCells();
+            cells.addItems(index, howmany);
+        }
+        numColumns += howmany;
+    }
+
+    @Override
+    public Row getItemForEdit(int index)
+    {
+        Row row = super.getItemForEdit(index);
+        CellCollection cells = row.getCells();
+        if (cells.isEmpty())
+            cells.addItems(0, numColumns);
+
+        return row;
+    }
+
+    @Override
+    protected Row createItem() {
+        return new Row();
+    }
+}

src/com/github/miachm/sods/RowStyle.java

@@ -50,4 +50,8 @@ public String toString() {
                 ", isHidden=" + isHidden +
                 '}';
     }
+
+    public boolean isDefault() {
+        return this.equals(new RowStyle());
+    }
 }