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

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

Browse Source 
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
This commit is contained in:
Andreas Beeker 2015-08-26 21:25:58 +00:00
parent 6bdc2fb024
commit cf84bb1a85
20 changed files with 21 additions and 21 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< public interface AutoShape<
S extends Shape<S,P>, S extends Shape<S,P>,
P extends TextParagraph<S,P,? extends TextRun> P extends TextParagraph<S,P,?>
> extends TextShape<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< public interface Background<
S extends Shape<S,P>, S extends Shape<S,P>,
P extends TextParagraph<S,P,? extends TextRun> P extends TextParagraph<S,P,?>
> extends Shape<S,P> { > extends Shape<S,P> {
FillStyle getFillStyle(); 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< public interface ConnectorShape<
S extends Shape<S,P>, S extends Shape<S,P>,
P extends TextParagraph<S,P,? extends TextRun> P extends TextParagraph<S,P,?>
> extends SimpleShape<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.GeneralPath;
public interface FreeformShape< public interface FreeformShape<
S extends Shape<S,P>, S extends Shape<S,P>,
P extends TextParagraph<S,P,? extends TextRun> P extends TextParagraph<S,P,?>
> extends AutoShape<S,P> { > extends AutoShape<S,P> {
/** /**
* Gets the shape path. * Gets the shape path.

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

@ -21,7 +21,7 @@ import java.awt.geom.Rectangle2D;
public interface GroupShape< public interface GroupShape<
S extends Shape<S,P>, 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> { > extends Shape<S,P>, ShapeContainer<S,P>, PlaceableShape<S,P> {
/** /**

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

@ -27,7 +27,7 @@ import org.apache.poi.util.Internal;
@Internal @Internal
public interface Line< public interface Line<
S extends Shape<S,P>, S extends Shape<S,P>,
P extends TextParagraph<S,P,? extends TextRun> P extends TextParagraph<S,P,?>
> extends AutoShape<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< public interface MasterSheet<
S extends Shape<S,P>, S extends Shape<S,P>,
P extends TextParagraph<S,P,? extends TextRun> P extends TextParagraph<S,P,?>
> extends Sheet<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< public interface Notes<
S extends Shape<S,P>, S extends Shape<S,P>,
P extends TextParagraph<S,P,? extends TextRun> P extends TextParagraph<S,P,?>
> extends Sheet<S,P> { > extends Sheet<S,P> {
List<? extends List<P>> getTextParagraphs(); 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< public interface PictureShape<
S extends Shape<S,P>, S extends Shape<S,P>,
P extends TextParagraph<S,P,? extends TextRun> P extends TextParagraph<S,P,?>
> extends SimpleShape<S,P> { > extends SimpleShape<S,P> {
/** /**
* Returns the picture data for this picture. * 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< public interface PlaceableShape<
S extends Shape<S,P>, S extends Shape<S,P>,
P extends TextParagraph<S,P,? extends TextRun> P extends TextParagraph<S,P,?>
> { > {
ShapeContainer<S,P> getParent(); ShapeContainer<S,P> getParent();

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

@ -20,7 +20,7 @@ package org.apache.poi.sl.usermodel;
public interface Shape< public interface Shape<
S extends Shape<S,P>, S extends Shape<S,P>,
P extends TextParagraph<S,P,? extends TextRun> P extends TextParagraph<S,P,?>
> { > {
ShapeContainer<S,P> getParent(); 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< public interface ShapeContainer<
S extends Shape<S,P>, S extends Shape<S,P>,
P extends TextParagraph<S,P,? extends TextRun> P extends TextParagraph<S,P,?>
> extends Iterable<S> { > extends Iterable<S> {
/** /**
* Returns an list containing all of the elements in this container in proper * 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< public interface Sheet<
S extends Shape<S,P>, S extends Shape<S,P>,
P extends TextParagraph<S,P,? extends TextRun> P extends TextParagraph<S,P,?>
> extends ShapeContainer<S,P> { > extends ShapeContainer<S,P> {
SlideShow<S,P> getSlideShow(); SlideShow<S,P> getSlideShow();

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

@ -23,7 +23,7 @@ import org.apache.poi.sl.draw.geom.IAdjustableShape;
public interface SimpleShape< public interface SimpleShape<
S extends Shape<S,P>, 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> { > extends Shape<S,P>, IAdjustableShape, PlaceableShape<S,P> {
FillStyle getFillStyle(); FillStyle getFillStyle();
LineDecoration getLineDecoration(); LineDecoration getLineDecoration();

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< public interface Slide<
S extends Shape<S,P>, S extends Shape<S,P>,
P extends TextParagraph<S,P,? extends TextRun> P extends TextParagraph<S,P,?>
> extends Sheet<S,P> { > extends Sheet<S,P> {
Notes<S,P> getNotes(); Notes<S,P> getNotes();
void setNotes(Notes<S,P> notes); void setNotes(Notes<S,P> notes);

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

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

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

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

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< public interface TableShape<
S extends Shape<S,P>, S extends Shape<S,P>,
P extends TextParagraph<S,P,? extends TextRun> P extends TextParagraph<S,P,?>
> extends Shape<S,P>, PlaceableShape<S,P> { > extends Shape<S,P>, PlaceableShape<S,P> {
// to be defined ... // to be defined ...
} }

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

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

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

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