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 7af81ce2f203d20ae88cbfe34a32fbb4434d058b..540c92eb2e2610018ddefa2f8ff5ba644acce29d 100644 (file)
--- 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 6756e9ec968013d2806a3d5b8114022e9705bbad..d7b4e2773465db492f82ff571dd7c191dc1b0d4b 100644 (file)
--- 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