fixed compilation for jdk 1.5

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

diff --git a/src/java/org/apache/poi/hssf/record/EscherAggregate.java b/src/java/org/apache/poi/hssf/record/EscherAggregate.java
index 12f6b8ae9eaa767daccf7f3e1a197a3199cdda55..a93b655ca0e69abff0818d3828c4e093d430f8fa 100644 (file)
--- a/src/java/org/apache/poi/hssf/record/EscherAggregate.java
+++ b/src/java/org/apache/poi/hssf/record/EscherAggregate.java
@@ -553,7 +553,9 @@ public final class EscherAggregate extends AbstractEscherHolderRecord {
                     drawing.setData(buf);
                     temp += drawing.serialize(pos + temp, data);
                 } else {
-                    ContinueRecord drawing = new ContinueRecord(Arrays.copyOfRange(drawingData, j, Math.min(j + RecordInputStream.MAX_RECORD_DATA_SIZE, drawingData.length)));
+                    byte[] buf = new byte[Math.min(RecordInputStream.MAX_RECORD_DATA_SIZE, drawingData.length - j)];
+                    System.arraycopy(drawingData, j, buf, 0, Math.min(RecordInputStream.MAX_RECORD_DATA_SIZE, drawingData.length - j));
+                    ContinueRecord drawing = new ContinueRecord(buf);
                     temp += drawing.serialize(pos + temp, data);
                 }
             }
@@ -708,7 +710,8 @@ public final class EscherAggregate extends AbstractEscherHolderRecord {
 
     public void setMainSpRecordId(int shapeId) {
         EscherContainerRecord dgContainer = getEscherContainer();
-        EscherContainerRecord spContainer = (EscherContainerRecord) dgContainer.getChildById(EscherContainerRecord.SPGR_CONTAINER).getChild(0);
+        EscherContainerRecord spgrConatiner = (EscherContainerRecord) dgContainer.getChildById(EscherContainerRecord.SPGR_CONTAINER);
+        EscherContainerRecord spContainer = (EscherContainerRecord) spgrConatiner.getChild(0);
         EscherSpRecord sp = (EscherSpRecord) spContainer.getChildById(EscherSpRecord.RECORD_ID);
         sp.setShapeId(shapeId);
     }

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java b/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java
index f08625a010f5c7c5f0af03197743a954eea0b5a8..4ee69956202a2f1496f0b3d8beaf2916f26d4032 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java
@@ -346,7 +346,8 @@ public class HSSFShapeGroup extends HSSFShape implements HSSFShapeContainer {
         spgrContainer.setRecordId(EscherContainerRecord.SPGR_CONTAINER);
         spgrContainer.setOptions((short) 0x000F);
         EscherContainerRecord spContainer = new EscherContainerRecord();
-        byte [] inSp = getEscherContainer().getChildById(EscherContainerRecord.SP_CONTAINER).serialize();
+        EscherContainerRecord cont = getEscherContainer().getChildById(EscherContainerRecord.SP_CONTAINER);
+        byte [] inSp = cont.serialize();
         spContainer.fillFields(inSp, 0, new DefaultEscherRecordFactory());
 
         spgrContainer.addChildRecord(spContainer);

diff --git a/src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java b/src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java
index f9f35ce406f01c93f587e47d45f9db27133c0e4b..6a1638335dcc33e0f8bea9efa9c9eed33e8dfdb7 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java
@@ -351,13 +351,15 @@ public class TestDrawingShapes extends TestCase {
         String opt1Str = opt.toXml();\r
 \r
         textbox.setFillColor(textbox.getFillColor());\r
-        assertEquals(opt1Str, HSSFTestHelper.getEscherContainer(textbox).getChildById(EscherOptRecord.RECORD_ID).toXml());\r
+        EscherContainerRecord container = HSSFTestHelper.getEscherContainer(textbox);\r
+        EscherOptRecord optRecord = container.getChildById(EscherOptRecord.RECORD_ID);\r
+        assertEquals(opt1Str, optRecord.toXml());\r
         textbox.setLineStyle(textbox.getLineStyle());\r
-        assertEquals(opt1Str, HSSFTestHelper.getEscherContainer(textbox).getChildById(EscherOptRecord.RECORD_ID).toXml());\r
+        assertEquals(opt1Str, optRecord.toXml());\r
         textbox.setLineWidth(textbox.getLineWidth());\r
-        assertEquals(opt1Str, HSSFTestHelper.getEscherContainer(textbox).getChildById(EscherOptRecord.RECORD_ID).toXml());\r
+        assertEquals(opt1Str, optRecord.toXml());\r
         textbox.setLineStyleColor(textbox.getLineStyleColor());\r
-        assertEquals(opt1Str, HSSFTestHelper.getEscherContainer(textbox).getChildById(EscherOptRecord.RECORD_ID).toXml());\r
+        assertEquals(opt1Str, optRecord.toXml());\r
     }\r
 \r
     public void testDgRecordNumShapes(){\r