Fix for JDK6 bug: http://bugs.java.com/view_bug.do?bug_id=6569074

This was fixed in jdk 7u72 ... so we'll keep this bit uncleaner version for a while ...

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1698006 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 bea0502135169fd129d00fdbec74556f3145236e..5a77bdae4c0b0515e6e5a3c219b7315e612669a7 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,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > 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 879879a209d47bca826317581f657d9ce8d7afd0..64f3b36a5f177cd70678b385bec2a2bff306c39c 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,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > 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 8d356b655a7875b438f052b54a71901adbe0aa44..39e34d29e3271a449975c9513a07e311cf0a7d4e 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;
 \r
 public interface ConnectorShape<\r
     S extends Shape<S,P>,\r
-    P extends TextParagraph<S,P,? extends TextRun>\r
+    P extends TextParagraph<S,P,?>\r
 > extends SimpleShape<S,P> {\r
 \r
 }\r

diff --git a/src/java/org/apache/poi/sl/usermodel/FreeformShape.java b/src/java/org/apache/poi/sl/usermodel/FreeformShape.java
index 19b5d313fc3ed575a9f03074f16f9148c2799a7a..ca9a8d30f1613730f49f4097c963d490104492f3 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.GeneralPath;
 \r
 public interface FreeformShape<\r
     S extends Shape<S,P>,\r
-    P extends TextParagraph<S,P,? extends TextRun>\r
+    P extends TextParagraph<S,P,?>\r
 > extends AutoShape<S,P> {\r
     /**\r
      * Gets the shape path.\r

diff --git a/src/java/org/apache/poi/sl/usermodel/GroupShape.java b/src/java/org/apache/poi/sl/usermodel/GroupShape.java
index 31f5be53450e38583635231b3d7073ef31bad1d4..a7545a4d4d510e7a84162d33e507662d6396b616 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,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > extends Shape<S,P>, ShapeContainer<S,P>, PlaceableShape<S,P> {
 
     /**

diff --git a/src/java/org/apache/poi/sl/usermodel/Line.java b/src/java/org/apache/poi/sl/usermodel/Line.java
index d2c2134e5284fa17a84d975267ae6b5fa64174ea..e9325c55bf04a2ec8331af97a932b16b04f775b3 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,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > 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 ac23bc3bbaa71fe5fe3afc84df26eb67bf96e5f7..fdfcf438084fb8d9bb53cd583d825f4bdbf35bf8 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,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > 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 377ad24c4003f64e6396c13ca0cffc9c7e34cf3b..d156e98a7db49e74ca7d984efd44713009b0e32f 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,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > 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 c7fb629410e84ae61da75832d8e3df39221e0656..671a439467c36149e4e256df0750708d4bac3e17 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,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > 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 f434b3cc6df329cb998d9bf217dbde23fcbfa85b..191bad65f6058ef1fe145ec34437b64a333d1106 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;
 \r
 public interface PlaceableShape<\r
     S extends Shape<S,P>,\r
-    P extends TextParagraph<S,P,? extends TextRun>\r
+    P extends TextParagraph<S,P,?>\r
 > {\r
     ShapeContainer<S,P> getParent();\r
     \r

diff --git a/src/java/org/apache/poi/sl/usermodel/Shape.java b/src/java/org/apache/poi/sl/usermodel/Shape.java
index 164c406438095c6935beb23434fd5a068d2719ed..13996fa6ccc361966c77600201134585022468e8 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/Shape.java
+++ b/src/java/org/apache/poi/sl/usermodel/Shape.java
@@ -20,7 +20,7 @@ package org.apache.poi.sl.usermodel;
 
 public interface Shape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > {
        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 b5c296098636f91e07a01f9c763c963c43d5711e..a83d8cae9579fdcb5e175a3ddd4fda53ea6cf501 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,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > 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 923dac3781299e10da7ea47416397c8ec964aad5..cd2a6f18c3dc5d645a4b7c701add54b59ac23600 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,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > 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 92612cf956874882b84f73eeb4cffb3d51a7e39d..95f4590ebeaea597539370c2d6b95af5290953fb 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/SimpleShape.java
+++ b/src/java/org/apache/poi/sl/usermodel/SimpleShape.java
@@ -23,7 +23,7 @@ import org.apache.poi.sl.draw.geom.IAdjustableShape;
 
 public interface SimpleShape<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > extends Shape<S,P>, IAdjustableShape, PlaceableShape<S,P> {
     FillStyle getFillStyle();
     LineDecoration getLineDecoration();

diff --git a/src/java/org/apache/poi/sl/usermodel/Slide.java b/src/java/org/apache/poi/sl/usermodel/Slide.java
index 237e0229bbed194c5a9af2621453179c9b01caed..dae2f42e674e57c34f3674a58fa7a5561db24eff 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,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > 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 2b04327e466635dff4c86b5704ab2d0cf17c1152..03e63f240d929be1b7e3c77d57e4100bf0edbfc0 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/SlideShow.java
+++ b/src/java/org/apache/poi/sl/usermodel/SlideShow.java
@@ -26,7 +26,7 @@ import org.apache.poi.sl.usermodel.PictureData.PictureType;
 
 public interface SlideShow<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > {
        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 30cb2da37df9c6ee1129cc8a55ca80af35fd103d..278573bab503819ecd329b1105eca987482bfe48 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/TableCell.java
+++ b/src/java/org/apache/poi/sl/usermodel/TableCell.java
@@ -19,7 +19,7 @@ package org.apache.poi.sl.usermodel;
 \r
 public interface TableCell<\r
     S extends Shape<S,P>,\r
-    P extends TextParagraph<S,P,? extends TextRun>\r
+    P extends TextParagraph<S,P,?>\r
 > extends TextShape<S,P> {\r
 \r
 }\r

diff --git a/src/java/org/apache/poi/sl/usermodel/TableShape.java b/src/java/org/apache/poi/sl/usermodel/TableShape.java
index 2ac2881d6d3eeb28b674cfce633b5667caa57003..29342e7d943423ee90f27eb490fbbcc95508a82d 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;
 \r
 public interface TableShape<\r
     S extends Shape<S,P>,\r
-    P extends TextParagraph<S,P,? extends TextRun>\r
+    P extends TextParagraph<S,P,?>\r
 > extends Shape<S,P>, PlaceableShape<S,P> {\r
     // to be defined ...\r
 }\r

diff --git a/src/java/org/apache/poi/sl/usermodel/TextBox.java b/src/java/org/apache/poi/sl/usermodel/TextBox.java
index 94fd4de40df0783cd5cdd369eef56ad2e67d3918..8fa997c89e22cbf987727ca0919100f14da51820 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/TextBox.java
+++ b/src/java/org/apache/poi/sl/usermodel/TextBox.java
@@ -19,6 +19,6 @@ package org.apache.poi.sl.usermodel;
 
 public interface TextBox<
     S extends Shape<S,P>,
-    P extends TextParagraph<S,P,? extends TextRun>
+    P extends TextParagraph<S,P,?>
 > 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 5f55a1dc40395ca65eb9b58aae76ffd272e58881..f487c108a40dc075f1aa0b6cc4ea7cee8eafe68c 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/TextShape.java
+++ b/src/java/org/apache/poi/sl/usermodel/TextShape.java
@@ -21,7 +21,7 @@ import java.util.List;
 \r
 public interface TextShape<\r
     S extends Shape<S,P>,\r
-    P extends TextParagraph<S,P,? extends TextRun>\r
+    P extends TextParagraph<S,P,?>\r
 > extends SimpleShape<S,P>, Iterable<P>  {\r
     /**\r
      * Vertical Text Types\r
@@ -93,7 +93,7 @@ public interface TextShape<
     /**\r
      * @return the TextParagraphs for this text box\r
      */\r
-    List<? extends TextParagraph<S,P,? extends TextRun>> getTextParagraphs();\r
+    List<? extends TextParagraph<S,P,?>> getTextParagraphs();\r
 \r
     /**\r
      * @return text shape margin\r