You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ke...@apache.org on 2001/08/31 13:41:26 UTC
cvs commit: xml-fop/src/org/apache/fop/fo/flow BasicLink.java Inline.java
keiron 01/08/31 04:41:26
Modified: src/org/apache/fop/fo/flow BasicLink.java Inline.java
Log:
basic link now extends inline as suggested by
Enrico Schnepel <en...@gmx.de>
so that the inline info is properly set
Revision Changes Path
1.8 +2 -7 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BasicLink.java 2001/08/06 09:12:59 1.7
+++ BasicLink.java 2001/08/31 11:41:25 1.8
@@ -1,5 +1,5 @@
/*
- * $Id: BasicLink.java,v 1.7 2001/08/06 09:12:59 keiron Exp $
+ * $Id: BasicLink.java,v 1.8 2001/08/31 11:41:25 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -18,7 +18,7 @@
import java.util.Enumeration;
import java.awt.Rectangle;
-public class BasicLink extends FObjMixed {
+public class BasicLink extends Inline {
public static class Maker extends FObj.Maker {
public FObj make(FObj parent,
@@ -36,11 +36,6 @@
PropertyList propertyList) throws FOPException {
super(parent, propertyList);
this.name = "fo:basic-link";
-
- if (parent.getName().equals("fo:flow")) {
- throw new FOPException("basic-link can't be directly"
- + " under flow");
- }
}
public Status layout(Area area) throws FOPException {
1.7 +5 -7 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Inline.java 2001/08/06 09:12:59 1.6
+++ Inline.java 2001/08/31 11:41:25 1.7
@@ -1,5 +1,5 @@
/*
- * $Id: Inline.java,v 1.6 2001/08/06 09:12:59 keiron Exp $
+ * $Id: Inline.java,v 1.7 2001/08/31 11:41:25 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -40,6 +40,10 @@
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");
+ }
// Common Accessibility Properties
AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
@@ -88,12 +92,6 @@
if (textDecoration == TextDecoration.LINE_THROUGH) {
this.lineThrough = true;
}
-
- if (parent.getName().equals("fo:flow")) {
- throw new FOPException("fo:inline can't be directly"
- + " under flow");
- }
-
}
protected void addCharacters(char data[], int start, int length) {
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org