moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Rollback of r1801368 because of a generics bug with self-referenced types in Java6

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1801373 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2017-07-09 15:27:29 +00:00
parent 04ffc95da7
commit 0cac9103ba
24 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/poi/sl/usermodel/AutoShape.java
View File

@ -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> {
}

2
src/java/org/apache/poi/sl/usermodel/Background.java
View File

@ -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();
}

2
src/java/org/apache/poi/sl/usermodel/ConnectorShape.java
View File

@ -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> {
}

2
src/java/org/apache/poi/sl/usermodel/FreeformShape.java
View File

@ -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.

2
src/java/org/apache/poi/sl/usermodel/GraphicalFrame.java
View File

@ -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> {
/**

2
src/java/org/apache/poi/sl/usermodel/GroupShape.java
View File

@ -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> {
/**

2
src/java/org/apache/poi/sl/usermodel/Hyperlink.java
View File

@ -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

2
src/java/org/apache/poi/sl/usermodel/Line.java
View File

@ -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> {
}

2
src/java/org/apache/poi/sl/usermodel/MasterSheet.java
View File

@ -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> {
}

2
src/java/org/apache/poi/sl/usermodel/Notes.java
View File

@ -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();
}

2
src/java/org/apache/poi/sl/usermodel/PictureShape.java
View File

@ -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.

2
src/java/org/apache/poi/sl/usermodel/PlaceableShape.java
View File

@ -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();

2
src/java/org/apache/poi/sl/usermodel/Shadow.java
View File

@ -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,? extends TextRun>
P extends TextParagraph<S,P,?>
> {
SimpleShape<S,P> getShadowParent();

2
src/java/org/apache/poi/sl/usermodel/Shape.java
View File

@ -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();

2
src/java/org/apache/poi/sl/usermodel/ShapeContainer.java
View File

@ -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

2
src/java/org/apache/poi/sl/usermodel/Sheet.java
View File

@ -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();

2
src/java/org/apache/poi/sl/usermodel/SimpleShape.java
View File

@ -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,? extends TextRun>
P extends TextParagraph<S,P,?>
> extends Shape<S,P>, IAdjustableShape, PlaceableShape<S,P> {
FillStyle getFillStyle();

2
src/java/org/apache/poi/sl/usermodel/Slide.java
View File

@ -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);

2
src/java/org/apache/poi/sl/usermodel/SlideShow.java
View File

@ -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,? extends TextRun>
P extends TextParagraph<S,P,?>
> extends Closeable {
Slide<S,P> createSlide() throws IOException;

2
src/java/org/apache/poi/sl/usermodel/TableCell.java
View File

@ -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,? extends TextRun>
P extends TextParagraph<S,P,?>
> extends TextShape<S,P> {
enum BorderEdge { bottom, left, top, right }

2
src/java/org/apache/poi/sl/usermodel/TableShape.java
View File

@ -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.

2
src/java/org/apache/poi/sl/usermodel/TextBox.java
View File

@ -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> {
}

4
src/java/org/apache/poi/sl/usermodel/TextShape.java
View File

@ -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

2
src/ooxml/testcases/org/apache/poi/sl/TestFonts.java
View File

@ -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) {