Seems we need a cast here to compile with some newer JDKs, at least IntelliJ complains for me

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1730464 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2016-02-15 08:33:12 +00:00
parent 528a64dc76
commit 98da5af350

View File

@ -60,7 +60,7 @@ public class DrawTextShape extends DrawSimpleShape {
vertFlip ^= ps.getFlipVertical(); vertFlip ^= ps.getFlipVertical();
horzFlip ^= ps.getFlipHorizontal(); horzFlip ^= ps.getFlipHorizontal();
sc = ps.getParent(); sc = ps.getParent();
}; }
// Horizontal flipping applies only to shape outline and not to the text in the shape. // Horizontal flipping applies only to shape outline and not to the text in the shape.
// Applying flip second time restores the original not-flipped transform // Applying flip second time restores the original not-flipped transform
@ -109,8 +109,9 @@ public class DrawTextShape extends DrawSimpleShape {
DrawFactory fact = DrawFactory.getInstance(graphics); DrawFactory fact = DrawFactory.getInstance(graphics);
double y0 = y; double y0 = y;
Iterator<? extends TextParagraph<?,?,? extends TextRun>> paragraphs = getShape().iterator(); //noinspection RedundantCast
Iterator<? extends TextParagraph<?,?,? extends TextRun>> paragraphs = (Iterator<? extends TextParagraph<?, ?, ? extends TextRun>>) getShape().iterator();
boolean isFirstLine = true; boolean isFirstLine = true;
for (int autoNbrIdx=0; paragraphs.hasNext(); autoNbrIdx++){ for (int autoNbrIdx=0; paragraphs.hasNext(); autoNbrIdx++){
TextParagraph<?,?,? extends TextRun> p = paragraphs.next(); TextParagraph<?,?,? extends TextRun> p = paragraphs.next();