#61943 - SL Common: narrow generics definition because of tighter java9 checks

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

diff --git a/src/java/org/apache/poi/sl/usermodel/AutoShape.java b/src/java/org/apache/poi/sl/usermodel/AutoShape.java
index 5a77bdae4c0b0515e6e5a3c219b7315e612669a7..bea0502135169fd129d00fdbec74556f3145236e 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/AutoShape.java
+++ b/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> {
 }

diff --git a/src/java/org/apache/poi/sl/usermodel/Background.java b/src/java/org/apache/poi/sl/usermodel/Background.java
index 64f3b36a5f177cd70678b385bec2a2bff306c39c..879879a209d47bca826317581f657d9ce8d7afd0 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/Background.java
+++ b/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();
 }

diff --git a/src/java/org/apache/poi/sl/usermodel/ConnectorShape.java b/src/java/org/apache/poi/sl/usermodel/ConnectorShape.java
index e10c7507dd73d8ae4704aa15554ee640bd5a5f96..2b580daeb87f714c99ddc35a55907df93aa79615 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/ConnectorShape.java
+++ b/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> {
 
 }

diff --git a/src/java/org/apache/poi/sl/usermodel/FreeformShape.java b/src/java/org/apache/poi/sl/usermodel/FreeformShape.java
index c8ada26f22d816c94ea012306f301ba667cb961e..2a1580a7da4b1ccd2acbcff070291fe765cdbd98 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/FreeformShape.java
+++ b/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.

diff --git a/src/java/org/apache/poi/sl/usermodel/GraphicalFrame.java b/src/java/org/apache/poi/sl/usermodel/GraphicalFrame.java
index f8ba1e2c9d43ebdc3b02f0d68fdc0844b3b09e9e..def24d95973a3fe7d133150a750f36cef168888c 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/GraphicalFrame.java
+++ b/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> {
 
     /**

diff --git a/src/java/org/apache/poi/sl/usermodel/GroupShape.java b/src/java/org/apache/poi/sl/usermodel/GroupShape.java
index a7545a4d4d510e7a84162d33e507662d6396b616..31f5be53450e38583635231b3d7073ef31bad1d4 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/GroupShape.java
+++ b/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> {
 
     /**

diff --git a/src/java/org/apache/poi/sl/usermodel/Hyperlink.java b/src/java/org/apache/poi/sl/usermodel/Hyperlink.java
index 3c2a9fc2860d0975824c54a00af47033f5dbe4e4..381c9289956b23b48a161974b7aa0c8080d4e577 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/Hyperlink.java
+++ b/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

diff --git a/src/java/org/apache/poi/sl/usermodel/Line.java b/src/java/org/apache/poi/sl/usermodel/Line.java
index e9325c55bf04a2ec8331af97a932b16b04f775b3..d2c2134e5284fa17a84d975267ae6b5fa64174ea 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/Line.java
+++ b/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> {
 
 }

diff --git a/src/java/org/apache/poi/sl/usermodel/MasterSheet.java b/src/java/org/apache/poi/sl/usermodel/MasterSheet.java
index fdfcf438084fb8d9bb53cd583d825f4bdbf35bf8..ac23bc3bbaa71fe5fe3afc84df26eb67bf96e5f7 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/MasterSheet.java
+++ b/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> {
 
 }

diff --git a/src/java/org/apache/poi/sl/usermodel/Notes.java b/src/java/org/apache/poi/sl/usermodel/Notes.java
index d156e98a7db49e74ca7d984efd44713009b0e32f..377ad24c4003f64e6396c13ca0cffc9c7e34cf3b 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/Notes.java
+++ b/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();
 }

diff --git a/src/java/org/apache/poi/sl/usermodel/PictureShape.java b/src/java/org/apache/poi/sl/usermodel/PictureShape.java
index 671a439467c36149e4e256df0750708d4bac3e17..c7fb629410e84ae61da75832d8e3df39221e0656 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/PictureShape.java
+++ b/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.

diff --git a/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java b/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java
index da1981a04d48facc57f93715d81d1a7ad4022d8a..80d9f0fa52b0816b97c7f891f1be7187b78f1ef7 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java
+++ b/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();
     

diff --git a/src/java/org/apache/poi/sl/usermodel/Shadow.java b/src/java/org/apache/poi/sl/usermodel/Shadow.java
index 2c99f32b643b028200beef215680d880479f5f65..de462f9132fcd5236f8b7cf1650c83afc5846177 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/Shadow.java
+++ b/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();
     

diff --git a/src/java/org/apache/poi/sl/usermodel/Shape.java b/src/java/org/apache/poi/sl/usermodel/Shape.java
index 0115f8b9a791b156d47de3775aec804a24aaf182..8afc26fcfdc8bfead2e8446b9f96ce22595fcf21 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/Shape.java
+++ b/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();
 

diff --git a/src/java/org/apache/poi/sl/usermodel/ShapeContainer.java b/src/java/org/apache/poi/sl/usermodel/ShapeContainer.java
index 086501b4c08b4c2ca16655d7f70b94a018a520a8..ba02e4b05e548049c941baddddca94dbf80f391c 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/ShapeContainer.java
+++ b/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

diff --git a/src/java/org/apache/poi/sl/usermodel/Sheet.java b/src/java/org/apache/poi/sl/usermodel/Sheet.java
index cd2a6f18c3dc5d645a4b7c701add54b59ac23600..923dac3781299e10da7ea47416397c8ec964aad5 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/Sheet.java
+++ b/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();
 

diff --git a/src/java/org/apache/poi/sl/usermodel/SimpleShape.java b/src/java/org/apache/poi/sl/usermodel/SimpleShape.java
index aee69fb735d683f6d097f4349dd04c9c8deba34d..7bbbddfd09687273c4626ba224e0de48546c99ff 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/SimpleShape.java
+++ b/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();

diff --git a/src/java/org/apache/poi/sl/usermodel/Slide.java b/src/java/org/apache/poi/sl/usermodel/Slide.java
index 3b2913269da52bafa8a8929902451adbe9a0b249..74c9d6b0f855af8b32e141a330fcabba29ca9a5e 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/Slide.java
+++ b/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);

diff --git a/src/java/org/apache/poi/sl/usermodel/SlideShow.java b/src/java/org/apache/poi/sl/usermodel/SlideShow.java
index 228925d1c42579cc9d59c89b993146516301e64a..90d81df3b8dfb7114ef0a75877992d59cd0a85e3 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/SlideShow.java
+++ b/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;
 

diff --git a/src/java/org/apache/poi/sl/usermodel/TableCell.java b/src/java/org/apache/poi/sl/usermodel/TableCell.java
index 1543148d7736c010324981321fd0aeb10097ec16..4bc5e3327888909812c9b25a16391c92ea967be7 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/TableCell.java
+++ b/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 }
 

diff --git a/src/java/org/apache/poi/sl/usermodel/TableShape.java b/src/java/org/apache/poi/sl/usermodel/TableShape.java
index 7dbb13f00c68dfe5edd24dbedb486e11576d214a..20f2dc3d768c4d56c38143bc5491db04caaf8780 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/TableShape.java
+++ b/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.

diff --git a/src/java/org/apache/poi/sl/usermodel/TextBox.java b/src/java/org/apache/poi/sl/usermodel/TextBox.java
index bc6951103a84073394b957d253f8255ad202c290..1405722b859558a3a410969e4c34fba6b7efe143 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/TextBox.java
+++ b/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> {
 }

diff --git a/src/java/org/apache/poi/sl/usermodel/TextShape.java b/src/java/org/apache/poi/sl/usermodel/TextShape.java
index e480e5645ef2cf0ad142286f37e04a2a95600a4b..93426074346ba1c143bb1f86563bd5c69e4a2f25 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/TextShape.java
+++ b/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

diff --git a/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java b/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java
index d6e83130ff75c7a245f49c35f23d5b0ced1f66e3..099813c010513f499a549cb1e65f98433c290f39 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java
+++ b/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java
@@ -147,7 +147,7 @@ public class TestFonts {
         // TODO: set east asian font family - MS Office uses "MS Mincho" or "MS Gothic" as a fallback
         // see https://stackoverflow.com/questions/26063828 for good explanation about the font metrics
         // differences on different environments
-        for (TextParagraph<?,?,?> p : tb.getTextParagraphs()) {
+        for (TextParagraph<?,?,? extends TextRun> p : tb.getTextParagraphs()) {
             for (TextRun r : p.getTextRuns()) {
                 r.setFontFamily(fontFamily, fontGroup);
             }