Implement Vertical text centering feature

Requested in issue #31

Author: miachm

resources/CAS.ods

@@ -169,6 +169,19 @@ private Style readCellStyleEntry(XmlReaderInstance reader) {
                         style.setBackgroundColor(new Color(backgroundColor));
                     }
                     catch (IllegalArgumentException e) { System.err.println(e.getMessage());}
+
+                String verticalAlign = instance.getAttribValue("style:vertical-align");
+                if (verticalAlign != null) {
+                    Style.VERTICAL_TEXT_ALIGMENT pos = null;
+                    if (verticalAlign.equalsIgnoreCase("middle")) {
+                        pos = Style.VERTICAL_TEXT_ALIGMENT.Middle;
+                    } else if (verticalAlign.equalsIgnoreCase("top")) {
+                        pos = Style.VERTICAL_TEXT_ALIGMENT.Top;
+                    } else if (verticalAlign.equalsIgnoreCase("bottom")) {
+                        pos = Style.VERTICAL_TEXT_ALIGMENT.Bottom;
+                    }
+                    style.setVerticalTextAligment(pos);
+                }
             }
 
             if(instance.getTag().equals("style:paragraph-properties")) {

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

@@ -364,6 +364,10 @@ private void writeCellStyle(XMLStreamWriter out, Style style) throws XMLStreamEx
 				if (style.isWrap()) {
 					out.writeAttribute("fo:wrap-option", "wrap");
 				}
+
+				if (style.getVerticalTextAligment() != null) {
+                    out.writeAttribute("style:vertical-align", style.getVerticalTextAligment().toString().toLowerCase());
+                }
 
 				if(style.hasBorders()) {
 					writeBorderStyle(out, style);

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

@@ -2,6 +2,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * This a class which represents the formatting of a cell (background color, font size, font style, etc...)
@@ -16,7 +17,8 @@ public final class Style implements Cloneable {
     private int fontSize = -1;
     private Borders borders = null;
     private boolean wrap = false;
-    private TEXT_ALIGMENT alignment = null;
+    private TEXT_ALIGMENT horizontal_alignment = null;
+    private VERTICAL_TEXT_ALIGMENT vertical_alignment = null;
     private boolean isDate = false;
 
     /** Defines the text position of a Cell
@@ -25,6 +27,10 @@ public enum TEXT_ALIGMENT {
         Left, Center, Right
     }
 
+    public enum VERTICAL_TEXT_ALIGMENT {
+        Top, Middle, Bottom
+    }
+
     /**
      * Constructs an empty-default Style.
      */
@@ -219,7 +225,7 @@ public void setWrap(boolean wrap) {
 	 * @return true if the style has table cell properties, false otherwise.
 	 */
 	public boolean hasTableCellProperties() {
-		return backgroundColor != null || hasBorders() || wrap;
+		return backgroundColor != null || hasBorders() || wrap || vertical_alignment != null;
 	}
 
 	/**
@@ -236,17 +242,24 @@ public boolean hasBorders() {
      * @param p {@link TEXT_ALIGMENT} Left, Center, Right
      */
     public void setTextAligment (TEXT_ALIGMENT p) {
-        alignment = p;
+        horizontal_alignment = p;
     }
 
     /**
      * Get text aligment of the cell
      * @return p {@link TEXT_ALIGMENT} Left, Center, Right
      */
     public TEXT_ALIGMENT getTextAligment() {
-        return alignment;
+        return horizontal_alignment;
+    }
+
+
+    public void setVerticalTextAligment (VERTICAL_TEXT_ALIGMENT p) {
+        vertical_alignment = p;
     }
 
+    public VERTICAL_TEXT_ALIGMENT getVerticalTextAligment() { return vertical_alignment;}
+
     public Object clone() throws CloneNotSupportedException {
         return super.clone();
     }
@@ -272,14 +285,17 @@ public boolean equals(Object o) {
         if (italic != style.italic) return false;
         if (underline != style.underline) return false;
         if (fontSize != style.fontSize) return false;
-        if (borders != null ? !borders.equals(style.borders) : style.borders != null) return false;
+        if (!Objects.equals(borders, style.borders)) return false;
         if (wrap != style.wrap) return false;
-        if (fontColor != null ? !fontColor.equals(style.fontColor) : style.fontColor != null) return false;
-        if (backgroundColor != null ? !backgroundColor.equals(style.backgroundColor) : style.backgroundColor != null)
+        if (!Objects.equals(fontColor, style.fontColor)) return false;
+        if (!Objects.equals(backgroundColor, style.backgroundColor))
             return false;
         if (isDate != style.isDate)
             return false;
-        return alignment == style.alignment;
+        if (horizontal_alignment != style.horizontal_alignment)
+            return false;
+
+        return vertical_alignment == style.vertical_alignment;
     }
 
     @Override
@@ -293,7 +309,8 @@ public int hashCode() {
         result = 31 * result + (borders != null ? borders.hashCode() : 0);
         result = 31 * result + (wrap ? 1 : 0);
         result = 31 * result + (isDate ? 1 : 0);
-        result = 31 * result + (alignment != null ? alignment.hashCode() : 0);
+        result = 31 * result + (horizontal_alignment != null ? horizontal_alignment.hashCode() : 0);
+        result = 31 * result + (vertical_alignment != null ? vertical_alignment.hashCode() : 0);
         return result;
     }
 
@@ -341,9 +358,12 @@ public Map<String, String> getCssStyles()
         	result.put("white-space", "normal");
         }
 
-        if(alignment != null)
+        if(horizontal_alignment != null)
             result.put("text-align", getTextAligment().toString());
 
+        if(vertical_alignment != null)
+            result.put("vertical-align", getVerticalTextAligment().toString().toLowerCase());
+
         return result;
     }
 

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

@@ -60,4 +60,23 @@ public void testCustomFontSize() throws IOException {
         SpreadSheet spreadSheet = new SpreadSheet(new File("resources/floatfontsize.ods"));
         assertEquals(spreadSheet.getSheet(0).getDataRange().getStyle().getFontSize(), 4);
     }
+
+
+    @Test
+    public void testVerticalsAligment()
+    {
+        for (Style.VERTICAL_TEXT_ALIGMENT aligment : Style.VERTICAL_TEXT_ALIGMENT.values()) {
+            Style style = new Style();
+            assertNull(style.getVerticalTextAligment());
+            style.setVerticalTextAligment(aligment);
+            assertEquals(style.getVerticalTextAligment(), aligment);
+
+            Sheet sheet = new Sheet("A", 2, 2);
+            Range range = sheet.getRange(0, 0);
+            range.setStyle(style);
+
+            sheet = saveAndLoad(sheet);
+            assertEquals(sheet.getRange(0, 0).getStyle().getVerticalTextAligment(), aligment);
+        }
+    }
 }