SL Common: narrow generics definition because of tighter java9 checks

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

src/java/org/apache/poi/sl/usermodel/AutoShape.java

@@ -19,6 +19,6 @@ package org.apache.poi.sl.usermodel;
 
 public interface AutoShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends TextShape<S,P> {
 }

src/java/org/apache/poi/sl/usermodel/Background.java

@@ -19,7 +19,7 @@ package org.apache.poi.sl.usermodel;
 
 public interface Background<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends Shape<S,P> {
     FillStyle getFillStyle();
 }

src/java/org/apache/poi/sl/usermodel/ConnectorShape.java

@@ -19,7 +19,7 @@ package org.apache.poi.sl.usermodel;
 
 public interface ConnectorShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends SimpleShape<S,P> {
 
 }

src/java/org/apache/poi/sl/usermodel/FreeformShape.java

@@ -21,7 +21,7 @@ import java.awt.geom.Path2D;
 
 public interface FreeformShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends AutoShape<S,P> {
     /**
      * Gets the shape path.

src/java/org/apache/poi/sl/usermodel/GraphicalFrame.java

@@ -19,7 +19,7 @@ package org.apache.poi.sl.usermodel;
 
 public interface GraphicalFrame<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends Shape<S,P>, PlaceableShape<S,P> {
 
     /**

src/java/org/apache/poi/sl/usermodel/GroupShape.java

@@ -21,7 +21,7 @@ import java.awt.geom.Rectangle2D;
 
 public interface GroupShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends Shape<S,P>, ShapeContainer<S,P>, PlaceableShape<S,P> {
 
     /**

src/java/org/apache/poi/sl/usermodel/Hyperlink.java

@@ -23,7 +23,7 @@ package org.apache.poi.sl.usermodel;
  */
 public interface Hyperlink<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends org.apache.poi.common.usermodel.Hyperlink {
     /**
      * Link to an email

src/java/org/apache/poi/sl/usermodel/Line.java

@@ -27,7 +27,7 @@ import org.apache.poi.util.Internal;
 @Internal
 public interface Line<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends AutoShape<S,P> {
 
 }

src/java/org/apache/poi/sl/usermodel/MasterSheet.java

@@ -19,7 +19,7 @@ package org.apache.poi.sl.usermodel;
 
 public interface MasterSheet<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends Sheet<S,P> {
 
 }

src/java/org/apache/poi/sl/usermodel/Notes.java

@@ -21,7 +21,7 @@ import java.util.List;
 
 public interface Notes<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends Sheet<S,P> {
 	List<? extends List<P>> getTextParagraphs();
 }

src/java/org/apache/poi/sl/usermodel/PictureShape.java

@@ -21,7 +21,7 @@ import java.awt.Insets;
 
 public interface PictureShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends SimpleShape<S,P> {
     /**
      * Returns the picture data for this picture.

src/java/org/apache/poi/sl/usermodel/PlaceableShape.java

@@ -21,7 +21,7 @@ import java.awt.geom.Rectangle2D;
 
 public interface PlaceableShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > {
     ShapeContainer<S,P> getParent();
     

src/java/org/apache/poi/sl/usermodel/Shadow.java

@@ -23,7 +23,7 @@ import org.apache.poi.sl.usermodel.PaintStyle.SolidPaint;
 
 public interface Shadow<
 S extends Shape<S,P>,
-P extends TextParagraph<S,P,?>
+P extends TextParagraph<S,P,? extends TextRun>
 > {
     SimpleShape<S,P> getShadowParent();
     

src/java/org/apache/poi/sl/usermodel/Shape.java

@@ -22,7 +22,7 @@ import java.awt.geom.Rectangle2D;
 
 public interface Shape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > {
 	ShapeContainer<S,P> getParent();
 

src/java/org/apache/poi/sl/usermodel/ShapeContainer.java

@@ -22,7 +22,7 @@ import java.util.List;
 
 public interface ShapeContainer<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends Iterable<S> {
     /**
      * Returns an list containing all of the elements in this container in proper

src/java/org/apache/poi/sl/usermodel/Sheet.java

@@ -25,7 +25,7 @@ import java.awt.Graphics2D;
  */
 public interface Sheet<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends ShapeContainer<S,P> {
 	SlideShow<S,P> getSlideShow();
 

src/java/org/apache/poi/sl/usermodel/SimpleShape.java

@@ -25,7 +25,7 @@ import org.apache.poi.sl.draw.geom.IAdjustableShape;
 
 public interface SimpleShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends Shape<S,P>, IAdjustableShape, PlaceableShape<S,P> {
 
     FillStyle getFillStyle();

src/java/org/apache/poi/sl/usermodel/Slide.java

@@ -19,7 +19,7 @@ package org.apache.poi.sl.usermodel;
 
 public interface Slide<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends Sheet<S,P> {
     Notes<S,P> getNotes();
     void setNotes(Notes<S,P> notes);

src/java/org/apache/poi/sl/usermodel/SlideShow.java

@@ -29,7 +29,7 @@ import org.apache.poi.sl.usermodel.PictureData.PictureType;
 
 public interface SlideShow<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends Closeable {
 	Slide<S,P> createSlide() throws IOException;
 

src/java/org/apache/poi/sl/usermodel/TableCell.java

@@ -24,7 +24,7 @@ import org.apache.poi.sl.usermodel.StrokeStyle.LineDash;
 
 public interface TableCell<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends TextShape<S,P> {
     enum BorderEdge { bottom, left, top, right }
 

src/java/org/apache/poi/sl/usermodel/TableShape.java

@@ -19,7 +19,7 @@ package org.apache.poi.sl.usermodel;
 
 public interface TableShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends Shape<S,P>, PlaceableShape<S,P> {
     /**
      * Return the maximum number of columns.

src/java/org/apache/poi/sl/usermodel/TextBox.java

@@ -26,6 +26,6 @@ package org.apache.poi.sl.usermodel;
  */
 public interface TextBox<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends AutoShape<S,P> {
 }

src/java/org/apache/poi/sl/usermodel/TextShape.java

@@ -23,7 +23,7 @@ import java.util.List;
 
 public interface TextShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,?>
+    P extends TextParagraph<S,P,? extends TextRun>
 > extends SimpleShape<S,P>, Iterable<P>  {
     /**
      * Vertical Text Types
@@ -159,7 +159,7 @@ public interface TextShape<
     /**
      * @return the TextParagraphs for this text box
      */
-    List<? extends TextParagraph<S,P,?>> getTextParagraphs();
+    List<P> getTextParagraphs();
 
     /**
      * @return text shape margin