[FOray-commit] SF.net SVN: foray:[12917] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray:[12917] trunk/foray
|
From: <vic...@us...> - 2022-12-22 15:54:55
|
Revision: 12917
http://sourceforge.net/p/foray/code/12917
Author: victormote
Date: 2022-12-22 15:54:52 +0000 (Thu, 22 Dec 2022)
Log Message:
-----------
Conform to aXSL change: Remove generic type from InstreamForeignObject.
Modified Paths:
--------------
trunk/foray/foray-app/src/test/java/org/foray/app/fo/TestGraphic.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractAncestralInlineArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/ForeignObjectArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/MathArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/SvgArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/link/LinkFactory.java
trunk/foray/foray-content/src/main/java/org/foray/content/ContentTree4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/ForeignXml.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdContentHeight.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdContentWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/math/obj/InstreamMathElement.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/svg/obj/InstreamSvgElement.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/AbstractPropertyTests.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/InstreamForeignObjectPnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/OverrideGraftingContext.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/PioneerLayoutStrategy.java
Modified: trunk/foray/foray-app/src/test/java/org/foray/app/fo/TestGraphic.java
===================================================================
--- trunk/foray/foray-app/src/test/java/org/foray/app/fo/TestGraphic.java 2022-12-22 14:04:15 UTC (rev 12916)
+++ trunk/foray/foray-app/src/test/java/org/foray/app/fo/TestGraphic.java 2022-12-22 15:54:52 UTC (rev 12917)
@@ -63,7 +63,7 @@
/* ... which contains an InstreamForeignObject ... */
node = block.formattingObjectChildAt(0);
assertTrue(node instanceof InstreamForeignObject4a);
- final InstreamForeignObject4a<?> ifo = (InstreamForeignObject4a<?>) node;
+ final InstreamForeignObject4a ifo = (InstreamForeignObject4a) node;
/* ... which contains an SVGElement ... */
node = ifo.formattingObjectChildAt(0);
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractAncestralInlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractAncestralInlineArea.java 2022-12-22 14:04:15 UTC (rev 12916)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractAncestralInlineArea.java 2022-12-22 15:54:52 UTC (rev 12917)
@@ -103,7 +103,7 @@
}
@Override
- public ForeignObjectArea createForeignObjectArea(final InstreamForeignObject<?> ifo, final int ipd) {
+ public ForeignObjectArea createForeignObjectArea(final InstreamForeignObject ifo, final int ipd) {
final ForeignObjectArea newForeignArea = ForeignObjectArea.makeForeignObjectArea(ifo, this, ipd);
this.children.add(newForeignArea);
return newForeignArea;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java 2022-12-22 14:04:15 UTC (rev 12916)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java 2022-12-22 15:54:52 UTC (rev 12917)
@@ -968,7 +968,7 @@
}
@Override
- public int getIntrinsicWidth(final InstreamForeignObject<?> instreamForeign) {
+ public int getIntrinsicWidth(final InstreamForeignObject instreamForeign) {
final int pixelDensity = getAreaTree().getPixelDensity();
try {
final Graphic graphic = getGraphicForForeign(instreamForeign);
@@ -979,7 +979,7 @@
}
@Override
- public int getIntrinsicHeight(final InstreamForeignObject<?> instreamForeign) {
+ public int getIntrinsicHeight(final InstreamForeignObject instreamForeign) {
final int pixelDensity = getAreaTree().getPixelDensity();
try {
final Graphic graphic = getGraphicForForeign(instreamForeign);
@@ -995,7 +995,7 @@
* @return The graphic for {@code foreignXml}.
* @throws GraphicException For errors creating the graphic.
*/
- private Graphic getGraphicForForeign(final InstreamForeignObject<?> instreamForeign) throws GraphicException {
+ private Graphic getGraphicForForeign(final InstreamForeignObject instreamForeign) throws GraphicException {
final GraphicServer server = getAreaTree().getGraphicServer();
if (instreamForeign.getXmlDocument() instanceof MathMLDocument) {
final MathMLDocument document = (MathMLDocument) instreamForeign.getXmlDocument();
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/ForeignObjectArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/ForeignObjectArea.java 2022-12-22 14:04:15 UTC (rev 12916)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ForeignObjectArea.java 2022-12-22 15:54:52 UTC (rev 12917)
@@ -51,7 +51,7 @@
org.axsl.area.NormalInlineArea {
/** The link to the FO tree. */
- private Link<InstreamForeignObject<?>> foLink;
+ private Link<InstreamForeignObject> foLink;
/** The parent of this node. The parent can be either a {@link LineArea4a}
* or another {@link AbstractInlineArea}. */
@@ -83,7 +83,7 @@
* @param width The width, in millipoints, of the Area.
* @return The new instance.
*/
- static ForeignObjectArea makeForeignObjectArea(final InstreamForeignObject<?> generatedBy,
+ static ForeignObjectArea makeForeignObjectArea(final InstreamForeignObject generatedBy,
final LineArea4a parentArea, final int width) {
final ForeignObjectArea newFoArea = new ForeignObjectArea(parentArea);
ForeignObjectArea.init(newFoArea, generatedBy, width);
@@ -97,7 +97,7 @@
* @param width The width, in millipoints, of the Area.
* @return The new instance.
*/
- static ForeignObjectArea makeForeignObjectArea(final InstreamForeignObject<?> generatedBy,
+ static ForeignObjectArea makeForeignObjectArea(final InstreamForeignObject generatedBy,
final AbstractInlineArea parentArea, final int width) {
final ForeignObjectArea newFoArea = new ForeignObjectArea(parentArea);
ForeignObjectArea.init(newFoArea, generatedBy, width);
@@ -110,7 +110,7 @@
* @param newFoArea The newly-created ForeignObjectArea instance.
* @param width The width, in millipoints, of the Area.
*/
- private static void init(final ForeignObjectArea newFoArea, final InstreamForeignObject<?> generatedBy,
+ private static void init(final ForeignObjectArea newFoArea, final InstreamForeignObject generatedBy,
final int width) {
newFoArea.foLink = newFoArea.getLink(generatedBy);
newFoArea.registerLink(generatedBy);
@@ -124,14 +124,12 @@
// Create the reference area for the content.
if (generatedBy.getXmlDocument() instanceof SVGDocument) {
- @SuppressWarnings("unchecked")
- final InstreamForeignObject<SVGDocument> svgElement = (InstreamForeignObject<SVGDocument>) generatedBy;
+ final InstreamForeignObject svgElement = (InstreamForeignObject) generatedBy;
final SvgArea svgArea = SvgArea.makeSvgArea(svgElement, newFoArea);
newFoArea.foreignContent = svgArea;
} else if (generatedBy.getXmlDocument() instanceof MathMLDocument) {
- @SuppressWarnings("unchecked")
- final InstreamForeignObject<MathMLDocument> mathElement =
- (InstreamForeignObject<MathMLDocument>) generatedBy;
+ final InstreamForeignObject mathElement =
+ (InstreamForeignObject) generatedBy;
final MathArea mathArea = MathArea.makeMathArea(mathElement, newFoArea);
newFoArea.foreignContent = mathArea;
}
@@ -148,7 +146,7 @@
* @return The bpd of the viewport for this area.
*/
public int viewportBPD() {
- final InstreamForeignObject<?> ifo = this.traitGeneratedBy();
+ final InstreamForeignObject ifo = this.traitGeneratedBy();
return ifo.viewportBpd(this);
}
@@ -157,7 +155,7 @@
* @return The ipd of the viewport for this area.
*/
public int viewportIPD() {
- final InstreamForeignObject<?> ifo = this.traitGeneratedBy();
+ final InstreamForeignObject ifo = this.traitGeneratedBy();
return ifo.viewportIpd(this);
}
@@ -188,12 +186,12 @@
}
@Override
- public Link<InstreamForeignObject<?>> getFoLink() {
+ public Link<InstreamForeignObject> getFoLink() {
return this.foLink;
}
@Override
- public InstreamForeignObject<?> traitGeneratedBy() {
+ public InstreamForeignObject traitGeneratedBy() {
return this.getFoLink().getGenerator();
}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java 2022-12-22 14:04:15 UTC (rev 12916)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java 2022-12-22 15:54:52 UTC (rev 12917)
@@ -1020,7 +1020,7 @@
}
@Override
- public ForeignObjectArea createForeignObjectArea(final InstreamForeignObject<?> ifo, final int ipd) {
+ public ForeignObjectArea createForeignObjectArea(final InstreamForeignObject ifo, final int ipd) {
final ForeignObjectArea newForeignArea = ForeignObjectArea.makeForeignObjectArea(ifo, this, ipd);
this.children.add(newForeignArea);
return newForeignArea;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/MathArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/MathArea.java 2022-12-22 14:04:15 UTC (rev 12916)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/MathArea.java 2022-12-22 15:54:52 UTC (rev 12917)
@@ -45,7 +45,7 @@
private ForeignObjectArea parent;
/** The link to the FO tree. */
- private InstreamForeignObject<MathMLDocument> foLink;
+ private InstreamForeignObject foLink;
/**
* Construct a MathArea.
@@ -61,7 +61,7 @@
* @param parentArea The parent area.
* @return The new instance.
*/
- static MathArea makeMathArea(final InstreamForeignObject<MathMLDocument> generatedBy,
+ static MathArea makeMathArea(final InstreamForeignObject generatedBy,
final ForeignObjectArea parentArea) {
final MathArea newMathArea = new MathArea(parentArea);
newMathArea.foLink = generatedBy;
@@ -71,7 +71,8 @@
@Override
public MathGraphic getGraphic() {
try {
- return this.parent.getAreaTree().getGraphicServer().procureMathGraphic(this.foLink.getXmlDocument());
+ return this.parent.getAreaTree().getGraphicServer().procureMathGraphic(
+ (MathMLDocument) this.foLink.getXmlDocument());
} catch (final GraphicException e) {
this.parent.getAreaTree().logError(e.getMessage());
return null;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/SvgArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/SvgArea.java 2022-12-22 14:04:15 UTC (rev 12916)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/SvgArea.java 2022-12-22 15:54:52 UTC (rev 12917)
@@ -46,7 +46,7 @@
private ForeignObjectArea parent;
/** The link to the FO tree. */
- private InstreamForeignObject<SVGDocument> foLink;
+ private InstreamForeignObject foLink;
/**
* Construct an SvgArea.
@@ -62,7 +62,7 @@
* @param parentArea The parent area.
* @return The new instance.
*/
- static SvgArea makeSvgArea(final InstreamForeignObject<SVGDocument> generatedBy,
+ static SvgArea makeSvgArea(final InstreamForeignObject generatedBy,
final ForeignObjectArea parentArea) {
final SvgArea newSvgArea = new SvgArea(parentArea);
newSvgArea.foLink = generatedBy;
@@ -72,7 +72,8 @@
@Override
public SvgGraphic getGraphic() {
try {
- return this.parent.getAreaTree().getGraphicServer().procureSvgGraphic(this.foLink.getXmlDocument());
+ return this.parent.getAreaTree().getGraphicServer().procureSvgGraphic(
+ (SVGDocument) this.foLink.getXmlDocument());
} catch (final GraphicException e) {
this.parent.getAreaTree().logError(e.getMessage());
return null;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/link/LinkFactory.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/link/LinkFactory.java 2022-12-22 14:04:15 UTC (rev 12916)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/link/LinkFactory.java 2022-12-22 15:54:52 UTC (rev 12917)
@@ -191,8 +191,8 @@
}
@Override
- public NormalLink<InstreamForeignObject<?>> visit(final InstreamForeignObject<?> host) {
- return new NormalLink<InstreamForeignObject<?>>(host);
+ public NormalLink<InstreamForeignObject> visit(final InstreamForeignObject host) {
+ return new NormalLink<InstreamForeignObject>(host);
}
@Override
Modified: trunk/foray/foray-content/src/main/java/org/foray/content/ContentTree4a.java
===================================================================
--- trunk/foray/foray-content/src/main/java/org/foray/content/ContentTree4a.java 2022-12-22 14:04:15 UTC (rev 12916)
+++ trunk/foray/foray-content/src/main/java/org/foray/content/ContentTree4a.java 2022-12-22 15:54:52 UTC (rev 12917)
@@ -104,7 +104,7 @@
this.children.add(new ScalableContent(externalGraphic, fontUse, context));
return;
} else if (fo instanceof InstreamForeignObject) {
- final InstreamForeignObject<?> instreamForeign = (InstreamForeignObject<?>) fo;
+ final InstreamForeignObject instreamForeign = (InstreamForeignObject) fo;
this.children.add(new ScalableContent(instreamForeign, fontUse, context));
return;
} else if (fo instanceof Inline) {
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-22 14:04:15 UTC (rev 12916)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java 2022-12-22 15:54:52 UTC (rev 12917)
@@ -498,13 +498,10 @@
public void rootElementEnded() {
ForeignXml<?> foreignXml = null;
if (this.foreignDocument instanceof SVGDocument) {
- @SuppressWarnings("unchecked")
- final InstreamForeignObject4a<SVGDocument> parent = (InstreamForeignObject4a<SVGDocument>) this.currentFObj;
+ final InstreamForeignObject4a parent = (InstreamForeignObject4a) this.currentFObj;
foreignXml = new InstreamSvgElement(parent, (SVGDocument) this.foreignDocument);
} else if (this.foreignDocument instanceof MathMLDocument) {
- @SuppressWarnings("unchecked")
- final InstreamForeignObject4a<MathMLDocument> parent =
- (InstreamForeignObject4a<MathMLDocument>) this.currentFObj;
+ final InstreamForeignObject4a parent = (InstreamForeignObject4a) this.currentFObj;
foreignXml = new InstreamMathElement(parent, (MathMLDocument) this.foreignDocument);
} else {
throw new IllegalStateException("Unexpected document type:" + this.foreignDocument.getClass().getName());
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/ForeignXml.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/ForeignXml.java 2022-12-22 14:04:15 UTC (rev 12916)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/ForeignXml.java 2022-12-22 15:54:52 UTC (rev 12917)
@@ -63,13 +63,13 @@
public abstract class ForeignXml<D extends Document> extends FoObj {
/** The parent of this node. */
- private InstreamForeignObject4a<D> parent;
+ private InstreamForeignObject4a parent;
/**
* Constructor.
* @param parent The parent FoObj.
*/
- public ForeignXml(final InstreamForeignObject4a<D> parent) {
+ public ForeignXml(final InstreamForeignObject4a parent) {
super(parent);
this.parent = parent;
}
@@ -107,7 +107,7 @@
}
@Override
- public InstreamForeignObject4a<D> getParent() {
+ public InstreamForeignObject4a getParent() {
return this.parent;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java 2022-12-22 14:04:15 UTC (rev 12916)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/InstreamForeignObject4a.java 2022-12-22 15:54:52 UTC (rev 12917)
@@ -45,15 +45,14 @@
/**
* An "instream-foreign-object" object in XSL-FO.
- * @param <D> The document type stored in this object.
*/
-public class InstreamForeignObject4a<D extends Document> extends FoScalable4a implements InstreamForeignObject<D> {
+public class InstreamForeignObject4a extends FoScalable4a implements InstreamForeignObject {
/** The parent of this node. */
private FoObj parent;
/** The children of this object. */
- private List<ForeignXml<D>> children = new ArrayList<ForeignXml<D>>(1);
+ private List<ForeignXml<Document>> children = new ArrayList<ForeignXml<Document>>(1);
/**
* Constructor.
@@ -115,7 +114,7 @@
}
@Override
- public List<ForeignXml<D>> getChildren() {
+ public List<ForeignXml<Document>> getChildren() {
return this.children;
}
@@ -126,7 +125,7 @@
+ "type of foreign xml.");
}
@SuppressWarnings("unchecked")
- final ForeignXml<D> foreignXmlChild = (ForeignXml<D>) child;
+ final ForeignXml<Document> foreignXmlChild = (ForeignXml<Document>) child;
this.getChildren().add(foreignXmlChild);
}
@@ -181,7 +180,7 @@
}
@Override
- public D getXmlDocument() {
+ public Document getXmlDocument() {
return this.children.get(0).getDocument();
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdContentHeight.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdContentHeight.java 2022-12-22 14:04:15 UTC (rev 12916)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdContentHeight.java 2022-12-22 15:54:52 UTC (rev 12917)
@@ -74,7 +74,7 @@
return context.getIntrinsicHeight((ExternalGraphic) fobjScaled);
}
if (fobjScaled instanceof InstreamForeignObject) {
- final InstreamForeignObject<?> ifo = (InstreamForeignObject<?>) fobjScaled;
+ final InstreamForeignObject ifo = (InstreamForeignObject) fobjScaled;
context.getIntrinsicHeight(ifo);
}
throw new IllegalStateException("Unexpected FO: " + fobjScaled.getClass().getName());
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdContentWidth.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdContentWidth.java 2022-12-22 14:04:15 UTC (rev 12916)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdContentWidth.java 2022-12-22 15:54:52 UTC (rev 12917)
@@ -74,7 +74,7 @@
return context.getIntrinsicWidth((ExternalGraphic) fobjScaled);
}
if (fobjScaled instanceof InstreamForeignObject) {
- final InstreamForeignObject<?> ifo = (InstreamForeignObject<?>) fobjScaled;
+ final InstreamForeignObject ifo = (InstreamForeignObject) fobjScaled;
context.getIntrinsicWidth(ifo);
}
throw new IllegalStateException("Unexpected FO: " + fobjScaled.getClass().getName());
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/math/obj/InstreamMathElement.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/math/obj/InstreamMathElement.java 2022-12-22 14:04:15 UTC (rev 12916)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/math/obj/InstreamMathElement.java 2022-12-22 15:54:52 UTC (rev 12917)
@@ -47,7 +47,7 @@
* @param parent The parent FoObj.
* @param document The DOM document.
*/
- public InstreamMathElement(final InstreamForeignObject4a<MathMLDocument> parent, final MathMLDocument document) {
+ public InstreamMathElement(final InstreamForeignObject4a parent, final MathMLDocument document) {
super(parent);
this.document = document;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/svg/obj/InstreamSvgElement.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/svg/obj/InstreamSvgElement.java 2022-12-22 14:04:15 UTC (rev 12916)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/svg/obj/InstreamSvgElement.java 2022-12-22 15:54:52 UTC (rev 12917)
@@ -47,7 +47,7 @@
* @param parent The parent FoObj.
* @param document The DOM document.
*/
- public InstreamSvgElement(final InstreamForeignObject4a<SVGDocument> parent, final SVGDocument document) {
+ public InstreamSvgElement(final InstreamForeignObject4a parent, final SVGDocument document) {
super(parent);
this.document = document;
}
Modified: trunk/foray/foray-fotree/src/test/java/org/foray/fotree/AbstractPropertyTests.java
===================================================================
--- trunk/foray/foray-fotree/src/test/java/org/foray/fotree/AbstractPropertyTests.java 2022-12-22 14:04:15 UTC (rev 12916)
+++ trunk/foray/foray-fotree/src/test/java/org/foray/fotree/AbstractPropertyTests.java 2022-12-22 15:54:52 UTC (rev 12917)
@@ -168,12 +168,12 @@
return -1;
}
@Override
- public int getIntrinsicWidth(final InstreamForeignObject<?> instreamForeign) {
+ public int getIntrinsicWidth(final InstreamForeignObject instreamForeign) {
/* We don't care about this for now. */
return -1;
}
@Override
- public int getIntrinsicHeight(final InstreamForeignObject<?> instreamForeign) {
+ public int getIntrinsicHeight(final InstreamForeignObject instreamForeign) {
/* We don't care about this for now. */
return -1;
}
Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/InstreamForeignObjectPnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/InstreamForeignObjectPnr.java 2022-12-22 14:04:15 UTC (rev 12916)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/InstreamForeignObjectPnr.java 2022-12-22 15:54:52 UTC (rev 12917)
@@ -41,7 +41,7 @@
public class InstreamForeignObjectPnr extends FoObjPnr {
/** The real FONode which this proxy represents. */
- private InstreamForeignObject<?> node;
+ private InstreamForeignObject node;
/**
* Constructor.
@@ -48,7 +48,7 @@
* @param foreignObject The FO Tree object which is being laid out.
* @param layout The ancestor layout system.
*/
- public InstreamForeignObjectPnr(final InstreamForeignObject<?> foreignObject,
+ public InstreamForeignObjectPnr(final InstreamForeignObject foreignObject,
final PioneerLayoutStrategy layout) {
super(foreignObject, layout);
this.node = foreignObject;
@@ -65,7 +65,7 @@
}
@Override
- public InstreamForeignObject<?> getFONode() {
+ public InstreamForeignObject getFONode() {
return this.node;
}
Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/OverrideGraftingContext.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/OverrideGraftingContext.java 2022-12-22 14:04:15 UTC (rev 12916)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/OverrideGraftingContext.java 2022-12-22 15:54:52 UTC (rev 12917)
@@ -200,12 +200,12 @@
}
@Override
- public int getIntrinsicWidth(final InstreamForeignObject<?> instreamForeign) {
+ public int getIntrinsicWidth(final InstreamForeignObject instreamForeign) {
return this.wrappedContext.getIntrinsicWidth(instreamForeign);
}
@Override
- public int getIntrinsicHeight(final InstreamForeignObject<?> instreamForeign) {
+ public int getIntrinsicHeight(final InstreamForeignObject instreamForeign) {
return this.wrappedContext.getIntrinsicHeight(instreamForeign);
}
Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/PioneerLayoutStrategy.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/PioneerLayoutStrategy.java 2022-12-22 14:04:15 UTC (rev 12916)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/PioneerLayoutStrategy.java 2022-12-22 15:54:52 UTC (rev 12917)
@@ -472,7 +472,7 @@
}
@Override
- public InstreamForeignObjectPnr visit(final InstreamForeignObject<?> node) {
+ public InstreamForeignObjectPnr visit(final InstreamForeignObject node) {
return new InstreamForeignObjectPnr(node, this);
}
@@ -776,7 +776,7 @@
final Object nonTextToUse = nonText.getContent();
if (nonTextToUse instanceof InstreamForeignObject) {
- final InstreamForeignObject<?> ifo = (InstreamForeignObject<?>) nonTextToUse;
+ final InstreamForeignObject ifo = (InstreamForeignObject) nonTextToUse;
factory.createForeignObjectArea(ifo, sizeInline);
} else if (nonTextToUse instanceof ExternalGraphic) {
final ExternalGraphic graphic = (ExternalGraphic) nonTextToUse;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
