Seems we need a cast here to compile with some newer JDKs, at least IntelliJ complain...

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

diff --git a/src/java/org/apache/poi/sl/draw/DrawTextShape.java b/src/java/org/apache/poi/sl/draw/DrawTextShape.java
index 77af128d29e75f2c0066a6b49ac62e2ba44f59df..06b57dab264472a004c387da821bbdd55c10e235 100644 (file)
--- a/src/java/org/apache/poi/sl/draw/DrawTextShape.java
+++ b/src/java/org/apache/poi/sl/draw/DrawTextShape.java
@@ -60,7 +60,7 @@ public class DrawTextShape extends DrawSimpleShape {
             vertFlip ^= ps.getFlipVertical();\r
             horzFlip ^= ps.getFlipHorizontal();\r
             sc = ps.getParent();\r
-        };\r
+        }\r
         \r
         // Horizontal flipping applies only to shape outline and not to the text in the shape.\r
         // Applying flip second time restores the original not-flipped transform\r
@@ -109,8 +109,9 @@ public class DrawTextShape extends DrawSimpleShape {
         DrawFactory fact = DrawFactory.getInstance(graphics);\r
 \r
         double y0 = y;\r
-        Iterator<? extends TextParagraph<?,?,? extends TextRun>> paragraphs = getShape().iterator();\r
-        \r
+        //noinspection RedundantCast\r
+        Iterator<? extends TextParagraph<?,?,? extends TextRun>> paragraphs = (Iterator<? extends TextParagraph<?, ?, ? extends TextRun>>) getShape().iterator();\r
+\r
         boolean isFirstLine = true;\r
         for (int autoNbrIdx=0; paragraphs.hasNext(); autoNbrIdx++){\r
             TextParagraph<?,?,? extends TextRun> p = paragraphs.next();\r