added features:

-background image for comment
-wrapText for HSSFSimpleShape
-few other improvements

git-svn-id: https://svn.apache.org/repos/asf/poi/branches/gsoc2012@1366636 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java b/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java
index dbf4a6dad23e555fe17721ea70b2458c11aef1ff..b97eeafda2bd467642a6ea8ee403414162eacb2f 100644 (file)
--- a/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java
+++ b/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java
@@ -154,6 +154,15 @@ public abstract class AbstractEscherOptRecord extends EscherRecord
         sortProperties();
     }
 
+    public void removeEscherProperty(int num){
+        for ( Iterator<EscherProperty> iterator = getEscherProperties().iterator(); iterator.hasNext(); ) {
+            EscherProperty prop = iterator.next();
+            if (prop.getPropertyNumber() == num){
+                iterator.remove();
+            }
+        }
+    }
+
     /**
      * Retrieve the string representation of this record.
      */

diff --git a/src/java/org/apache/poi/ddf/EscherBoolProperty.java b/src/java/org/apache/poi/ddf/EscherBoolProperty.java
index da9499af38ffb9056d0f6080bde7aadcb4049c9d..304439548578764b88ba801e363c2d4ae957f616 100644 (file)
--- a/src/java/org/apache/poi/ddf/EscherBoolProperty.java
+++ b/src/java/org/apache/poi/ddf/EscherBoolProperty.java
@@ -70,7 +70,7 @@ public class EscherBoolProperty
     public String toXml(String tab){
         StringBuilder builder = new StringBuilder();
         builder.append(tab).append("<").append(getClass().getSimpleName()).append(" id=\"0x").append(HexDump.toHex(getId()))
-                .append("\" name=\"").append(getName()).append("\" blipId=\"")
+                .append("\" name=\"").append(getName()).append("\" simpleValue=\"").append(getPropertyValue()).append("\" blipId=\"")
                 .append(isBlipId()).append("\" value=\"").append(isTrue()).append("\"").append("/>\n");
         return builder.toString();
     }

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java b/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java
index 4922529e6dd12cf44197ea66a9f02cd2b7b1d1f2..6c1fecbc3b26f266f9fd22fed31924aebd418cd9 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java
@@ -19,7 +19,6 @@ package org.apache.poi.hssf.usermodel;
 import org.apache.poi.ddf.*;
 import org.apache.poi.hssf.record.*;
 import org.apache.poi.ss.usermodel.Comment;
-import org.apache.poi.ss.usermodel.RichTextString;
 
 /**
  * Represents a cell comment - a sticky note associated with a cell.
@@ -28,6 +27,9 @@ import org.apache.poi.ss.usermodel.RichTextString;
  */
 public class HSSFComment extends HSSFTextbox implements Comment {
 
+    private final static int FILL_TYPE_SOLID = 0;
+    private final static int FILL_TYPE_PICTURE = 3;
+
     /*
       * TODO - make HSSFComment more consistent when created vs read from file.
       * Currently HSSFComment has two main forms (corresponding to the two constructors).   There
@@ -77,10 +79,11 @@ public class HSSFComment extends HSSFTextbox implements Comment {
     protected EscherContainerRecord createSpContainer() {
         EscherContainerRecord spContainer = super.createSpContainer();
         EscherOptRecord opt = spContainer.getChildById(EscherOptRecord.RECORD_ID);
-        removeEscherProperty(opt, EscherProperties.TEXT__TEXTLEFT);
-        removeEscherProperty(opt, EscherProperties.TEXT__TEXTRIGHT);
-        removeEscherProperty(opt, EscherProperties.TEXT__TEXTTOP);
-        removeEscherProperty(opt, EscherProperties.TEXT__TEXTBOTTOM);
+        opt.removeEscherProperty(EscherProperties.TEXT__TEXTLEFT);
+        opt.removeEscherProperty(EscherProperties.TEXT__TEXTRIGHT);
+        opt.removeEscherProperty(EscherProperties.TEXT__TEXTTOP);
+        opt.removeEscherProperty(EscherProperties.TEXT__TEXTBOTTOM);
+        opt.setEscherProperty(new EscherSimpleProperty(EscherProperties.GROUPSHAPE__PRINT, false, false, 655362));
         return spContainer;
     }
 
@@ -215,7 +218,7 @@ public class HSSFComment extends HSSFTextbox implements Comment {
     }
 
     @Override
-    public HSSFShape cloneShape() {
+    protected HSSFShape cloneShape() {
         TextObjectRecord txo = (TextObjectRecord) getTextObjectRecord().cloneViaReserialise();
         EscherContainerRecord spContainer = new EscherContainerRecord();
         byte [] inSp = getEscherContainer().serialize();
@@ -224,4 +227,26 @@ public class HSSFComment extends HSSFTextbox implements Comment {
         NoteRecord note = (NoteRecord) getNoteRecord().cloneViaReserialise();
         return new HSSFComment(spContainer, obj, txo, note);
     }
+    
+    public void setBackgroundImage(int pictureIndex){
+        setPropertyValue(new EscherSimpleProperty( EscherProperties.FILL__PATTERNTEXTURE, false, true, pictureIndex));
+        setPropertyValue(new EscherSimpleProperty( EscherProperties.FILL__FILLTYPE, false, false, FILL_TYPE_PICTURE));
+        EscherBSERecord bse = _patriarch.getSheet().getWorkbook().getWorkbook().getBSERecord(pictureIndex);
+        bse.setRef(bse.getRef() + 1);
+    }
+    
+    public void resetBackgroundImage(){
+        EscherSimpleProperty property = getOptRecord().lookup(EscherProperties.FILL__PATTERNTEXTURE);
+        if (null != property){
+            EscherBSERecord bse = _patriarch.getSheet().getWorkbook().getWorkbook().getBSERecord(property.getPropertyValue());
+            bse.setRef(bse.getRef() - 1);
+            getOptRecord().removeEscherProperty(EscherProperties.FILL__PATTERNTEXTURE);
+        }
+        setPropertyValue(new EscherSimpleProperty( EscherProperties.FILL__FILLTYPE, false, false, FILL_TYPE_SOLID));
+    }
+    
+    public int getBackgroundImageId(){
+        EscherSimpleProperty property = getOptRecord().lookup(EscherProperties.FILL__PATTERNTEXTURE);
+        return property == null ? 0 : property.getPropertyValue();
+    }
 }

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFObjectData.java b/src/java/org/apache/poi/hssf/usermodel/HSSFObjectData.java
index dfe2b76a7e543c258bee8b6fe41da7455fa56565..57451dd8173eaa8d57d3a63d587141e0421750ed 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFObjectData.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFObjectData.java
@@ -136,7 +136,7 @@ public final class HSSFObjectData extends HSSFPicture {
     }
 
     @Override
-    public HSSFShape cloneShape() {
+    protected HSSFShape cloneShape() {
         EscherContainerRecord spContainer = new EscherContainerRecord();
         byte[] inSp = getEscherContainer().serialize();
         spContainer.fillFields(inSp, 0, new DefaultEscherRecordFactory());

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java b/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java
index 7d8618ba7bac4d46fbede54ad9e584e9a1dd6198..2fa906f4670dada138188a7040c1460f3e51a6e5 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java
@@ -87,8 +87,8 @@ public class HSSFPicture extends HSSFSimpleShape implements Picture {
     protected EscherContainerRecord createSpContainer() {
         EscherContainerRecord spContainer = super.createSpContainer();
         EscherOptRecord opt = spContainer.getChildById(EscherOptRecord.RECORD_ID);
-        removeEscherProperty(opt, EscherProperties.LINESTYLE__LINEDASHING);
-        removeEscherProperty(opt, EscherProperties.LINESTYLE__NOLINEDRAWDASH);
+        opt.removeEscherProperty(EscherProperties.LINESTYLE__LINEDASHING);
+        opt.removeEscherProperty(EscherProperties.LINESTYLE__NOLINEDRAWDASH);
         spContainer.removeChildRecord(spContainer.getChildById(EscherTextboxRecord.RECORD_ID));
         return spContainer;
     }
@@ -290,7 +290,7 @@ public class HSSFPicture extends HSSFSimpleShape implements Picture {
     }
 
     @Override
-    public HSSFShape cloneShape() {
+    protected HSSFShape cloneShape() {
         EscherContainerRecord spContainer = new EscherContainerRecord();
         byte [] inSp = getEscherContainer().serialize();
         spContainer.fillFields(inSp, 0, new DefaultEscherRecordFactory());

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFShape.java b/src/java/org/apache/poi/hssf/usermodel/HSSFShape.java
index ba7a8667065f3976c545eed15ff09cafa2f322d6..dd8a586f73b59e01030c56f443e74a1faf8fef38 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFShape.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFShape.java
@@ -90,15 +90,6 @@ public abstract class HSSFShape {
 
     protected abstract void afterRemove(HSSFPatriarch patriarch);
 
-    protected void removeEscherProperty(EscherOptRecord opt, int num){
-        for ( Iterator<EscherProperty> iterator = opt.getEscherProperties().iterator(); iterator.hasNext(); ) {
-            EscherProperty prop = iterator.next();
-            if (prop.getPropertyNumber() == num){
-                iterator.remove();
-            }
-        }
-    }
-
     void setShapeId(int shapeId){
         EscherSpRecord spRecord = _escherContainer.getChildById(EscherSpRecord.RECORD_ID);
         spRecord.setShapeId(shapeId);
@@ -112,15 +103,15 @@ public abstract class HSSFShape {
 
     abstract void afterInsert(HSSFPatriarch patriarch);
 
-    public EscherContainerRecord getEscherContainer() {
+    protected EscherContainerRecord getEscherContainer() {
         return _escherContainer;
     }
 
-    public ObjRecord getObjRecord() {
+    protected ObjRecord getObjRecord() {
         return _objRecord;
     }
 
-    public EscherOptRecord getOptRecord() {
+    protected EscherOptRecord getOptRecord() {
         return _optRecord;
     }
 
@@ -353,5 +344,5 @@ public abstract class HSSFShape {
         return 1;
     }
 
-    public abstract HSSFShape cloneShape();
+    protected abstract HSSFShape cloneShape();
 }

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java b/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java
index 1c8ac95dfa4d2c8cef2739199c74d97268ff28a2..f08625a010f5c7c5f0af03197743a954eea0b5a8 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java
@@ -337,7 +337,7 @@ public class HSSFShapeGroup extends HSSFShape implements HSSFShapeContainer {
     }
 
     @Override
-    public HSSFShape cloneShape() {
+    protected HSSFShape cloneShape() {
         throw new IllegalStateException("Use method cloneShape(HSSFPatriarch patriarch)");
     }
 

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java b/src/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java
index 77d23f3f1d2d8a34a7a928bfa564f6e6c3657476..661c1d998c2531b71d00866f0c84325076275a76 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java
@@ -57,6 +57,10 @@ public class HSSFSimpleShape extends HSSFShape
     public final static short       OBJECT_TYPE_COMMENT            = 25;
 //    public final static short       OBJECT_TYPE_MICROSOFT_OFFICE_DRAWING = 30;
 
+    public final static int WRAP_SQUARE = 0;
+    public final static int WRAP_BY_POINTS = 1;
+    public final static int WRAP_NONE = 2;
+
     private static final Map <Short, Short> objTypeToShapeType = new HashMap<Short, Short>();
 
     private TextObjectRecord _textObjectRecord;
@@ -83,12 +87,14 @@ public class HSSFSimpleShape extends HSSFShape
         _textObjectRecord = createTextObjRecord();
     }
 
-    public TextObjectRecord getTextObjectRecord() {
+    protected TextObjectRecord getTextObjectRecord() {
         return _textObjectRecord;
     }
 
     protected TextObjectRecord createTextObjRecord(){
         TextObjectRecord obj = new TextObjectRecord();
+        obj.setHorizontalTextAlignment(2);
+        obj.setVerticalTextAlignment(2);
         obj.setTextLocked(true);
         obj.setTextOrientation(TextObjectRecord.TEXT_ORIENTATION_NONE);
         obj.setStr(new HSSFRichTextString(""));
@@ -194,7 +200,7 @@ public class HSSFSimpleShape extends HSSFShape
     }
 
     @Override
-    public HSSFShape cloneShape() {
+    protected HSSFShape cloneShape() {
         TextObjectRecord txo = null;
         EscherContainerRecord spContainer = new EscherContainerRecord();
         byte [] inSp = getEscherContainer().serialize();
@@ -243,4 +249,13 @@ public class HSSFSimpleShape extends HSSFShape
         }
         spRecord.setShapeType(objTypeToShapeType.get((short) shapeType));
     }
+
+    public int getWrapText(){
+        EscherSimpleProperty property = getOptRecord().lookup(EscherProperties.TEXT__WRAPTEXT);
+        return null == property ? WRAP_SQUARE : property.getPropertyValue();
+    }
+
+    public void setWrapText(int value){
+        setPropertyValue(new EscherSimpleProperty(EscherProperties.TEXT__WRAPTEXT, false, false, value));
+    }
 }

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java b/src/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java
index 9f859ee3aceefe94374514ce4540ca1844f18110..4260ead63897e60bc383ff602207636435ac7407 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java
@@ -230,7 +230,7 @@ public class HSSFTextbox extends HSSFSimpleShape {
     }
 
     @Override
-    public HSSFShape cloneShape() {
+    protected HSSFShape cloneShape() {
         TextObjectRecord txo = (TextObjectRecord) getTextObjectRecord().cloneViaReserialise();
         EscherContainerRecord spContainer = new EscherContainerRecord();
         byte[] inSp = getEscherContainer().serialize();

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFUnknownShape.java b/src/java/org/apache/poi/hssf/usermodel/HSSFUnknownShape.java
index 75d33c6c659e9a71baa56c10457a0866dc446bb3..e28d3f8cc14c654b324c0289d34a6a2ac8f6a857 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFUnknownShape.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFUnknownShape.java
@@ -50,7 +50,7 @@ public class HSSFUnknownShape extends HSSFShape {
     }\r
 \r
     @Override\r
-    public HSSFShape cloneShape() {\r
+    protected HSSFShape cloneShape() {\r
         return null;\r
     }\r
 }\r

diff --git a/src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java b/src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java
index 23dc0526cd3f476b5f6f322173551b60a69ea7a7..512ad2371eb02a0ab927aa69da73155370ea09e6 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java
@@ -120,7 +120,7 @@ public class TestDrawingShapes extends TestCase {
         HSSFSheet sheet = wb.createSheet();\r
 \r
         HSSFPatriarch drawing = sheet.createDrawingPatriarch();\r
-        HSSFClientAnchor anchor = new HSSFClientAnchor(10, 10, 200, 200, (short) 2, 2, (short) 15, 15);\r
+        HSSFClientAnchor anchor = new HSSFClientAnchor(10, 10, 50, 50, (short) 2, 2, (short) 4, 4);\r
         anchor.setAnchorType(2);\r
         assertEquals(anchor.getAnchorType(), 2);\r
 \r
@@ -132,13 +132,16 @@ public class TestDrawingShapes extends TestCase {
         assertEquals(10000, rectangle.getLineWidth());\r
         rectangle.setLineStyle(10);\r
         assertEquals(10, rectangle.getLineStyle());\r
+        assertEquals(rectangle.getWrapText(), HSSFSimpleShape.WRAP_SQUARE);\r
         rectangle.setLineStyleColor(1111);\r
         rectangle.setNoFill(true);\r
+        rectangle.setWrapText(HSSFSimpleShape.WRAP_NONE);\r
         rectangle.setString(new HSSFRichTextString("teeeest"));\r
         assertEquals(rectangle.getLineStyleColor(), 1111);\r
-        assertEquals(((EscherSimpleProperty)((EscherOptRecord)rectangle.getEscherContainer().getChildById(EscherOptRecord.RECORD_ID))\r
+        assertEquals(((EscherSimpleProperty)((EscherOptRecord)HSSFTestHelper.getEscherContainer(rectangle).getChildById(EscherOptRecord.RECORD_ID))\r
                 .lookup(EscherProperties.TEXT__TEXTID)).getPropertyValue(), "teeeest".hashCode());\r
         assertEquals(rectangle.isNoFill(), true);\r
+        assertEquals(rectangle.getWrapText(), HSSFSimpleShape.WRAP_NONE);\r
         assertEquals(rectangle.getString().getString(), "teeeest");\r
 \r
         wb = HSSFTestDataSamples.writeOutAndReadBack(wb);\r
@@ -157,6 +160,7 @@ public class TestDrawingShapes extends TestCase {
         assertEquals(rectangle2.getFillColor(), 777);\r
         assertEquals(rectangle2.isNoFill(), true);\r
         assertEquals(rectangle2.getString().getString(), "teeeest");\r
+        assertEquals(rectangle.getWrapText(), HSSFSimpleShape.WRAP_NONE);\r
 \r
         rectangle2.setFillColor(3333);\r
         rectangle2.setLineStyle(9);\r
@@ -167,6 +171,7 @@ public class TestDrawingShapes extends TestCase {
         rectangle2.getAnchor().setDx2(3);\r
         rectangle2.getAnchor().setDy1(4);\r
         rectangle2.getAnchor().setDy2(5);\r
+        rectangle.setWrapText(HSSFSimpleShape.WRAP_BY_POINTS);\r
         rectangle2.setString(new HSSFRichTextString("test22"));\r
 \r
         wb = HSSFTestDataSamples.writeOutAndReadBack(wb);\r
@@ -175,6 +180,7 @@ public class TestDrawingShapes extends TestCase {
         assertEquals(1, drawing.getChildren().size());\r
         rectangle2 = (HSSFSimpleShape) drawing.getChildren().get(0);\r
         assertEquals(HSSFSimpleShape.OBJECT_TYPE_RECTANGLE, rectangle2.getShapeType());\r
+        assertEquals(rectangle.getWrapText(), HSSFSimpleShape.WRAP_BY_POINTS);\r
         assertEquals(77, rectangle2.getLineWidth());\r
         assertEquals(9, rectangle2.getLineStyle());\r
         assertEquals(rectangle2.getLineStyleColor(), 4444);\r
@@ -313,7 +319,7 @@ public class TestDrawingShapes extends TestCase {
 \r
         HSSFTextbox textbox = patriarch.createTextbox(new HSSFClientAnchor());\r
         EscherOptRecord opt1 = HSSFTestHelper.getOptRecord(textbox);\r
-        EscherOptRecord opt2 = textbox.getEscherContainer().getChildById(EscherOptRecord.RECORD_ID);\r
+        EscherOptRecord opt2 = HSSFTestHelper.getEscherContainer(textbox).getChildById(EscherOptRecord.RECORD_ID);\r
         assertSame(opt1, opt2);\r
     }\r
     \r
@@ -328,13 +334,13 @@ public class TestDrawingShapes extends TestCase {
         String opt1Str = opt.toXml();\r
 \r
         textbox.setFillColor(textbox.getFillColor());\r
-        assertEquals(opt1Str, textbox.getEscherContainer().getChildById(EscherOptRecord.RECORD_ID).toXml());\r
+        assertEquals(opt1Str, HSSFTestHelper.getEscherContainer(textbox).getChildById(EscherOptRecord.RECORD_ID).toXml());\r
         textbox.setLineStyle(textbox.getLineStyle());\r
-        assertEquals(opt1Str, textbox.getEscherContainer().getChildById(EscherOptRecord.RECORD_ID).toXml());\r
+        assertEquals(opt1Str, HSSFTestHelper.getEscherContainer(textbox).getChildById(EscherOptRecord.RECORD_ID).toXml());\r
         textbox.setLineWidth(textbox.getLineWidth());\r
-        assertEquals(opt1Str, textbox.getEscherContainer().getChildById(EscherOptRecord.RECORD_ID).toXml());\r
+        assertEquals(opt1Str, HSSFTestHelper.getEscherContainer(textbox).getChildById(EscherOptRecord.RECORD_ID).toXml());\r
         textbox.setLineStyleColor(textbox.getLineStyleColor());\r
-        assertEquals(opt1Str, textbox.getEscherContainer().getChildById(EscherOptRecord.RECORD_ID).toXml());\r
+        assertEquals(opt1Str, HSSFTestHelper.getEscherContainer(textbox).getChildById(EscherOptRecord.RECORD_ID).toXml());\r
     }\r
 \r
     public void testDgRecordNumShapes(){\r
@@ -370,7 +376,7 @@ public class TestDrawingShapes extends TestCase {
         shape.setString(new HSSFRichTextString("string1"));\r
         assertEquals(shape.getString().getString(), "string1");\r
 \r
-        assertNotNull(shape.getEscherContainer().getChildById(EscherTextboxRecord.RECORD_ID));\r
+        assertNotNull(HSSFTestHelper.getEscherContainer(shape).getChildById(EscherTextboxRecord.RECORD_ID));\r
         assertEquals(agg.getShapeToObjMapping().size(), 2);\r
 \r
         wb = HSSFTestDataSamples.writeOutAndReadBack(wb);\r
@@ -381,9 +387,9 @@ public class TestDrawingShapes extends TestCase {
 \r
         shape = (HSSFSimpleShape) patriarch.getChildren().get(0);\r
 \r
-        assertNotNull(shape.getTextObjectRecord());\r
+        assertNotNull(HSSFTestHelper.getTextObjRecord(shape));\r
         assertEquals(shape.getString().getString(), "string1");\r
-        assertNotNull(shape.getEscherContainer().getChildById(EscherTextboxRecord.RECORD_ID));\r
+        assertNotNull(HSSFTestHelper.getEscherContainer(shape).getChildById(EscherTextboxRecord.RECORD_ID));\r
         assertEquals(agg.getShapeToObjMapping().size(), 2);\r
     }\r
 \r
@@ -396,8 +402,8 @@ public class TestDrawingShapes extends TestCase {
         HSSFTestHelper.setShapeId(combobox, 1024);\r
         ComboboxShape comboboxShape = new ComboboxShape(combobox, 1024);\r
 \r
-        assertTrue(Arrays.equals(comboboxShape.getSpContainer().serialize(), combobox.getEscherContainer().serialize()));\r
-        assertTrue(Arrays.equals(comboboxShape.getObjRecord().serialize(), combobox.getObjRecord().serialize()));\r
+        assertTrue(Arrays.equals(comboboxShape.getSpContainer().serialize(), HSSFTestHelper.getEscherContainer(combobox).serialize()));\r
+        assertTrue(Arrays.equals(comboboxShape.getObjRecord().serialize(), HSSFTestHelper.getObjRecord(combobox).serialize()));\r
     }\r
 \r
     public void testRemoveShapes(){\r

diff --git a/src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java b/src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java
index 7d42b46375fc2ef00050698ea0f6c39077bf37d8..08da761936fc84e714adcffd4bdc78ce15febf09 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java
@@ -55,17 +55,17 @@ public class TestHSSFAnchor extends TestCase {
 \r
         HSSFSimpleShape rectangle = (HSSFSimpleShape) drawing.getChildren().get(0);\r
 \r
-        assertEquals(rectangle.getEscherContainer().getChild(0).getRecordId(), EscherSpRecord.RECORD_ID);\r
-        assertEquals(rectangle.getEscherContainer().getChild(1).getRecordId(), EscherOptRecord.RECORD_ID);\r
-        assertEquals(rectangle.getEscherContainer().getChild(2).getRecordId(), EscherClientAnchorRecord.RECORD_ID);\r
-        assertEquals(rectangle.getEscherContainer().getChild(3).getRecordId(), EscherClientDataRecord.RECORD_ID);\r
+        assertEquals(HSSFTestHelper.getEscherContainer(rectangle).getChild(0).getRecordId(), EscherSpRecord.RECORD_ID);\r
+        assertEquals(HSSFTestHelper.getEscherContainer(rectangle).getChild(1).getRecordId(), EscherOptRecord.RECORD_ID);\r
+        assertEquals(HSSFTestHelper.getEscherContainer(rectangle).getChild(2).getRecordId(), EscherClientAnchorRecord.RECORD_ID);\r
+        assertEquals(HSSFTestHelper.getEscherContainer(rectangle).getChild(3).getRecordId(), EscherClientDataRecord.RECORD_ID);\r
 \r
         rectangle.setAnchor(new HSSFClientAnchor());\r
 \r
-        assertEquals(rectangle.getEscherContainer().getChild(0).getRecordId(), EscherSpRecord.RECORD_ID);\r
-        assertEquals(rectangle.getEscherContainer().getChild(1).getRecordId(), EscherOptRecord.RECORD_ID);\r
-        assertEquals("  " + HexDump.toHex(rectangle.getEscherContainer().getChild(2).getRecordId()) + "    ", rectangle.getEscherContainer().getChild(2).getRecordId(), EscherClientAnchorRecord.RECORD_ID);\r
-        assertEquals(rectangle.getEscherContainer().getChild(3).getRecordId(), EscherClientDataRecord.RECORD_ID);\r
+        assertEquals(HSSFTestHelper.getEscherContainer(rectangle).getChild(0).getRecordId(), EscherSpRecord.RECORD_ID);\r
+        assertEquals(HSSFTestHelper.getEscherContainer(rectangle).getChild(1).getRecordId(), EscherOptRecord.RECORD_ID);\r
+        assertEquals(HSSFTestHelper.getEscherContainer(rectangle).getChild(2).getRecordId(), EscherClientAnchorRecord.RECORD_ID);\r
+        assertEquals(HSSFTestHelper.getEscherContainer(rectangle).getChild(3).getRecordId(), EscherClientDataRecord.RECORD_ID);\r
     }\r
 \r
     public void testCreateClientAnchorFromContainer(){\r
@@ -135,8 +135,8 @@ public class TestHSSFAnchor extends TestCase {
         rectangle.setAnchor(anchor);\r
 \r
         assertNotNull(anchor.getEscherAnchor());\r
-        assertNotNull(rectangle.getEscherContainer());\r
-        assertTrue(anchor.getEscherAnchor().equals(rectangle.getEscherContainer().getChildById(EscherClientAnchorRecord.RECORD_ID)));\r
+        assertNotNull(HSSFTestHelper.getEscherContainer(rectangle));\r
+        assertTrue(anchor.getEscherAnchor().equals(HSSFTestHelper.getEscherContainer(rectangle).getChildById(EscherClientAnchorRecord.RECORD_ID)));\r
     }\r
 \r
     public void testClientAnchorFromEscher(){\r

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/HSSFTestHelper.java b/src/testcases/org/apache/poi/hssf/usermodel/HSSFTestHelper.java
index 465f7746b0491e60807d4ae354f8be08acacdf9b..3954688912f3ec117744fc53fe5d3f852926bb88 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/usermodel/HSSFTestHelper.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/HSSFTestHelper.java
@@ -21,6 +21,8 @@ import org.apache.poi.hssf.model.DrawingManager2;
 import org.apache.poi.hssf.model.InternalSheet;
 import org.apache.poi.hssf.model.InternalWorkbook;
 import org.apache.poi.hssf.record.EscherAggregate;
+import org.apache.poi.hssf.record.ObjRecord;
+import org.apache.poi.hssf.record.TextObjectRecord;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -104,4 +106,16 @@ public class HSSFTestHelper {
     public static void setShapeId(HSSFShape shape, int id){
         shape.setShapeId(id);
     }
+
+    public static EscherContainerRecord getEscherContainer(HSSFShape shape){
+        return shape.getEscherContainer();
+    }
+
+    public static TextObjectRecord getTextObjRecord(HSSFSimpleShape shape){
+        return shape.getTextObjectRecord();
+    }
+
+    public static ObjRecord getObjRecord(HSSFShape shape){
+        return shape.getObjRecord();
+    }
 }

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestComment.java b/src/testcases/org/apache/poi/hssf/usermodel/TestComment.java
index cbf49bb5e3d0c8ada957354dfd4b8fc10da73c32..1f8c069351c722b08d56e60b4669bd7b44de2a7b 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestComment.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestComment.java
@@ -7,7 +7,7 @@ import org.apache.poi.hssf.model.CommentShape;
 import org.apache.poi.hssf.model.HSSFTestModelHelper;\r
 import org.apache.poi.hssf.record.*;\r
 \r
-import java.io.IOException;\r
+import java.io.*;\r
 import java.util.Arrays;\r
 \r
 /**\r
@@ -91,11 +91,14 @@ public class TestComment extends TestCase {
         HSSFWorkbook wb = new HSSFWorkbook();\r
         HSSFSheet sh = wb.createSheet();\r
         HSSFPatriarch patriarch = sh.createDrawingPatriarch();\r
+        int idx = wb.addPicture(new byte[]{1,2,3}, HSSFWorkbook.PICTURE_TYPE_PNG);\r
 \r
         HSSFComment comment = patriarch.createCellComment(new HSSFClientAnchor());\r
         comment.setString(new HSSFRichTextString("comment1"));\r
-        comment = patriarch.createCellComment(new HSSFClientAnchor());\r
+        comment = patriarch.createCellComment(new HSSFClientAnchor(0,0,100,100,(short)0,0,(short)10,10));\r
         comment.setString(new HSSFRichTextString("comment2"));\r
+        comment.setBackgroundImage(idx);\r
+        assertEquals(comment.getBackgroundImageId(), idx);\r
 \r
         assertEquals(patriarch.getChildren().size(), 2);\r
 \r
@@ -103,6 +106,11 @@ public class TestComment extends TestCase {
         sh = wb.getSheetAt(0);\r
         patriarch = sh.getDrawingPatriarch();\r
 \r
+        comment = (HSSFComment) patriarch.getChildren().get(1);\r
+        assertEquals(comment.getBackgroundImageId(), idx);\r
+        comment.resetBackgroundImage();\r
+        assertEquals(comment.getBackgroundImageId(), 0);\r
+\r
         assertEquals(patriarch.getChildren().size(), 2);\r
         comment = patriarch.createCellComment(new HSSFClientAnchor());\r
         comment.setString(new HSSFRichTextString("comment3"));\r
@@ -111,6 +119,8 @@ public class TestComment extends TestCase {
         wb = HSSFTestDataSamples.writeOutAndReadBack(wb);\r
         sh = wb.getSheetAt(0);\r
         patriarch = sh.getDrawingPatriarch();\r
+        comment = (HSSFComment) patriarch.getChildren().get(1);\r
+        assertEquals(comment.getBackgroundImageId(), 0);\r
         assertEquals(patriarch.getChildren().size(), 3);\r
         assertEquals(((HSSFComment) patriarch.getChildren().get(0)).getString().getString(), "comment1");\r
         assertEquals(((HSSFComment) patriarch.getChildren().get(1)).getString().getString(), "comment2");\r