cvs commit: xml-fop/src/java/org/apache/fop/fo FONode.java
pbwest 2004/04/19 08:24:51
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FONode.java
Log:
Modified a logging call level
Revision ChangesPath
No revision
No revision
1.2.2.18 +5 -2 xml-fop/src/java/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
retrieving revision 1.2.2.17
retrieving revision 1.2.2.18
diff -u -r1.2.2.17 -r1.2.2.18
--- FONode.java 16 Apr 2004 05:17:00 - 1.2.2.17
+++ FONode.java 19 Apr 2004 15:24:51 - 1.2.2.18
@@ -21,6 +21,7 @@
import java.util.BitSet;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.fop.apps.FOPException;
@@ -241,14 +242,16 @@
int property;
int prop = foKeys[propx].intValue();
if ( ! attrBitSet.get(prop)) {
-log.info(Ignoring
+if (log.isLoggable(Level.FINE)) {
+log.fine(Ignoring
+ PropNames.getPropertyName(prop)
+ on
+ FObjectNames.getFOName(type)
+ for attribute set
+ FOPropertySets.getAttrSetName(stateFlags)
+ .);
-continue;
+continue;
+}
}
String attrValue = foAttributes.getFoAttrValue(prop);
try {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FONode.java
pbwest 2004/04/15 22:17:00
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FONode.java
Log:
Get logger through foTree
Revision ChangesPath
No revision
No revision
1.2.2.17 +4 -3 xml-fop/src/java/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
retrieving revision 1.2.2.16
retrieving revision 1.2.2.17
diff -u -r1.2.2.16 -r1.2.2.17
--- FONode.java 8 Mar 2004 20:42:53 - 1.2.2.16
+++ FONode.java 16 Apr 2004 05:17:00 - 1.2.2.17
@@ -24,7 +24,6 @@
import java.util.logging.Logger;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.Fop;
import org.apache.fop.datastructs.ROBitSet;
import org.apache.fop.datastructs.SyncedNode;
import org.apache.fop.datastructs.TreeException;
@@ -53,7 +52,6 @@
private static final String tag = $Name$;
private static final String revision = $Revision$;
-protected Logger log = Logger.getLogger(Fop.fopPackage);
/**
* State flags: a bit set of states applicable during FO tree build.
* N.B. States must be powers of 2.
@@ -111,7 +109,9 @@
* The FO Tree
*/
protected final FOTree foTree;
-
+
+protected final Logger log;
+
/** The buffer from which parser events are drawn. */
protected final XmlEventReader xmlevents;
@@ -207,6 +207,7 @@
{
super(parent, foTree);
this.foTree = foTree;
+this.log = foTree.getLogger();
this.type = type;
this.stateFlags = stateFlags;
this.sparsePropsMap = sparsePropsMap;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FONode.java
pbwest 2004/03/08 12:42:53
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FONode.java
Log:
Made log instance variable
Revision ChangesPath
No revision
No revision
1.2.2.16 +4 -4 xml-fop/src/java/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
retrieving revision 1.2.2.15
retrieving revision 1.2.2.16
diff -u -r1.2.2.15 -r1.2.2.16
--- FONode.java 2 Feb 2004 02:01:43 - 1.2.2.15
+++ FONode.java 8 Mar 2004 20:42:53 - 1.2.2.16
@@ -53,7 +53,7 @@
private static final String tag = $Name$;
private static final String revision = $Revision$;
-protected static final Logger logger = Logger.getLogger(Fop.fopPackage);
+protected Logger log = Logger.getLogger(Fop.fopPackage);
/**
* State flags: a bit set of states applicable during FO tree build.
* N.B. States must be powers of 2.
@@ -240,7 +240,7 @@
int property;
int prop = foKeys[propx].intValue();
if ( ! attrBitSet.get(prop)) {
-logger.info(Ignoring
+log.info(Ignoring
+ PropNames.getPropertyName(prop)
+ on
+ FObjectNames.getFOName(type)
@@ -271,12 +271,12 @@
}
}
} catch (FunctionNotImplementedException e) {
-logger.info
+log.info
(Function not implemented: + e.getMessage()
+ . Ignoring property '
+ PropNames.getPropertyName(prop) + '.);
} catch (PropertyException e) {
-logger.info
+log.info
(Problem with ' + PropNames.getPropertyName(prop)
+ ':\n + e.getMessage() + \nIgnoring property.);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FONode.java
pbwest 2004/02/01 00:12:00
Modified:src/java/org/apache/fop/area/inline Tag:
FOP_0-20-0_Alt-Design InlineArea.java
InlineContainer.java
src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
BlockContainer.java BlockArea.java Area.java
src/java/org/apache/fop/datastructs Tag:
FOP_0-20-0_Alt-Design Node.java TNode.java
src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FONode.java
Added: src/java/org/apache/fop/datastructs Tag:
FOP_0-20-0_Alt-Design SyncedNode.java
Log:
Revision ChangesPath
No revision
No revision
1.2.2.3 +4 -4 xml-fop/src/java/org/apache/fop/area/inline/InlineArea.java
Index: InlineArea.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/inline/InlineArea.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- InlineArea.java 1 Feb 2004 05:47:38 - 1.2.2.2
+++ InlineArea.java 1 Feb 2004 08:12:00 - 1.2.2.3
@@ -33,9 +33,9 @@
* @param index
* @throws IndexOutOfBoundsException
*/
-public InlineArea(Node parent, int index)
+public InlineArea(Node parent, int index, Object areaSync)
throws IndexOutOfBoundsException {
-super(parent, index);
+super(parent, index, areaSync);
// TODO Auto-generated constructor stub
}
@@ -43,8 +43,8 @@
* @param parent
* @throws IndexOutOfBoundsException
*/
-public InlineArea(Node parent) throws IndexOutOfBoundsException {
-super(parent);
+public InlineArea(Node parent, Object areaSync) throws
IndexOutOfBoundsException {
+super(parent, areaSync);
// TODO Auto-generated constructor stub
}
1.1.2.3 +7 -6
xml-fop/src/java/org/apache/fop/area/inline/Attic/InlineContainer.java
Index: InlineContainer.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/inline/Attic/InlineContainer.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- InlineContainer.java 1 Feb 2004 05:47:38 - 1.1.2.2
+++ InlineContainer.java 1 Feb 2004 08:12:00 - 1.1.2.3
@@ -33,9 +33,9 @@
* @param index
* @throws IndexOutOfBoundsException
*/
-public InlineContainer(Node parent, int index)
+public InlineContainer(Node parent, int index, Object areaSync)
throws IndexOutOfBoundsException {
-super(parent, index);
+super(parent, index, areaSync);
// TODO Auto-generated constructor stub
}
@@ -43,8 +43,9 @@
* @param parent
* @throws IndexOutOfBoundsException
*/
-public InlineContainer(Node parent) throws IndexOutOfBoundsException {
-super(parent);
+public InlineContainer(Node parent, Object areaSync)
+throws IndexOutOfBoundsException {
+super(parent, areaSync);
// TODO Auto-generated constructor stub
}
No revision
No revision
1.1.2.3 +7 -6 xml-fop/src/java/org/apache/fop/area/Attic/BlockContainer.java
Index: BlockContainer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/BlockContainer.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BlockContainer.java 1 Feb 2004 05:47:38 - 1.1.2.2
+++ BlockContainer.java 1 Feb 2004 08:12:00 - 1.1.2.3
@@ -32,9 +32,9 @@
* @param index
* @throws IndexOutOfBoundsException
*/
-public BlockContainer(Node parent, int index)
+public BlockContainer(Node parent, int index, Object areaSync)
throws IndexOutOfBoundsException {
-super(parent, index);
+super(parent, index, areaSync);
// TODO Auto-generated constructor stub
}
@@ -42,8 +42,9 @@
* @param parent
* @throws IndexOutOfBoundsException
*/
-public BlockContainer(Node parent) throws IndexOutOfBoundsException {
-super(parent);
+public BlockContainer(Node parent, Object areaSync)
+throws IndexOutOfBoundsException {
+super(parent, areaSync);
// TODO Auto-generated constructor stub
}
1.1.2.3 +8 -6 xml-fop/src/java/org/apache/fop/area/Attic/BlockArea.java
Index: BlockArea.java
===
RCS
cvs commit: xml-fop/src/java/org/apache/fop/fo FONode.java
pbwest 2004/01/27 22:25:32
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FONode.java
Log:
Fixed copyright dates
Revision ChangesPath
No revision
No revision
1.2.2.13 +2 -2 xml-fop/src/java/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
retrieving revision 1.2.2.12
retrieving revision 1.2.2.13
diff -u -r1.2.2.12 -r1.2.2.13
--- FONode.java 27 Jan 2004 01:17:21 - 1.2.2.12
+++ FONode.java 28 Jan 2004 06:25:32 - 1.2.2.13
@@ -1,5 +1,5 @@
/*
- Copyright 2004 The Apache Software Foundation.
+ Copyright 2002-2004 The Apache Software Foundation.
Licensed under the Apache License, Version 2.0 (the License);
you may not use this file except in compliance with the License.
@@ -209,7 +209,7 @@
int stateFlags, int[] sparsePropsMap, int[] sparseIndices)
throws TreeException, FOPException, PropertyException
{
-super(parent);
+super(parent, Node.SYNCHRONIZE);
this.foTree = foTree;
this.type = type;
this.stateFlags = stateFlags;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FONode.java
pbwest 2004/01/26 17:17:21
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FONode.java
Log:
Added direct foTree reference, instead of relying on
Tree reference in superclass.
Revision ChangesPath
No revision
No revision
1.2.2.12 +25 -53xml-fop/src/java/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
retrieving revision 1.2.2.11
retrieving revision 1.2.2.12
diff -u -r1.2.2.11 -r1.2.2.12
--- FONode.java 25 Jan 2004 04:40:34 - 1.2.2.11
+++ FONode.java 27 Jan 2004 01:17:21 - 1.2.2.12
@@ -1,57 +1,20 @@
/*
- *
- * The Apache Software License, Version 1.1
- *
- *
- * Copyright (C) 1999-2004 The Apache Software Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modifica-
- * tion, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *this list of conditions and the following disclaimer in the documentation
- *and/or other materials provided with the distribution.
- *
- * 3. The end-user documentation included with the redistribution, if any, must
- *include the following acknowledgment: This product includes software
- *developed by the Apache Software Foundation (http://www.apache.org/).
- *Alternately, this acknowledgment may appear in the software itself, if
- *and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names FOP and Apache Software Foundation must not be used to
- *endorse or promote products derived from this software without prior
- *written permission. For written permission, please contact
- *[EMAIL PROTECTED]
- *
- * 5. Products derived from this software may not be called Apache, nor may
- *Apache appear in their name, without prior written permission of the
- *Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * on behalf of the Apache Software Foundation and was originally created by
- * James Tauber [EMAIL PROTECTED]. For more information on the Apache
- * Software Foundation, please see http://www.apache.org/.
- *
- * FONode.java
+ Copyright 2004 The Apache Software Foundation.
+
+ Licensed under the Apache License, Version 2.0 (the License);
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an AS IS BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
* Created: Sat Nov 10 01:39:37 2001
* $Id$
- *
- * @author a href=mailto:[EMAIL PROTECTED]Peter B. West/a
- * @version $Revision$ $Name$
*/
package org.apache.fop.fo;
@@ -82,6 +45,9 @@
/**
* Class for nodes in the FO tree.
+ *
+ * @author a href=mailto:[EMAIL PROTECTED]Peter B. West/a
+ * @version $Revision$ $Name$
*/
public class FONode extends Node{
@@ -143,6 +109,11 @@
ROOT | DECLARATIONS | LAYOUT | SEQ_MASTER |
PAGESEQ | FLOW | STATIC | TITLE | MC_MARKER;
+/**
+ * The FO Tree
+ */
+protected final FOTree foTree;
cvs commit: xml-fop/src/java/org/apache/fop/fo FONode.java
pbwest 2004/01/24 18:40:12
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FONode.java
Log:
Switch to java.util.logging
Revision ChangesPath
No revision
No revision
1.2.2.10 +5 -4 xml-fop/src/java/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
retrieving revision 1.2.2.9
retrieving revision 1.2.2.10
diff -u -r1.2.2.9 -r1.2.2.10
--- FONode.java 21 Jan 2004 10:59:35 - 1.2.2.9
+++ FONode.java 25 Jan 2004 02:40:11 - 1.2.2.10
@@ -58,6 +58,7 @@
import java.util.BitSet;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.logging.Logger;
import org.apache.fop.apps.FOPException;
import org.apache.fop.datastructs.Node;
@@ -73,7 +74,6 @@
import org.apache.fop.fo.expr.PropertyParser;
import org.apache.fop.fo.flow.FoMarker;
import org.apache.fop.fo.properties.Property;
-import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.Namespaces;
@@ -88,6 +88,7 @@
private static final String tag = $Name$;
private static final String revision = $Revision$;
+protected static final Logger logger = Logger.getLogger(org.apache.fop);
/**
* State flags: a bit set of states applicable during FO tree build.
* N.B. States must be powers of 2.
@@ -270,7 +271,7 @@
int property;
int prop = foKeys[propx].intValue();
if ( ! attrBitSet.get(prop)) {
-MessageHandler.logln(Ignoring
+logger.info(Ignoring
+ PropNames.getPropertyName(prop)
+ on
+ FObjectNames.getFOName(type)
@@ -301,12 +302,12 @@
}
}
} catch (FunctionNotImplementedException e) {
-MessageHandler.logln
+logger.info
(Function not implemented: + e.getMessage()
+ . Ignoring property '
+ PropNames.getPropertyName(prop) + '.);
} catch (PropertyException e) {
-MessageHandler.logln
+logger.info
(Problem with ' + PropNames.getPropertyName(prop)
+ ':\n + e.getMessage() + \nIgnoring property.);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FONode.java
pbwest 2004/01/21 02:59:35
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FONode.java
Log:
getMarkers -
Javadoc comment added
relinquish(event) problem fixed
Revision ChangesPath
No revision
No revision
1.2.2.9 +7 -3 xml-fop/src/java/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
retrieving revision 1.2.2.8
retrieving revision 1.2.2.9
diff -u -r1.2.2.8 -r1.2.2.9
--- FONode.java 20 Jan 2004 05:45:55 - 1.2.2.8
+++ FONode.java 21 Jan 2004 10:59:35 - 1.2.2.9
@@ -606,17 +606,21 @@
}
}
+/**
+ * Gets the fo:marker elements (if any) defined in the this node. Any
+ * fo:marker events found are relinquished.
+ * @return the number of markers found
+ * @throws FOPException
+ */
public int getMarkers() throws FOPException {
XmlEvent ev;
-
try {
while ((ev = xmlevents.expectStartElement
(FObjectNames.MARKER, XmlEvent.DISCARD_W_SPACE))
!= null) {
new FoMarker(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
numMarkers++;
-ev = xmlevents.getEndElement(
-XmlEventReader.DISCARD_EV, ev);
+// Relinquish the original event
namespaces.relinquishEvent(ev);
}
} catch (TreeException e) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FONode.java
pbwest 2004/01/16 22:31:26
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FONode.java
Log:
Added numMarkers and int getMarkers.
Added MC_LEADER to set of states for stateFlags.
Removed unused debugging methods.
Revision ChangesPath
No revision
No revision
1.2.2.7 +27 -20xml-fop/src/java/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
retrieving revision 1.2.2.6
retrieving revision 1.2.2.7
diff -u -r1.2.2.6 -r1.2.2.7
--- FONode.java 15 Jan 2004 03:01:54 - 1.2.2.6
+++ FONode.java 17 Jan 2004 06:31:26 - 1.2.2.7
@@ -71,8 +71,10 @@
import org.apache.fop.fo.expr.FunctionNotImplementedException;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.expr.PropertyParser;
+import org.apache.fop.fo.flow.FoMarker;
import org.apache.fop.fo.properties.Property;
import org.apache.fop.messaging.MessageHandler;
+import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.Namespaces;
@@ -115,6 +117,7 @@
,MC_FOOTNOTE = 1024
,MC_MULTI_CASE = 2048
,MC_ABSOLUTELY_POSITIONED = 4096
+ ,MC_LEADER = 8192
;
public static final int
@@ -207,6 +210,9 @@
/** Ancestor reference area of this FONode. */
protected FONode ancestorRefArea = null;
+/** The number of markers on this FO. */
+protected int numMarkers = 0;
+
/**
* @param foTree an ttFOTree/tt to which this node belongs
* @param type the fo type of this FONode.
@@ -347,26 +353,6 @@
}
/**
- * Get the isparsePropsSet/i for this node.
- * @return the ttPropertyValue[]/tt.
- */
-/* DEBUG
-public PropertyValue[] getSparsePropsSet() {
-return sparsePropsSet;
-}
-*/
-
-/**
- * Get the isparsePropsMap/i for this node.
- * @return the ttint[]/tt.
- */
-/* DEBUG
-public int[] getSparsePropsMap() {
-return sparsePropsMap;
-}
-*/
-
-/**
* Get the eclosing ttFOTree/tt instance of this ttFONode/tt.
* @return the ttFOTree/tt.
*/
@@ -620,4 +606,25 @@
}
}
+public int getMarkers() throws FOPException {
+XmlEvent ev;
+
+try {
+while ((ev = xmlevents.expectStartElement
+(FObjectNames.MARKER, XmlEvent.DISCARD_W_SPACE))
+!= null) {
+new FoMarker(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
+numMarkers++;
+ev = xmlevents.getEndElement(
+SyncedXmlEventsBuffer.DISCARD_EV, ev);
+namespaces.surrenderEvent(ev);
+}
+} catch (TreeException e) {
+throw new FOPException(e);
+} catch (FOPException e) {
+throw new FOPException(e);
+}
+return numMarkers;
+}
+
}// FONode
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FONode.java
pbwest 2004/01/14 07:02:36
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FONode.java
Log:
SyncedFoXmlEventsBuffer renamed to SyncedXmlEventsBuffer
Changed constructor signature to take XMLEvent instead of FoXMLEvent
Moved defaultConstructorArgs to FObjects
Revision ChangesPath
No revision
No revision
1.2.2.4 +4 -22 xml-fop/src/java/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- FONode.java 10 Jan 2004 06:29:50 - 1.2.2.3
+++ FONode.java 14 Jan 2004 15:02:36 - 1.2.2.4
@@ -73,8 +73,8 @@
import org.apache.fop.fo.expr.PropertyParser;
import org.apache.fop.fo.properties.Property;
import org.apache.fop.messaging.MessageHandler;
-import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.XMLEvent;
+import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.XMLNamespaces;
/**
@@ -139,7 +139,7 @@
PAGESEQ | FLOW | STATIC | TITLE | MC_MARKER;
/** The buffer from which parser events are drawn. */
-protected final SyncedFoXmlEventsBuffer xmlevents;
+protected final SyncedXmlEventsBuffer xmlevents;
/** The namespaces object associated with ixmlevents/i. */
protected XMLNamespaces namespaces;
@@ -208,24 +208,6 @@
protected FONode ancestorRefArea = null;
/**
- * The default constructor arguments for an FObject. bN.B./b not
- * all subclasses of ttFONode/tt use this constructor; e.g.
- * ttFoRoot/tt, ttFoPageSequence/tt amp; ttFoFlow/tt.
- * Generally these FObjects are not invoked through reflection. If such
- * invocation becomes necessary for a particular class, a contructor of
- * this kind must be added to the class.
- * pAt present, the only difference is in the addition of the
- * ttint.class/tt constructor argument.
- */
-protected static final Class[] defaultConstructorArgs =
-new Class[] {
-FOTree.class
-,FONode.class
-,FoXMLEvent.class
-,int.class
-};
-
-/**
* @param foTree an ttFOTree/tt to which this node belongs
* @param type the fo type of this FONode.
* @param parent an ttFONode/tt, the parent node of this node in
@@ -244,7 +226,7 @@
* properties.
*/
public FONode
-(FOTree foTree, int type, FONode parent, FoXMLEvent event,
+(FOTree foTree, int type, FONode parent, XMLEvent event,
int stateFlags, int[] sparsePropsMap, int[] sparseIndices)
throws TreeException, FOPException, PropertyException
{
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FONode.java FOTreeBuilder.java FOTreeControl.java FObjMixed.java GenericShorthandParser.java InlineCharIterator.java OneCharIterator.java PropertyManager.java XMLElement.java
vmote 2003/09/01 11:33:06
Modified:src/java/org/apache/fop/fo FONode.java FOTreeBuilder.java
FOTreeControl.java FObjMixed.java
GenericShorthandParser.java InlineCharIterator.java
OneCharIterator.java PropertyManager.java
XMLElement.java
Log:
checkstyle/javadoc changes only
Revision ChangesPath
1.10 +4 -2 xml-fop/src/java/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FONode.java 22 Aug 2003 17:42:41 - 1.9
+++ FONode.java 1 Sep 2003 18:33:05 - 1.10
@@ -61,9 +61,8 @@
// FOP
import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.FOTreeControl;
import org.apache.fop.util.CharUtilities;
-import org.apache.fop.apps.*;
+import org.apache.fop.apps.FOUserAgent;
/**
* base class for nodes in the XML tree
@@ -197,6 +196,9 @@
return null;
}
+/**
+ * @return an iterator for the characters in this node
+ */
public CharIterator charIterator() {
return new OneCharIterator(CharUtilities.CODE_EOT);
}
1.15 +2 -2 xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java
Index: FOTreeBuilder.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- FOTreeBuilder.java28 Aug 2003 19:49:44 - 1.14
+++ FOTreeBuilder.java1 Sep 2003 18:33:05 - 1.15
@@ -54,7 +54,6 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import org.apache.fop.fo.FOTreeControl;
import org.apache.fop.fo.pagination.Root;
// SAX
@@ -74,7 +73,7 @@
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
-import org.apache.fop.apps.*;
+import org.apache.fop.apps.FOUserAgent;
/**
* SAX Handler that passes parsed data to the various
@@ -123,6 +122,7 @@
private FOUserAgent userAgent;
+/** The FOTreeControl object managing the FO Tree that is being built */
public FOTreeControl foTreeControl;
/**
1.5 +37 -12xml-fop/src/java/org/apache/fop/fo/FOTreeControl.java
Index: FOTreeControl.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeControl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FOTreeControl.java26 Aug 2003 17:15:14 - 1.4
+++ FOTreeControl.java1 Sep 2003 18:33:05 - 1.5
@@ -66,20 +66,45 @@
* with information about the environment, and to keep track of meta-type
* information.
*/
-
public interface FOTreeControl {
-public String fontLookup(String family, String style,
+/**
+ * @param family the font family
+ * @param style the font style
+ * @param weight the font weight
+ * @return the String font name matching the parameters
+ */
+String fontLookup(String family, String style,
int weight);
-public FontMetrics getMetricsFor(String fontName);
-
-public boolean isSetupValid();
-
-public Map getFonts();
-
-public void setBookmarks(Bookmarks bookmarks);
-
-public Bookmarks getBookmarks();
+/**
+ * @param fontName the String containing the font name for which a
+ * FontMetrics object is desired
+ * @return the FontMetrics object matching the fontName parameter
+ */
+FontMetrics getMetricsFor(String fontName);
+
+/**
+ * @return true if the default font has been properly setup
+ */
+boolean isSetupValid();
+
+/**
+ * @return a Map containing the Fonts used in this FO Tree
+ */
+Map getFonts();
+
+/**
+ * Sets the Bookmark object which encapsulates the bookmarks for the FO
+ * Tree.
+ * @param bookmarks the Bookmark object encapsulating the bookmarks for this
+ * FO Tree.
+ */
+void setBookmarks(Bookmarks bookmarks);
+
+/**
+ * @return the Bookmark object encapsulating the bookmarks for the FO Tree.
+ */
+Bookmarks getBookmarks();
}
1.12 +0 -2 xml-fop/src/java/org/apache/fop/fo/FObjMixed.java
Index: FObjMixed.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObjMixed.java,v
retrieving revision 1.11
cvs commit: xml-fop/src/java/org/apache/fop/fo FONode.java Title.java Unknown.java UnknownXMLObj.java XMLObj.java
vmote 2003/07/14 07:14:03
Modified:src/java/org/apache/fop/fo FONode.java Title.java
Unknown.java UnknownXMLObj.java XMLObj.java
Log:
style changes only
Revision ChangesPath
1.3 +16 -11xml-fop/src/java/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FONode.java 29 Jun 2003 19:34:33 - 1.2
+++ FONode.java 14 Jul 2003 14:14:03 - 1.3
@@ -3,34 +3,34 @@
*
*The Apache Software License, Version 1.1
*
- *
+ *
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
*this list of conditions and the following disclaimer.
- *
+ *
* 2. Redistributions in binary form must reproduce the above copyright notice,
*this list of conditions and the following disclaimer in the documentation
*and/or other materials provided with the distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution, if any, must
*include the following acknowledgment: This product includes software
*developed by the Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowledgment may appear in the software itself, if
*and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names FOP and Apache Software Foundation must not be used to
*endorse or promote products derived from this software without prior
*written permission. For written permission, please contact
*[EMAIL PROTECTED]
- *
+ *
* 5. Products derived from this software may not be called Apache, nor may
*Apache appear in their name, without prior written permission of the
*Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
@@ -42,12 +42,12 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- *
+ *
* This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by
* James Tauber [EMAIL PROTECTED]. For more information on the Apache
* Software Foundation, please see http://www.apache.org/.
- */
+ */
package org.apache.fop.fo;
// Java
@@ -68,7 +68,7 @@
*
*/
public abstract class FONode {
-
+
/** FO User Agent for this node (for logger etc.)*/
protected FOUserAgent userAgent;
/** Parent FO node */
@@ -123,6 +123,11 @@
public void setStructHandler(StructureHandler st) {
}
+/**
+ * Do something with the attributes for this element
+ * @param attlist Collection of attributes passed to us from the parser.
+ * @throws FOPException for errors or inconsistencies in the attributes
+ */
public void handleAttrs(Attributes attlist) throws FOPException {
}
1.2 +19 -11xml-fop/src/java/org/apache/fop/fo/Title.java
Index: Title.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Title.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Title.java11 Mar 2003 13:05:19 - 1.1
+++ Title.java14 Jul 2003 14:14:03 - 1.2
@@ -3,34 +3,34 @@
*
*The Apache Software License, Version 1.1
*
- *
+ *
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright notice,
