From 00ec6aeb7969c217c191b2081819cb5c168edd04 Mon Sep 17 00:00:00 2001 From: fotis Date: Fri, 11 Aug 2000 00:02:55 +0000 Subject: [PATCH] substitutes inline-sequence with inline (this is just a renaming, but the fo has to be rewritten) git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193627 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/fop/fo/StandardElementMapping.java | 4 +- .../flow/{InlineSequence.java => Inline.java} | 37 +++++++++---------- 2 files changed, 20 insertions(+), 21 deletions(-) rename src/org/apache/fop/fo/flow/{InlineSequence.java => Inline.java} (82%) diff --git a/src/org/apache/fop/fo/StandardElementMapping.java b/src/org/apache/fop/fo/StandardElementMapping.java index ac4837c52..36e9991b5 100644 --- a/src/org/apache/fop/fo/StandardElementMapping.java +++ b/src/org/apache/fop/fo/StandardElementMapping.java @@ -93,8 +93,8 @@ public class StandardElementMapping implements ElementMapping { builder.addMapping(uri, "page-number-citation", PageNumberCitation.maker()); builder.addMapping(uri, "display-sequence", DisplaySequence.maker()); - builder.addMapping(uri, "inline-sequence", - InlineSequence.maker()); + builder.addMapping(uri, "inline", + Inline.maker()); builder.addMapping(uri, "external-graphic", ExternalGraphic.maker()); builder.addMapping(uri, "table", Table.maker()); diff --git a/src/org/apache/fop/fo/flow/InlineSequence.java b/src/org/apache/fop/fo/flow/Inline.java similarity index 82% rename from src/org/apache/fop/fo/flow/InlineSequence.java rename to src/org/apache/fop/fo/flow/Inline.java index ab7a015d1..6a168d93d 100644 --- a/src/org/apache/fop/fo/flow/InlineSequence.java +++ b/src/org/apache/fop/fo/flow/Inline.java @@ -59,28 +59,27 @@ import org.apache.fop.apps.FOPException; // Java import java.util.Enumeration; -public class InlineSequence extends FObjMixed { +public class Inline extends FObjMixed { - public static class Maker extends FObj.Maker { - public FObj make(FObj parent, PropertyList propertyList) - throws FOPException { - return new InlineSequence(parent, propertyList); - } + public static class Maker extends FObj.Maker { + public FObj make(FObj parent, PropertyList propertyList) + throws FOPException { + return new Inline(parent, propertyList); } + } - public static FObj.Maker maker() { - return new InlineSequence.Maker(); - } + public static FObj.Maker maker() { + return new Inline.Maker(); + } + + public Inline(FObj parent, PropertyList propertyList) + throws FOPException { + super(parent, propertyList); + this.name = "fo:inline"; - public InlineSequence(FObj parent, PropertyList propertyList) - throws FOPException { - super(parent, propertyList); - this.name = "fo:inline-sequence"; - - if (parent.getName().equals("fo:flow")) { - throw new FOPException("inline-sequence can't be directly" - + " under flow"); - } + if (parent.getName().equals("fo:flow")) { + throw new FOPException("fo:inline can't be directly" + + " under flow"); } - + } } -- 2.39.5