From: Andreas Beeker <kiwiwings@apache.org>
Date: Mon, 13 Feb 2017 06:46:59 +0000 (+0000)
Subject: Generics fix for metro shapes
X-Git-Tag: REL_3_16_FINAL~95
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d66307cb6715debc9aacc590125c2b0ddd86700a;p=poi.git

Generics fix for metro shapes

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

diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java
index 7af81ce2f2..540c92eb2e 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java
@@ -444,7 +444,7 @@ public final class HSLFTextRun implements TextRun {
         }
 
         if (ts.getSheet() instanceof MasterSheet) {
-            TextShape<?,? extends TextParagraph<?,?,TextRun>> ms = ts.getMetroShape();
+            TextShape<?,? extends TextParagraph<?,?,? extends TextRun>> ms = ts.getMetroShape();
             if (ms == null) {
                 return null;
             }
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java
index 6756e9ec96..d7b4e27734 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java
@@ -927,8 +927,8 @@ implements TextShape<HSLFShape,HSLFTextParagraph> {
      *
      * @return null, if there's no alternative representation, otherwise the text shape
      */
-    public TextShape<?,? extends TextParagraph<?,?,TextRun>> getMetroShape() {
-        HSLFMetroShape<TextShape<?,? extends TextParagraph<?,?,TextRun>>> mbs = new HSLFMetroShape<TextShape<?,? extends TextParagraph<?,?,TextRun>>>(this);
+    public TextShape<?,? extends TextParagraph<?,?,? extends TextRun>> getMetroShape() {
+        HSLFMetroShape<TextShape<?,? extends TextParagraph<?,?,? extends TextRun>>> mbs = new HSLFMetroShape<TextShape<?,? extends TextParagraph<?,?,? extends TextRun>>>(this);
         return mbs.getShape();
     }
 }
\ No newline at end of file