pietsch 2002/07/23 18:06:26
Modified: src/org/apache/fop/extensions Tag: fop-0_20_2-maintain
Label.java Outline.java
src/org/apache/fop/fo Tag: fop-0_20_2-maintain
ColorProfile.java Declarations.java FObj.java
FObjMixed.java Title.java
ToBeImplementedElement.java Unknown.java
UnknownXMLObj.java XMLElement.java XMLObj.java
src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
BasicLink.java BidiOverride.java Block.java
BlockContainer.java Character.java
ExternalGraphic.java Float.java Flow.java
Footnote.java FootnoteBody.java
InitialPropertySet.java Inline.java
InlineContainer.java InstreamForeignObject.java
Leader.java ListBlock.java ListItem.java
ListItemBody.java ListItemLabel.java Marker.java
MultiCase.java MultiProperties.java
MultiPropertySet.java MultiSwitch.java
MultiToggle.java PageNumber.java
PageNumberCitation.java RetrieveMarker.java
StaticContent.java Table.java TableAndCaption.java
TableBody.java TableCaption.java TableCell.java
TableColumn.java TableFooter.java TableHeader.java
TableRow.java Wrapper.java
src/org/apache/fop/fo/pagination Tag: fop-0_20_2-maintain
ConditionalPageMasterReference.java
LayoutMasterSet.java PageSequence.java
PageSequenceMaster.java Region.java
RegionAfter.java RegionBefore.java RegionBody.java
RegionEnd.java RegionStart.java
RepeatablePageMasterAlternatives.java
RepeatablePageMasterReference.java Root.java
SimplePageMaster.java
SinglePageMasterReference.java
src/org/apache/fop/svg Tag: fop-0_20_2-maintain SVGObj.java
Log:
Removed 'name' field and diverse getElementName() methods,
replaced by getName() returning a string constant.
A few minor cosmetic changes.
Revision Changes Path
No revision
No revision
1.2.2.2 +4 -1 xml-fop/src/org/apache/fop/extensions/Label.java
Index: Label.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/extensions/Label.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- Label.java 16 Jul 2002 20:04:43 -0000 1.2.2.1
+++ Label.java 24 Jul 2002 01:06:21 -0000 1.2.2.2
@@ -39,5 +39,8 @@
return textBuffer.toString();
}
+ public String getName() {
+ return "fop:label";
+ }
}
1.4.2.1 +4 -1 xml-fop/src/org/apache/fop/extensions/Outline.java
Index: Outline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/extensions/Outline.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- Outline.java 21 Aug 2001 08:26:11 -0000 1.4
+++ Outline.java 24 Jul 2002 01:06:21 -0000 1.4.2.1
@@ -103,6 +103,9 @@
return _internalDestination;
}
+ public String getName() {
+ return "fop:outline";
+ }
}
No revision
No revision
1.4.2.1 +6 -10 xml-fop/src/org/apache/fop/fo/ColorProfile.java
Index: ColorProfile.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/ColorProfile.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- ColorProfile.java 20 Aug 2001 11:19:22 -0000 1.4
+++ ColorProfile.java 24 Jul 2002 01:06:21 -0000 1.4.2.1
@@ -11,21 +11,15 @@
import org.apache.fop.fo.*;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.properties.*;
-import org.apache.fop.layout.AreaTree;
import org.apache.fop.apps.FOPException;
-/**
- * The fo:root formatting object. Contains page masters, root extensions,
- * page-sequences.
- */
-public class ColorProfile extends ToBeImplementedElement {
+public class ColorProfile extends FObj {
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
PropertyList propertyList) throws FOPException {
return new ColorProfile(parent, propertyList);
}
-
}
public static FObj.Maker maker() {
@@ -35,11 +29,13 @@
protected ColorProfile(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
- this.name = "fo:color-profile";
-
+ log.warn("color profile not implemented");
// this.properties.get("src");
// this.properties.get("color-profile-name");
// this.properties.get("rendering-intent");
}
+ public String getName() {
+ return "fo:color-profile";
+ }
}
1.3.2.1 +6 -7 xml-fop/src/org/apache/fop/fo/Declarations.java
Index: Declarations.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Declarations.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- Declarations.java 20 Aug 2001 11:19:22 -0000 1.3
+++ Declarations.java 24 Jul 2002 01:06:21 -0000 1.3.2.1
@@ -11,19 +11,15 @@
import org.apache.fop.fo.*;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.properties.*;
-import org.apache.fop.layout.AreaTree;
import org.apache.fop.apps.FOPException;
-/**
- */
-public class Declarations extends ToBeImplementedElement {
+public class Declarations extends FObj {
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
PropertyList propertyList) throws FOPException {
return new Declarations(parent, propertyList);
}
-
}
public static FObj.Maker maker() {
@@ -33,7 +29,10 @@
protected Declarations(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
- this.name = "fo:declarations";
+ log.warn("declarations not implemented");
}
+ public String getName() {
+ return "fo:declarations";
+ }
}
1.20.2.2 +13 -19 xml-fop/src/org/apache/fop/fo/FObj.java
Index: FObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FObj.java,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -r1.20.2.1 -r1.20.2.2
--- FObj.java 19 Jul 2002 20:41:00 -0000 1.20.2.1
+++ FObj.java 24 Jul 2002 01:06:21 -0000 1.20.2.2
@@ -21,19 +21,16 @@
/**
* base class for representation of formatting objects and their processing
*/
-public class FObj extends FONode {
-
- public static class Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new FObj(parent, propertyList);
- }
+public abstract class FObj extends FONode {
+ public abstract static class Maker {
+ abstract public FObj make(FObj parent,
+ PropertyList propertyList) throws FOPException;
}
- public static Maker maker() {
- return new Maker();
- }
+// public static Maker maker() {
+// return new Maker();
+// }
// protected PropertyList properties;
public PropertyList properties;
@@ -42,14 +39,13 @@
// markers
private Hashtable markers;
- protected String name;
+// protected String name;
protected FObj(FObj parent, PropertyList propertyList) {
super(parent);
this.properties = propertyList; // TO BE REMOVED!!!
propertyList.setFObj(this);
this.propMgr = makePropertyManager(propertyList);
- this.name = "default FO";
setWritingMode();
}
@@ -83,16 +79,14 @@
* returns the name of the formatting object
* @return the name of this formatting objects
*/
- public String getName() {
- return this.name;
- }
+ abstract public String getName();
/**
*
*/
- protected void start() {
- // do nothing by default
- }
+// protected void start() {
+// // do nothing by default
+// }
/**
*
1.12.2.5 +2 -13 xml-fop/src/org/apache/fop/fo/FObjMixed.java
Index: FObjMixed.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FObjMixed.java,v
retrieving revision 1.12.2.4
retrieving revision 1.12.2.5
diff -u -r1.12.2.4 -r1.12.2.5
--- FObjMixed.java 6 Jul 2002 19:05:29 -0000 1.12.2.4
+++ FObjMixed.java 24 Jul 2002 01:06:21 -0000 1.12.2.5
@@ -15,23 +15,12 @@
* base class for representation of mixed content formatting objects
* and their processing
*/
-public class FObjMixed extends FObj {
+public abstract class FObjMixed extends FObj {
// Textdecoration
protected TextState ts;
private StringBuffer textBuffer;
-
- public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new FObjMixed(parent, propertyList);
- }
- }
-
- public static FObj.Maker maker() {
- return new FObjMixed.Maker();
- }
protected FObjMixed(FObj parent, PropertyList propertyList) {
super(parent, propertyList);
1.4.2.1 +5 -2 xml-fop/src/org/apache/fop/fo/Title.java
Index: Title.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Title.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- Title.java 20 Aug 2001 11:19:22 -0000 1.4
+++ Title.java 24 Jul 2002 01:06:21 -0000 1.4.2.1
@@ -35,7 +35,10 @@
protected Title(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
- this.name = "fo:title";
+ }
+
+ public String getName() {
+ return "fo:title";
}
public Status layout(Area area) throws FOPException {
1.3.2.1 +4 -4 xml-fop/src/org/apache/fop/fo/ToBeImplementedElement.java
Index: ToBeImplementedElement.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/ToBeImplementedElement.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- ToBeImplementedElement.java 20 Aug 2001 11:19:22 -0000 1.3
+++ ToBeImplementedElement.java 24 Jul 2002 01:06:21 -0000 1.3.2.1
@@ -16,7 +16,7 @@
/**
*/
-public class ToBeImplementedElement extends FObj {
+public abstract class ToBeImplementedElement extends FObj {
protected ToBeImplementedElement(FObj parent, PropertyList propertyList)
throws FOPException {
@@ -24,8 +24,8 @@
}
public Status layout(Area area) throws FOPException {
- log.debug("This element \"" + this.name
- + "\" is not yet implemented.");
+ log.debug("The element '" + this.getName()
+ + "' is not yet implemented.");
return new Status(Status.OK);
}
1.2.2.1 +5 -2 xml-fop/src/org/apache/fop/fo/Unknown.java
Index: Unknown.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Unknown.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- Unknown.java 20 Aug 2001 11:19:23 -0000 1.2
+++ Unknown.java 24 Jul 2002 01:06:21 -0000 1.2.2.1
@@ -38,7 +38,10 @@
protected Unknown(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
- this.name = "unknown";
+ }
+
+ public String getName() {
+ return "(unknown)";
}
public Status layout(Area area) throws FOPException {
1.2.2.1 +9 -10 xml-fop/src/org/apache/fop/fo/UnknownXMLObj.java
Index: UnknownXMLObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/UnknownXMLObj.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- UnknownXMLObj.java 8 Oct 2001 09:56:38 -0000 1.2
+++ UnknownXMLObj.java 24 Jul 2002 01:06:21 -0000 1.2.2.1
@@ -59,14 +59,9 @@
* @param parent the parent formatting object
* @param propertyList the explicit properties of this object
*/
- protected UnknownXMLObj(FObj parent, PropertyList propertyList, String space,
String tag) {
- super(parent, propertyList, tag);
- this.namespace = space;
- if(!"".equals(space)) {
- this.name = this.namespace + ":" + tag;
- } else {
- this.name = "(none):" + tag;
- }
+ protected UnknownXMLObj(FObj parent, PropertyList propertyList, String
namespace, String name) {
+ super(parent, propertyList, name);
+ this.namespace = namespace;
}
public String getNameSpace() {
@@ -92,10 +87,14 @@
// this is an error
//throw new FOPException("Foreign XML not in
fo:instream-foreign-object");
//}
- log.error("no handler defined for " + this.name + " foreign xml");
+ log.error("no handler defined for " + this.getName() + " foreign xml");
/* return status */
return new Status(Status.OK);
+ }
+
+ public String getName() {
+ return ""+namespace+":"+tagName;
}
}
1.1.2.1 +5 -1 xml-fop/src/org/apache/fop/fo/XMLElement.java
Index: XMLElement.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/XMLElement.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- XMLElement.java 13 Sep 2001 07:49:32 -0000 1.1
+++ XMLElement.java 24 Jul 2002 01:06:21 -0000 1.1.2.1
@@ -63,6 +63,10 @@
init();
}
+ public String getName() {
+ return tagName;
+ }
+
/**
* layout this formatting object.
*
1.2.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/XMLObj.java
Index: XMLObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/XMLObj.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- XMLObj.java 16 Jul 2002 20:04:44 -0000 1.2.2.1
+++ XMLObj.java 24 Jul 2002 01:06:21 -0000 1.2.2.2
@@ -27,7 +27,7 @@
*/
public abstract class XMLObj extends FObj {
- protected String tagName = "";
+ protected String tagName;
protected Element element;
protected Document doc;
@@ -141,7 +141,7 @@
*/
public Status layout(Area area) throws FOPException {
/* generate a warning */
- log.error("" + this.name + " outside foreign xml");
+ log.error("" + this.tagName + " outside foreign xml");
/* return status */
return new Status(Status.OK);
No revision
No revision
1.8.2.1 +5 -3 xml-fop/src/org/apache/fop/fo/flow/BasicLink.java
Index: BasicLink.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/BasicLink.java,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- BasicLink.java 31 Aug 2001 11:41:25 -0000 1.8
+++ BasicLink.java 24 Jul 2002 01:06:22 -0000 1.8.2.1
@@ -25,7 +25,6 @@
PropertyList propertyList) throws FOPException {
return new BasicLink(parent, propertyList);
}
-
}
public static FObj.Maker maker() {
@@ -35,7 +34,10 @@
public BasicLink(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
- this.name = "fo:basic-link";
+ }
+
+ public String getName() {
+ return "fo:basic-link";
}
public Status layout(Area area) throws FOPException {
1.4.2.1 +5 -3 xml-fop/src/org/apache/fop/fo/flow/BidiOverride.java
Index: BidiOverride.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/BidiOverride.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- BidiOverride.java 20 Aug 2001 11:19:23 -0000 1.4
+++ BidiOverride.java 24 Jul 2002 01:06:22 -0000 1.4.2.1
@@ -24,7 +24,6 @@
PropertyList propertyList) throws FOPException {
return new BidiOverride(parent, propertyList);
}
-
}
public static FObj.Maker maker() {
@@ -34,7 +33,10 @@
protected BidiOverride(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
- this.name = "fo:bidi-override";
+ }
+
+ public String getName() {
+ return "fo:bidi-override";
}
public Status layout(Area area) throws FOPException {
1.41.2.5 +5 -2 xml-fop/src/org/apache/fop/fo/flow/Block.java
Index: Block.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
retrieving revision 1.41.2.4
retrieving revision 1.41.2.5
diff -u -r1.41.2.4 -r1.41.2.5
--- Block.java 23 Apr 2002 22:24:44 -0000 1.41.2.4
+++ Block.java 24 Jul 2002 01:06:22 -0000 1.41.2.5
@@ -69,9 +69,12 @@
throws FOPException {
super(parent, propertyList);
- this.name = "fo:block";
this.span = this.properties.get("span").getEnum();
ts = propMgr.getTextDecoration(parent);
+ }
+
+ public String getName() {
+ return "fo:block";
}
public Status layout(Area area) throws FOPException {
1.11.2.2 +5 -2 xml-fop/src/org/apache/fop/fo/flow/BlockContainer.java
Index: BlockContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/BlockContainer.java,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -r1.11.2.1 -r1.11.2.2
--- BlockContainer.java 23 Apr 2002 22:24:44 -0000 1.11.2.1
+++ BlockContainer.java 24 Jul 2002 01:06:22 -0000 1.11.2.2
@@ -51,8 +51,11 @@
protected BlockContainer(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
- this.name = "fo:block-container";
this.span = this.properties.get("span").getEnum();
+ }
+
+ public String getName() {
+ return "fo:block-container";
}
public Status layout(Area area) throws FOPException {
1.12.2.1 +11 -11 xml-fop/src/org/apache/fop/fo/flow/Character.java
Index: Character.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Character.java,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- Character.java 11 Sep 2001 10:04:24 -0000 1.12
+++ Character.java 24 Jul 2002 01:06:22 -0000 1.12.2.1
@@ -37,24 +37,24 @@
public final static int OK = 0;
public final static int DOESNOT_FIT = 1;
- public Character(FObj parent, PropertyList propertyList) {
- super(parent, propertyList);
- this.name = "fo:character";
- }
-
- public static FObj.Maker maker() {
- return new Character.Maker();
- }
-
-
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
PropertyList propertyList) throws FOPException {
return new Character(parent, propertyList);
}
+ }
+
+ public static FObj.Maker maker() {
+ return new Character.Maker();
+ }
+ public Character(FObj parent, PropertyList propertyList) {
+ super(parent, propertyList);
}
+ public String getName() {
+ return "fo:character";
+ }
public Status layout(Area area) throws FOPException {
BlockArea blockArea;
1.13.2.1 +14 -15 xml-fop/src/org/apache/fop/fo/flow/ExternalGraphic.java
Index: ExternalGraphic.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/ExternalGraphic.java,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- ExternalGraphic.java 12 Sep 2001 09:19:34 -0000 1.13
+++ ExternalGraphic.java 24 Jul 2002 01:06:22 -0000 1.13.2.1
@@ -36,12 +36,24 @@
ImageArea imageArea;
+ public static class Maker extends FObj.Maker {
+ public FObj make(FObj parent,
+ PropertyList propertyList) throws FOPException {
+ return new ExternalGraphic(parent, propertyList);
+ }
+ }
+
+ public static FObj.Maker maker() {
+ return new ExternalGraphic.Maker();
+ }
public ExternalGraphic(FObj parent, PropertyList propertyList) {
super(parent, propertyList);
- this.name = "fo:external-graphic";
}
+ public String getName() {
+ return "fo:external-graphic";
+ }
public Status layout(Area area) throws FOPException {
@@ -251,18 +263,5 @@
return new Status(Status.OK);
}
-
- public static FObj.Maker maker() {
- return new ExternalGraphic.Maker();
- }
-
-
- public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new ExternalGraphic(parent, propertyList);
- }
-
- }
}
1.4.2.1 +5 -2 xml-fop/src/org/apache/fop/fo/flow/Float.java
Index: Float.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Float.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- Float.java 20 Aug 2001 11:19:23 -0000 1.4
+++ Float.java 24 Jul 2002 01:06:22 -0000 1.4.2.1
@@ -33,7 +33,10 @@
protected Float(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
- this.name = "fo:float";
+ }
+
+ public String getName() {
+ return "fo:float";
}
public Status layout(Area area) throws FOPException {
1.24.2.2 +9 -11 xml-fop/src/org/apache/fop/fo/flow/Flow.java
Index: Flow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Flow.java,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -u -r1.24.2.1 -r1.24.2.2
--- Flow.java 19 Jul 2002 20:41:00 -0000 1.24.2.1
+++ Flow.java 24 Jul 2002 01:06:22 -0000 1.24.2.2
@@ -65,13 +65,11 @@
protected Flow(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
- this.name = getElementName();
if (parent.getName().equals("fo:page-sequence")) {
this.pageSequence = (PageSequence)parent;
} else {
- throw new FOPException("flow must be child of "
- + "page-sequence, not "
+ throw new FOPException("flow must be child of page-sequence, not "
+ parent.getName());
}
setFlowName(getProperty("flow-name").getString());
@@ -82,21 +80,25 @@
// fo:flow per fo:page-sequence only.
if (pageSequence.isFlowSet()) {
- if (this.name.equals("fo:flow")) {
+ if (getName().equals("fo:flow")) {
throw new FOPException("Only a single fo:flow permitted"
+ " per fo:page-sequence");
} else {
- throw new FOPException(this.name
+ throw new FOPException(getName()
+ " not allowed after fo:flow");
}
}
pageSequence.addFlow(this);
}
+ public String getName() {
+ return "fo:flow";
+ }
+
protected void setFlowName(String name) throws FOPException {
if (name == null || name.equals("")) {
log.warn("A 'flow-name' is required for "
- + getElementName()
+ + getName()
+ ". This constraint will be enforced in future versions of
FOP");
_flowName = "xsl-region-body";
} else {
@@ -216,10 +218,6 @@
*/
public int getContentWidth() {
return this.contentWidth;
- }
-
- protected String getElementName() {
- return "fo:flow";
}
public Status getStatus() {
1.6.2.1 +5 -2 xml-fop/src/org/apache/fop/fo/flow/Footnote.java
Index: Footnote.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Footnote.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- Footnote.java 11 Sep 2001 10:04:24 -0000 1.6
+++ Footnote.java 24 Jul 2002 01:06:22 -0000 1.6.2.1
@@ -35,7 +35,10 @@
public Footnote(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
- this.name = "fo:footnote";
+ }
+
+ public String getName() {
+ return "fo:footnote";
}
public Status layout(Area area) throws FOPException {
1.6.2.1 +5 -2 xml-fop/src/org/apache/fop/fo/flow/FootnoteBody.java
Index: FootnoteBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/FootnoteBody.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- FootnoteBody.java 30 Jul 2001 20:29:23 -0000 1.6
+++ FootnoteBody.java 24 Jul 2002 01:06:22 -0000 1.6.2.1
@@ -42,8 +42,11 @@
public FootnoteBody(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
- this.name = "fo:footnote-body";
this.areaClass = AreaClass.setAreaClass(AreaClass.XSL_FOOTNOTE);
+ }
+
+ public String getName() {
+ return "fo:footnote-body";
}
public Status layout(Area area) throws FOPException {
1.4.2.1 +5 -2 xml-fop/src/org/apache/fop/fo/flow/InitialPropertySet.java
Index: InitialPropertySet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/InitialPropertySet.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- InitialPropertySet.java 20 Aug 2001 11:19:23 -0000 1.4
+++ InitialPropertySet.java 24 Jul 2002 01:06:22 -0000 1.4.2.1
@@ -34,7 +34,10 @@
protected InitialPropertySet(FObj parent, PropertyList propertyList)
throws FOPException {
super(parent, propertyList);
- this.name = "fo:initial-property-set";
+ }
+
+ public String getName() {
+ return "fo:initial-property-set";
}
public Status layout(Area area) throws FOPException {
1.8.2.4 +6 -2 xml-fop/src/org/apache/fop/fo/flow/Inline.java
Index: Inline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Inline.java,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -r1.8.2.3 -r1.8.2.4
--- Inline.java 6 Jul 2002 19:05:30 -0000 1.8.2.3
+++ Inline.java 24 Jul 2002 01:06:22 -0000 1.8.2.4
@@ -33,7 +33,6 @@
public Inline(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
- this.name = "fo:inline";
if (parent.getName().equals("fo:flow")) {
throw new FOPException("inline formatting objects cannot"
+ " be directly under flow");
@@ -77,4 +76,9 @@
ts = propMgr.getTextDecoration(parent);
}
+
+ public String getName() {
+ return "fo:inline";
+ }
+
}
1.4.2.1 +5 -3 xml-fop/src/org/apache/fop/fo/flow/InlineContainer.java
Index: InlineContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/InlineContainer.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- InlineContainer.java 20 Aug 2001 11:19:23 -0000 1.4
+++ InlineContainer.java 24 Jul 2002 01:06:22 -0000 1.4.2.1
@@ -23,7 +23,6 @@
PropertyList propertyList) throws FOPException {
return new InlineContainer(parent, propertyList);
}
-
}
public static FObj.Maker maker() {
@@ -33,7 +32,6 @@
protected InlineContainer(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
- this.name = "fo:inline-container";
// Common Border, Padding, and Background Properties
BorderAndPadding bap = propMgr.getBorderAndPadding();
@@ -64,6 +62,10 @@
// this.properties.get("reference-orientation");
// this.properties.get("width");
// this.properties.get("writing-mode");
+ }
+
+ public String getName() {
+ return "fo:inline-container";
}
}
1.14.2.1 +5 -2 xml-fop/src/org/apache/fop/fo/flow/InstreamForeignObject.java
Index: InstreamForeignObject.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/InstreamForeignObject.java,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- InstreamForeignObject.java 6 Aug 2001 09:12:59 -0000 1.14
+++ InstreamForeignObject.java 24 Jul 2002 01:06:22 -0000 1.14.2.1
@@ -76,7 +76,10 @@
*/
public InstreamForeignObject(FObj parent, PropertyList propertyList) {
super(parent, propertyList);
- this.name = "fo:instream-foreign-object";
+ }
+
+ public String getName() {
+ return "fo:instream-foreign-object";
}
/**
1.13.2.2 +5 -2 xml-fop/src/org/apache/fop/fo/flow/Leader.java
Index: Leader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Leader.java,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -r1.13.2.1 -r1.13.2.2
--- Leader.java 6 Jul 2002 19:05:30 -0000 1.13.2.1
+++ Leader.java 24 Jul 2002 01:06:22 -0000 1.13.2.2
@@ -40,7 +40,10 @@
public Leader(FObj parent, PropertyList propertyList) {
super(parent, propertyList);
- this.name = "fo:leader";
+ }
+
+ public String getName() {
+ return "fo:leader";
}
public Status layout(Area area) throws FOPException {
1.21.2.2 +5 -2 xml-fop/src/org/apache/fop/fo/flow/ListBlock.java
Index: ListBlock.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/ListBlock.java,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -r1.21.2.1 -r1.21.2.2
--- ListBlock.java 23 Apr 2002 22:24:44 -0000 1.21.2.1
+++ ListBlock.java 24 Jul 2002 01:06:22 -0000 1.21.2.2
@@ -46,7 +46,10 @@
public ListBlock(FObj parent, PropertyList propertyList) {
super(parent, propertyList);
- this.name = "fo:list-block";
+ }
+
+ public String getName() {
+ return "fo:list-block";
}
public Status layout(Area area) throws FOPException {
1.16.2.1 +5 -2 xml-fop/src/org/apache/fop/fo/flow/ListItem.java
Index: ListItem.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/ListItem.java,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -r1.16 -r1.16.2.1
--- ListItem.java 6 Aug 2001 09:12:59 -0000 1.16
+++ ListItem.java 24 Jul 2002 01:06:22 -0000 1.16.2.1
@@ -46,7 +46,10 @@
public ListItem(FObj parent, PropertyList propertyList) {
super(parent, propertyList);
- this.name = "fo:list-item";
+ }
+
+ public String getName() {
+ return "fo:list-item";
}
public Status layout(Area area) throws FOPException {
1.11.2.1 +5 -2 xml-fop/src/org/apache/fop/fo/flow/ListItemBody.java
Index: ListItemBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/ListItemBody.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- ListItemBody.java 6 Aug 2001 09:12:59 -0000 1.11
+++ ListItemBody.java 24 Jul 2002 01:06:22 -0000 1.11.2.1
@@ -33,7 +33,10 @@
public ListItemBody(FObj parent, PropertyList propertyList) {
super(parent, propertyList);
- this.name = "fo:list-item-body";
+ }
+
+ public String getName() {
+ return "fo:list-item-body";
}
public Status layout(Area area) throws FOPException {
1.11.2.1 +5 -2 xml-fop/src/org/apache/fop/fo/flow/ListItemLabel.java
Index: ListItemLabel.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/ListItemLabel.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- ListItemLabel.java 6 Aug 2001 09:12:59 -0000 1.11
+++ ListItemLabel.java 24 Jul 2002 01:06:22 -0000 1.11.2.1
@@ -33,7 +33,10 @@
public ListItemLabel(FObj parent, PropertyList propertyList) {
super(parent, propertyList);
- this.name = "fo:list-item-label";
+ }
+
+ public String getName() {
+ return "fo:list-item-label";
}
public Status layout(Area area) throws FOPException {
1.6.2.1 +5 -2 xml-fop/src/org/apache/fop/fo/flow/Marker.java
Index: Marker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Marker.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- Marker.java 21 Sep 2001 09:08:38 -0000 1.6
+++ Marker.java 24 Jul 2002 01:06:22 -0000 1.6.2.1
@@ -33,7 +33,6 @@
public Marker(FObj parent, PropertyList propertyList) {
super(parent, propertyList);
- this.name = "fo:marker";
// do check to see that 'this' is under fo:flow
@@ -49,6 +48,10 @@
//log.error("marker cannot be added to '" + parent
// + "'");
}
+ }
+
+ public String getName() {
+ return "fo:marker";
}
public Status layout(Area area) throws FOPException {
1.4.2.1 +5 -3 xml-fop/src/org/apache/fop/fo/flow/MultiCase.java
Index: MultiCase.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/MultiCase.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- MultiCase.java 20 Aug 2001 11:19:23 -0000 1.4
+++ MultiCase.java 24 Jul 2002 01:06:22 -0000 1.4.2.1
@@ -23,7 +23,6 @@
PropertyList propertyList) throws FOPException {
return new MultiCase(parent, propertyList);
}
-
}
public static FObj.Maker maker() {
@@ -33,7 +32,10 @@
protected MultiCase(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
- this.name = "fo:multi-case";
+ }
+
+ public String getName() {
+ return "fo:multi-case";
}
public Status layout(Area area) throws FOPException {
1.4.2.1 +5 -2 xml-fop/src/org/apache/fop/fo/flow/MultiProperties.java
Index: MultiProperties.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/MultiProperties.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- MultiProperties.java 20 Aug 2001 11:19:23 -0000 1.4
+++ MultiProperties.java 24 Jul 2002 01:06:22 -0000 1.4.2.1
@@ -33,7 +33,10 @@
protected MultiProperties(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
- this.name = "fo:multi-properties";
+ }
+
+ public String getName() {
+ return "fo:multi-properties";
}
public Status layout(Area area) throws FOPException {
1.4.2.1 +5 -2 xml-fop/src/org/apache/fop/fo/flow/MultiPropertySet.java
Index: MultiPropertySet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/MultiPropertySet.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- MultiPropertySet.java 20 Aug 2001 11:19:23 -0000 1.4
+++ MultiPropertySet.java 24 Jul 2002 01:06:22 -0000 1.4.2.1
@@ -33,7 +33,10 @@
protected MultiPropertySet(FObj parent, PropertyList propertyList)
throws FOPException {
super(parent, propertyList);
- this.name = "fo:multi-property-set";
+ }
+
+ public String getName() {
+ return "fo:multi-property-set";
}
public Status layout(Area area) throws FOPException {
1.4.2.1 +5 -2 xml-fop/src/org/apache/fop/fo/flow/MultiSwitch.java
Index: MultiSwitch.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/MultiSwitch.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- MultiSwitch.java 20 Aug 2001 11:19:23 -0000 1.4
+++ MultiSwitch.java 24 Jul 2002 01:06:22 -0000 1.4.2.1
@@ -33,7 +33,10 @@
protected MultiSwitch(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
- this.name = "fo:multi-switch";
+ }
+
+ public String getName() {
+ return "fo:multi-switch";
}
public Status layout(Area area) throws FOPException {
1.4.2.1 +5 -2 xml-fop/src/org/apache/fop/fo/flow/MultiToggle.java
Index: MultiToggle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/MultiToggle.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- MultiToggle.java 20 Aug 2001 11:19:23 -0000 1.4
+++ MultiToggle.java 24 Jul 2002 01:06:22 -0000 1.4.2.1
@@ -33,7 +33,10 @@
protected MultiToggle(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
- this.name = "fo:multi-toggle";
+ }
+
+ public String getName() {
+ return "fo:multi-toggle";
}
public Status layout(Area area) throws FOPException {
1.21.2.1 +5 -2 xml-fop/src/org/apache/fop/fo/flow/PageNumber.java
Index: PageNumber.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/PageNumber.java,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -r1.21 -r1.21.2.1
--- PageNumber.java 11 Sep 2001 10:04:24 -0000 1.21
+++ PageNumber.java 24 Jul 2002 01:06:22 -0000 1.21.2.1
@@ -41,7 +41,10 @@
public PageNumber(FObj parent, PropertyList propertyList) {
super(parent, propertyList);
- this.name = "fo:page-number";
+ }
+
+ public String getName() {
+ return "fo:page-number";
}
public Status layout(Area area) throws FOPException {
1.19.2.1 +4 -2 xml-fop/src/org/apache/fop/fo/flow/PageNumberCitation.java
Index: PageNumberCitation.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/PageNumberCitation.java,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -r1.19 -r1.19.2.1
--- PageNumberCitation.java 11 Sep 2001 10:04:24 -0000 1.19
+++ PageNumberCitation.java 24 Jul 2002 01:06:22 -0000 1.19.2.1
@@ -98,9 +98,11 @@
public PageNumberCitation(FObj parent, PropertyList propertyList) {
super(parent, propertyList);
- this.name = "fo:page-number-citation";
}
+ public String getName() {
+ return "fo:page-number-citation";
+ }
public Status layout(Area area) throws FOPException {
if (!(area instanceof BlockArea)) {
1.6.2.3 +6 -3 xml-fop/src/org/apache/fop/fo/flow/RetrieveMarker.java
Index: RetrieveMarker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/RetrieveMarker.java,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- RetrieveMarker.java 19 Jul 2002 00:30:13 -0000 1.6.2.2
+++ RetrieveMarker.java 24 Jul 2002 01:06:23 -0000 1.6.2.3
@@ -17,7 +17,7 @@
// Java
import java.util.Vector;
-public class RetrieveMarker extends FObjMixed {
+public class RetrieveMarker extends FObj {
private String retrieveClassName;
private int retrievePosition;
@@ -37,7 +37,6 @@
public RetrieveMarker(FObj parent, PropertyList propertyList) {
super(parent, propertyList);
- this.name = "fo:retrieve-marker";
this.retrieveClassName =
this.properties.get("retrieve-class-name").getString();
@@ -45,6 +44,10 @@
this.properties.get("retrieve-position").getEnum();
this.retrieveBoundary =
this.properties.get("retrieve-boundary").getEnum();
+ }
+
+ public String getName() {
+ return "fo:retrieve-marker";
}
public Status layout(Area area) throws FOPException {
1.18.2.1 +6 -6 xml-fop/src/org/apache/fop/fo/flow/StaticContent.java
Index: StaticContent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/StaticContent.java,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- StaticContent.java 14 Oct 2001 20:39:54 -0000 1.18
+++ StaticContent.java 24 Jul 2002 01:06:23 -0000 1.18.2.1
@@ -37,6 +37,10 @@
((PageSequence)parent).setIsFlowSet(false); // hacquery of sorts
}
+ public String getName() {
+ return "fo:static-content";
+ }
+
public Status layout(Area area) throws FOPException {
return layout(area, null);
}
@@ -90,15 +94,11 @@
return new Status(Status.OK);
}
- protected String getElementName() {
- return "fo:static-content";
- }
-
// flowname checking is more stringient for static content currently
protected void setFlowName(String name) throws FOPException {
if (name == null || name.equals("")) {
throw new FOPException("A 'flow-name' is required for "
- + getElementName() + ".");
+ + getName() + ".");
} else {
super.setFlowName(name);
}
1.39.2.2 +5 -2 xml-fop/src/org/apache/fop/fo/flow/Table.java
Index: Table.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Table.java,v
retrieving revision 1.39.2.1
retrieving revision 1.39.2.2
diff -u -r1.39.2.1 -r1.39.2.2
--- Table.java 23 Apr 2002 22:24:44 -0000 1.39.2.1
+++ Table.java 24 Jul 2002 01:06:23 -0000 1.39.2.2
@@ -60,7 +60,10 @@
public Table(FObj parent, PropertyList propertyList) {
super(parent, propertyList);
- this.name = "fo:table";
+ }
+
+ public String getName() {
+ return "fo:table";
}
public Status layout(Area area) throws FOPException {
1.4.2.1 +5 -2 xml-fop/src/org/apache/fop/fo/flow/TableAndCaption.java
Index: TableAndCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableAndCaption.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- TableAndCaption.java 20 Aug 2001 11:19:23 -0000 1.4
+++ TableAndCaption.java 24 Jul 2002 01:06:23 -0000 1.4.2.1
@@ -33,7 +33,10 @@
protected TableAndCaption(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
- this.name = "fo:table-and-caption";
+ }
+
+ public String getName() {
+ return "fo:table-and-caption";
}
public Status layout(Area area) throws FOPException {
1.38.2.5 +5 -2 xml-fop/src/org/apache/fop/fo/flow/TableBody.java
Index: TableBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableBody.java,v
retrieving revision 1.38.2.4
retrieving revision 1.38.2.5
diff -u -r1.38.2.4 -r1.38.2.5
--- TableBody.java 20 Jul 2002 12:58:48 -0000 1.38.2.4
+++ TableBody.java 24 Jul 2002 01:06:23 -0000 1.38.2.5
@@ -35,7 +35,10 @@
public TableBody(FObj parent, PropertyList propertyList)
throws FOPException {
super(parent, propertyList);
- this.name = "fo:table-body";
+ }
+
+ public String getName() {
+ return "fo:table-body";
}
}
1.4.2.1 +5 -2 xml-fop/src/org/apache/fop/fo/flow/TableCaption.java
Index: TableCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableCaption.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- TableCaption.java 20 Aug 2001 11:19:23 -0000 1.4
+++ TableCaption.java 24 Jul 2002 01:06:23 -0000 1.4.2.1
@@ -33,7 +33,10 @@
protected TableCaption(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
- this.name = "fo:table-caption";
+ }
+
+ public String getName() {
+ return "fo:table-caption";
}
public Status layout(Area area) throws FOPException {
1.39.2.3 +5 -2 xml-fop/src/org/apache/fop/fo/flow/TableCell.java
Index: TableCell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableCell.java,v
retrieving revision 1.39.2.2
retrieving revision 1.39.2.3
diff -u -r1.39.2.2 -r1.39.2.3
--- TableCell.java 20 Jul 2002 12:50:00 -0000 1.39.2.2
+++ TableCell.java 24 Jul 2002 01:06:23 -0000 1.39.2.3
@@ -98,12 +98,15 @@
public TableCell(FObj parent, PropertyList propertyList)
throws FOPException {
super(parent, propertyList);
- this.name = "fo:table-cell";
if (!(parent instanceof TableRow)) {
throw new FOPException("A table cell must be child of fo:table-row,"
+ " not " + parent.getName());
}
doSetup(); // init some basic property values
+ }
+
+ public String getName() {
+ return "fo:table-cell";
}
// Set position relative to table (set by body?)
1.20.2.3 +5 -3 xml-fop/src/org/apache/fop/fo/flow/TableColumn.java
Index: TableColumn.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableColumn.java,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -r1.20.2.2 -r1.20.2.3
--- TableColumn.java 20 Jul 2002 12:50:00 -0000 1.20.2.2
+++ TableColumn.java 24 Jul 2002 01:06:23 -0000 1.20.2.3
@@ -31,7 +31,6 @@
PropertyList propertyList) throws FOPException {
return new TableColumn(parent, propertyList);
}
-
}
public static FObj.Maker maker() {
@@ -41,11 +40,14 @@
public TableColumn(FObj parent, PropertyList propertyList)
throws FOPException {
super(parent, propertyList);
- this.name = "fo:table-column";
if (!(parent instanceof Table)) {
throw new FOPException("A table column must be child of fo:table, not "
+ parent.getName());
}
+ }
+
+ public String getName() {
+ return "fo:table-column";
}
public Length getColumnWidthAsLength() {
1.3.2.2 +5 -2 xml-fop/src/org/apache/fop/fo/flow/TableFooter.java
Index: TableFooter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableFooter.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- TableFooter.java 20 Jul 2002 12:58:48 -0000 1.3.2.1
+++ TableFooter.java 24 Jul 2002 01:06:23 -0000 1.3.2.2
@@ -35,7 +35,10 @@
public TableFooter(FObj parent, PropertyList propertyList)
throws FOPException {
super(parent, propertyList);
- this.name = "fo:table-footer";
+ }
+
+ public String getName() {
+ return "fo:table-footer";
}
public int getYPosition() {
1.2.2.2 +5 -2 xml-fop/src/org/apache/fop/fo/flow/TableHeader.java
Index: TableHeader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableHeader.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- TableHeader.java 20 Jul 2002 12:58:48 -0000 1.2.2.1
+++ TableHeader.java 24 Jul 2002 01:06:23 -0000 1.2.2.2
@@ -35,7 +35,10 @@
public TableHeader(FObj parent, PropertyList propertyList)
throws FOPException {
super(parent, propertyList);
- this.name = "fo:table-header";
+ }
+
+ public String getName() {
+ return "fo:table-header";
}
}
1.51.2.3 +5 -2 xml-fop/src/org/apache/fop/fo/flow/TableRow.java
Index: TableRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableRow.java,v
retrieving revision 1.51.2.2
retrieving revision 1.51.2.3
diff -u -r1.51.2.2 -r1.51.2.3
--- TableRow.java 20 Jul 2002 12:50:00 -0000 1.51.2.2
+++ TableRow.java 24 Jul 2002 01:06:23 -0000 1.51.2.3
@@ -174,12 +174,15 @@
public TableRow(FObj parent, PropertyList propertyList)
throws FOPException {
super(parent, propertyList);
- this.name = "fo:table-row";
if (!(parent instanceof AbstractTableBody)) {
throw new FOPException("A table row must be child of fo:table-body,"
+ " fo:table-header or fo:table-footer, not "
+ parent.getName());
}
+ }
+
+ public String getName() {
+ return "fo:table-row";
}
public void setColumns(Vector columns) {
1.4.2.2 +5 -1 xml-fop/src/org/apache/fop/fo/flow/Wrapper.java
Index: Wrapper.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Wrapper.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- Wrapper.java 6 Jul 2002 19:05:30 -0000 1.4.2.1
+++ Wrapper.java 24 Jul 2002 01:06:23 -0000 1.4.2.2
@@ -34,6 +34,10 @@
return new Wrapper.Maker();
}
+ public String getName() {
+ return "fo:wrapper";
+ }
+
public Wrapper(FObj parent, PropertyList propertyList) {
super(parent, propertyList);
// check that this occurs inside an fo:flow
No revision
No revision
1.5.2.3 +5 -2
xml-fop/src/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
Index: ConditionalPageMasterReference.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- ConditionalPageMasterReference.java 18 Jul 2002 22:25:30 -0000 1.5.2.2
+++ ConditionalPageMasterReference.java 24 Jul 2002 01:06:25 -0000 1.5.2.3
@@ -37,7 +37,6 @@
throws FOPException {
super(parent, propertyList);
- this.name = "fo:conditional-page-master-reference";
if (getProperty("master-reference") != null) {
this.masterName = getProperty("master-reference").getString();
}
@@ -57,6 +56,10 @@
this.pagePosition = this.properties.get("page-position").getEnum();
this.oddOrEven = this.properties.get("odd-or-even").getEnum();
this.blankOrNotBlank = this.properties.get("blank-or-not-blank").getEnum();
+ }
+
+ public String getName() {
+ return "fo:conditional-page-master-reference";
}
protected boolean isValid(boolean isOddPage, boolean isFirstPage,
1.10.2.1 +5 -4 xml-fop/src/org/apache/fop/fo/pagination/LayoutMasterSet.java
Index: LayoutMasterSet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/LayoutMasterSet.java,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- LayoutMasterSet.java 30 Jul 2001 20:29:25 -0000 1.10
+++ LayoutMasterSet.java 24 Jul 2002 01:06:25 -0000 1.10.2.1
@@ -23,7 +23,6 @@
PropertyList propertyList) throws FOPException {
return new LayoutMasterSet(parent, propertyList);
}
-
}
public static FObj.Maker maker() {
@@ -39,7 +38,6 @@
protected LayoutMasterSet(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
- this.name = "fo:layout-master-set";
this.simplePageMasters = new Hashtable();
this.pageSequenceMasters = new Hashtable();
@@ -55,6 +53,10 @@
}
+ public String getName() {
+ return "fo:layout-master-set";
+ }
+
protected void addSimplePageMaster(SimplePageMaster simplePageMaster)
throws FOPException {
// check against duplication of master-name
@@ -147,6 +149,5 @@
}
return result;
}
-
}
1.39.2.5 +4 -2 xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java
Index: PageSequence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java,v
retrieving revision 1.39.2.4
retrieving revision 1.39.2.5
diff -u -r1.39.2.4 -r1.39.2.5
--- PageSequence.java 18 Jul 2002 22:25:30 -0000 1.39.2.4
+++ PageSequence.java 24 Jul 2002 01:06:25 -0000 1.39.2.5
@@ -121,7 +121,6 @@
protected PageSequence(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
- this.name = "fo:page-sequence";
if (parent.getName().equals("fo:root")) {
this.root = (Root)parent;
@@ -177,6 +176,9 @@
// this.properties.get("id");
}
+ public String getName() {
+ return "fo:page-sequence";
+ }
public void addFlow(Flow flow) throws FOPException {
if (_flowMap.containsKey(flow.getFlowName())) {
1.6.2.2 +6 -2 xml-fop/src/org/apache/fop/fo/pagination/PageSequenceMaster.java
Index: PageSequenceMaster.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageSequenceMaster.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- PageSequenceMaster.java 18 Jul 2002 22:25:30 -0000 1.6.2.1
+++ PageSequenceMaster.java 24 Jul 2002 01:06:25 -0000 1.6.2.2
@@ -45,7 +45,6 @@
protected PageSequenceMaster(FObj parent, PropertyList propertyList)
throws FOPException {
super(parent, propertyList);
- this.name = "fo:page-sequence-master";
if (parent.getName().equals("fo:layout-master-set")) {
this.layoutMasterSet = (LayoutMasterSet)parent;
@@ -133,4 +132,9 @@
}
return pageMaster;
}
+
+ public String getName() {
+ return "fo:page-sequence-master";
+ }
+
}
1.5.2.1 +3 -10 xml-fop/src/org/apache/fop/fo/pagination/Region.java
Index: Region.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Region.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- Region.java 30 Jul 2001 20:29:25 -0000 1.5
+++ Region.java 24 Jul 2002 01:06:25 -0000 1.5.2.1
@@ -25,7 +25,6 @@
protected Region(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
- this.name = getElementName();
// regions may have name, or default
if (null == this.properties.get(PROP_REGION_NAME)) {
@@ -38,7 +37,7 @@
if (isReserved(getRegionName())
&&!getRegionName().equals(getDefaultRegionName())) {
throw new FOPException(PROP_REGION_NAME + " '" + _regionName
- + "' for " + this.name
+ + "' for " + this.getName()
+ " not permitted.");
}
}
@@ -47,7 +46,7 @@
_layoutMaster = (SimplePageMaster)parent;
getPageMaster().addRegion(this);
} else {
- throw new FOPException(getElementName() + " must be child "
+ throw new FOPException(getName() + " must be child "
+ "of simple-page-master, not "
+ parent.getName());
}
@@ -66,12 +65,6 @@
* etc.)
*/
protected abstract String getDefaultRegionName();
-
- /**
- * Returns the element name ("fo:region-body", "fo:region-start",
- * etc.)
- */
- protected abstract String getElementName();
public abstract String getRegionClass();
1.9.2.3 +5 -5 xml-fop/src/org/apache/fop/fo/pagination/RegionAfter.java
Index: RegionAfter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RegionAfter.java,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- RegionAfter.java 16 Jul 2002 19:13:23 -0000 1.9.2.2
+++ RegionAfter.java 24 Jul 2002 01:06:25 -0000 1.9.2.3
@@ -39,6 +39,10 @@
precedence = this.properties.get("precedence").getEnum();
}
+ public String getName() {
+ return "fo:region-after";
+ }
+
RegionArea makeRegionArea(int allocationRectangleXPosition,
int allocationRectangleYPosition,
int allocationRectangleWidth,
@@ -82,10 +86,6 @@
protected String getDefaultRegionName() {
return "xsl-region-after";
- }
-
- protected String getElementName() {
- return "fo:region-after";
}
public String getRegionClass() {
1.9.2.3 +5 -5 xml-fop/src/org/apache/fop/fo/pagination/RegionBefore.java
Index: RegionBefore.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RegionBefore.java,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- RegionBefore.java 16 Jul 2002 19:13:23 -0000 1.9.2.2
+++ RegionBefore.java 24 Jul 2002 01:06:25 -0000 1.9.2.3
@@ -40,6 +40,10 @@
}
+ public String getName() {
+ return "fo:region-before";
+ }
+
RegionArea makeRegionArea(int allocationRectangleXPosition,
int allocationRectangleYPosition,
int allocationRectangleWidth,
@@ -82,10 +86,6 @@
protected String getDefaultRegionName() {
return "xsl-region-before";
- }
-
- protected String getElementName() {
- return "fo:region-before";
}
public String getRegionClass() {
1.11.2.2 +5 -5 xml-fop/src/org/apache/fop/fo/pagination/RegionBody.java
Index: RegionBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RegionBody.java,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -r1.11.2.1 -r1.11.2.2
--- RegionBody.java 23 Apr 2002 22:25:25 -0000 1.11.2.1
+++ RegionBody.java 24 Jul 2002 01:06:25 -0000 1.11.2.2
@@ -40,6 +40,10 @@
super(parent, propertyList);
}
+ public String getName() {
+ return "fo:region-body";
+ }
+
RegionArea makeRegionArea(int allocationRectangleXPosition,
int allocationRectangleYPosition,
int allocationRectangleWidth,
@@ -99,10 +103,6 @@
protected String getDefaultRegionName() {
return "xsl-region-body";
- }
-
- protected String getElementName() {
- return "fo:region-body";
}
public String getRegionClass() {
1.3.2.3 +4 -5 xml-fop/src/org/apache/fop/fo/pagination/RegionEnd.java
Index: RegionEnd.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RegionEnd.java,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- RegionEnd.java 16 Jul 2002 19:13:23 -0000 1.3.2.2
+++ RegionEnd.java 24 Jul 2002 01:06:25 -0000 1.3.2.3
@@ -37,6 +37,9 @@
super(parent, propertyList);
}
+ public String getName() {
+ return "fo:region-end";
+ }
RegionArea makeRegionArea(int allocationRectangleXPosition,
int allocationRectangleYPosition,
@@ -88,10 +91,6 @@
protected String getDefaultRegionName() {
return "xsl-region-end";
- }
-
- protected String getElementName() {
- return "fo:region-end";
}
public String getRegionClass() {
1.3.2.3 +4 -5 xml-fop/src/org/apache/fop/fo/pagination/RegionStart.java
Index: RegionStart.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RegionStart.java,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- RegionStart.java 16 Jul 2002 19:13:23 -0000 1.3.2.2
+++ RegionStart.java 24 Jul 2002 01:06:25 -0000 1.3.2.3
@@ -37,6 +37,9 @@
super(parent, propertyList);
}
+ public String getName() {
+ return "fo:region-start";
+ }
RegionArea makeRegionArea(int allocationRectangleXPosition,
int allocationRectangleYPosition,
@@ -86,10 +89,6 @@
protected String getDefaultRegionName() {
return "xsl-region-start";
- }
-
- protected String getElementName() {
- return "fo:region-start";
}
public String getRegionClass() {
1.7.2.2 +5 -2
xml-fop/src/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
Index: RepeatablePageMasterAlternatives.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- RepeatablePageMasterAlternatives.java 18 Jul 2002 22:25:30 -0000 1.7.2.1
+++ RepeatablePageMasterAlternatives.java 24 Jul 2002 01:06:25 -0000 1.7.2.2
@@ -45,7 +45,6 @@
public RepeatablePageMasterAlternatives(FObj parent, PropertyList propertyList)
throws FOPException {
super(parent, propertyList);
- this.name = "fo:repeatable-page-master-alternatives";
if (parent.getName().equals("fo:page-sequence-master")) {
this.pageSequenceMaster = (PageSequenceMaster)parent;
@@ -72,6 +71,10 @@
}
}
conditionalPageMasterRefs = new Vector();
+ }
+
+ public String getName() {
+ return "fo:repeatable-page-master-alternatives";
}
public void addConditionalPageMasterReference(ConditionalPageMasterReference
cpmr) {
1.3.2.2 +5 -2
xml-fop/src/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
Index: RepeatablePageMasterReference.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- RepeatablePageMasterReference.java 18 Jul 2002 22:25:30 -0000 1.3.2.1
+++ RepeatablePageMasterReference.java 24 Jul 2002 01:06:25 -0000 1.3.2.2
@@ -33,7 +33,6 @@
public RepeatablePageMasterReference(FObj parent, PropertyList propertyList)
throws FOPException {
super(parent, propertyList);
- name = "fo:repeatable-page-master-reference";
if (getProperty("master-reference") != null) {
this.masterName = getProperty("master-reference").getString();
if (parent.getName().equals("fo:page-sequence-master")) {
@@ -61,6 +60,10 @@
+ "'for 'maximum-repeats' property");
}
}
+ }
+
+ public String getName() {
+ return "fo:repeatable-page-master-reference";
}
public String getNextPageMasterName(boolean isOddPage,
1.16.2.2 +5 -3 xml-fop/src/org/apache/fop/fo/pagination/Root.java
Index: Root.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Root.java,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -r1.16.2.1 -r1.16.2.2
--- Root.java 12 Jul 2002 01:15:33 -0000 1.16.2.1
+++ Root.java 24 Jul 2002 01:06:25 -0000 1.16.2.2
@@ -47,8 +47,6 @@
protected Root(FObj parent,
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
- this.name = "fo:root";
-
// this.properties.get("media-usage");
if (parent != null) {
@@ -70,5 +68,9 @@
public void setLayoutMasterSet(LayoutMasterSet layoutMasterSet) {
this.layoutMasterSet = layoutMasterSet;
+ }
+
+ public String getName() {
+ return "fo:root";
}
}
1.15.2.3 +5 -2 xml-fop/src/org/apache/fop/fo/pagination/SimplePageMaster.java
Index: SimplePageMaster.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/SimplePageMaster.java,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -u -r1.15.2.2 -r1.15.2.3
--- SimplePageMaster.java 18 Jul 2002 22:25:30 -0000 1.15.2.2
+++ SimplePageMaster.java 24 Jul 2002 01:06:25 -0000 1.15.2.3
@@ -50,7 +50,6 @@
protected SimplePageMaster(FObj parent, PropertyList propertyList)
throws FOPException {
super(parent, propertyList);
- this.name = "fo:simple-page-master";
if (parent.getName().equals("fo:layout-master-set")) {
this.layoutMasterSet = (LayoutMasterSet)parent;
@@ -68,6 +67,10 @@
}
_regions = new Hashtable();
+ }
+
+ public String getName() {
+ return "fo:simple-page-master";
}
protected void end() {
1.4.2.2 +5 -2
xml-fop/src/org/apache/fop/fo/pagination/SinglePageMasterReference.java
Index: SinglePageMasterReference.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/SinglePageMasterReference.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- SinglePageMasterReference.java 18 Jul 2002 22:25:30 -0000 1.4.2.1
+++ SinglePageMasterReference.java 24 Jul 2002 01:06:25 -0000 1.4.2.2
@@ -31,7 +31,6 @@
public SinglePageMasterReference(FObj parent, PropertyList propertyList)
throws FOPException {
super(parent, propertyList);
- this.name = "fo:single-page-master-reference";
if (getProperty("master-reference") != null) {
this.masterName = getProperty("master-reference").getString();
if (parent.getName().equals("fo:page-sequence-master")) {
@@ -45,6 +44,10 @@
log.warn("A fo:single-page-master-reference does not have a
master-reference and so is being ignored");
}
this.state = FIRST;
+ }
+
+ public String getName() {
+ return "fo:single-page-master-reference";
}
public String getNextPageMasterName(boolean isOddPage,
No revision
No revision
1.7.2.1 +5 -2 xml-fop/src/org/apache/fop/svg/SVGObj.java
Index: SVGObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/SVGObj.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- SVGObj.java 12 Sep 2001 09:28:13 -0000 1.7
+++ SVGObj.java 24 Jul 2002 01:06:26 -0000 1.7.2.1
@@ -56,7 +56,10 @@
*/
protected SVGObj(FObj parent, PropertyList propertyList, String tag) {
super(parent, propertyList, tag);
- this.name = "svg:" + tag;
+ }
+
+ public String getName() {
+ return "svg:"+tagName;
}
public String getNameSpace() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
