Is this a bug in the JVM implementation or are self-referential generics not allowed per the Java 6 language spec?
Are our jenkins slaves using the latest version of Java 6? Looks like Java 6 and 9 support are mutually exclusive here. Time to drop Java 6 support. On Jul 9, 2017 5:27 PM, <[email protected]> wrote: > Author: kiwiwings > Date: Sun Jul 9 15:27:29 2017 > New Revision: 1801373 > > URL: http://svn.apache.org/viewvc?rev=1801373&view=rev > Log: > Rollback of r1801368 because of a generics bug with self-referenced types > in Java6 > > Modified: > poi/trunk/src/java/org/apache/poi/sl/usermodel/AutoShape.java > poi/trunk/src/java/org/apache/poi/sl/usermodel/Background.java > poi/trunk/src/java/org/apache/poi/sl/usermodel/ConnectorShape.java > poi/trunk/src/java/org/apache/poi/sl/usermodel/FreeformShape.java > poi/trunk/src/java/org/apache/poi/sl/usermodel/GraphicalFrame.java > poi/trunk/src/java/org/apache/poi/sl/usermodel/GroupShape.java > poi/trunk/src/java/org/apache/poi/sl/usermodel/Hyperlink.java > poi/trunk/src/java/org/apache/poi/sl/usermodel/Line.java > poi/trunk/src/java/org/apache/poi/sl/usermodel/MasterSheet.java > poi/trunk/src/java/org/apache/poi/sl/usermodel/Notes.java > poi/trunk/src/java/org/apache/poi/sl/usermodel/PictureShape.java > poi/trunk/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java > poi/trunk/src/java/org/apache/poi/sl/usermodel/Shadow.java > poi/trunk/src/java/org/apache/poi/sl/usermodel/Shape.java > poi/trunk/src/java/org/apache/poi/sl/usermodel/ShapeContainer.java > poi/trunk/src/java/org/apache/poi/sl/usermodel/Sheet.java > poi/trunk/src/java/org/apache/poi/sl/usermodel/SimpleShape.java > poi/trunk/src/java/org/apache/poi/sl/usermodel/Slide.java > poi/trunk/src/java/org/apache/poi/sl/usermodel/SlideShow.java > poi/trunk/src/java/org/apache/poi/sl/usermodel/TableCell.java > poi/trunk/src/java/org/apache/poi/sl/usermodel/TableShape.java > poi/trunk/src/java/org/apache/poi/sl/usermodel/TextBox.java > poi/trunk/src/java/org/apache/poi/sl/usermodel/TextShape.java > poi/trunk/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java > > Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/AutoShape.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/ > poi/sl/usermodel/AutoShape.java?rev=1801373&r1=1801372& > r2=1801373&view=diff > ============================================================ > ================== > --- poi/trunk/src/java/org/apache/poi/sl/usermodel/AutoShape.java > (original) > +++ poi/trunk/src/java/org/apache/poi/sl/usermodel/AutoShape.java Sun > Jul 9 15:27:29 2017 > @@ -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> { > } > > Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/Background.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/ > poi/sl/usermodel/Background.java?rev=1801373&r1=1801372& > r2=1801373&view=diff > ============================================================ > ================== > --- poi/trunk/src/java/org/apache/poi/sl/usermodel/Background.java > (original) > +++ poi/trunk/src/java/org/apache/poi/sl/usermodel/Background.java Sun > Jul 9 15:27:29 2017 > @@ -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(); > } > > Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/ > ConnectorShape.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/ > poi/sl/usermodel/ConnectorShape.java?rev=1801373&r1=1801372&r2=1801373& > view=diff > ============================================================ > ================== > --- poi/trunk/src/java/org/apache/poi/sl/usermodel/ConnectorShape.java > (original) > +++ poi/trunk/src/java/org/apache/poi/sl/usermodel/ConnectorShape.java > Sun Jul 9 15:27:29 2017 > @@ -19,7 +19,7 @@ package org.apache.poi.sl.usermodel; > > public interface ConnectorShape< > S extends Shape<S,P>, > - P extends TextParagraph<S,P,? extends TextRun> > + P extends TextParagraph<S,P,?> > > extends SimpleShape<S,P> { > > } > > Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/ > FreeformShape.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/ > poi/sl/usermodel/FreeformShape.java?rev=1801373&r1=1801372&r2=1801373& > view=diff > ============================================================ > ================== > --- poi/trunk/src/java/org/apache/poi/sl/usermodel/FreeformShape.java > (original) > +++ poi/trunk/src/java/org/apache/poi/sl/usermodel/FreeformShape.java Sun > Jul 9 15:27:29 2017 > @@ -21,7 +21,7 @@ import java.awt.geom.Path2D; > > public interface FreeformShape< > S extends Shape<S,P>, > - P extends TextParagraph<S,P,? extends TextRun> > + P extends TextParagraph<S,P,?> > > extends AutoShape<S,P> { > /** > * Gets the shape path. > > Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/ > GraphicalFrame.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/ > poi/sl/usermodel/GraphicalFrame.java?rev=1801373&r1=1801372&r2=1801373& > view=diff > ============================================================ > ================== > --- poi/trunk/src/java/org/apache/poi/sl/usermodel/GraphicalFrame.java > (original) > +++ poi/trunk/src/java/org/apache/poi/sl/usermodel/GraphicalFrame.java > Sun Jul 9 15:27:29 2017 > @@ -19,7 +19,7 @@ package org.apache.poi.sl.usermodel; > > public interface GraphicalFrame< > S extends Shape<S,P>, > - P extends TextParagraph<S,P,? extends TextRun> > + P extends TextParagraph<S,P,?> > > extends Shape<S,P>, PlaceableShape<S,P> { > > /** > > Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/GroupShape.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/ > poi/sl/usermodel/GroupShape.java?rev=1801373&r1=1801372& > r2=1801373&view=diff > ============================================================ > ================== > --- poi/trunk/src/java/org/apache/poi/sl/usermodel/GroupShape.java > (original) > +++ poi/trunk/src/java/org/apache/poi/sl/usermodel/GroupShape.java Sun > Jul 9 15:27:29 2017 > @@ -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> { > > /** > > Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/Hyperlink.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/ > poi/sl/usermodel/Hyperlink.java?rev=1801373&r1=1801372& > r2=1801373&view=diff > ============================================================ > ================== > --- poi/trunk/src/java/org/apache/poi/sl/usermodel/Hyperlink.java > (original) > +++ poi/trunk/src/java/org/apache/poi/sl/usermodel/Hyperlink.java Sun > Jul 9 15:27:29 2017 > @@ -23,7 +23,7 @@ package org.apache.poi.sl.usermodel; > */ > public interface Hyperlink< > S extends Shape<S,P>, > - P extends TextParagraph<S,P,? extends TextRun> > + P extends TextParagraph<S,P,?> > > extends org.apache.poi.common.usermodel.Hyperlink { > /** > * Link to an email > > Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/Line.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/ > poi/sl/usermodel/Line.java?rev=1801373&r1=1801372&r2=1801373&view=diff > ============================================================ > ================== > --- poi/trunk/src/java/org/apache/poi/sl/usermodel/Line.java (original) > +++ poi/trunk/src/java/org/apache/poi/sl/usermodel/Line.java Sun Jul 9 > 15:27:29 2017 > @@ -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> { > > } > > Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/MasterSheet.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/ > poi/sl/usermodel/MasterSheet.java?rev=1801373&r1=1801372& > r2=1801373&view=diff > ============================================================ > ================== > --- poi/trunk/src/java/org/apache/poi/sl/usermodel/MasterSheet.java > (original) > +++ poi/trunk/src/java/org/apache/poi/sl/usermodel/MasterSheet.java Sun > Jul 9 15:27:29 2017 > @@ -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> { > > } > > Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/Notes.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/ > poi/sl/usermodel/Notes.java?rev=1801373&r1=1801372&r2=1801373&view=diff > ============================================================ > ================== > --- poi/trunk/src/java/org/apache/poi/sl/usermodel/Notes.java (original) > +++ poi/trunk/src/java/org/apache/poi/sl/usermodel/Notes.java Sun Jul 9 > 15:27:29 2017 > @@ -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(); > } > > Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/PictureShape.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/ > poi/sl/usermodel/PictureShape.java?rev=1801373&r1=1801372& > r2=1801373&view=diff > ============================================================ > ================== > --- poi/trunk/src/java/org/apache/poi/sl/usermodel/PictureShape.java > (original) > +++ poi/trunk/src/java/org/apache/poi/sl/usermodel/PictureShape.java Sun > Jul 9 15:27:29 2017 > @@ -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. > > Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/ > PlaceableShape.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/ > poi/sl/usermodel/PlaceableShape.java?rev=1801373&r1=1801372&r2=1801373& > view=diff > ============================================================ > ================== > --- poi/trunk/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java > (original) > +++ poi/trunk/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java > Sun Jul 9 15:27:29 2017 > @@ -21,7 +21,7 @@ import java.awt.geom.Rectangle2D; > > public interface PlaceableShape< > S extends Shape<S,P>, > - P extends TextParagraph<S,P,? extends TextRun> > + P extends TextParagraph<S,P,?> > > { > ShapeContainer<S,P> getParent(); > > > Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/Shadow.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/ > poi/sl/usermodel/Shadow.java?rev=1801373&r1=1801372&r2=1801373&view=diff > ============================================================ > ================== > --- poi/trunk/src/java/org/apache/poi/sl/usermodel/Shadow.java (original) > +++ poi/trunk/src/java/org/apache/poi/sl/usermodel/Shadow.java Sun Jul 9 > 15:27:29 2017 > @@ -23,7 +23,7 @@ import org.apache.poi.sl.usermodel.Paint > > public interface Shadow< > S extends Shape<S,P>, > -P extends TextParagraph<S,P,? extends TextRun> > +P extends TextParagraph<S,P,?> > > { > SimpleShape<S,P> getShadowParent(); > > > Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/Shape.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/ > poi/sl/usermodel/Shape.java?rev=1801373&r1=1801372&r2=1801373&view=diff > ============================================================ > ================== > --- poi/trunk/src/java/org/apache/poi/sl/usermodel/Shape.java (original) > +++ poi/trunk/src/java/org/apache/poi/sl/usermodel/Shape.java Sun Jul 9 > 15:27:29 2017 > @@ -22,7 +22,7 @@ import java.awt.geom.Rectangle2D; > > public interface Shape< > S extends Shape<S,P>, > - P extends TextParagraph<S,P,? extends TextRun> > + P extends TextParagraph<S,P,?> > > { > ShapeContainer<S,P> getParent(); > > > Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/ > ShapeContainer.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/ > poi/sl/usermodel/ShapeContainer.java?rev=1801373&r1=1801372&r2=1801373& > view=diff > ============================================================ > ================== > --- poi/trunk/src/java/org/apache/poi/sl/usermodel/ShapeContainer.java > (original) > +++ poi/trunk/src/java/org/apache/poi/sl/usermodel/ShapeContainer.java > Sun Jul 9 15:27:29 2017 > @@ -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 > > Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/Sheet.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/ > poi/sl/usermodel/Sheet.java?rev=1801373&r1=1801372&r2=1801373&view=diff > ============================================================ > ================== > --- poi/trunk/src/java/org/apache/poi/sl/usermodel/Sheet.java (original) > +++ poi/trunk/src/java/org/apache/poi/sl/usermodel/Sheet.java Sun Jul 9 > 15:27:29 2017 > @@ -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(); > > > Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/SimpleShape.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/ > poi/sl/usermodel/SimpleShape.java?rev=1801373&r1=1801372& > r2=1801373&view=diff > ============================================================ > ================== > --- poi/trunk/src/java/org/apache/poi/sl/usermodel/SimpleShape.java > (original) > +++ poi/trunk/src/java/org/apache/poi/sl/usermodel/SimpleShape.java Sun > Jul 9 15:27:29 2017 > @@ -25,7 +25,7 @@ import org.apache.poi.sl.draw.geom.IAdju > > 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(); > > Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/Slide.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/ > poi/sl/usermodel/Slide.java?rev=1801373&r1=1801372&r2=1801373&view=diff > ============================================================ > ================== > --- poi/trunk/src/java/org/apache/poi/sl/usermodel/Slide.java (original) > +++ poi/trunk/src/java/org/apache/poi/sl/usermodel/Slide.java Sun Jul 9 > 15:27:29 2017 > @@ -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); > > Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/SlideShow.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/ > poi/sl/usermodel/SlideShow.java?rev=1801373&r1=1801372& > r2=1801373&view=diff > ============================================================ > ================== > --- poi/trunk/src/java/org/apache/poi/sl/usermodel/SlideShow.java > (original) > +++ poi/trunk/src/java/org/apache/poi/sl/usermodel/SlideShow.java Sun > Jul 9 15:27:29 2017 > @@ -29,7 +29,7 @@ import org.apache.poi.sl.usermodel.Pictu > > public interface SlideShow< > S extends Shape<S,P>, > - P extends TextParagraph<S,P,? extends TextRun> > + P extends TextParagraph<S,P,?> > > extends Closeable { > Slide<S,P> createSlide() throws IOException; > > > Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/TableCell.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/ > poi/sl/usermodel/TableCell.java?rev=1801373&r1=1801372& > r2=1801373&view=diff > ============================================================ > ================== > --- poi/trunk/src/java/org/apache/poi/sl/usermodel/TableCell.java > (original) > +++ poi/trunk/src/java/org/apache/poi/sl/usermodel/TableCell.java Sun > Jul 9 15:27:29 2017 > @@ -24,7 +24,7 @@ import org.apache.poi.sl.usermodel.Strok > > public interface TableCell< > S extends Shape<S,P>, > - P extends TextParagraph<S,P,? extends TextRun> > + P extends TextParagraph<S,P,?> > > extends TextShape<S,P> { > enum BorderEdge { bottom, left, top, right } > > > Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/TableShape.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/ > poi/sl/usermodel/TableShape.java?rev=1801373&r1=1801372& > r2=1801373&view=diff > ============================================================ > ================== > --- poi/trunk/src/java/org/apache/poi/sl/usermodel/TableShape.java > (original) > +++ poi/trunk/src/java/org/apache/poi/sl/usermodel/TableShape.java Sun > Jul 9 15:27:29 2017 > @@ -19,7 +19,7 @@ package org.apache.poi.sl.usermodel; > > public interface TableShape< > S extends Shape<S,P>, > - P extends TextParagraph<S,P,? extends TextRun> > + P extends TextParagraph<S,P,?> > > extends Shape<S,P>, PlaceableShape<S,P> { > /** > * Return the maximum number of columns. > > Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/TextBox.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/ > poi/sl/usermodel/TextBox.java?rev=1801373&r1=1801372&r2=1801373&view=diff > ============================================================ > ================== > --- poi/trunk/src/java/org/apache/poi/sl/usermodel/TextBox.java (original) > +++ poi/trunk/src/java/org/apache/poi/sl/usermodel/TextBox.java Sun Jul > 9 15:27:29 2017 > @@ -26,6 +26,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> { > } > > Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/TextShape.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/ > poi/sl/usermodel/TextShape.java?rev=1801373&r1=1801372& > r2=1801373&view=diff > ============================================================ > ================== > --- poi/trunk/src/java/org/apache/poi/sl/usermodel/TextShape.java > (original) > +++ poi/trunk/src/java/org/apache/poi/sl/usermodel/TextShape.java Sun > Jul 9 15:27:29 2017 > @@ -23,7 +23,7 @@ import java.util.List; > > public interface TextShape< > S extends Shape<S,P>, > - P extends TextParagraph<S,P,? extends TextRun> > + P extends TextParagraph<S,P,?> > > extends SimpleShape<S,P>, Iterable<P> { > /** > * Vertical Text Types > @@ -159,7 +159,7 @@ public interface TextShape< > /** > * @return the TextParagraphs for this text box > */ > - List<P> getTextParagraphs(); > + List<? extends TextParagraph<S,P,?>> getTextParagraphs(); > > /** > * @return text shape margin > > Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java > URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/ > org/apache/poi/sl/TestFonts.java?rev=1801373&r1=1801372& > r2=1801373&view=diff > ============================================================ > ================== > --- poi/trunk/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java > (original) > +++ poi/trunk/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java Sun > Jul 9 15:27:29 2017 > @@ -142,7 +142,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<?,?,? extends TextRun> p : > tb.getTextParagraphs()) { > + for (TextParagraph<?,?,?> p : tb.getTextParagraphs()) { > for (TextRun r : p.getTextRuns()) { > r.setFontFamily(fontFamily); > if (r instanceof XSLFTextRun) { > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > >
