Re: [VOTE:RESULT] Luca Furini for Committer
Quoting Chris Bowditch <[EMAIL PROTECTED]>: > Jeremias Maerki wrote: > > > Looks like we don't get any more votes. Let's see: > > > > +1 from: > > Simon Pepping, Clay Leeds, Jeremias Maerki, Oleg Tkachenko, Finn Bock, > > Glen Mazza, Christian Geisert, Joerg Pietschmann, Bertrand Delacrétaz. > > (9 votes) > > cough, cough. I did vote too. Sorry to be picky, but I want to make it clear > > that I think Luca really deserves committership. Congratulations, Luca. I seem to recall voting +1 on this very early on, but I could be mistaken. If so, +1. Peter
Re: XML Graphics: board concerns
Quoting Glen Mazza <[EMAIL PROTECTED]>: > > The board hasn't > > approved the creation of the XML Graphics project > > due to the following > > concern: They didn't recognize any names on the PMC > > list. > > Jeremias, this is just not plausible. How could they > not recognize Jeremias Maerki, Joerg Pietschmann, or > Thomas DeWeese? (Or even me? I've had several emails > with Dirk and Ted, etc. over the past year.) Please > explain further. Glen, No, it is not plausible. But that's what Greg Stein has told the pmc@ list (I think) in response to questions at to why the Xalan project was having problems getting off the ground. Not only is it implausible, it's downright outrageous, and a very fine example of a degree of incompetence in the current Board that asymptotically approaches totality. I've asked Jeremias how long this startling display took to get back from the Board. Peter
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties CorrespondingProperty.java BorderAfterStyle.java BorderCommonStyleRelative.java BorderEndStyle.java BorderTopStyle.java BorderLeftStyle.java BorderBeforeStyle.java BorderCommonStyleAbsolute.java AbstractCorrespondingProperty.java BorderStartStyle.java BorderCommonStyle.java BorderBottomStyle.java BorderRightStyle.java
pbwest 2004/04/21 20:05:47
Modified:src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design CorrespondingProperty.java
BorderAfterStyle.java
BorderCommonStyleRelative.java BorderEndStyle.java
BorderTopStyle.java BorderLeftStyle.java
BorderBeforeStyle.java
BorderCommonStyleAbsolute.java
AbstractCorrespondingProperty.java
BorderStartStyle.java BorderCommonStyle.java
BorderBottomStyle.java BorderRightStyle.java
Log:
Border style corresponding properties extended
Revision ChangesPath
No revision
No revision
1.1.2.2 +4 -2
xml-fop/src/java/org/apache/fop/fo/properties/Attic/CorrespondingProperty.java
Index: CorrespondingProperty.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/CorrespondingProperty.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- CorrespondingProperty.java21 Apr 2004 15:21:18 - 1.1.2.1
+++ CorrespondingProperty.java22 Apr 2004 03:05:47 - 1.1.2.2
@@ -34,4 +34,6 @@
throws PropertyException;
public int getCorrespondingProperty(FONode foNode)
throws PropertyException;
+public boolean overridesCorresponding(FONode foNode)
+throws PropertyException;
}
1.1.2.6 +4 -4
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderAfterStyle.java
Index: BorderAfterStyle.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderAfterStyle.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BorderAfterStyle.java 21 Apr 2004 15:21:18 - 1.1.2.5
+++ BorderAfterStyle.java 22 Apr 2004 03:05:47 - 1.1.2.6
@@ -51,13 +51,13 @@
return inherited;
}
-public int getCorrespondingAbsoluteProperty(FONode foNode)
+public int getCorrespondingProperty(FONode foNode)
throws PropertyException {
-return getCorrespondingAbsoluteStyleProperty(
+return getCorrespondingStyleProperty(
foNode, WritingMode.AFTER);
}
-public boolean correspondingOverrides(FONode foNode) {
+public boolean overridesCorresponding(FONode foNode) {
return false;
}
1.1.2.3 +5 -41
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderCommonStyleRelative.java
Index: BorderCommonStyleRelative.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderCommonStyleRelative.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderCommonStyleRelative.java21 Apr 2004 15:21:18 - 1.1.2.2
+++ BorderCommonStyleRelative.java22 Apr 2004 03:05:47 - 1.1.2.3
@@ -19,8 +19,6 @@
*/
package org.apache.fop.fo.properties;
-import org.apache.fop.datatypes.EnumType;
-import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
@@ -32,29 +30,9 @@
* @author pbw
* @version $Revision$ $Name$
*/
-public class BorderCommonStyleRelative
-extends BorderCommonStyle
-implements RelativeCorrespondingProperty {
-/* (non-Javadoc)
- * @see
org.apache.fop.fo.properties.RelativeCorrespondingProperty#getWritingMode(org.apache.fop.fo.FONode)
- */
-public int getWritingMode(FONode foNode)
-throws PropertyException {
-PropertyValue wm = foNode.getPropertyValue(PropNames.WRITING_MODE);
-return EnumType.getEnumValue(wm);
-}
+public abstract class BorderCommonStyleRelative
+extends BorderCommonStyle {
-public int getCorrespondingProperty(FONode foNode)
-throws PropertyException {
-return getCorrespondingAbsoluteProperty(foNode);
-}
-/* (non-Javadoc)
- * @see
org.apache.fop.fo.properties.RelativeCorrespondingProperty#getCorrespondingAbsoluteProperty(org.apache.fop.fo.FONode)
- */
-public int getCorrespondingAbsoluteProperty(FONode foNode)
-throws PropertyException {
-throw new PropertyException("Called from superclass");
-}
/** Array of absolute border style properties,
* indexed by absolute edge constants */
@@ -74,26 +52,12 @@
* @return the absolute border style property index
* @throws PropertyException
*/
-pro
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties CorrespondingProperty.java AbstractCorrespondingProperty.java BorderAfterStyle.java BorderCommonStyleRelative.java BorderEndStyle.java BorderTopStyle.java Property.java BorderLeftStyle.java BorderBeforeStyle.java BorderCommonStyleAbsolute.java AbsoluteCorrespondingProperty.java BorderStartStyle.java BorderCommonStyle.java BorderBottomStyle.java RelativeCorrespondingProperty.java BorderRightStyle.java
pbwest 2004/04/21 08:21:19
Modified:src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design BorderAfterStyle.java
BorderCommonStyleRelative.java BorderEndStyle.java
BorderTopStyle.java Property.java
BorderLeftStyle.java BorderBeforeStyle.java
BorderCommonStyleAbsolute.java
AbsoluteCorrespondingProperty.java
BorderStartStyle.java BorderCommonStyle.java
BorderBottomStyle.java
RelativeCorrespondingProperty.java
BorderRightStyle.java
Added: src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design CorrespondingProperty.java
AbstractCorrespondingProperty.java
Log:
W.I.P. on corresponding properties
Revision ChangesPath
No revision
No revision
1.1.2.5 +3 -3
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderAfterStyle.java
Index: BorderAfterStyle.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderAfterStyle.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- BorderAfterStyle.java 20 Apr 2004 17:15:25 - 1.1.2.4
+++ BorderAfterStyle.java 21 Apr 2004 15:21:18 - 1.1.2.5
@@ -53,8 +53,8 @@
public int getCorrespondingAbsoluteProperty(FONode foNode)
throws PropertyException {
-return WritingMode.getCorrespondingAbsoluteEdge(
-getWritingMode(foNode), WritingMode.AFTER);
+return getCorrespondingAbsoluteStyleProperty(
+foNode, WritingMode.AFTER);
}
public boolean correspondingOverrides(FONode foNode) {
1.1.2.2 +42 -2
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderCommonStyleRelative.java
Index: BorderCommonStyleRelative.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderCommonStyleRelative.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderCommonStyleRelative.java20 Apr 2004 17:15:26 - 1.1.2.1
+++ BorderCommonStyleRelative.java21 Apr 2004 15:21:18 - 1.1.2.2
@@ -43,6 +43,11 @@
PropertyValue wm = foNode.getPropertyValue(PropNames.WRITING_MODE);
return EnumType.getEnumValue(wm);
}
+
+public int getCorrespondingProperty(FONode foNode)
+throws PropertyException {
+return getCorrespondingAbsoluteProperty(foNode);
+}
/* (non-Javadoc)
* @see
org.apache.fop.fo.properties.RelativeCorrespondingProperty#getCorrespondingAbsoluteProperty(org.apache.fop.fo.FONode)
*/
@@ -50,10 +55,45 @@
throws PropertyException {
throw new PropertyException("Called from superclass");
}
+
+/** Array of absolute border style properties,
+ * indexed by absolute edge constants */
+private static int[] absBorderStyleProps = {
+PropNames.NO_PROPERTY
+,PropNames.BORDER_TOP_STYLE
+,PropNames.BORDER_BOTTOM_STYLE
+,PropNames.BORDER_LEFT_STYLE
+,PropNames.BORDER_RIGHT_STYLE
+};
+
+/**
+ * Gets the absolute border style property corresponding to the given
+ * relative edge
+ * @param foNode the node on which the property is being defined
+ * @param relativeEdge
+ * @return the absolute border style property index
+ * @throws PropertyException
+ */
+protected int getCorrespondingAbsoluteStyleProperty(
+FONode foNode, int relativeEdge)
+throws PropertyException {
+int absEdge = WritingMode.getCorrespondingAbsoluteEdge(
+getWritingMode(foNode), relativeEdge);
+return absBorderStyleProps[absEdge];
+}
+
/* (non-Javadoc)
* @see
org.apache.fop.fo.properties.RelativeCorrespondingProperty#correspondingOverrides(org.apache.fop.fo.FONode)
*/
public boolean correspondingOverrides(FONode foNode) {
return false;
}
+
+/* (non-Javadoc)
+ * @see org.apache.fop.fo.properties.Property#isCorrespondingRelative()
+ */
+public static boolean isCorrespondingRelative() {
+return true;
+}
+
}
1.1.2.5 +3 -3
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderEndStyle.java
Index: BorderEndStyle.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/proper
cvs commit: xml-fop/src/java/org/apache/fop/render/awt FontTest.java
pbwest 2004/04/20 10:20:53 Added: src/java/org/apache/fop/render/awt Tag: FOP_0-20-0_Alt-Design FontTest.java Log: Testing Java2D font handling Revision ChangesPath No revision No revision 1.1.2.1 +60 -0 xml-fop/src/java/org/apache/fop/render/awt/Attic/FontTest.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area Page.java
pbwest 2004/04/20 10:16:50
Added: src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
Page.java
Log:
Speculator for handling page generation
Revision ChangesPath
No revision
No revision
1.4.2.1 +22 -118 xml-fop/src/java/org/apache/fop/area/Page.java
Index: Page.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Page.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- Page.java 27 Feb 2004 17:41:26 - 1.4
+++ Page.java 20 Apr 2004 17:16:50 - 1.4.2.1
@@ -1,136 +1,40 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
+ * 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
- *
+ *
+ * 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 on 16/04/2004
+ * $Id$
*/
-
-/* $Id$ */
-
package org.apache.fop.area;
-import java.io.Serializable;
-import java.util.Map;
-
-import org.apache.fop.fo.pagination.Region;
-
/**
- * The page.
- * This holds the contents of the page. Each region is added.
- * The unresolved references area added so that if the page is
- * serialized then it will handle the resolving properly after
- * being reloaded.
- * This is serializable so it can be saved to cache to save
- * memory if there are forward references.
- * The page is cloneable so the page master can make copies of
- * the top level page and regions.
+ * This class gathers all of of the components necessary to set up the basic
+ * page area precursors for the resolution of fo:flow and
+ * fo:static-content elements.
+ *
+ * @author pbw
+ * @version $Revision$ $Name$
*/
-public class Page implements Serializable, Cloneable {
-// contains before, start, body, end and after regions
-private RegionViewport regionBefore = null;
-private RegionViewport regionStart = null;
-private RegionViewport regionBody = null;
-private RegionViewport regionEnd = null;
-private RegionViewport regionAfter = null;
-
-// temporary map of unresolved objects used when serializing the page
-private Map unresolved = null;
-
-/**
- * Set the region on this page.
- *
- * @param areaclass the area class of the region to set
- * @param port the region viewport to set
- */
-public void setRegionViewport(int areaclass, RegionViewport port) {
-if (areaclass == Region.BEFORE_CODE) {
-regionBefore = port;
-} else if (areaclass == Region.START_CODE) {
-regionStart = port;
-} else if (areaclass == Region.BODY_CODE) {
-regionBody = port;
-} else if (areaclass == Region.END_CODE) {
-regionEnd = port;
-} else if (areaclass == Region.AFTER_CODE) {
-regionAfter = port;
-}
-}
-
+public class Page {
+
/**
- * Get the region from this page.
- *
- * @param areaclass the region area class
- * @return the region viewport or null if none
+ * Constructs a null page in the absence of a particular
+ * FoSimplePageMaster. All dimensions are undefined, and
+ * only the minimal set of areas is constructed.
*/
-public RegionViewport getRegionViewport(int areaclass) {
-if (areaclass == Region.BEFORE_CODE) {
-return regionBefore;
-} else if (areaclass == Region.START_CODE) {
-return regionStart;
-} else if (areaclass == Region.BODY_CODE) {
-return regionBody;
-} else if (areaclass == Region.END_CODE) {
-return regionEnd;
-} else if (areaclass == Region.AFTER_CODE) {
-return regionAfter;
-}
-return null;
-}
-
-/**
- * Clone this page.
- * This returns a new page with a clone of all the regions.
- *
- * @return a new clone of this page
- */
-public Object clone() {
-Page p = new Page();
-if (regionBefore != null) {
-p.regionBefore = (RegionViewport)regionBefore.clone();
-}
-if
cvs commit: xml-fop/src/java/org/apache/fop/datatypes EnumType.java
pbwest 2004/04/20 10:15:56
Modified:src/java/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
EnumType.java
Log:
Initial phase of corresponding property handling
Revision ChangesPath
No revision
No revision
1.1.2.3 +18 -3 xml-fop/src/java/org/apache/fop/datatypes/Attic/EnumType.java
Index: EnumType.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datatypes/Attic/EnumType.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- EnumType.java 19 Feb 2004 03:11:55 - 1.1.2.2
+++ EnumType.java 20 Apr 2004 17:15:56 - 1.1.2.3
@@ -164,6 +164,21 @@
}
/**
+ * Return the ENUM value from a PropertyValue.
+ * @param pv
+ * @return the ENUM constant
+ * @exception PropertyException if the PropertyValue is not
+ * an EnumType
+ */
+public static int getEnumValue(PropertyValue pv)
+throws PropertyException {
+if (pv.getType() == PropertyValue.ENUM) {
+return ((EnumType)pv).getEnumValue();
+}
+throw new PropertyException("PropertyValue not an ENUM type");
+}
+
+/**
* @return the String enumeration token.
*/
public String getEnumToken() throws PropertyException {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties BorderCommonStyleRelative.java BorderCommonStyleAbsolute.java AbsoluteCorrespondingProperty.java RelativeCorrespondingProperty.java WritingMode.java BorderAfterStyle.java BorderEndStyle.java BorderTopStyle.java BorderLeftStyle.java BorderBeforeStyle.java BorderStartStyle.java BorderBottomStyle.java BorderRightStyle.java
pbwest 2004/04/20 10:15:32
Modified:src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design WritingMode.java
BorderAfterStyle.java BorderEndStyle.java
BorderTopStyle.java BorderLeftStyle.java
BorderBeforeStyle.java BorderStartStyle.java
BorderBottomStyle.java BorderRightStyle.java
Added: src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design
BorderCommonStyleRelative.java
BorderCommonStyleAbsolute.java
AbsoluteCorrespondingProperty.java
RelativeCorrespondingProperty.java
Log:
Initial phase of corresponding property handling
Revision ChangesPath
No revision
No revision
1.1.2.6 +227 -10
xml-fop/src/java/org/apache/fop/fo/properties/Attic/WritingMode.java
Index: WritingMode.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/WritingMode.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- WritingMode.java 25 Feb 2004 23:09:09 - 1.1.2.5
+++ WritingMode.java 20 Apr 2004 17:15:25 - 1.1.2.6
@@ -22,6 +22,7 @@
import java.util.HashMap;
+import org.apache.fop.datastructs.ROIntArray;
import org.apache.fop.datatypes.EnumType;
import org.apache.fop.datatypes.Ints;
import org.apache.fop.datatypes.PropertyValue;
@@ -50,9 +51,11 @@
public static final int LR_TB = 1;
public static final int RL_TB = 2;
public static final int TB_RL = 3;
-public static final int LR = 4;
-public static final int RL = 5;
-public static final int TB = 6;
+public static final int LR = 1;
+public static final int RL = 2;
+public static final int TB = 3;
+public static final int MAX_WRITING_MODE = TB_RL;
+
public PropertyValue getInitialValue(int property)
throws PropertyException
{
@@ -64,22 +67,28 @@
return inherited;
}
-
private static final String[] rwEnums = {
null
,"lr-tb"
,"rl-tb"
,"tb-rl"
-,"lr"
-,"rl"
-,"tb"
};
+
+private static final String[] rwEnumsSynon = {
+null
+,"lr"
+,"rl"
+,"tb"
+};
+
private static final HashMap rwEnumHash;
static {
-rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
+rwEnumHash = new HashMap(9);
for (int i = 1; i < rwEnums.length; i++ ) {
rwEnumHash.put(rwEnums[i],
-Ints.consts.get(i));
+Ints.consts.get(i));
+rwEnumHash.put(rwEnumsSynon[i],
+Ints.consts.get(i));
}
}
public int getEnumIndex(String enumval)
@@ -97,5 +106,213 @@
throw new PropertyException("index out of range: " + index);
return rwEnums[index];
}
+
+public static final int BEFORE = 1;
+public static final int AFTER = 2;
+public static final int START = 3;
+public static final int END = 4;
+
+public static final int MAX_EDGE = END;
+
+private static final String[] relativeEdges = {
+null
+,"before"
+,"after"
+,"start"
+,"end"
+};
+
+public static final int TOP = 1;
+public static final int BOTTOM = 2;
+public static final int LEFT = 3;
+public static final int RIGHT = 4;
+
+private static final String[] absoluteEdges = {
+null
+,"top"
+,"bottom"
+,"left"
+,"right"
+};
+
+private static final int[] lr_tbAbsRelMap = {
+0, BEFORE, AFTER, START, END
+};
+
+private static final int[] lr_tbRelAbsMap = {
+0, TOP, BOTTOM, LEFT, RIGHT
+};
+
+private static final int[] rl_tbAbsRelMap = {
+0, BEFORE, AFTER, END, START
+};
+
+private static final int[] rl_tbRelAbsMap = {
+0, TOP, BOTTOM, RIGHT, LEFT
+};
+
+private static final int[] tb_rlAbsRelMap = {
+0, START, END, AFTER, BEFORE
+};
+
+private static final int[] tb_rlRelAbsMap = {
+0, RIGHT, LEFT, TOP, BOTTOM
+};
+
+// top-to-bottom, left-to-right, e.g., Mongolian
+// Currently unused
+private st
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties BorderLeft.java BorderBottom.java BorderRight.java BorderTop.java
pbwest 2004/04/19 08:37:24
Modified:src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design BorderLeft.java
BorderBottom.java BorderRight.java BorderTop.java
Log:
Made subclass of Border shorthands
Revision ChangesPath
No revision
No revision
1.1.2.4 +15 -13
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderLeft.java
Index: BorderLeft.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderLeft.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderLeft.java 19 Feb 2004 03:11:40 - 1.1.2.3
+++ BorderLeft.java 19 Apr 2004 15:37:23 - 1.1.2.4
@@ -25,7 +25,7 @@
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class BorderLeft extends Property {
+public class BorderLeft extends BorderAbsoluteShorthand {
public static final int dataTypes = SHORTHAND;
public int getDataTypes() {
@@ -57,18 +57,20 @@
* The value(s) provided, if valid, are converted into a list
* containing the expansion of the shorthand. The elements may
* be in any order. A minimum of one value will be present.
+ *
+ * a border-EDGE-color ColorType or inheritance value
+ * a border-EDGE-style EnumType or inheritance value
+ * a border-EDGE-width MappedNumeric or inheritance
+ * value
+ *
+ * N.B. this is the order of elements defined in
+ * ShorthandPropSets.borderRightExpansion
*
- * a border-EDGE-color ColorType or inheritance value
- * a border-EDGE-style EnumType or inheritance value
- * a border-EDGE-width MappedNumeric or inheritance value
- *
- * N.B. this is the order of elements defined in
- * ShorthandPropSets.borderRightExpansion
- *
- * @param propindex - the int property index.
- * @param foNode - the FONode being built
- * @param value PropertyValue returned by the parser
- * @return PropertyValue the verified value
+ * @param propindex index of the property
+ * @param foNode on which this property value is expressed
+ * @param value of the property expression parsed in the previous stages
+ * of property expression evaluation
+ * @return the refined and expanded value
*/
public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
1.1.2.4 +15 -13
xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderBottom.java
Index: BorderBottom.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderBottom.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderBottom.java 19 Feb 2004 03:11:40 - 1.1.2.3
+++ BorderBottom.java 19 Apr 2004 15:37:23 - 1.1.2.4
@@ -25,7 +25,7 @@
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-public class BorderBottom extends Property {
+public class BorderBottom extends BorderAbsoluteShorthand {
public static final int dataTypes = SHORTHAND;
public int getDataTypes() {
@@ -57,18 +57,20 @@
* The value(s) provided, if valid, are converted into a list
* containing the expansion of the shorthand. The elements may
* be in any order. A minimum of one value will be present.
+ *
+ * a border-EDGE-color ColorType or inheritance value
+ * a border-EDGE-style EnumType or inheritance value
+ * a border-EDGE-width MappedNumeric or inheritance
+ * value
+ *
+ * N.B. this is the order of elements defined in
+ * ShorthandPropSets.borderRightExpansion
*
- * a border-EDGE-color ColorType or inheritance value
- * a border-EDGE-style EnumType or inheritance value
- * a border-EDGE-width MappedNumeric or inheritance value
- *
- * N.B. this is the order of elements defined in
- * ShorthandPropSets.borderRightExpansion
- *
- * @param propindex - the int proeprty index.
- * @param foNode - the FONode being built
- * @param value PropertyValue returned by the parser
- * @return PropertyValue the verified value
+ * @param propindex index of the property
+ * @param foNode on which this property value is expressed
+ * @param value of the property expression parsed in the previous stages
+ * of property expression evaluation
+ * @return the refined and expanded value
*/
public PropertyValue refineParsing
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties BorderAbsoluteShorthand.java
pbwest 2004/04/19 08:36:03 Added: src/java/org/apache/fop/fo/properties Tag: FOP_0-20-0_Alt-Design BorderAbsoluteShorthand.java Log: Moved borderEdge and private processEdgeValue and processEdgeList methods here from Property Superclass for Border shorthands Revision ChangesPath No revision No revision 1.1.2.1 +228 -0 xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderAbsoluteShorthand.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties Property.java
pbwest 2004/04/19 08:34:29
Modified:src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design Property.java
Log:
Moved borderEdge and private processEdgeValue and processEdgeList methods to
BorderAbsoluteShorthand
Revision ChangesPath
No revision
No revision
1.1.2.10 +7 -176xml-fop/src/java/org/apache/fop/fo/properties/Property.java
Index: Property.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Property.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- Property.java 25 Feb 2004 23:09:09 - 1.1.2.9
+++ Property.java 19 Apr 2004 15:34:29 - 1.1.2.10
@@ -26,7 +26,6 @@
import org.apache.fop.apps.Fop;
import org.apache.fop.datatypes.Auto;
-import org.apache.fop.datatypes.ColorType;
import org.apache.fop.datatypes.CountryType;
import org.apache.fop.datatypes.EnumType;
import org.apache.fop.datatypes.LanguageType;
@@ -459,10 +458,9 @@
// TODO: validate here
return pv;
case PropertyValue.LIST:
-System.out.println(value);
throw new PropertyException
("PropertyValueList passed to Property.refineParsing for "
-+ propName);
++ propName + "\n" + value.toString());
default:
if ( ! nested) {
if ((dataTypes & COMPOUND) != 0)
@@ -531,8 +529,7 @@
* @throws PropertyException if list contains more than
* one element or if the contained element is not a list.
*/
-protected PropertyValueList spaceSeparatedList
-(PropertyValueList list)
+protected PropertyValueList spaceSeparatedList (PropertyValueList list)
throws PropertyException
{
if (list.size() != 1)
@@ -653,8 +650,7 @@
{
int initialValueType =
PropertyConsts.pconsts.getInitialValueType(property);
-//System.out.println("In Property getInitialValue property "
-//+ property);
+logger.fine("In Property getInitialValue property " + property);
if ((initialValueType & Property.USE_GET_IT_FUNCTION) != 0)
throw new PropertyException
("Property.getInitialValue() called for property with "
@@ -669,6 +665,7 @@
case NONE_IT:
return new None(property);
case AURAL_IT:
+// TODO Arrange to ignore and log PropertyNotImplemented
throw new PropertyNotImplementedException
("Aural properties not implemented: "
+ PropNames.getPropertyName(property));
@@ -677,172 +674,6 @@
("Unexpected initial value type " + initialValueType
+ " for " + PropNames.getPropertyName(property));
}
-}
-
-/**
- * 'value' is a PropertyValueList or an individual PropertyValue.
- * If 'value' is a PropertyValueList, it must contain a single
- * PropertyValueList, which in turn contains the individual elements.
- *
- * 'value' can contain a parsed Inherit value,
- * parsed FromParent value, parsed FromNearestSpecified value,
- * or, in any order;
- * border-width
- * a parsed NCName value containing a standard border width
- * or a Numeric length value (including a percentage)
- * border-style
- * a parsed NCName value containing a standard border style
- * border-color
- * a parsed ColorType value, or an NCName containing one of
- * the standard colors
- *
- * The value(s) provided, if valid, are converted into a list
- * containing the expansion of the shorthand. The elements may
- * be in any order. A minimum of one value will be present.
- *
- * a border-EDGE-color ColorType or inheritance value
- * a border-EDGE-style EnumType or inheritance value
- * a border-EDGE-width MappedNumeric or inheritance value
- *
- * N.B. this is the order of elements defined in
- * ShorthandPropSets.borderRightExpansion
- */
-protected PropertyValue borderEdge
-(int propindex, FONode foNode, PropertyValue value,
-int styleProp, int colorProp, int widthProp)
-throws PropertyException
-{
-return borderEdge(propindex, foNode, value, styleProp,
-colorProp, widthProp, NOT_NESTED);
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/area CoordTransformer.java
pbwest 2004/04/19 08:22:42 Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design CoordTransformer.java Log: Minor doc changes Revision ChangesPath No revision No revision 1.1.2.2 +2 -6 xml-fop/src/java/org/apache/fop/area/Attic/CoordTransformer.java Index: CoordTransformer.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/CoordTransformer.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- CoordTransformer.java 24 Feb 2004 07:54:00 - 1.1.2.1 +++ CoordTransformer.java 19 Apr 2004 15:22:42 - 1.1.2.2 @@ -254,13 +254,9 @@ } /** + * Construct a coordinate transformation matrix. * @param absRefOrient * @param writingMode - * @param absVPrect - * @return - */ -/** - * Construct a coordinate transformation matrix. * @param absVPrect absolute viewpoint rectangle * @param relBPDim the relative block progression dimension * @param relIPDim the relative inline progression dimension - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FOTree.java
pbwest 2004/04/15 22:18:52
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FOTree.java
Log:
Added getNextPageId and getLogger methods
Revision ChangesPath
No revision
No revision
1.1.2.9 +22 -3 xml-fop/src/java/org/apache/fop/fo/Attic/FOTree.java
Index: FOTree.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FOTree.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FOTree.java 8 Mar 2004 20:46:29 - 1.1.2.8
+++ FOTree.java 16 Apr 2004 05:18:52 - 1.1.2.9
@@ -43,6 +43,17 @@
private static final String tag = "$Name$";
private static final String revision = "$Revision$";
+/** Provides a monotonically increasing pageId */
+private long nextPageId = 0;
+/** Locking object for synchronizing getNextPageId method.
+ * The value is irrelevant. */
+private Boolean lock = new Boolean(true);
+public long getNextPageId() {
+synchronized (lock) {
+return ++nextPageId;
+}
+}
+
/**
* The buffer from which the XmlEvents from the parser will
* be read. protected so that FONode can access it.
@@ -165,6 +176,14 @@
*/
}
System.out.println("# of FONodes: " + nodecount);
+}
+
+/**
+ * Gets the FOTree logger
+ * @return the logger
+ */
+public Logger getLogger() {
+return log;
}
}// FOTree
-
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/area PageViewport.java PageRefArea.java
pbwest 2004/04/15 22:15:17
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
PageViewport.java PageRefArea.java
Log:
Eliminated currently unused code
Revision ChangesPath
No revision
No revision
1.2.2.4 +46 -46xml-fop/src/java/org/apache/fop/area/PageViewport.java
Index: PageViewport.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/PageViewport.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- PageViewport.java 28 Feb 2004 02:06:44 - 1.2.2.3
+++ PageViewport.java 16 Apr 2004 05:15:16 - 1.2.2.4
@@ -18,9 +18,9 @@
package org.apache.fop.area;
import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
+//import java.io.IOException;
+//import java.io.ObjectOutputStream;
+//import java.io.ObjectInputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -89,7 +89,7 @@
/**
* Create a page viewport.
* @param parent node of this viewport
- * @param sync object on which teh Area is synchronized
+ * @param sync object on which the Area is synchronized
* @param pageId the unique identifier of this page
* @param p the page reference area for the contents of this page
* @param bounds the dimensions of the viewport
@@ -371,48 +371,48 @@
}
}
-/**
- * Save the viewport pageRefArea to an object stream.
- * The map of unresolved references are set on the pageRefArea so that
- * the resolvers can be properly serialized and reloaded.
- * @param out the object output stream to write the contents
- */
-public void savePage(ObjectOutputStream out) {
-// set the unresolved references so they are serialized
-synchronized (sync) {
-((PageRefArea)refArea).setUnresolvedReferences(unresolved);
-try {
-out.writeObject(refArea);
-} catch (IOException e) {
-throw new RuntimeException(e);
-}
-refArea = null;
-}
-}
-
-/**
- * Load the viewport pageRefArea from an object stream.
- * This loads the pageRefArea from the stream and
- * if there are any unresolved references that were resolved
- * while saved they will be resolved on the page contents.
- * @param in the object input stream to read the pageRefArea from
- * @throws Exception if there is an error loading the pageRefArea
- */
-public void loadPage(ObjectInputStream in) throws Exception {
-synchronized (sync) {
-PageRefArea pageRefArea = (PageRefArea) in.readObject();
-refArea = pageRefArea;
-unresolved = pageRefArea.getUnresolvedReferences();
-if (unresolved != null && pendingResolved != null) {
-for (Iterator iter = pendingResolved.keySet().iterator();
-iter.hasNext();) {
-String id = (String) iter.next();
-resolve(id, (List)pendingResolved.get(id));
-}
-pendingResolved = null;
-}
-}
-}
+///**
+// * Save the viewport pageRefArea to an object stream.
+// * The map of unresolved references are set on the pageRefArea so that
+// * the resolvers can be properly serialized and reloaded.
+// * @param out the object output stream to write the contents
+// */
+//public void savePage(ObjectOutputStream out) {
+//// set the unresolved references so they are serialized
+//synchronized (sync) {
+//((PageRefArea)refArea).setUnresolvedReferences(unresolved);
+//try {
+//out.writeObject(refArea);
+//} catch (IOException e) {
+//throw new RuntimeException(e);
+//}
+//refArea = null;
+//}
+//}
+
+///**
+// * Load the viewport pageRefArea from an object stream.
+// * This loads the pageRefArea from the stream and
+// * if there are any unresolved references that were resolved
+// * while saved they will be resolved on the page contents.
+// * @param in the object input stream to read the pageRefArea from
+// * @throws Exception if there is an error loading the pageRefArea
+// */
+//public void loadPage(ObjectInputStream in) throws Exception {
+//synchronized (sync) {
+//PageRefArea pageRefArea = (PageRefArea) in.readObject();
+//refArea = pageRefArea;
+//un
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow FoStaticContent.java
pbwest 2004/04/15 22:12:34
Modified:src/java/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoStaticContent.java
Log:
Added getFlowName()
Fixed erroneous exception messages
Revision ChangesPath
No revision
No revision
1.1.2.11 +19 -6
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoStaticContent.java
Index: FoStaticContent.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoStaticContent.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoStaticContent.java 25 Feb 2004 23:40:28 - 1.1.2.10
+++ FoStaticContent.java 16 Apr 2004 05:12:34 - 1.1.2.11
@@ -91,8 +91,7 @@
/**
* Construct an fo:static-content node, and buffer the contents for later
-* parsing
- * subtree.
+ * parsing.
* Content model for fo:static-content: (%block;)+
* @param foTree the FO tree being built
* @param parent the parent FONode of this node
@@ -109,9 +108,11 @@
ncName = (NCName)(getPropertyValue(PropNames.FLOW_NAME));
} catch (PropertyException e) {
throw new FOPException(
-"Cannot find marker-class-name in fo:marker", e);
+"Cannot find flow-name in fo:static-content", e);
} catch (ClassCastException e) {
-throw new FOPException("Wrong PropertyValue type in fo:marker", e);
+throw new FOPException
+("Wrong PropertyValue type for flow-name in fo:static-content",
+e);
}
flowName = ncName.getNCName();
@@ -132,11 +133,23 @@
}
/**
+ * Gets the buffer of XmlEvents from this
+ * fo:static-content subtree
+ *
* @return the static-content subtree buffer
*/
public XmlEventsArrayBuffer getEventBuffer() {
return buffer;
}
+/**
+ * Gets the flow-name with which this fo:static-content
+ * is associated
+ *
+ * @return the flow-name
+ */
+public String getFlowName() {
+return flowName;
+}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow FoPageSequence.java
pbwest 2004/04/15 22:09:10
Modified:src/java/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoPageSequence.java
Log:
Added HashMap of ArrayLists of static-content subtrees, indexed by flow-name
Provide access to umodifiable Map of above
Revision ChangesPath
No revision
No revision
1.1.2.12 +58 -7
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageSequence.java
Index: FoPageSequence.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageSequence.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- FoPageSequence.java 25 Feb 2004 23:40:28 - 1.1.2.11
+++ FoPageSequence.java 16 Apr 2004 05:09:10 - 1.1.2.12
@@ -21,9 +21,16 @@
package org.apache.fop.fo.flow;
// FOP
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.BitSet;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import java.util.NoSuchElementException;
+import java.util.Set;
import org.apache.fop.apps.FOPException;
import org.apache.fop.datastructs.TreeException;
@@ -97,6 +104,20 @@
private int title = -1;
/** Child index of first fo:static-content child. */
private int firstStaticContent = -1;
+/**
+ * Private map of Lists of static-content subtrees hashed on
+ * flow-name. Note that there is no restriction on multiple
+ * fo:static-content elements being assigned to a single
+ * flow-name, so the objects keyed by flow-name
+ * must be able to hold more than one element; hence Lists.
+ *
+ * Each element of the HashMap, keyed on the
+ * flow-name is an ArrayList containing one or
+ * more instances of FoStaticContent.
+ */
+private HashMap staticSubtrees = null;
+/** Unmodifiable version of staticSubtrees */
+public Map staticContents = null;
/** Child index of fo:flow child. */
private int flowChild = -1;
@@ -127,18 +148,48 @@
namespaces.relinquishEvent(ev);
} // else ignore
-// Look for zero or more static-content
+// Look for zero or more static-content subtrees
nowProcessing = "static-content";
while ((ev = xmlevents.expectStartElement
(FObjectNames.STATIC_CONTENT, XmlEvent.DISCARD_W_SPACE))
!= null) {
// Loop over remaining fo:static-content
-if (firstStaticContent == -1)
+if (firstStaticContent == -1) {
firstStaticContent = numChildren();
-new FoStaticContent(getFOTree(), this, (FoXmlEvent)ev);
+staticSubtrees = new HashMap();
+}
+FoStaticContent statContent =
+new FoStaticContent(getFOTree(), this, (FoXmlEvent)ev);
namespaces.relinquishEvent(ev);
+// Collect the static-content subtrees for this page-sequence
+String flowname = statContent.getFlowName();
+if (! staticSubtrees.containsKey(flowname)) {
+// Create a new list for this key
+staticSubtrees.put(flowname, new ArrayList(1));
+}
+// Add an entry to an existing List
+ArrayList statconsList =
+(ArrayList)(staticSubtrees.get(flowname));
+statconsList.add(statContent);
+}
+// Create the unmodifiable map of unmodifiable lists
+// TODO make the contents of the events buffer unmodifiable
+// Each value in the Map is an ArrayList. Iterate over all of the
+// entries, replacing the ArrayList value in each Map.Entry with an
+// unmodifiableList constructed from the ArrayList
+if (staticSubtrees != null) {
+Set entries = staticSubtrees.entrySet();
+Iterator iter = entries.iterator();
+while (iter.hasNext()) {
+Map.Entry entry = (Map.Entry)(iter.next());
+entry.setValue(
+Collections.unmodifiableList(
+(List)(entry.getValue(;
+}
+// Now make an unmodifiableMap from the overall HashMap
+// of flow-name indexed ArrayLists
+staticContents = Collections.unmodifiableMap(staticSubtrees);
}
-
// Generate a null page for
cvs commit: xml-fop/src/java/org/apache/fop/apps Fop.java
pbwest 2004/04/15 04:48:27
Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Fop.java
Log:
Added renderThread based on Runnable Renderer
Started AWT renderer
Started renderThread
Moved relevant variables closer to run method
Added Javadoc comments to many variables
Modified thread monitoring and shutdown loop to
a timed join on the render thread with termination
based on the termination of the fo thread
public void setRenderer(String) changed to
public Renderer getRenderer(String)
Revision ChangesPath
No revision
No revision
1.1.2.17 +96 -51xml-fop/src/java/org/apache/fop/apps/Fop.java
Index: Fop.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Fop.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- Fop.java 15 Apr 2004 07:02:18 - 1.1.2.16
+++ Fop.java 15 Apr 2004 11:48:26 - 1.1.2.17
@@ -39,7 +39,6 @@
import org.apache.fop.configuration.UserOptions;
import org.apache.fop.fo.FOTree;
import org.apache.fop.render.Renderer;
-import org.apache.fop.render.awt.AWTRenderer;
import org.apache.fop.version.Version;
import org.apache.fop.xml.FoXmlSerialHandler;
import org.apache.fop.xml.Namespaces;
@@ -48,6 +47,15 @@
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
+/**
+ * The startup class for Fop. Class Fop includes a main method and a
+ * constructor. The prior Driver class has been merged in as the Fop
+ * constructor and run method, which are called from within main.
+ * Fop can be run from the command line, or instantiated by an external
+ * process.
+ *
+ * @version $Revision$ $Name$
+ */
public class Fop {
/** private constant to indicate renderer was not defined. */
@@ -72,24 +80,6 @@
public static final int RENDER_SVG = 9;
/** Render to RTF. OutputStream must be set */
public static final int RENDER_RTF = 10;
-
-private InputHandler inputHandler;
-private XMLReader parser;
-private InputSource saxSource;
-
-private FoXmlSerialHandler xmlhandler;
-private SyncedXmlEventsBuffer eventsBuffer;
-private Namespaces namespaces;
-private XmlEventReader eventReader;
-private FOTree foTree;
-private AreaTree areaTree = new AreaTree();
-private GraphicsEnvironment gEnv = null;
-
-private Thread driverThread;
-private Thread parserThread;
-private Thread foThread;
-private Thread areaThread;
-private Thread renderThread;
/** the renderer type code given by setRenderer */
private int rendererType = NOT_SET;
@@ -235,6 +225,41 @@
//System.out.println("PC time : " + (endPCi - startPCi));
}
+
+/** Manages the flow of xsl:fo source into FOP */
+private InputHandler inputHandler;
+/** Parser for the xsl:fo source */
+private XMLReader parser;
+/** The parser's xsl:fo source stream */
+private InputSource saxSource;
+
+/** Head process of the parser thread */
+private FoXmlSerialHandler xmlhandler;
+/**
+ * XmlEvents buffer which is the link between the parser process and the
+ * FO Tree builder. It accepts events from the parser, and feeds them to
+ * the FO Tree builder.
+ */
+private SyncedXmlEventsBuffer eventsBuffer;
+/** namespaces object required for XMLEvent handling */
+private Namespaces namespaces;
+/** The XmlEventReader which supplies events to the FO Tree
+ * builder */
+private XmlEventReader eventReader;
+/** Head process of the FO Tree builder thread */
+private FOTree foTree;
+private AreaTree areaTree = new AreaTree();
+
+/** Thread of main Fop process */
+private Thread fopThread;
+/** Thread of parser process */
+private Thread parserThread;
+/** Thread of FO Tree building process */
+private Thread foThread;
+private Thread areaThread;
+/** Thread of rendering process */
+private Thread renderThread;
+
public void run() {
setupRunStats();
@@ -273,27 +298,49 @@
xmlhandler = new FoXmlSerialHandler(eventsBuffer, parser, saxSource);
foTree = new FOTree(eventReader);
-driverThread = Thread.currentThread();
+fopThread = Thread.currentThread();
+renderThread = new Thread(renderer, "Renderer");
+renderThread.setDaemon(true);
foThread = new Thread(foTree, "FOTreeBuilder");
foThread.setDaemon(true);
parserThread = new Thread(xmlhandler, "XMLSerialHandler"
cvs commit: xml-fop/src/java/org/apache/fop/render/awt AWTRenderer.java
pbwest 2004/04/15 04:33:47
Modified:src/java/org/apache/fop/render/awt Tag:
FOP_0-20-0_Alt-Design AWTRenderer.java
Log:
Disable PreviewDialog
Return from finishng() on InterruptedException
Revision ChangesPath
No revision
No revision
1.21.2.5 +4 -2 xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.21.2.4
retrieving revision 1.21.2.5
diff -u -r1.21.2.4 -r1.21.2.5
--- AWTRenderer.java 15 Apr 2004 08:01:50 - 1.21.2.4
+++ AWTRenderer.java 15 Apr 2004 11:33:47 - 1.21.2.5
@@ -76,8 +76,8 @@
protected PreviewDialog frame;
public AWTRenderer() {
-translator = new Translator();
-createPreviewDialog();
+//translator = new Translator();
+//createPreviewDialog();
}
/**
@@ -130,6 +130,8 @@
try {
wait();
} catch (InterruptedException e) {
+// We can go now
+return;
}
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/render/awt/viewer PreviewDialog.java
pbwest 2004/04/15 04:31:42
Modified:src/java/org/apache/fop/render/awt/viewer Tag:
FOP_0-20-0_Alt-Design PreviewDialog.java
Log:
Disabled fop startup from within PreviewDialog
Revision ChangesPath
No revision
No revision
1.2.2.4 +2 -3
xml-fop/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java
Index: PreviewDialog.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- PreviewDialog.java15 Apr 2004 08:04:24 - 1.2.2.3
+++ PreviewDialog.java15 Apr 2004 11:31:42 - 1.2.2.4
@@ -379,8 +379,7 @@
private class Reloader extends Thread {
public void run() {
if (fop == null) {
-fop = new Fop();
-fop.setRenderer(renderer);
+throw new RuntimeException("No Fop process to reload");
} else {
fop.reset();
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/xml FoXmlSerialHandler.java
pbwest 2004/04/15 04:29:58
Modified:src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
FoXmlSerialHandler.java
Log:
Added setRenderThread()
Revision ChangesPath
No revision
No revision
1.1.2.9 +17 -3
xml-fop/src/java/org/apache/fop/xml/Attic/FoXmlSerialHandler.java
Index: FoXmlSerialHandler.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/FoXmlSerialHandler.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoXmlSerialHandler.java 8 Mar 2004 12:42:22 - 1.1.2.8
+++ FoXmlSerialHandler.java 15 Apr 2004 11:29:58 - 1.1.2.9
@@ -54,6 +54,7 @@
private Namespaces namespaces;
private InputSource source;
private Thread foThread;
+private Thread renderThread;
protected Logger log = Logger.getLogger(Fop.fopPackage);
private boolean errorDump;
@@ -76,10 +77,23 @@
}
}
+/**
+ * Allow the thread starter process to notify the serial handler of
+ * the FO Tree building thread.
+ * @param foThread
+ */
public void setFoThread(Thread foThread) {
this.foThread = foThread;
}
+/**
+ * Allow the thread starter process to notify the serial handler of
+ * the rendering thread.
+ * @param renderThread
+ */
+public void setRenderThread(Thread renderThread) {
+this.renderThread = renderThread;
+}
/**
* This is the run method for the callback parser thread.
*/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/render/awt/viewer PreviewDialog.java
pbwest 2004/04/15 01:04:24
Modified:src/java/org/apache/fop/render/awt/viewer Tag:
FOP_0-20-0_Alt-Design PreviewDialog.java
Log:
Removed InputHandler references to maintain compatibility with AWTRenderer
Revision ChangesPath
No revision
No revision
1.2.2.3 +5 -14
xml-fop/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java
Index: PreviewDialog.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- PreviewDialog.java14 Mar 2004 11:21:27 - 1.2.2.2
+++ PreviewDialog.java15 Apr 2004 08:04:24 - 1.2.2.3
@@ -49,7 +49,6 @@
//FOP
import org.apache.fop.apps.Fop;
-import org.apache.fop.apps.InputHandler;
import org.apache.fop.apps.FOPException;
import org.apache.fop.render.awt.AWTRenderer;
@@ -66,8 +65,6 @@
protected Translator translator;
/** The AWT renderer */
protected AWTRenderer renderer;
-/** The InputHandler associated with this window */
-protected InputHandler inputHandler;
/** The Fop used for refreshing/reloading the view */
protected Fop fop;
@@ -83,9 +80,8 @@
* Creates a new PreviewDialog that uses the given renderer.
* @param aRenderer the to use renderer
*/
-public PreviewDialog(AWTRenderer aRenderer, InputHandler handler) {
+public PreviewDialog(AWTRenderer aRenderer) {
renderer = aRenderer;
-inputHandler = handler;
translator = renderer.getTranslator();
//Commands aka Actions
@@ -219,14 +215,13 @@
}
});
// inputHandler must be set to allow reloading
-if (inputHandler != null) {
menu.add(new Command(translator.getString("Menu.Reload")) {
public void doit() {
reload();
}
});
-}
-menu.addSeparator();
+
+menu.addSeparator();
menu.add(new Command(translator.getString("Menu.Exit")) {
public void doit() {
dispose();
@@ -394,13 +389,9 @@
infoStatus.setText("");
currentPage = 0;
-try {
+// TODO work out how to reload
setStatus(translator.getString("Status.Build.FO.tree"));
-fop.render(inputHandler);
setStatus(translator.getString("Status.Show"));
-} catch (FOPException e) {
-reportException(e);
-}
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/render/awt AWTRenderer.java
pbwest 2004/04/15 01:01:50
Modified:src/java/org/apache/fop/render/awt Tag:
FOP_0-20-0_Alt-Design AWTRenderer.java
Log:
Removed currently unused code from HEAD
Added generation of GraphicsEnvironment and getGraphicsEnvironment
Implements Runnable; added run method
Added thread termination condition
Revision ChangesPath
No revision
No revision
1.21.2.4 +50 -259 xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.21.2.3
retrieving revision 1.21.2.4
diff -u -r1.21.2.3 -r1.21.2.4
--- AWTRenderer.java 16 Mar 2004 12:07:08 - 1.21.2.3
+++ AWTRenderer.java 15 Apr 2004 08:01:50 - 1.21.2.4
@@ -29,6 +29,7 @@
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics;
+import java.awt.GraphicsEnvironment;
import java.awt.Toolkit;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
@@ -38,11 +39,7 @@
import java.awt.print.Printable;
import java.io.IOException;
import java.util.Map;
-import java.util.Vector;
-
-import org.apache.fop.apps.Document;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.InputHandler;
import org.apache.fop.area.PageViewport;
import org.apache.fop.render.AbstractRenderer;
import org.apache.fop.render.awt.viewer.PreviewDialog;
@@ -50,29 +47,18 @@
/**
* This is FOP's AWT renderer.
+ * In alt-design, this renders Graphics2D objects.
*/
public class AWTRenderer
extends AbstractRenderer
-implements Printable, Pageable {
+implements Runnable, Printable, Pageable {
protected double scaleFactor = 100.0;
protected int pageNumber = 0;
-private int pageWidth = 0;
-private int pageHeight = 0;
-private Vector pageViewportList = new java.util.Vector();
-private Vector pageList = new java.util.Vector();
-private Vector bufferedImageList = new java.util.Vector();
private BufferedImage currentPageImage = null;
+private GraphicsEnvironment gEnv =
+GraphicsEnvironment.getLocalGraphicsEnvironment();
-/** Font configuration */
-protected Document fontInfo;
-
-/**
-The InputHandler associated with this Renderer.
-Sent to the PreviewDialog for document reloading.
-*/
-private InputHandler inputHandler;
-
/**
* The resource bundle used for AWT messages.
*/
@@ -89,15 +75,19 @@
*/
protected PreviewDialog frame;
-public AWTRenderer(InputHandler handler) {
-inputHandler = handler;
+public AWTRenderer() {
translator = new Translator();
-createPreviewDialog(inputHandler);
+createPreviewDialog();
}
-public AWTRenderer() {
-translator = new Translator();
-createPreviewDialog(null);
+/**
+ * Returns the graphics environment (including available font information)
+ * for this renderer.
+ *
+ * @return the graphics environment for this renderer
+ */
+public GraphicsEnvironment getGraphicsEnvironment() {
+return gEnv;
}
/**
@@ -119,14 +109,6 @@
//FontSetup.setup(fontInfo, fontImage.createGraphics());
//}
-public int getPageNumber() {
-return pageNumber;
-}
-
-public void setPageNumber(int aValue) {
-pageNumber = aValue;
-}
-
public void setScaleFactor(double newScaleFactor) {
scaleFactor = newScaleFactor;
}
@@ -135,20 +117,28 @@
return scaleFactor;
}
-//public void startRenderer(OutputStream out)
-//throws IOException {
-//// empty pageViewportList, in case of a reload from PreviewDialog
-//pageViewportList.removeAllElements();
-//pageList.removeAllElements();
-//bufferedImageList.removeAllElements();
-//System.out.println("\nRegion Types: 0-Before/Top, 1-Start/Left, 2-Body,
3-End/Right, 4-After/Bottom");
-//}
-//
-//public void stopRenderer()
-//throws IOException {
-//frame.setStatus(translator.getString("Status.Show"));
-//frame.showPage();
-//}
+private boolean finished = false;
+
+public synchronized void finish() {
+if (finished) return;
+finished = true;
+notifyAll();
+}
+
+private synchronized void finishing() {
+while (! finished) {
+try {
+wait();
+} catch (InterruptedException e) {
+}
+}
+}
+
+public void run()
cvs commit: xml-fop/build/classes/conf .cvsignore
pbwest 2004/04/15 00:49:09 Modified:build/classes/conf Tag: FOP_0-20-0_Alt-Design .cvsignore Log: Revision ChangesPath No revision No revision 1.1.2.3 +2 -0 xml-fop/build/classes/conf/Attic/.cvsignore Index: .cvsignore === RCS file: /home/cvs/xml-fop/build/classes/conf/Attic/.cvsignore,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- .cvsignore6 Mar 2004 06:08:39 - 1.1.2.2 +++ .cvsignore15 Apr 2004 07:49:09 - 1.1.2.3 @@ -1,3 +1,5 @@ config.dtd config.xml +fop.system.properties fop.xconf +logging.properties - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/render Renderer.java
pbwest 2004/04/15 00:46:19
Modified:src/java/org/apache/fop/render Tag: FOP_0-20-0_Alt-Design
Renderer.java
Log:
Add getGraphicsEnvironment
Revision ChangesPath
No revision
No revision
1.8.2.4 +4 -0 xml-fop/src/java/org/apache/fop/render/Renderer.java
Index: Renderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/Renderer.java,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -r1.8.2.3 -r1.8.2.4
--- Renderer.java 16 Mar 2004 12:17:53 - 1.8.2.3
+++ Renderer.java 15 Apr 2004 07:46:19 - 1.8.2.4
@@ -19,6 +19,7 @@
package org.apache.fop.render;
// Java
+import java.awt.GraphicsEnvironment;
import java.io.OutputStream;
import java.io.IOException;
// FOP
@@ -41,6 +42,9 @@
public interface Renderer extends Runnable {
void setOutputStream(OutputStream outputStream);
+
+/** @return the GraphicsEnvironment of this renderer. */
+GraphicsEnvironment getGraphicsEnvironment();
/**
* Set the User Agent.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/render AbstractRenderer.java
pbwest 2004/04/15 00:45:08
Modified:src/java/org/apache/fop/render Tag: FOP_0-20-0_Alt-Design
AbstractRenderer.java
Log:
Generate and return a GraphicsEnvironment
Revision ChangesPath
No revision
No revision
1.24.2.4 +5 -507xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java
Index: AbstractRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java,v
retrieving revision 1.24.2.3
retrieving revision 1.24.2.4
diff -u -r1.24.2.3 -r1.24.2.4
--- AbstractRenderer.java 16 Mar 2004 12:17:53 - 1.24.2.3
+++ AbstractRenderer.java 15 Apr 2004 07:45:08 - 1.24.2.4
@@ -18,6 +18,7 @@
package org.apache.fop.render;
+import java.awt.GraphicsEnvironment;
import java.io.OutputStream;
import java.util.HashMap;
import java.util.Map;
@@ -47,27 +48,6 @@
/** renderer configuration */
protected Map options = new HashMap();
-///** block progression position */
-//protected int currentBPPosition = 0;
-//
-///** inline progression position */
-//protected int currentIPPosition = 0;
-//
-///** current inline progression position in block */
-//protected int currentBlockIPPosition = 0;
-//
-///**
-// * the block progression position of the containing block used for
-// * absolutely positioned blocks
-// */
-//protected int containingBPPosition = 0;
-//
-///**
-// * the inline progression position of the containing block used for
-// * absolutely positioned blocks
-// */
-//protected int containingIPPosition = 0;
-
protected Logger log = Logger.getLogger(Fop.fopPackage);
@@ -80,15 +60,14 @@
public void run() {
}
+public GraphicsEnvironment getGraphicsEnvironment() {
+return null;
+}
+
public synchronized void setOutputStream(OutputStream output) {
this.output = output;
}
-///**
-// * @see org.apache.fop.render.Renderer
-// */
-//public abstract void setupFontInfo(FOTreeControl foTreeControl);
-
/** @see org.apache.fop.render.Renderer */
public synchronized void setUserAgent(FOUserAgent agent) {
userAgent = agent;
@@ -110,12 +89,6 @@
return false;
}
-///**
-// * @param ext (todo) Description of the Parameter
-// * @seeorg.apache.fop.render.Renderer
-// */
-//public void renderExtension(TreeExt ext) { }
-
/**
* Prepare a page for rendering. This is called if the renderer supports
* out of order rendering. The renderer should prepare the page so that a
@@ -127,110 +100,6 @@
*/
public void preparePage(PageViewport page) { }
-///**
-// * Utility method to convert a page sequence title to a string. Some
-// * renderers may only be able to use a string title. A title is a sequence
-// * of inline areas that this method attempts to convert to an equivalent
-// * string.
-// *
-// * @param title The Title to convert
-// * @return An expanded string representing the title
-// */
-//protected String convertTitleToString(Title title) {
-//List children = title.getInlineAreas();
-//String str = convertToString(children);
-//return str.trim();
-//}
-//
-//private String convertToString(List children) {
-//StringBuffer sb = new StringBuffer();
-//for (int count = 0; count < children.size(); count++) {
-//InlineArea inline = (InlineArea) children.get(count);
-//if (inline instanceof Character) {
-//sb.append(((Character) inline).getChar());
-//} else if (inline instanceof TextArea) {
-//sb.append(((TextArea) inline).getTextArea());
-//} else if (inline instanceof InlineParent) {
-//sb.append(convertToString(
-//((InlineParent) inline).getChildAreas()));
-//} else {
-//sb.append(" ");
-//}
-//}
-//return sb.toString();
-//}
-//
-///** @see org.apache.fop.render.Renderer */
-//public void startPageSequence(Title seqTitle) {
-////do nothing
-//}
-
-// normally this would be overriden to create a page in the
-// output
-///** @see org.apache.fop.render.Renderer */
-//public void renderPage(PageViewport page)
-//throws IOException, FOPException {
-//
-//Page p = page.getPage();
-//renderPageAreas(p);
-//}
-
-///**
-// * Renders page areas.
-// *
-//
cvs commit: xml-fop/src/java/org/apache/fop/configuration CLI_Options.java
pbwest 2004/04/15 00:09:40
Modified:src/java/org/apache/fop/configuration Tag:
FOP_0-20-0_Alt-Design CLI_Options.java
Log:
Added usage rport using org.apache.commons.cli.HelpFormatter
Revision ChangesPath
No revision
No revision
1.1.2.3 +42 -16
xml-fop/src/java/org/apache/fop/configuration/Attic/CLI_Options.java
Index: CLI_Options.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/configuration/Attic/CLI_Options.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- CLI_Options.java 14 Mar 2004 02:44:53 - 1.1.2.2
+++ CLI_Options.java 15 Apr 2004 07:09:40 - 1.1.2.3
@@ -20,11 +20,14 @@
package org.apache.fop.configuration;
import java.io.FileNotFoundException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.util.Locale;
import java.util.logging.Level;
// fop
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.OptionGroup;
@@ -64,17 +67,17 @@
Options options = new Options();
OptionBuilder.withArgName("help");
OptionBuilder.withLongOpt("help");
-OptionBuilder.withDescription("Describe usage");
+OptionBuilder.withDescription("Describe usage and exit");
options.addOption(OptionBuilder.create("?"));
// The mutually exclusive verbosity group includes the -d and -q flags
OptionGroup verbosity = new OptionGroup();
OptionBuilder.withArgName("debug mode");
OptionBuilder.withLongOpt("full-error-dump");
-OptionBuilder.withDescription("Debug mode: verbose reporting");
+OptionBuilder.withDescription("Verbosity: verbose reporting");
verbosity.addOption(OptionBuilder.create("d"));
OptionBuilder.withArgName("quiet mode");
OptionBuilder.withLongOpt("quiet");
-OptionBuilder.withDescription("Quiet mode: report errors only");
+OptionBuilder.withDescription("Verbosity: report errors only");
verbosity.addOption(OptionBuilder.create("q"));
verbosity.setRequired(false);
// Add verbosity to options
@@ -102,12 +105,14 @@
OptionBuilder.withArgName("fo:file");
OptionBuilder.withLongOpt("fo");
OptionBuilder.hasArg();
-OptionBuilder.withDescription("XSL-FO input file");
+OptionBuilder.withDescription("Input:XSL-FO input file");
input.addOption(OptionBuilder.create("fo"));
OptionBuilder.withArgName("xml file");
OptionBuilder.withLongOpt("xml");
OptionBuilder.hasArg();
-OptionBuilder.withDescription("XML source file for generating XSL-FO
input");
+OptionBuilder.withDescription(
+"Input:XML source file for generating XSL-FO input."
++ " Requires -xsl");
input.addOption(
OptionBuilder.create("xml"));
// Add the input group to the options
@@ -134,55 +139,57 @@
OptionGroup output = new OptionGroup();
OptionBuilder.withArgName("screen renderer");
OptionBuilder.withLongOpt("awt");
-OptionBuilder.withDescription("Input will be renderered to display");
+OptionBuilder.withDescription("Output:Renderered to display using AWT");
output.addOption(OptionBuilder.create("awt"));
OptionBuilder.withArgName("pdf output file");
OptionBuilder.withLongOpt("pdf");
OptionBuilder.hasArg();
-OptionBuilder.withDescription("Input will be rendered as PDF to named
file");
+OptionBuilder.withDescription("Output:Rendered as PDF to named file");
output.addOption(OptionBuilder.create("pdf"));
OptionBuilder.withArgName("postscript output file");
OptionBuilder.withLongOpt("ps");
OptionBuilder.hasArg();
-OptionBuilder.withDescription("Input will be rendered as Postscript to
named file");
+OptionBuilder.withDescription("Ouput:Rendered as Postscript to named file");
output.addOption(OptionBuilder.create("ps"));
OptionBuilder.withArgName("pcl output f
cvs commit: xml-fop/src/java/org/apache/fop/apps Fop.java
pbwest 2004/04/15 00:02:18
Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Fop.java
Log:
Added AWT specific rendering details:
Renderer provides a GraphicsEnvironment for use in layout
Added getGraphicsEnvironment
Added renderer initialisation for AWT
Set default logging level to INFO (java.util.logging)
Removed redundant setInputHandler method
Revision ChangesPath
No revision
No revision
1.1.2.16 +15 -14xml-fop/src/java/org/apache/fop/apps/Fop.java
Index: Fop.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Fop.java,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- Fop.java 16 Mar 2004 06:49:03 - 1.1.2.15
+++ Fop.java 15 Apr 2004 07:02:18 - 1.1.2.16
@@ -21,6 +21,7 @@
package org.apache.fop.apps;
//import java.util.logging.Handler;
+import java.awt.GraphicsEnvironment;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@@ -82,6 +83,7 @@
private XmlEventReader eventReader;
private FOTree foTree;
private AreaTree areaTree = new AreaTree();
+private GraphicsEnvironment gEnv = null;
private Thread driverThread;
private Thread parserThread;
@@ -190,8 +192,8 @@
logger = Logger.getLogger(fopPackage);
logger.setLevel(Level.CONFIG);
logger.config(version);
-// Then restrict to WARNING
-logger.setLevel(Level.WARNING);
+// Then restrict to INFO
+logger.setLevel(Level.INFO);
}
private void setupRunStats() {
@@ -256,12 +258,15 @@
throw new FOPException(e2);
}
}
-setInputHandler(options.getInputHandler());
+inputHandler = options.getInputHandler();
parser = inputHandler.getParser();
saxSource = inputHandler.getInputSource();
// Setting of namespace-prefixes feature no longer required
//setParserFeatures(parser);
+rendererType = options.getRenderer();
+setRenderer(rendererType);
+gEnv = renderer.getGraphicsEnvironment();
namespaces = new Namespaces();
eventsBuffer = new SyncedXmlEventsBuffer(namespaces);
eventReader = new XmlEventReader(eventsBuffer, namespaces);
@@ -301,15 +306,6 @@
}
/**
- * Sets the InputHandler for XML imput as specified in FOPOptions.
- * @param inputHandler the InputHandler
- */
-public void setInputHandler(InputHandler inputHandler) {
-this.inputHandler = inputHandler;
-}
-
-
-/**
* Optionally sets the FOUserAgent instance for FOP to use. The Driver
* class sets up its own FOUserAgent if none is set through this method.
* @param agent FOUserAgent to use
@@ -351,7 +347,8 @@
//setRenderer("org.apache.fop.render.pdf.PDFRenderer");
//break;
case RENDER_AWT:
-throw new IllegalArgumentException("Use renderer form of setRenderer()
for AWT");
+setRenderer("org.apache.fop.render.awt.AWTRenderer");
+break;
//case RENDER_PRINT:
//setRenderer("org.apache.fop.render.awt.AWTPrintRenderer");
//break;
@@ -403,6 +400,10 @@
*/
public Renderer getRenderer() {
return renderer;
+}
+
+public GraphicsEnvironment getGraphicsEnvironment() {
+return gEnv;
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/render/awt AWTFontMetrics.java
pbwest 2004/03/17 20:50:11 Modified:src/java/org/apache/fop/render/awt Tag: FOP_0-20-0_Alt-Design AWTFontMetrics.java Log: Updated details on getAscender bug Revision ChangesPath No revision No revision 1.2.2.3 +17 -0 xml-fop/src/java/org/apache/fop/render/awt/AWTFontMetrics.java Index: AWTFontMetrics.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTFontMetrics.java,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -r1.2.2.2 -r1.2.2.3 --- AWTFontMetrics.java 16 Mar 2004 12:02:37 - 1.2.2.2 +++ AWTFontMetrics.java 18 Mar 2004 04:50:11 - 1.2.2.3 @@ -118,6 +118,23 @@ //int realAscent = fmt.getAscent() // - (fmt.getDescent() + fmt.getLeading()); //return FONT_FACTOR * realAscent; +/* + * Bug 4399887 has status Closed, not a bug. The comments on the bug + * are: + * The submitter is incorrectly assuming that the string he has used + * is displaying characters which represent those with the maximum + * ascent in the font. If (for example) the unicode character + * \u00c1 which is the A-acute character used in many European + * languages is placed in the bodu of the "Wrong" string it can be + * seen that the JDK is exactly correct in its determination of the + * ascent of the font. + * If the bounds of a particular string are interesting then the + * Rectangle FontMetrics.getStringBounds(..) method can be called. + * The y value of the rectangle is the offset from the origin + * (baseline) apparently needed by the sample test program + * + * [EMAIL PROTECTED] 2001-05-15 + */ } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/render/awt AWTFontMetrics.java
pbwest 2004/03/17 20:49:07 Modified:src/java/org/apache/fop/render/awt AWTFontMetrics.java Log: Updated details on getAscender bug Revision ChangesPath 1.3 +17 -0 xml-fop/src/java/org/apache/fop/render/awt/AWTFontMetrics.java Index: AWTFontMetrics.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTFontMetrics.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AWTFontMetrics.java 27 Feb 2004 17:51:22 - 1.2 +++ AWTFontMetrics.java 18 Mar 2004 04:49:07 - 1.3 @@ -115,6 +115,23 @@ // workaround for sun bug on FontMetrics.getAscent() // http://developer.java.sun.com/developer/bugParade/bugs/4399887.html +/* + * Bug 4399887 has status Closed, not a bug. The comments on the bug + * are: + * The submitter is incorrectly assuming that the string he has used + * is displaying characters which represent those with the maximum + * ascent in the font. If (for example) the unicode character + * \u00c1 which is the A-acute character used in many European + * languages is placed in the bodu of the "Wrong" string it can be + * seen that the JDK is exactly correct in its determination of the + * ascent of the font. + * If the bounds of a particular string are interesting then the + * Rectangle FontMetrics.getStringBounds(..) method can be called. + * The y value of the rectangle is the offset from the origin + * (baseline) apparently needed by the sample test program + * + * [EMAIL PROTECTED] 2001-05-15 + */ int realAscent = fmt.getAscent() - (fmt.getDescent() + fmt.getLeading()); return FONT_FACTOR * realAscent; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/render AbstractRenderer.java Renderer.java
pbwest 2004/03/16 04:17:54
Modified:src/java/org/apache/fop/render Tag: FOP_0-20-0_Alt-Design
AbstractRenderer.java Renderer.java
Log:
startRenderer and stopRenderer methods removed.
Many fields and their setter removed - use general options setter.
Commented out many fields until design of rendering in alt-design is finalised.
Revision ChangesPath
No revision
No revision
1.24.2.3 +38 -88xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java
Index: AbstractRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java,v
retrieving revision 1.24.2.2
retrieving revision 1.24.2.3
diff -u -r1.24.2.2 -r1.24.2.3
--- AbstractRenderer.java 13 Mar 2004 08:46:05 - 1.24.2.2
+++ AbstractRenderer.java 16 Mar 2004 12:17:53 - 1.24.2.3
@@ -18,9 +18,8 @@
package org.apache.fop.render;
-import java.io.IOException;
import java.io.OutputStream;
-import java.util.Date;
+import java.util.HashMap;
import java.util.Map;
import java.util.logging.Logger;
// XML
@@ -33,87 +32,56 @@
import org.apache.fop.apps.Fop;
import org.apache.fop.configuration.FOUserAgent;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-
/**
* Abstract base class for all renderers. The Abstract renderer does all the
* top level processing of the area tree and adds some abstract methods to
* handle viewports. This keeps track of the current block and inline position.
*/
public abstract class AbstractRenderer
- implements Renderer, Configurable {
+ implements Renderer {
-/**
- * user agent
- */
+protected OutputStream output;
+/** user agent */
protected FOUserAgent userAgent;
-/**
- * producer (usually "FOP")
- */
-protected String producer = "FOP";
-
-/**
- * creator of document
- */
-protected String creator = null;
-
-/**
- * creation time
- */
-protected Date creationDate = null;
-
-/**
- * renderer configuration
- */
-protected Map options;
-
-/**
- * block progression position
- */
-protected int currentBPPosition = 0;
-
-/**
- * inline progression position
- */
-protected int currentIPPosition = 0;
-
-/**
- * current inline progression position in block
- */
-protected int currentBlockIPPosition = 0;
-
-/**
- * the block progression position of the containing block used for
- * absolutely positioned blocks
- */
-protected int containingBPPosition = 0;
+/** renderer configuration */
+protected Map options = new HashMap();
-/**
- * the inline progression position of the containing block used for
- * absolutely positioned blocks
- */
-protected int containingIPPosition = 0;
+///** block progression position */
+//protected int currentBPPosition = 0;
+//
+///** inline progression position */
+//protected int currentIPPosition = 0;
+//
+///** current inline progression position in block */
+//protected int currentBlockIPPosition = 0;
+//
+///**
+// * the block progression position of the containing block used for
+// * absolutely positioned blocks
+// */
+//protected int containingBPPosition = 0;
+//
+///**
+// * the inline progression position of the containing block used for
+// * absolutely positioned blocks
+// */
+//protected int containingIPPosition = 0;
protected Logger log = Logger.getLogger(Fop.fopPackage);
-
+
/**
- * @see
org.apache.avalon.framework.configuration.Configurable#configure(Configuration)
+ * Implements Runnable.run() so that this thread can be started.
+ * Set up the fonts and perform other initialization.
+ * Respond to requests from layout thread for information
+ * Wait for requests from layout thread for layout.
*/
-public void configure(Configuration conf) throws ConfigurationException {
-}
-
-/** @see org.apache.fop.render.Renderer */
-public void setProducer(String inProducer) {
-producer = inProducer;
+public void run() {
}
-/** @see org.apache.fop.render.Renderer */
-public void setCreator(String inCreator) {
-creator = inCreator;
+public synchronized void setOutputStream(OutputStream output) {
+this.output = output;
}
///**
cvs commit: xml-fop/src/java/org/apache/fop/render/awt AWTRenderer.java AWTPrintRenderer.java
pbwest 2004/03/16 04:07:09
Modified:src/java/org/apache/fop/render/awt Tag:
FOP_0-20-0_Alt-Design AWTRenderer.java
AWTPrintRenderer.java
Log:
startRenderer and stopRenderer methods commented out
Revision ChangesPath
No revision
No revision
1.21.2.3 +17 -16xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.3
diff -u -r1.21.2.2 -r1.21.2.3
--- AWTRenderer.java 13 Mar 2004 08:46:05 - 1.21.2.2
+++ AWTRenderer.java 16 Mar 2004 12:07:08 - 1.21.2.3
@@ -37,7 +37,6 @@
import java.awt.print.Pageable;
import java.awt.print.Printable;
import java.io.IOException;
-import java.io.OutputStream;
import java.util.Map;
import java.util.Vector;
@@ -52,7 +51,9 @@
/**
* This is FOP's AWT renderer.
*/
-public class AWTRenderer extends AbstractRenderer implements Printable, Pageable {
+public class AWTRenderer
+extends AbstractRenderer
+implements Printable, Pageable {
protected double scaleFactor = 100.0;
protected int pageNumber = 0;
@@ -134,20 +135,20 @@
return scaleFactor;
}
-public void startRenderer(OutputStream out)
-throws IOException {
-// empty pageViewportList, in case of a reload from PreviewDialog
-pageViewportList.removeAllElements();
-pageList.removeAllElements();
-bufferedImageList.removeAllElements();
-System.out.println("\nRegion Types: 0-Before/Top, 1-Start/Left, 2-Body,
3-End/Right, 4-After/Bottom");
-}
-
-public void stopRenderer()
-throws IOException {
-frame.setStatus(translator.getString("Status.Show"));
-frame.showPage();
-}
+//public void startRenderer(OutputStream out)
+//throws IOException {
+//// empty pageViewportList, in case of a reload from PreviewDialog
+//pageViewportList.removeAllElements();
+//pageList.removeAllElements();
+//bufferedImageList.removeAllElements();
+//System.out.println("\nRegion Types: 0-Before/Top, 1-Start/Left, 2-Body,
3-End/Right, 4-After/Bottom");
+//}
+//
+//public void stopRenderer()
+//throws IOException {
+//frame.setStatus(translator.getString("Status.Show"));
+//frame.showPage();
+//}
// Printable Interface
public PageFormat getPageFormat(int pos) {
1.7.2.2 +24 -24xml-fop/src/java/org/apache/fop/render/awt/AWTPrintRenderer.java
Index: AWTPrintRenderer.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTPrintRenderer.java,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- AWTPrintRenderer.java 10 Mar 2004 06:24:28 - 1.7.2.1
+++ AWTPrintRenderer.java 16 Mar 2004 12:07:08 - 1.7.2.2
@@ -18,9 +18,9 @@
package org.apache.fop.render.awt;
-import java.awt.print.PrinterException;
+//import java.awt.print.PrinterException;
import java.awt.print.PrinterJob;
-import java.io.IOException;
+//import java.io.IOException;
import java.util.Vector;
public class AWTPrintRenderer extends AWTRenderer {
@@ -60,27 +60,27 @@
printerJob.setPageable(this);
}
-public void stopRenderer() throws IOException {
-super.stopRenderer();
-
-if (endNumber == -1) {
-endNumber = getNumberOfPages();
-}
-
-Vector numbers = getInvalidPageNumbers();
-for (int i = numbers.size() - 1; i > -1; i--) {
-// removePage(Integer.parseInt((String)numbers.elementAt(i)));
-}
-
-try {
-printerJob.print();
-} catch (PrinterException e) {
-e.printStackTrace();
-throw new IOException("Unable to print: "
-+ e.getClass().getName()
-+ ": " + e.getMessage());
-}
-}
+//public void stopRenderer() throws IOException {
+//super.stopRenderer();
+//
+//if (endNumber == -1) {
+//endNumber = getNumberOfPages();
+//}
+//
+//Vector numbers = getInvalidPageNumbers();
+//for (int i = numbers.size() - 1; i > -1; i--) {
+//// removePage(Integer.parseInt((String)numbers.elementAt(i)));
+//}
+//
+//try {
+//printerJob.print();
+//} catch (PrinterException e) {
+//
cvs commit: xml-fop/src/java/org/apache/fop/render/awt AWTFontMetrics.java
pbwest 2004/03/16 04:02:37
Modified:src/java/org/apache/fop/render/awt Tag:
FOP_0-20-0_Alt-Design AWTFontMetrics.java
Log:
Assume getAscent bug is now fixed
Revision ChangesPath
No revision
No revision
1.2.2.2 +7 -6 xml-fop/src/java/org/apache/fop/render/awt/AWTFontMetrics.java
Index: AWTFontMetrics.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTFontMetrics.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- AWTFontMetrics.java 10 Mar 2004 06:24:28 - 1.2.2.1
+++ AWTFontMetrics.java 16 Mar 2004 12:02:37 - 1.2.2.2
@@ -111,13 +111,13 @@
*/
public int getAscender(String family, int style, int size) {
setFont(family, style, size);
-// return (int)(FONT_FACTOR * fmt.getAscent());
+return FONT_FACTOR * fmt.getAscent();
-// workaround for sun bug on FontMetrics.getAscent()
-// http://developer.java.sun.com/developer/bugParade/bugs/4399887.html
-int realAscent = fmt.getAscent()
- - (fmt.getDescent() + fmt.getLeading());
-return FONT_FACTOR * realAscent;
+//// workaround for sun bug on FontMetrics.getAscent()
+//// http://developer.java.sun.com/developer/bugParade/bugs/4399887.html
+//int realAscent = fmt.getAscent()
+// - (fmt.getDescent() + fmt.getLeading());
+//return FONT_FACTOR * realAscent;
}
@@ -175,6 +175,7 @@
// the output seems to look a little better if the
// space is rendered larger than given by
// the FontMetrics object
+// TODO find out why
if (i <= 32) {
w = (int)(1.4 * fmt.charWidth(i) * FONT_FACTOR);
} else {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/configuration FOUserAgent.java
pbwest 2004/03/15 22:49:35
Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
InputHandler.java FOFileHandler.java
XSLTInputHandler.java
src/java/org/apache/fop/configuration Tag:
FOP_0-20-0_Alt-Design FOUserAgent.java
Log:
Synchronized changes to base URL handling from HEAD.
Revision ChangesPath
No revision
No revision
1.4.2.7 +26 -1 xml-fop/src/java/org/apache/fop/apps/InputHandler.java
Index: InputHandler.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/InputHandler.java,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -u -r1.4.2.6 -r1.4.2.7
--- InputHandler.java 8 Mar 2004 21:02:27 - 1.4.2.6
+++ InputHandler.java 16 Mar 2004 06:49:35 - 1.4.2.7
@@ -41,6 +41,31 @@
*/
public abstract InputSource getInputSource();
+protected String baseURL = null;
+
+/**
+ * Get the base URL associated with this input source
+ * @return the input source
+ */
+public String getBaseURL() {
+return baseURL;
+}
+
+/**
+ * Attempts to set a default base URL from the parent of the file passed
+ * as an argument. Sets baseURL to the URL derived, or to an
+ * empty string if that fails.
+ * @param file
+ */
+protected void setBaseURL(File file) {
+try {
+baseURL =
+new
File(file.getAbsolutePath()).getParentFile().toURL().toExternalForm();
+} catch (Exception e) {
+baseURL = "";
+}
+}
+
/**
* Get the SAX parser associated with this input handler.
* @return the SAX parser
1.2.2.3 +2 -1 xml-fop/src/java/org/apache/fop/apps/FOFileHandler.java
Index: FOFileHandler.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/FOFileHandler.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- FOFileHandler.java8 Mar 2004 21:02:27 - 1.2.2.2
+++ FOFileHandler.java16 Mar 2004 06:49:35 - 1.2.2.3
@@ -39,6 +39,7 @@
*/
public FOFileHandler(File fofile) {
this.fofile = fofile;
+setBaseURL(fofile);
}
/**
1.12.2.3 +2 -0 xml-fop/src/java/org/apache/fop/apps/XSLTInputHandler.java
Index: XSLTInputHandler.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/XSLTInputHandler.java,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -u -r1.12.2.2 -r1.12.2.3
--- XSLTInputHandler.java 8 Mar 2004 21:02:27 - 1.12.2.2
+++ XSLTInputHandler.java 16 Mar 2004 06:49:35 - 1.12.2.3
@@ -55,6 +55,7 @@
public XSLTInputHandler(File xmlfile, File xsltfile, Vector params) {
this.xmlSource = new StreamSource(xmlfile);
this.xsltSource = new StreamSource(xsltfile);
+setBaseURL(xmlfile);
xsltParams = params;
}
@@ -67,6 +68,7 @@
public XSLTInputHandler(File xmlfile, File xsltfile) {
this.xmlSource = new StreamSource(xmlfile);
this.xsltSource = new StreamSource(xsltfile);
+setBaseURL(xmlfile);
}
/**
No revision
No revision
1.1.2.2 +3 -6
xml-fop/src/java/org/apache/fop/configuration/Attic/FOUserAgent.java
Index: FOUserAgent.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/configuration/Attic/FOUserAgent.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FOUserAgent.java 13 Mar 2004 08:41:29 - 1.1.2.1
+++ FOUserAgent.java 16 Mar 2004 06:49:35 - 1.1.2.2
@@ -20,11 +20,9 @@
// Java
import java.util.Map;
+import java.util.logging.Logger;
import java.io.InputStream;
-// Avalon
-import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.logger.Logger;
/**
* The User Agent for fo.
@@ -46,7 +44,7 @@
* These areas may contain resolveable areas that will be processed
* with other resolveable areas
*/
-public class FOUserAgent implements LogEnabled {
+public class FOUserAgent {
private Logger log;
/** Map containing various default values */
@@ -59,7 +57,6 @@
/**
* Sets the logger.
* @param log Logger to use
- * @see org.apache.avalon.framework.logger.LogEnabled#enableLogging(Logger)
*/
cvs commit: xml-fop/src/java/org/apache/fop/apps Fop.java
pbwest 2004/03/15 22:49:03
Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Fop.java
Log:
Synchronized changes to base URL handling from HEAD.
Mods to the way options are set in Renderer.
Revision ChangesPath
No revision
No revision
1.1.2.15 +21 -4 xml-fop/src/java/org/apache/fop/apps/Fop.java
Index: Fop.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Fop.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- Fop.java 14 Mar 2004 11:18:47 - 1.1.2.14
+++ Fop.java 16 Mar 2004 06:49:03 - 1.1.2.15
@@ -308,7 +308,22 @@
this.inputHandler = inputHandler;
}
+
+/**
+ * Optionally sets the FOUserAgent instance for FOP to use. The Driver
+ * class sets up its own FOUserAgent if none is set through this method.
+ * @param agent FOUserAgent to use
+ */
+public void setUserAgent(FOUserAgent agent) {
+userAgent = agent;
+}
+
protected FOUserAgent getUserAgent() {
+if (userAgent == null) {
+userAgent = new FOUserAgent();
+userAgent.enableLogging(logger);
+userAgent.setBaseURL("");
+}
return userAgent;
}
@@ -369,14 +384,15 @@
/**
* Set the Renderer to use.
- * @param renderer the renderer instance to use (Note: Logger must be set at
this point)
+ * @param renderer the renderer instance to use
+ * (Note: Logger must be set at this point)
*/
public void setRenderer(Renderer renderer) {
// AWTStarter calls this function directly
if (renderer instanceof AWTRenderer) {
rendererType = RENDER_AWT;
}
-renderer.setProducer(Version.getVersion());
+renderer.setOption("producer", Version.getVersion());
renderer.setUserAgent(getUserAgent());
this.renderer = renderer;
}
@@ -401,7 +417,7 @@
throws IllegalArgumentException {
try {
renderer = (Renderer)Class.forName(rendererClassName).newInstance();
-renderer.setProducer(Version.getVersion());
+renderer.setOption("producer", Version.getVersion());
renderer.setUserAgent(getUserAgent());
} catch (ClassNotFoundException e) {
throw new IllegalArgumentException("Could not find "
@@ -433,6 +449,7 @@
*/
public synchronized void render(InputHandler inputHandler)
throws FOPException {
+//userAgent.setBaseURL(inputHandler.getBaseURL());
throw new FOPException("Attempting to run null 'render' method");
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/conf config.xml
pbwest 2004/03/14 03:54:41 Modified:conf Tag: FOP_0-20-0_Alt-Design config.xml Log: Removed UserConfigFileName entry from system config, and included note that it is now imposssible to specify user level config in the system config file. Revision ChangesPath No revision No revision 1.7.4.3 +5 -2 xml-fop/conf/Attic/config.xml Index: config.xml === RCS file: /home/cvs/xml-fop/conf/Attic/config.xml,v retrieving revision 1.7.4.2 retrieving revision 1.7.4.3 diff -u -r1.7.4.2 -r1.7.4.3 --- config.xml2 Nov 2002 01:22:35 - 1.7.4.2 +++ config.xml14 Mar 2004 11:54:41 - 1.7.4.3 @@ -27,12 +27,15 @@ dumpConfiguration false - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/render/awt/viewer PreviewDialog.java
pbwest 2004/03/14 03:21:27
Modified:src/java/org/apache/fop/render/awt/viewer Tag:
FOP_0-20-0_Alt-Design PreviewDialog.java
Log:
Merged Driver into Fop
Revision ChangesPath
No revision
No revision
1.2.2.2 +9 -9
xml-fop/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java
Index: PreviewDialog.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- PreviewDialog.java10 Mar 2004 06:24:29 - 1.2.2.1
+++ PreviewDialog.java14 Mar 2004 11:21:27 - 1.2.2.2
@@ -48,7 +48,7 @@
import java.awt.print.PrinterException;
//FOP
-import org.apache.fop.apps.Driver;
+import org.apache.fop.apps.Fop;
import org.apache.fop.apps.InputHandler;
import org.apache.fop.apps.FOPException;
import org.apache.fop.render.awt.AWTRenderer;
@@ -68,8 +68,8 @@
protected AWTRenderer renderer;
/** The InputHandler associated with this window */
protected InputHandler inputHandler;
-/** The Driver used for refreshing/reloading the view */
-protected Driver driver;
+/** The Fop used for refreshing/reloading the view */
+protected Fop fop;
private int currentPage = 0;
private int pageCount = 0;
@@ -383,11 +383,11 @@
*/
private class Reloader extends Thread {
public void run() {
-if (driver == null) {
-driver = new Driver();
-driver.setRenderer(renderer);
+if (fop == null) {
+fop = new Fop();
+fop.setRenderer(renderer);
} else {
-driver.reset();
+fop.reset();
}
pageLabel.setIcon(null);
@@ -396,7 +396,7 @@
try {
setStatus(translator.getString("Status.Build.FO.tree"));
-driver.render(inputHandler);
+fop.render(inputHandler);
setStatus(translator.getString("Status.Show"));
} catch (FOPException e) {
reportException(e);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/configuration SystemOptions.java
pbwest 2004/03/14 03:19:47
Modified:src/java/org/apache/fop/configuration Tag:
FOP_0-20-0_Alt-Design SystemOptions.java
Log:
Merged Driver into Fop
Revision ChangesPath
No revision
No revision
1.1.2.3 +12 -13
xml-fop/src/java/org/apache/fop/configuration/Attic/SystemOptions.java
Index: SystemOptions.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/configuration/Attic/SystemOptions.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SystemOptions.java14 Mar 2004 02:44:53 - 1.1.2.2
+++ SystemOptions.java14 Mar 2004 11:19:47 - 1.1.2.3
@@ -31,10 +31,9 @@
import java.util.logging.Logger;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
-import org.apache.fop.apps.Driver;
+import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FOFileHandler;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.Fop;
import org.apache.fop.apps.InputHandler;
import org.apache.fop.apps.XSLTInputHandler;
@@ -398,26 +397,26 @@
case NOT_SET:
throw new FOPException("Renderer has not been set!");
case PDF_OUTPUT:
-return Driver.RENDER_PDF;
+return Fop.RENDER_PDF;
case AWT_OUTPUT:
-return Driver.RENDER_AWT;
+return Fop.RENDER_AWT;
case MIF_OUTPUT:
-return Driver.RENDER_MIF;
+return Fop.RENDER_MIF;
case PRINT_OUTPUT:
-return Driver.RENDER_PRINT;
+return Fop.RENDER_PRINT;
case PCL_OUTPUT:
-return Driver.RENDER_PCL;
+return Fop.RENDER_PCL;
case PS_OUTPUT:
-return Driver.RENDER_PS;
+return Fop.RENDER_PS;
case TXT_OUTPUT:
-return Driver.RENDER_TXT;
+return Fop.RENDER_TXT;
case SVG_OUTPUT:
-return Driver.RENDER_SVG;
+return Fop.RENDER_SVG;
case AREA_OUTPUT:
rendererOptions.put("fineDetail", coarseAreaXmlValue());
-return Driver.RENDER_XML;
+return Fop.RENDER_XML;
case RTF_OUTPUT:
-return Driver.RENDER_RTF;
+return Fop.RENDER_RTF;
default:
throw new FOPException("Invalid Renderer setting!");
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/apps Fop.java Document.java Driver.java
pbwest 2004/03/14 03:18:47
Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Fop.java Document.java
Removed: src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Driver.java
Log:
Merged Driver into Fop
Revision ChangesPath
No revision
No revision
1.1.2.14 +303 -49 xml-fop/src/java/org/apache/fop/apps/Fop.java
Index: Fop.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Fop.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- Fop.java 14 Mar 2004 03:12:36 - 1.1.2.13
+++ Fop.java 14 Mar 2004 11:18:47 - 1.1.2.14
@@ -29,29 +29,98 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.apache.fop.area.AreaTree;
import org.apache.fop.configuration.CLI_Options;
import org.apache.fop.configuration.ConfigurationResource;
import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.FOUserAgent;
import org.apache.fop.configuration.SystemOptions;
import org.apache.fop.configuration.UserOptions;
+import org.apache.fop.fo.FOTree;
+import org.apache.fop.render.Renderer;
+import org.apache.fop.render.awt.AWTRenderer;
+import org.apache.fop.version.Version;
+import org.apache.fop.xml.FoXmlSerialHandler;
+import org.apache.fop.xml.Namespaces;
+import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XmlEventReader;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
public class Fop {
+/** private constant to indicate renderer was not defined. */
+private static final int NOT_SET = 0;
+/** Render to PDF. OutputStream must be set */
+public static final int RENDER_PDF = 1;
+/** Render to a GUI window. No OutputStream neccessary */
+public static final int RENDER_AWT = 2;
+/** Render to MIF. OutputStream must be set */
+public static final int RENDER_MIF = 3;
+/** Render to XML. OutputStream must be set */
+public static final int RENDER_XML = 4;
+/** Render to PRINT. No OutputStream neccessary */
+public static final int RENDER_PRINT = 5;
+/** Render to PCL. OutputStream must be set */
+public static final int RENDER_PCL = 6;
+/** Render to Postscript. OutputStream must be set */
+public static final int RENDER_PS = 7;
+/** Render to Text. OutputStream must be set */
+public static final int RENDER_TXT = 8;
+/** Render to SVG. OutputStream must be set */
+public static final int RENDER_SVG = 9;
+/** Render to RTF. OutputStream must be set */
+public static final int RENDER_RTF = 10;
+
+private InputHandler inputHandler;
+private XMLReader parser;
+private InputSource saxSource;
+
+private FoXmlSerialHandler xmlhandler;
+private SyncedXmlEventsBuffer eventsBuffer;
+private Namespaces namespaces;
+private XmlEventReader eventReader;
+private FOTree foTree;
+private AreaTree areaTree = new AreaTree();
+
+private Thread driverThread;
+private Thread parserThread;
+private Thread foThread;
+private Thread areaThread;
+private Thread renderThread;
+
+/** the renderer type code given by setRenderer */
+private int rendererType = NOT_SET;
+
+/** the renderer to use to output the area tree */
+private Renderer renderer;
+
public static Runtime runtime;
public static long startTotal;
public static long startFree;
public static long startTime;
public static long startPCi;
public static long endPCi;
+private long endtotal, endfree, gctotal, gcfree;
-/**
- * The top-level package for FOP
- */
+/** The top-level package for FOP */
public static final String fopPackage = "org.apache.fop";
-
+/** The logging object */
private Logger logger;
-
+/** Configuration data */
public Configuration configuration = null;
+/** The version string */
+public final String version = Version.getVersion();
+/** The version revision string */
+public final String revision = Version.getRevision();
+/** The version name string */
+public final String name = Version.getName();
+
+protected Properties properties = null;
+protected SystemOptions options = null;
+protected UserOptions userOptions = null;
+protected CLI_Options cliOptions = null;
+protected FOUserAgent userAgent = null;
public static void main(String[] args) {
Fop fopInstance = new Fop(args);
@@ -80,17 +149,26 @@
String[] args = null;
public Fop() {
-
cvs commit: xml-fop/src/java/org/apache/fop/apps Fop.java
pbwest 2004/03/13 19:12:36
Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Fop.java
Log:
Fixes to options hierarchy
Revision ChangesPath
No revision
No revision
1.1.2.13 +21 -4 xml-fop/src/java/org/apache/fop/apps/Fop.java
Index: Fop.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Fop.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- Fop.java 13 Mar 2004 08:44:23 - 1.1.2.12
+++ Fop.java 14 Mar 2004 03:12:36 - 1.1.2.13
@@ -21,6 +21,7 @@
package org.apache.fop.apps;
//import java.util.logging.Handler;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.Enumeration;
@@ -28,9 +29,11 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.fop.configuration.*;
+import org.apache.fop.configuration.CLI_Options;
import org.apache.fop.configuration.ConfigurationResource;
import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.SystemOptions;
+import org.apache.fop.configuration.UserOptions;
public class Fop {
@@ -111,6 +114,8 @@
logger.setLevel(Level.WARNING);
Driver driver;
SystemOptions options = null;
+UserOptions userOptions = null;
+CLI_Options cliOptions = null;
Boolean bool = null;
runtime = Runtime.getRuntime();
@@ -121,9 +126,21 @@
try {
configuration = new Configuration();
if (args == null) {
-options = new UserOptions(configuration);
+userOptions = new UserOptions(configuration);
+options = userOptions;
+try {
+userOptions.configure();
+} catch (FileNotFoundException e2) {
+throw new FOPException(e2);
+}
} else {
-options = new CLI_Options(configuration, args);
+cliOptions = new CLI_Options(configuration, args);
+options = cliOptions;
+try {
+cliOptions.configure(args);
+} catch (FileNotFoundException e2) {
+throw new FOPException(e2);
+}
}
driver = new Driver(configuration, options);
driver.run();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/configuration SystemOptions.java CLI_Options.java UserOptions.java ConfigurationParser.java FOPOptions.java
pbwest 2004/03/13 18:44:54
Modified:src/java/org/apache/fop/configuration Tag:
FOP_0-20-0_Alt-Design SystemOptions.java
CLI_Options.java UserOptions.java
ConfigurationParser.java
Removed: src/java/org/apache/fop/configuration Tag:
FOP_0-20-0_Alt-Design FOPOptions.java
Log:
Fixes to options hierarchy
Revision ChangesPath
No revision
No revision
1.1.2.2 +84 -98
xml-fop/src/java/org/apache/fop/configuration/Attic/SystemOptions.java
Index: SystemOptions.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/configuration/Attic/SystemOptions.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SystemOptions.java13 Mar 2004 08:41:29 - 1.1.2.1
+++ SystemOptions.java14 Mar 2004 02:44:53 - 1.1.2.2
@@ -76,27 +76,12 @@
protected Configuration configuration = null;
-/* show configuration information */
-protected boolean dumpConfig = false;
-/* name of user configuration file */
-protected File userConfigFile = null;
-/* name of input fo file */
-protected File foFile = null;
-/* name of xsltFile (xslt transformation as input) */
-protected File xsltFile = null;
-/* name of xml file (xslt transformation as input) */
-protected File xmlFile = null;
-/* name of output file */
-protected File outputFile = null;
-/* name of buffer file */
-protected File bufferFile = null;
+///* show configuration information */
+//protected boolean dumpConfig = false;
/* input mode */
protected int inputmode = NOT_SET;
/* output mode */
protected int outputmode = NOT_SET;
-/* buffer mode */
-protected int buffermode = NOT_SET;
-/* language for user information */
// baseDir (set from the config files
protected String baseDir = null;
@@ -130,13 +115,6 @@
public SystemOptions(Configuration configuration) {
setup();
this.configuration = configuration;
-try {
-configure();
-} catch (FileNotFoundException e) {
-throw new RuntimeException(e);
-} catch (FOPException e) {
-throw new RuntimeException(e);
-}
}
private void setup() {
@@ -214,7 +192,7 @@
* @return the index of that name in the array of input mode names,
* or -1 if not found
*/
-public int inputModeNameToIndex(String name) {
+protected int inputModeNameToIndex(String name) {
for (int i = 0; i <= LAST_INPUT_MODE; i++) {
if (name.equals(inputModes[i])) return i;
}
@@ -227,7 +205,7 @@
* @return the index of that name in the array of output mode names,
* or -1 if not found
*/
-public int outputModeNameToIndex(String name) {
+protected int outputModeNameToIndex(String name) {
for (int i = 0; i <= LAST_INPUT_MODE; i++) {
if (name.equals(outputModes[i])) return i;
}
@@ -250,26 +228,9 @@
*
* @exception FOPException
*/
-void initOptions() throws FOPException {
+protected void initOptions() throws FOPException {
String str = null;
-// show configuration settings
-dumpConfig = configuration.isTrue("dumpConfiguration");
-
-if ((str = getFoFileName()) != null)
-foFile = new File(str);
-if ((str = getXmlFileName()) != null)
-xmlFile = new File(str);
-if ((str = getXsltFileName()) != null)
-xsltFile = new File(str);
-if ((str = getOutputFileName()) != null)
-outputFile = new File(str);
-if ((str = getBufferFileName()) != null)
-bufferFile = new File(str);
-// userConfigFile may be set in the process of loading said file
-if (userConfigFile == null && (str = getUserConfigFileName()) != null)
-userConfigFile = new File(str);
-
if ((str = getInputMode()) != null)
inputmode = inputModeIndex(str);
if ((str = getOutputMode()) != null)
@@ -291,7 +252,7 @@
log.config("base directory: " + baseDir);
}
-if (dumpConfig) {
+if (dumpConfig()) {
configuration.dumpConfiguration();
System.exit(0);
}
@@ -313,7 +274,7 @@
* @exception FOPException if the configuration file
* cannot be discovered.
*/
-public void loadConfiguration(String fname)
+protected void loadConfigu
cvs commit: xml-fop/src/java/org/apache/fop/configuration FOPOptions.java SystemOptions.java CLI_Options.java UserOptions.java FOUserAgent.java ConfigurationParser.java
pbwest 2004/03/13 00:41:30
Modified:src/java/org/apache/fop/configuration Tag:
FOP_0-20-0_Alt-Design ConfigurationParser.java
Added: src/java/org/apache/fop/configuration Tag:
FOP_0-20-0_Alt-Design FOPOptions.java
SystemOptions.java CLI_Options.java
UserOptions.java FOUserAgent.java
Log:
Reconstructed FOPOptions as:
SystemOptions
UserOptions extends SystemOptions
CLI_Options extends UserOptions
Moved all configuration-related classes into org.apache.fop.configuration
Revision ChangesPath
No revision
No revision
1.1.2.6 +7 -1
xml-fop/src/java/org/apache/fop/configuration/Attic/ConfigurationParser.java
Index: ConfigurationParser.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/configuration/Attic/ConfigurationParser.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ConfigurationParser.java 8 Mar 2004 21:40:41 - 1.1.2.5
+++ ConfigurationParser.java 13 Mar 2004 08:41:29 - 1.1.2.6
@@ -265,6 +265,12 @@
private void store(String role, String key, Object value) {
activeConfiguration = (HashMap)configMaps.get(role);
if (activeConfiguration != null) {
+Object val;
+if ((val = activeConfiguration.get(key)) != null) {
+configuration.logger.config(
+"Existing value for key " + key + ":"
++ val.toString() + " overrides " + value.toString());
+}
activeConfiguration.put(key, value);
} else {
configuration.logger.warning("Unknown role >" + role
No revision
Index: ConfigurationParser.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/configuration/Attic/ConfigurationParser.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ConfigurationParser.java 8 Mar 2004 21:40:41 - 1.1.2.5
+++ ConfigurationParser.java 13 Mar 2004 08:41:29 - 1.1.2.6
@@ -265,6 +265,12 @@
private void store(String role, String key, Object value) {
activeConfiguration = (HashMap)configMaps.get(role);
if (activeConfiguration != null) {
+Object val;
+if ((val = activeConfiguration.get(key)) != null) {
+configuration.logger.config(
+"Existing value for key " + key + ":"
++ val.toString() + " overrides " + value.toString());
+}
activeConfiguration.put(key, value);
} else {
configuration.logger.warning("Unknown role >" + role
No revision
Index: ConfigurationParser.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/configuration/Attic/ConfigurationParser.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ConfigurationParser.java 8 Mar 2004 21:40:41 - 1.1.2.5
+++ ConfigurationParser.java 13 Mar 2004 08:41:29 - 1.1.2.6
@@ -265,6 +265,12 @@
private void store(String role, String key, Object value) {
activeConfiguration = (HashMap)configMaps.get(role);
if (activeConfiguration != null) {
+Object val;
+if ((val = activeConfiguration.get(key)) != null) {
+configuration.logger.config(
+"Existing value for key " + key + ":"
++ val.toString() + " overrides " + value.toString());
+}
activeConfiguration.put(key, value);
} else {
configuration.logger.warning("Unknown role >" + role
1.1.2.1 +1130 -0
xml-fop/src/java/org/apache/fop/configuration/Attic/FOPOptions.java
1.1.2.1 +734 -0
xml-fop/src/java/org/apache/fop/configuration/Attic/SystemOptions.java
1.1.2.1 +359 -0
xml-fop/src/java/org/apache/fop/configuration/Attic/CLI_Options.java
1.1.2.1 +88 -0
xml-fop/src/java/org/apache/fop/configuration/Attic/UserOptions.java
1.1.2.1 +133 -0
xml-fop/src/java/org/apache/fop/configuration/Attic/FOUserAgent.java
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/apps Driver.java Fop.java Document.java FOUserAgent.java FOPOptions.java
pbwest 2004/03/13 00:44:23
Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Driver.java Fop.java Document.java
Removed: src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
FOUserAgent.java FOPOptions.java
Log:
Reconstructed FOPOptions as:
SystemOptions
UserOptions extends SystemOptions
CLI_Options extends UserOptions
Moved all configuration-related classes into org.apache.fop.configuration
Revision ChangesPath
No revision
No revision
1.9.2.14 +6 -4 xml-fop/src/java/org/apache/fop/apps/Driver.java
Index: Driver.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
retrieving revision 1.9.2.13
retrieving revision 1.9.2.14
diff -u -r1.9.2.13 -r1.9.2.14
--- Driver.java 10 Mar 2004 06:24:29 - 1.9.2.13
+++ Driver.java 13 Mar 2004 08:44:23 - 1.9.2.14
@@ -28,6 +28,8 @@
import org.xml.sax.XMLReader;
import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.FOUserAgent;
+import org.apache.fop.configuration.SystemOptions;
import org.apache.fop.fo.FOTree;
import org.apache.fop.layout.AreaTree;
import org.apache.fop.render.Renderer;
@@ -74,7 +76,7 @@
/** If true, full error stacks are reported */
private boolean _errorDump = false;
private Configuration configuration = null;
-private FOPOptions options = null;
+private SystemOptions options = null;
private FOUserAgent userAgent = null;
private InputHandler inputHandler;
@@ -107,13 +109,13 @@
public Driver() {
String version = Version.getVersion();
configuration = new Configuration();
-options = new FOPOptions(configuration);
+options = new SystemOptions(configuration);
userAgent = new FOUserAgent();
_errorDump = configuration.isTrue("debugMode");
logger.config(version);
}
-public Driver(Configuration config, FOPOptions options) {
+public Driver(Configuration config, SystemOptions options) {
String version = Version.getVersion();
configuration = config;
this.options = options;
1.1.2.12 +10 -8 xml-fop/src/java/org/apache/fop/apps/Fop.java
Index: Fop.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Fop.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- Fop.java 10 Mar 2004 06:24:29 - 1.1.2.11
+++ Fop.java 13 Mar 2004 08:44:23 - 1.1.2.12
@@ -25,8 +25,10 @@
import java.io.InputStream;
import java.util.Enumeration;
import java.util.Properties;
+import java.util.logging.Level;
import java.util.logging.Logger;
+import org.apache.fop.configuration.*;
import org.apache.fop.configuration.ConfigurationResource;
import org.apache.fop.configuration.Configuration;
@@ -44,12 +46,12 @@
*/
public static final String fopPackage = "org.apache.fop";
-private static Logger logger;
+private Logger logger;
-public Configuration configuration = new Configuration();
+public Configuration configuration = null;
public static void main(String[] args) {
-Fop fopInstance = new Fop();
+Fop fopInstance = new Fop(args);
fopInstance.run();
}
@@ -106,9 +108,9 @@
// Now that the Fop system properties have been added, set up logger
logger = Logger.getLogger(fopPackage);
// Then restrict to WARNING
+logger.setLevel(Level.WARNING);
Driver driver;
-Configuration configuration;
-FOPOptions options = null;
+SystemOptions options = null;
Boolean bool = null;
runtime = Runtime.getRuntime();
@@ -119,9 +121,9 @@
try {
configuration = new Configuration();
if (args == null) {
-options = new FOPOptions(configuration);
+options = new UserOptions(configuration);
} else {
-options = new FOPOptions(configuration, args);
+options = new CLI_Options(configuration, args);
}
driver = new Driver(configuration, options);
driver.run();
1.11.2.2 +2 -2 xml-fop/src/java/org/apache/fop/apps/Document.java
Index: Document.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Document.java,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -
cvs commit: xml-fop/src/java/org/apache/fop/fonts/type1 PFMFile.java
pbwest 2004/03/13 00:46:05
Modified:src/java/org/apache/fop/render Tag: FOP_0-20-0_Alt-Design
RendererContext.java AbstractRenderer.java
Renderer.java
src/java/org/apache/fop/render/awt Tag:
FOP_0-20-0_Alt-Design AWTRenderer.java
src/java/org/apache/fop/fonts/truetype Tag:
FOP_0-20-0_Alt-Design TTFFile.java
FontFileReader.java TTFSubSetFile.java
src/java/org/apache/fop/fonts/type1 Tag:
FOP_0-20-0_Alt-Design PFMFile.java
Log:
Tidied up to suppress Eclipse nagging
Revision ChangesPath
No revision
No revision
1.3.2.2 +1 -1 xml-fop/src/java/org/apache/fop/render/RendererContext.java
Index: RendererContext.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/RendererContext.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- RendererContext.java 10 Mar 2004 06:24:27 - 1.3.2.1
+++ RendererContext.java 13 Mar 2004 08:46:05 - 1.3.2.2
@@ -22,7 +22,7 @@
import java.util.Map;
//FOP
-import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.configuration.FOUserAgent;
/**
* The Render Context for external handlers. This provides a rendering context
1.24.2.2 +1 -1 xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java
Index: AbstractRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -u -r1.24.2.1 -r1.24.2.2
--- AbstractRenderer.java 10 Mar 2004 06:24:27 - 1.24.2.1
+++ AbstractRenderer.java 13 Mar 2004 08:46:05 - 1.24.2.2
@@ -30,8 +30,8 @@
import org.apache.fop.area.CoordTransformer;
import org.apache.fop.area.PageViewport;
import org.apache.fop.area.RegionViewport;
-import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
+import org.apache.fop.configuration.FOUserAgent;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
1.8.2.2 +1 -1 xml-fop/src/java/org/apache/fop/render/Renderer.java
Index: Renderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/Renderer.java,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- Renderer.java 10 Mar 2004 06:24:27 - 1.8.2.1
+++ Renderer.java 13 Mar 2004 08:46:05 - 1.8.2.2
@@ -27,7 +27,7 @@
// FOP
import org.apache.fop.apps.FOPException;
import org.apache.fop.area.PageViewport;
-import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.configuration.FOUserAgent;
/**
* Interface implemented by all renderers. This interface is used to control
No revision
No revision
1.21.2.2 +0 -4 xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -r1.21.2.1 -r1.21.2.2
--- AWTRenderer.java 10 Mar 2004 06:24:28 - 1.21.2.1
+++ AWTRenderer.java 13 Mar 2004 08:46:05 - 1.21.2.2
@@ -29,13 +29,9 @@
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import java.awt.Toolkit;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
import java.awt.print.PageFormat;
import java.awt.print.Pageable;
No revision
No revision
1.5.2.2 +18 -18xml-fop/src/java/org/apache/fop/fonts/truetype/TTFFile.java
Index: TTFFile.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/truetype/TTFFile.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- TTFFile.java 10 Mar 2004 06:24:28 - 1.5.2.1
+++ TTFFile.java 13 Mar 2004 08:46:05 - 1.5.2.2
@@ -380,7 +380,7 @@
ansiIndex = new java.util.HashMap();
for (int i = 32; i < Glyphs.WINANSI_ENCODING.length; i++) {
Integer a
cvs commit: xml-fop/src/java/org/apache/fop/fonts MultiByteFont.java FontUtil.java Font.java
pbwest 2004/03/10 04:36:53
Modified:src/java/org/apache/fop/fonts Tag: FOP_0-20-0_Alt-Design
MultiByteFont.java FontUtil.java Font.java
Log:
Cosmetic changes to keep Eclipse happy
Revision ChangesPath
No revision
No revision
1.5.2.2 +1 -1 xml-fop/src/java/org/apache/fop/fonts/MultiByteFont.java
Index: MultiByteFont.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/MultiByteFont.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- MultiByteFont.java10 Mar 2004 06:24:28 - 1.5.2.1
+++ MultiByteFont.java10 Mar 2004 12:36:53 - 1.5.2.2
@@ -200,7 +200,7 @@
* @see org.apache.fop.fonts.Font#mapChar(char)
*/
public char mapChar(char c) {
-int idx = (int)c;
+int idx = c;
int retIdx = 0;
for (int i = 0; (i < bfentries.length) && retIdx == 0; i++) {
1.2.2.2 +2 -2 xml-fop/src/java/org/apache/fop/fonts/FontUtil.java
Index: FontUtil.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/FontUtil.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- FontUtil.java 10 Mar 2004 06:24:28 - 1.2.2.1
+++ FontUtil.java 10 Mar 2004 12:36:53 - 1.2.2.2
@@ -35,7 +35,7 @@
int weight = 400;
try {
weight = Integer.parseInt(text);
-weight = ((int)weight / 100) * 100;
+weight = (weight / 100) * 100;
weight = Math.max(weight, 100);
weight = Math.min(weight, 900);
} catch (NumberFormatException nfe) {
1.1.2.4 +0 -1 xml-fop/src/java/org/apache/fop/fonts/Font.java
Index: Font.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/Font.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Font.java 10 Mar 2004 06:24:28 - 1.1.2.3
+++ Font.java 10 Mar 2004 12:36:53 - 1.1.2.4
@@ -182,7 +182,6 @@
* This also performs some guessing on widths on various
* versions of space that might not exists in the font.
* @param c character to inspect
- * @param fs FontState to use
* @return the width of the character
*/
public int getCharWidth(char c) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/lib jakarta-commons-io-SNAPSHOT.jar jakarta.commons.io.LICENSE.txt
pbwest 2004/03/09 22:42:32 Added: lib Tag: FOP_0-20-0_Alt-Design jakarta-commons-io-SNAPSHOT.jar jakarta.commons.io.LICENSE.txt Log: Required to compile AWT renderer Revision ChangesPath No revision No revision 1.1.2.1 +149 -0xml-fop/lib/Attic/jakarta-commons-io-SNAPSHOT.jar <> 1.1.2.1 +202 -0xml-fop/lib/Attic/jakarta.commons.io.LICENSE.txt - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/resources/awt_viewer/images reload.gif fop.gif nextpg.gif lastpg.gif prevpg.gif firstpg.gif Print.gif
pbwest 2004/03/09 22:27:30 Added: resources/awt_viewer/properties Tag: FOP_0-20-0_Alt-Design Viewer_de.properties Viewer_it.properties Viewer_pl.properties Viewer_tr.properties Viewer_fr.properties Viewer.properties Viewer_ja.properties Viewer_fi.properties Viewer_ru.properties Viewer_cs.properties resources/awt_viewer/images Tag: FOP_0-20-0_Alt-Design reload.gif fop.gif nextpg.gif lastpg.gif prevpg.gif firstpg.gif Print.gif Log: Imported AWT renderer from HEAD in preparation for area generation and rendering experiments. Hacks to allow compilation. Revision ChangesPath No revision No revision 1.1.2.1 +32 -0 xml-fop/resources/awt_viewer/properties/Attic/Viewer_de.properties 1.1.2.1 +21 -0 xml-fop/resources/awt_viewer/properties/Attic/Viewer_it.properties 1.1.2.1 +24 -0 xml-fop/resources/awt_viewer/properties/Attic/Viewer_pl.properties 1.1.2.1 +33 -0 xml-fop/resources/awt_viewer/properties/Attic/Viewer_tr.properties 1.1.2.1 +21 -0 xml-fop/resources/awt_viewer/properties/Attic/Viewer_fr.properties 1.1.2.1 +44 -0 xml-fop/resources/awt_viewer/properties/Attic/Viewer.properties 1.1.2.1 +28 -0 xml-fop/resources/awt_viewer/properties/Attic/Viewer_ja.properties 1.1.2.1 +23 -0 xml-fop/resources/awt_viewer/properties/Attic/Viewer_fi.properties 1.1.2.1 +43 -0 xml-fop/resources/awt_viewer/properties/Attic/Viewer_ru.properties 1.1.2.1 +34 -0 xml-fop/resources/awt_viewer/properties/Attic/Viewer_cs.properties No revision No revision 1.1.2.1 +4 -0 xml-fop/resources/awt_viewer/images/Attic/reload.gif <> 1.1.2.1 +9 -0 xml-fop/resources/awt_viewer/images/Attic/fop.gif <> 1.1.2.1 +4 -0 xml-fop/resources/awt_viewer/images/Attic/nextpg.gif <> 1.1.2.1 +4 -0 xml-fop/resources/awt_viewer/images/Attic/lastpg.gif <> 1.1.2.1 +4 -0 xml-fop/resources/awt_viewer/images/Attic/prevpg.gif <> 1.1.2.1 +4 -0 xml-fop/resources/awt_viewer/images/Attic/firstpg.gif <> 1.1.2.1 +3 -0 xml-fop/resources/awt_viewer/images/Attic/Print.gif <> - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/resources/awt_viewer/images - New directory
pbwest 2004/03/09 22:27:11 xml-fop/resources/awt_viewer/images - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/resources/awt_viewer - New directory
pbwest 2004/03/09 22:27:11 xml-fop/resources/awt_viewer - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/resources/awt_viewer/properties - New directory
pbwest 2004/03/09 22:27:11 xml-fop/resources/awt_viewer/properties - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/resources - New directory
pbwest 2004/03/09 22:27:11 xml-fop/resources - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fonts/apps PFMReader.java TTFReader.java
pbwest 2004/03/09 22:24:29 Modified:src/java/org/apache/fop/fonts Tag: FOP_0-20-0_Alt-Design FontDescriptor.java FontType.java FontMetrics.java Glyphs.java Font.java src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design Fop.java Driver.java Added: src/java/org/apache/fop/render Tag: FOP_0-20-0_Alt-Design RendererContext.java PrintRenderer.java package.html Renderer.java AbstractRenderer.java XMLHandler.java src/java/org/apache/fop/fonts Tag: FOP_0-20-0_Alt-Design CustomFont.java MutableFont.java BFEntry.java CIDFontType.java SingleByteFont.java EmbedFontInfo.java LazyFont.java FontUtil.java Typeface.java FontTriplet.java FontReader.java MultiByteFont.java CIDFont.java FontSetup.java src/java/org/apache/fop/fonts/truetype Tag: FOP_0-20-0_Alt-Design FontFileReader.java TTFFile.java TTFDirTabEntry.java TTFCmapEntry.java package.html TTFMtxEntry.java TTFSubSetFile.java src/java/org/apache/fop/render/awt Tag: FOP_0-20-0_Alt-Design FontSetup.java AWTRenderer.java FontMetricsMapper.java AWTFontMetrics.java AWTPrintRenderer.java src/java/org/apache/fop/fonts/type1 Tag: FOP_0-20-0_Alt-Design PFBParser.java PFMInputStream.java package.html PFMFile.java PFBData.java src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design Document.java FOUserAgent.java src/java/org/apache/fop/render/awt/viewer Tag: FOP_0-20-0_Alt-Design PreviewDialog.java Translator.java GoToPageDialog.java PreviewDialogAboutBox.java Command.java src/java/org/apache/fop/fonts/base14 Tag: FOP_0-20-0_Alt-Design package.html src/java/org/apache/fop/fonts/apps Tag: FOP_0-20-0_Alt-Design PFMReader.java TTFReader.java Log: Imported AWT renderer from HEAD in preparation for area generation and rendering experiments. Hacks to allow compilation. Revision ChangesPath No revision No revision 1.3.2.1 +0 -0 xml-fop/src/java/org/apache/fop/render/RendererContext.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/RendererContext.java.diff?r1=1.3&r2=1.3.2.1 1.7.2.1 +0 -16 xml-fop/src/java/org/apache/fop/render/PrintRenderer.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/PrintRenderer.java.diff?r1=1.7&r2=1.7.2.1 1.2.2.1 +0 -0 xml-fop/src/java/org/apache/fop/render/package.html http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/package.html.diff?r1=1.2&r2=1.2.2.1 1.8.2.1 +0 -37 xml-fop/src/java/org/apache/fop/render/Renderer.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/Renderer.java.diff?r1=1.8&r2=1.8.2.1 1.24.2.1 +492 -522 xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java.diff?r1=1.24&r2=1.24.2.1 1.2.2.1 +0 -0 xml-fop/src/java/org/apache/fop/render/XMLHandler.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/XMLHandler.java.diff?r1=1.2&r2=1.2.2.1 No revision No revision 1.1.2.3 +9 -9 xml-fop/src/java/org/apache/fop/fonts/FontDescriptor.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fonts/FontDescriptor.java.diff?r1=1.1.2.2&r2=1.1.2.3 1.1.2.3 +9 -9 xml-fop/src/java/org/apache/fop/fonts/FontType.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fonts/FontType.java.diff?r1=1.1.2.2&r2=1.1.2.3 1.1.2.3 +9 -9 xml-fop/src/java/org/apache/fop/fonts/FontMetrics.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fonts/FontMetrics.java.diff?r1=1.1.2.2&r2=1.1.2.3 1.3.2.3 +9 -9 xml-fop/src/java/org/apache/fop/fonts/Glyphs.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fonts/Glyphs.java.diff?r1=1.3.2.2&r2=1.3.2.3 1.1.2.3 +246 -21 xml-fop/src/java/org/apache/fop/fonts/Font.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fonts/Font.java.diff?r1=1.1.2.2&r2=1.1.2.3 No revision http://cvs.apache.org/viewcvs/xml-fop/src/java/org/a
cvs commit: xml-fop/src/java/org/apache/fop/apps Fop.java
pbwest 2004/03/08 15:01:14 Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design Fop.java Log: Removed unnecessary import Revision ChangesPath No revision No revision 1.1.2.10 +1 -2 xml-fop/src/java/org/apache/fop/apps/Fop.java Index: Fop.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Fop.java,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -u -r1.1.2.9 -r1.1.2.10 --- Fop.java 8 Mar 2004 22:59:55 - 1.1.2.9 +++ Fop.java 8 Mar 2004 23:01:13 - 1.1.2.10 @@ -25,7 +25,6 @@ import java.io.InputStream; import java.util.Enumeration; import java.util.Properties; -import java.util.logging.Level; import java.util.logging.Logger; import org.apache.fop.configuration.ConfigurationResource; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/apps Fop.java
pbwest 2004/03/08 14:59:55
Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Fop.java
Log:
Initialize system properties for logging before setting up Logger.
Revision ChangesPath
No revision
No revision
1.1.2.9 +29 -5 xml-fop/src/java/org/apache/fop/apps/Fop.java
Index: Fop.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Fop.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- Fop.java 6 Mar 2004 05:53:16 - 1.1.2.8
+++ Fop.java 8 Mar 2004 22:59:55 - 1.1.2.9
@@ -20,9 +20,15 @@
package org.apache.fop.apps;
+//import java.util.logging.Handler;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Enumeration;
+import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.apache.fop.configuration.ConfigurationResource;
import org.apache.fop.configuration.Configuration;
public class Fop {
@@ -39,16 +45,34 @@
*/
public static final String fopPackage = "org.apache.fop";
-public static final Logger logger = Logger.getLogger(fopPackage);
-static {
-logger.setLevel(Level.INFO);
-}
+private static Logger logger;
public Configuration configuration = new Configuration();
public static void main(String[] args) {
long endtotal, endfree, gctotal, gcfree;
+Properties properties;
+try {
+// Get the initial system properties
+InputStream propsfile =
+ConfigurationResource.getResourceFile(
+"conf/fop.system.properties", Fop.class);
+properties = new Properties();
+properties.load(propsfile);
+} catch (FOPException e1) {
+throw new RuntimeException(e1);
+} catch (IOException e1) {
+throw new RuntimeException(e1);
+}
+Enumeration props = properties.keys();
+while (props.hasMoreElements()) {
+String key = (String)(props.nextElement());
+System.setProperty(key, properties.getProperty(key));
+}
+// Now that the Fop system properties have been added, set up logger
+logger = Logger.getLogger(fopPackage);
+// Then restrict to WARNING
Driver driver;
Configuration configuration;
FOPOptions options = null;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/apps FOPOptions.java
pbwest 2004/03/08 14:57:57
Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
FOPOptions.java
Log:
Use local reference to Fop.logger to set level.
Revision ChangesPath
No revision
No revision
1.1.2.4 +2 -3 xml-fop/src/java/org/apache/fop/apps/Attic/FOPOptions.java
Index: FOPOptions.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Attic/FOPOptions.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FOPOptions.java 8 Mar 2004 22:49:05 - 1.1.2.3
+++ FOPOptions.java 8 Mar 2004 22:57:57 - 1.1.2.4
@@ -355,8 +355,7 @@
// quiet mode - this is the last setting, so there is no way to
// supress the logging of messages during options processing
if (configuration.isTrue("quiet")) {
-Fop.setLoggingLevel(Level.OFF);
-//log.setLevel(Level.OFF);
+log.setLevel(Level.OFF);
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/apps Driver.java
pbwest 2004/03/08 14:51:12
Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Driver.java
Log:
Use local reference to Fop.logger.
Revision ChangesPath
No revision
No revision
1.9.2.12 +6 -3 xml-fop/src/java/org/apache/fop/apps/Driver.java
Index: Driver.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
retrieving revision 1.9.2.11
retrieving revision 1.9.2.12
diff -u -r1.9.2.11 -r1.9.2.12
--- Driver.java 6 Mar 2004 05:53:16 - 1.9.2.11
+++ Driver.java 8 Mar 2004 22:51:12 - 1.9.2.12
@@ -21,6 +21,8 @@
package org.apache.fop.apps;
+import java.util.logging.Logger;
+
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
@@ -66,6 +68,7 @@
/** Render to RTF. OutputStream must be set */
public static final int RENDER_RTF = 10;
+protected Logger logger = Logger.getLogger(Fop.fopPackage);
/** If true, full error stacks are reported */
private boolean _errorDump = false;
private Configuration configuration = null;
@@ -97,7 +100,7 @@
configuration = new Configuration();
options = new FOPOptions(configuration);
_errorDump = configuration.isTrue("debugMode");
-Fop.logger.config(version);
+logger.config(version);
}
public Driver(String[] args, Configuration config, FOPOptions options) {
@@ -105,7 +108,7 @@
configuration = config;
this.options = options;
_errorDump = configuration.isTrue("debugMode");
-Fop.logger.config(version);
+logger.config(version);
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/apps FOPOptions.java
pbwest 2004/03/08 14:49:06
Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
FOPOptions.java
Log:
Moved getConfResourceFile to ...configuration.ConfigurationResource.
Use local reference to Fop.logger.
Modify usage of logger to reduce verbosity.
Modify usage of OptionBuilder to stop complaints from Eclipse.
Revision ChangesPath
No revision
No revision
1.1.2.3 +170 -212 xml-fop/src/java/org/apache/fop/apps/Attic/FOPOptions.java
Index: FOPOptions.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Attic/FOPOptions.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FOPOptions.java 6 Mar 2004 06:16:56 - 1.1.2.2
+++ FOPOptions.java 8 Mar 2004 22:49:05 - 1.1.2.3
@@ -1,8 +1,6 @@
/*
- * $Id$
- *
*
- * Copyright 1999-2003 The Apache Software Foundation.
+ * Copyright 1999-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.
@@ -16,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
- *
+ * $Id$
*/
package org.apache.fop.apps;
@@ -45,6 +43,7 @@
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
+import org.apache.fop.configuration.ConfigurationResource;
import org.apache.fop.configuration.Configuration;
import org.apache.fop.configuration.ConfigurationReader;
@@ -116,7 +115,7 @@
private java.util.HashMap rendererOptions;
-private Logger log;
+private Logger log = Logger.getLogger(Fop.fopPackage);
private Vector xsltParams = null;
@@ -345,7 +344,7 @@
} catch (Exception e) {}
}
if (debug) {
-Fop.logger.config("base directory: " + baseDir);
+log.config("base directory: " + baseDir);
}
if (dumpConfig) {
@@ -356,7 +355,8 @@
// quiet mode - this is the last setting, so there is no way to
// supress the logging of messages during options processing
if (configuration.isTrue("quiet")) {
-Fop.logger.setLevel(Level.OFF);
+Fop.setLoggingLevel(Level.OFF);
+//log.setLevel(Level.OFF);
}
}
@@ -385,44 +385,6 @@
}
/**
- * Convenience class for common functionality required by the config
- * files.
- * @param fname the configuration file name.
- * @param classob the requesting class
- * @return an InputStream generated through a call to
- * getResourceAsStream on the context ClassLoader
- * or the ClassLoader for the conf class provided as an argument.
- */
-public InputStream getConfResourceFile(String fname, Class classob)
-throws FOPException
-{
-InputStream configfile = null;
-
-// Try to use Context Class Loader to load the properties file.
-try {
-java.lang.reflect.Method getCCL =
-Thread.class.getMethod("getContextClassLoader", new Class[0]);
-if (getCCL != null) {
-ClassLoader contextClassLoader =
-(ClassLoader)getCCL.invoke(Thread.currentThread(),
-new Object[0]);
-configfile = contextClassLoader.getResourceAsStream("conf/"
-+ fname);
-}
-} catch (Exception e) {}
-
-// the entry /conf/config.xml refers to a directory conf
-// which is a sibling of org
-if (configfile == null)
-configfile = classob.getResourceAsStream("/conf/" + fname);
-if (configfile == null) {
-throw new FOPException(
-"can't find configuration file " + fname);
-}
-return configfile;
-}
-
-/**
* Loads configuration file from a system standard place.
* The context class loader and the ConfigurationReader
* class loader are asked in turn to getResourceAsStream
@@ -433,11 +395,11 @@
*/
public void loadConfiguration(String fname)
throws FOPException {
-InputStream configfile =
-getConfResourceFile(fname, ConfigurationReader.class);
+InputStream configfile = ConfigurationResource.getResourceFile(
+"conf/" + fname, ConfigurationReader.class);
cvs commit: xml-fop/src/java/org/apache/fop/fo FOAttributes.java
pbwest 2004/03/08 13:54:55
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FOAttributes.java
Log:
Updated copyright dates
Revision ChangesPath
No revision
No revision
1.1.2.9 +7 -10 xml-fop/src/java/org/apache/fop/fo/Attic/FOAttributes.java
Index: FOAttributes.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FOAttributes.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FOAttributes.java 19 Feb 2004 03:11:56 - 1.1.2.8
+++ FOAttributes.java 8 Mar 2004 21:54:55 - 1.1.2.9
@@ -1,11 +1,6 @@
/*
- * FOAttributes.java
- * $Id$
- *
- * Created: Wed Nov 14 15:19:51 2001
- *
*
- * Copyright 1999-2003 The Apache Software Foundation.
+ * Copyright 1999-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.
@@ -19,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
- *
+ * $Id$
*
- * @author mailto:[EMAIL PROTECTED]">Peter B. West
- * @version $Revision$ $Name$
+ * Created: Wed Nov 14 15:19:51 2001
*/
package org.apache.fop.fo;
@@ -43,6 +37,9 @@
/**
* The FO Attributes data structures and methods needed to manage the
* Attributes associated with FO nodes.
+ *
+ * @author mailto:[EMAIL PROTECTED]">Peter B. West
+ * @version $Revision$ $Name$
*/
public class FOAttributes {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow FoInstreamForeignObject.java FoTableColumn.java FoRetrieveMarker.java FoPageNumberCitation.java FoPageNumber.java FoMultiPropertySet.java FoCharacter.java FoPcdata.java FoExternalGraphic.java FoNoFo.java FoInitialPropertySet.java
pbwest 2004/03/08 13:52:00
Modified:src/java/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoInstreamForeignObject.java FoTableColumn.java
FoRetrieveMarker.java FoPageNumberCitation.java
FoPageNumber.java FoMultiPropertySet.java
FoCharacter.java FoPcdata.java
FoExternalGraphic.java FoNoFo.java
FoInitialPropertySet.java
Log:
Updated copyright dates
Revision ChangesPath
No revision
No revision
1.1.2.7 +5 -7
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInstreamForeignObject.java
Index: FoInstreamForeignObject.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInstreamForeignObject.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FoInstreamForeignObject.java 25 Feb 2004 23:40:28 - 1.1.2.6
+++ FoInstreamForeignObject.java 8 Mar 2004 21:51:59 - 1.1.2.7
@@ -1,8 +1,6 @@
/*
- * $Id$
- *
*
- * Copyright 1999-2003 The Apache Software Foundation.
+ * Copyright 1999-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.
@@ -16,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
- *
- *
- * @author mailto:[EMAIL PROTECTED]">Peter B. West
+ * $Id$
*/
package org.apache.fop.fo.flow;
@@ -39,6 +35,8 @@
/**
* Implements the fo:instream-foreign-object flow object.
+ *
+ * @author mailto:[EMAIL PROTECTED]">Peter B. West
*/
public class FoInstreamForeignObject extends FOPageSeqNode {
1.1.2.7 +5 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableColumn.java
Index: FoTableColumn.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableColumn.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FoTableColumn.java25 Feb 2004 23:40:28 - 1.1.2.6
+++ FoTableColumn.java8 Mar 2004 21:51:59 - 1.1.2.7
@@ -1,8 +1,6 @@
/*
- * $Id$
- *
*
- * Copyright 1999-2003 The Apache Software Foundation.
+ * Copyright 1999-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.
@@ -16,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
- *
- *
- * @author mailto:[EMAIL PROTECTED]">Peter B. West
+ * $Id$
*/
package org.apache.fop.fo.flow;
@@ -39,6 +35,8 @@
/**
* Implements the fo:table-column flow object.
+ *
+ * @author mailto:[EMAIL PROTECTED]">Peter B. West
*/
public class FoTableColumn extends FOPageSeqNode {
1.1.2.7 +5 -7
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoRetrieveMarker.java
Index: FoRetrieveMarker.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoRetrieveMarker.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FoRetrieveMarker.java 25 Feb 2004 23:40:28 - 1.1.2.6
+++ FoRetrieveMarker.java 8 Mar 2004 21:51:59 - 1.1.2.7
@@ -1,8 +1,6 @@
/*
- * $Id$
- *
*
- * Copyright 1999-2003 The Apache Software Foundation.
+ * Copyright 1999-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.
@@ -16,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
- *
- *
- * @author mailto:[EMAIL PROTECTED]">Peter B. West
+ * $Id$
*/
package org.apache.fop.fo.flow;
@@ -38,6 +34,8 @@
/**
* Implements the fo:retrieve-marker flow object.
+ *
+ * @author mailto:[EMAIL PROTECTED]">Peter B. West
*/
public class FoRetrieveMarker extends FOPageSeqNode {
1.1.2.8 +5 -7
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageNumberCitation.java
Index: FoPageNumberCitation.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageNumberCitation.java,v
retrievin
cvs commit: xml-fop/src/java/org/apache/fop/configuration Configuration.java ConfigurationReader.java ConfigurationParser.java
pbwest 2004/03/08 13:40:41 Modified:src/java/org/apache/fop/configuration Tag: FOP_0-20-0_Alt-Design Configuration.java ConfigurationReader.java ConfigurationParser.java Log: Updated copyright dates Revision ChangesPath No revision No revision 1.1.2.9 +2 -4 xml-fop/src/java/org/apache/fop/configuration/Attic/Configuration.java Index: Configuration.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/configuration/Attic/Configuration.java,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -u -r1.1.2.8 -r1.1.2.9 --- Configuration.java8 Mar 2004 21:08:37 - 1.1.2.8 +++ Configuration.java8 Mar 2004 21:40:41 - 1.1.2.9 @@ -1,6 +1,5 @@ /* - * - * Copyright 1999-2003 The Apache Software Foundation. + * Copyright 1999-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. @@ -14,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * * $Id$ */ 1.1.2.6 +2 -5 xml-fop/src/java/org/apache/fop/configuration/Attic/ConfigurationReader.java Index: ConfigurationReader.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/configuration/Attic/ConfigurationReader.java,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- ConfigurationReader.java 6 Mar 2004 05:59:10 - 1.1.2.5 +++ ConfigurationReader.java 8 Mar 2004 21:40:41 - 1.1.2.6 @@ -1,8 +1,5 @@ /* - * $Id$ - * - * - * Copyright 1999-2003 The Apache Software Foundation. + * Copyright 1999-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. @@ -16,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * + * $Id$ */ package org.apache.fop.configuration; 1.1.2.5 +2 -5 xml-fop/src/java/org/apache/fop/configuration/Attic/ConfigurationParser.java Index: ConfigurationParser.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/configuration/Attic/ConfigurationParser.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- ConfigurationParser.java 6 Mar 2004 05:59:10 - 1.1.2.4 +++ ConfigurationParser.java 8 Mar 2004 21:40:41 - 1.1.2.5 @@ -1,8 +1,5 @@ /* - * $Id$ - * - * - * Copyright 1999-2003 The Apache Software Foundation. + * Copyright 1999-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. @@ -16,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * + * $Id$ */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow FoLeader.java FoBidiOverride.java FoMultiCase.java FoBlock.java FoMultiToggle.java FoInline.java FoTitle.java FoWrapper.java FoBasicLink.java
pbwest 2004/03/08 13:14:50
Modified:src/java/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoLeader.java FoBidiOverride.java FoMultiCase.java
FoBlock.java FoMultiToggle.java FoInline.java
FoTitle.java FoWrapper.java FoBasicLink.java
Log:
Logger name changed to 'log' in superclass
Revision ChangesPath
No revision
No revision
1.1.2.12 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoLeader.java
Index: FoLeader.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoLeader.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- FoLeader.java 25 Feb 2004 23:40:28 - 1.1.2.11
+++ FoLeader.java 8 Mar 2004 21:14:49 - 1.1.2.12
@@ -158,7 +158,7 @@
}
} catch(UnexpectedStartElementException e) {
ev = xmlevents.getStartElement();
-logger.warning
+log.warning
("Ignoring unexpected Start Element: "
+ ev.getQName());
ev = xmlevents.getEndElement(
1.1.2.12 +3 -3
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBidiOverride.java
Index: FoBidiOverride.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBidiOverride.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- FoBidiOverride.java 25 Feb 2004 23:40:28 - 1.1.2.11
+++ FoBidiOverride.java 8 Mar 2004 21:14:50 - 1.1.2.12
@@ -132,7 +132,7 @@
}
} catch(UnexpectedStartElementException e) {
ev = xmlevents.getStartElement();
-logger.warning
+log.warning
("Ignoring unexpected Start Element: "
+ ev.getQName());
ev = xmlevents.getEndElement(
1.1.2.12 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiCase.java
Index: FoMultiCase.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiCase.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- FoMultiCase.java 25 Feb 2004 23:40:28 - 1.1.2.11
+++ FoMultiCase.java 8 Mar 2004 21:14:50 - 1.1.2.12
@@ -134,7 +134,7 @@
}
} catch(UnexpectedStartElementException e) {
ev = xmlevents.getStartElement();
-logger.warning
+log.warning
("Ignoring unexpected Start Element: "
+ ev.getQName());
ev = xmlevents.getEndElement(
1.1.2.14 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBlock.java
Index: FoBlock.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBlock.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoBlock.java 25 Feb 2004 23:40:28 - 1.1.2.13
+++ FoBlock.java 8 Mar 2004 21:14:50 - 1.1.2.14
@@ -157,7 +157,7 @@
}
} catch(UnexpectedStartElementException e) {
ev = xmlevents.getStartElement();
-logger.warning
+log.warning
("Ignoring unexpected Start Element: "
+ ev.getQName());
ev = xmlevents.getEndElement(
1.1.2.12 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiToggle.java
Index: FoMultiToggle.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiToggle.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- FoMultiToggle.java25 Feb 2004 23:40:28 - 1.1.2.11
+++ FoMultiToggle.java8 Mar 2004 21:14:50 - 1.1.2.12
@@ -126,7 +126,7 @@
}
} catch(UnexpectedStartElementException e) {
ev = xmlevents.getStartElement();
-logger.warning
+log.warning
cvs commit: xml-fop/src/java/org/apache/fop/configuration Configuration.java
pbwest 2004/03/08 13:08:37
Modified:src/java/org/apache/fop/configuration Tag:
FOP_0-20-0_Alt-Design Configuration.java
Log:
Consolidated logging calls in dumpConfiguration
Revision ChangesPath
No revision
No revision
1.1.2.8 +27 -29
xml-fop/src/java/org/apache/fop/configuration/Attic/Configuration.java
Index: Configuration.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/configuration/Attic/Configuration.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- Configuration.java6 Mar 2004 05:59:10 - 1.1.2.7
+++ Configuration.java8 Mar 2004 21:08:37 - 1.1.2.8
@@ -23,8 +23,8 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.logging.Level;
import java.util.logging.Logger;
-
import org.apache.fop.apps.Fop;
/**
@@ -36,7 +36,7 @@
*/
public class Configuration {
-protected final Logger logger = Logger.getLogger(Fop.fopPackage);
+protected Logger logger = Logger.getLogger(Fop.fopPackage);
/**
* defines role types
*/
@@ -397,52 +397,50 @@
* debug methods, which writes out all information in this configuration
*/
public void dumpConfiguration() {
-String key;
-Object value;
-ArrayList list;
-HashMap map, configuration;
-Iterator iterator;
-String tmp;
-System.out.println("Dumping configuration: ");
+StringBuffer msg = new StringBuffer();
+logger.setLevel(Level.CONFIG);
HashMap[] configs = {
standardConfiguration, pdfConfiguration, awtConfiguration
};
for (int i = 0; i < configs.length; i++) {
-logger.config("--");
-configuration = configs[i];
+msg.append("\n--");
+HashMap configuration = configs[i];
Iterator iter = configuration.keySet().iterator();
while (iter.hasNext()) {
-key = (String)iter.next();
-logger.config("key: " + key);
-value = configuration.get(key);
+String key = (String)iter.next();
+msg.append("\nkey: " + key);
+Object value = configuration.get(key);
if (value instanceof String) {
-logger.config(" value: " + value);
+msg.append(" value: " + value);
} else if (value instanceof Boolean) {
-logger.config
+msg.append
(" value: " + ((Boolean)value).booleanValue());
} else if (value instanceof Integer) {
-logger.config
+msg.append
(" value: " + ((Integer)value).intValue());
} else if (value instanceof ArrayList) {
-list = (ArrayList)value;
-iterator = list.iterator();
-StringBuffer msg = new StringBuffer(" values: ");
+ArrayList list = (ArrayList)value;
+Iterator iterator = list.iterator();
+msg.append(" values: ");
+if (iterator.hasNext()) {
+msg.append("<" + iterator.next() + ">");
+}
while (iterator.hasNext()) {
-msg.append(iterator.next() + " - ");
+msg.append(", <" + iterator.next() + ">");
}
-logger.config(msg.toString());
} else if (value instanceof HashMap) {
-map = (HashMap)value;
-iterator = map.keySet().iterator();
-StringBuffer msg = new StringBuffer(" values: ");
+HashMap map = (HashMap)value;
+Iterator iterator = map.keySet().iterator();
+msg.append(" values: ");
while (iterator.hasNext()) {
-tmp = (String)iterator.next();
-msg.append(" " + tmp + ":" + map.get(tmp));
+String tmp = (String)iterator.next();
+msg.append("\n"
cvs commit: xml-fop/src/java/org/apache/fop/configuration ConfigurationResource.java
pbwest 2004/03/08 13:07:11 Added: src/java/org/apache/fop/configuration Tag: FOP_0-20-0_Alt-Design ConfigurationResource.java Log: Extracted configuration resource location into class methods of this (new) class. Revision ChangesPath No revision No revision 1.1.2.1 +106 -0 xml-fop/src/java/org/apache/fop/configuration/Attic/ConfigurationResource.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/apps InputHandler.java FOFileHandler.java XSLTInputHandler.java
pbwest 2004/03/08 13:02:28
Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
InputHandler.java FOFileHandler.java
XSLTInputHandler.java
Log:
Dropped createParser back to super class InputHandler.
Changed related methods from call to instance.
Revision ChangesPath
No revision
No revision
1.4.2.6 +31 -1 xml-fop/src/java/org/apache/fop/apps/InputHandler.java
Index: InputHandler.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/InputHandler.java,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -r1.4.2.5 -r1.4.2.6
--- InputHandler.java 6 Mar 2004 05:53:16 - 1.4.2.5
+++ InputHandler.java 8 Mar 2004 21:02:27 - 1.4.2.6
@@ -24,6 +24,7 @@
// Java
import java.net.URL;
+import java.util.logging.Logger;
import java.io.File;
/**
@@ -33,6 +34,7 @@
*/
public abstract class InputHandler {
+protected Logger log = Logger.getLogger(Fop.fopPackage);
/**
* Get the input source associated with this input handler.
* @return the input source
@@ -74,6 +76,34 @@
return new InputSource(new URL("file", null, path).toString());
} catch (java.net.MalformedURLException e) {
throw new Error("unexpected MalformedURLException");
+}
+}
+
+/**
+ * creates a SAX parser, using the value of org.xml.sax.parser
+ * defaulting to org.apache.xerces.parsers.SAXParser
+ *
+ * @return the created SAX parser
+ */
+protected XMLReader createParser() throws FOPException {
+String parserClassName = System.getProperty("org.xml.sax.parser");
+if (parserClassName == null) {
+parserClassName = "org.apache.xerces.parsers.SAXParser";
+}
+log.config("using SAX parser " + parserClassName);
+
+try {
+return (XMLReader)Class.forName(parserClassName).newInstance();
+} catch (ClassNotFoundException e) {
+throw new FOPException(e);
+} catch (InstantiationException e) {
+throw new FOPException("Could not instantiate "
+ + parserClassName, e);
+} catch (IllegalAccessException e) {
+throw new FOPException("Could not access " + parserClassName, e);
+} catch (ClassCastException e) {
+throw new FOPException(parserClassName + " is not a SAX driver",
+ e);
}
}
1.2.2.2 +3 -31 xml-fop/src/java/org/apache/fop/apps/FOFileHandler.java
Index: FOFileHandler.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/FOFileHandler.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- FOFileHandler.java6 Mar 2004 05:53:16 - 1.2.2.1
+++ FOFileHandler.java8 Mar 2004 21:02:27 - 1.2.2.2
@@ -29,7 +29,7 @@
* Manages input if it is an XSL-FO file.
*/
public class FOFileHandler extends InputHandler {
-
+
private File fofile = null;
private URL foURL = null;
@@ -68,39 +68,11 @@
}
/**
- * creates a SAX parser, using the value of org.xml.sax.parser
- * defaulting to org.apache.xerces.parsers.SAXParser
- *
- * @return the created SAX parser
- */
-protected static XMLReader createParser() throws FOPException {
-String parserClassName = System.getProperty("org.xml.sax.parser");
-if (parserClassName == null) {
-parserClassName = "org.apache.xerces.parsers.SAXParser";
-}
-Fop.logger.config("using SAX parser " + parserClassName);
-
-try {
-return (XMLReader)Class.forName(parserClassName).newInstance();
-} catch (ClassNotFoundException e) {
-throw new FOPException(e);
-} catch (InstantiationException e) {
-throw new FOPException("Could not instantiate "
- + parserClassName, e);
-} catch (IllegalAccessException e) {
-throw new FOPException("Could not access " + parserClassName, e);
-} catch (ClassCastException e) {
-throw new FOPException(parserClassName + " is not a SAX driver",
- e);
-}
-}
-
-/**
* Returns the fully qualified classname of the standard XML parser for FOP
* to use.
* @return the XML par
cvs commit: xml-fop/src/java/org/apache/fop/fo FOTree.java
pbwest 2004/03/08 12:46:29
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FOTree.java
Log:
Made log instance variable
Revision ChangesPath
No revision
No revision
1.1.2.8 +6 -4 xml-fop/src/java/org/apache/fop/fo/Attic/FOTree.java
Index: FOTree.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FOTree.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FOTree.java 6 Mar 2004 05:55:12 - 1.1.2.7
+++ FOTree.java 8 Mar 2004 20:46:29 - 1.1.2.8
@@ -19,6 +19,7 @@
package org.apache.fop.fo;
import java.util.logging.Level;
+import java.util.logging.Logger;
import org.apache.fop.apps.Fop;
import org.apache.fop.datastructs.Tree;
@@ -56,6 +57,7 @@
*/
protected PropertyParser exprParser;
+protected Logger log = Logger.getLogger(Fop.fopPackage);
/**
* @param xmlevents the buffer from which XmlEvents from the
* parser are read.
@@ -64,7 +66,7 @@
throws PropertyException
{
super();
-Level level = Fop.logger.getLevel();
+Level level = log.getLevel();
if (level.intValue() <= Level.FINE.intValue()) {
errorDump = true;
}
-
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/xml FoXmlSerialHandler.java
pbwest 2004/03/08 04:42:22
Modified:src/java/org/apache/fop/fo/pagination Tag:
FOP_0-20-0_Alt-Design FoLayoutMasterSet.java
src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
FoXmlSerialHandler.java
Log:
Change the way Logger is accessed
Revision ChangesPath
No revision
No revision
1.1.2.10 +4 -5
xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
Index: FoLayoutMasterSet.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoLayoutMasterSet.java25 Feb 2004 22:33:54 - 1.1.2.9
+++ FoLayoutMasterSet.java8 Mar 2004 12:42:22 - 1.1.2.10
@@ -26,7 +26,6 @@
import java.util.NoSuchElementException;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.Fop;
import org.apache.fop.datastructs.TreeException;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FOTree;
@@ -256,7 +255,7 @@
public long makePageId() {
if (++pageId == 0) {
++pageId; // 0 is invalid
-Fop.logger.warning("Page ID rollover.");
+log.warning("Page ID rollover.");
}
return pageId;
}
No revision
No revision
1.1.2.8 +6 -4
xml-fop/src/java/org/apache/fop/xml/Attic/FoXmlSerialHandler.java
Index: FoXmlSerialHandler.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/FoXmlSerialHandler.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoXmlSerialHandler.java 6 Mar 2004 05:56:58 - 1.1.2.7
+++ FoXmlSerialHandler.java 8 Mar 2004 12:42:22 - 1.1.2.8
@@ -21,6 +21,7 @@
import java.util.NoSuchElementException;
import java.util.logging.Level;
+import java.util.logging.Logger;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
@@ -53,6 +54,7 @@
private Namespaces namespaces;
private InputSource source;
private Thread foThread;
+protected Logger log = Logger.getLogger(Fop.fopPackage);
private boolean errorDump;
/**
@@ -68,7 +70,7 @@
this.source = source;
namespaces = events.getNamespaces();
parser.setContentHandler(this);
-Level level = Fop.logger.getLevel();
+Level level = log.getLevel();
if (level.intValue() <= Level.FINE.intValue()) {
errorDump = true;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/conf fop.system.properties logging.properties
pbwest 2004/03/08 04:38:32 Added: conf Tag: FOP_0-20-0_Alt-Design fop.system.properties logging.properties Log: For configuring java.util.logging Revision ChangesPath No revision No revision 1.1.2.1 +7 -0 xml-fop/conf/Attic/fop.system.properties 1.1.2.1 +41 -0 xml-fop/conf/Attic/logging.properties - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/apps FOPOptions.java
pbwest 2004/03/05 22:16:56
Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
FOPOptions.java
Log:
Used OptionBuilder for all args
Revision ChangesPath
No revision
No revision
1.1.2.2 +7 -3 xml-fop/src/java/org/apache/fop/apps/Attic/FOPOptions.java
Index: FOPOptions.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Attic/FOPOptions.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FOPOptions.java 6 Mar 2004 05:53:16 - 1.1.2.1
+++ FOPOptions.java 6 Mar 2004 06:16:56 - 1.1.2.2
@@ -519,8 +519,12 @@
// Add verbosity to options
options.addOptionGroup(verbosity);
// Add the dump-config option directly
-options.addOption(new Option(
-"x", "dump-config", NO_ARG, "Dump configuration settings"));
+options.addOption(
+OptionBuilder
+.withArgName("dump config")
+.withLongOpt("dump-config")
+.withDescription("Dump configuration settings")
+.create("x"));
// Add the config-file option directly
options.addOption(
OptionBuilder
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/build/classes/conf .cvsignore
pbwest 2004/03/05 22:08:39 Modified:build/classes/conf Tag: FOP_0-20-0_Alt-Design .cvsignore Log: Revision ChangesPath No revision No revision 1.1.2.2 +3 -1 xml-fop/build/classes/conf/Attic/.cvsignore Index: .cvsignore === RCS file: /home/cvs/xml-fop/build/classes/conf/Attic/.cvsignore,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- .cvsignore15 Jan 2004 02:46:24 - 1.1.2.1 +++ .cvsignore6 Mar 2004 06:08:39 - 1.1.2.2 @@ -1 +1,3 @@ -* \ No newline at end of file +config.dtd +config.xml +fop.xconf - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/.externalToolBuilders Alt-design clean.launch Alt-Design build.launch Alt-design clean build.launch
pbwest 2004/03/05 22:06:33 Added: .externalToolBuilders Tag: FOP_0-20-0_Alt-Design Alt-design clean.launch Alt-Design build.launch Alt-design clean build.launch Log: Revision ChangesPath No revision No revision No revision No revision No revision No revision No revision No revision No revision - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop .classpath .project
pbwest 2004/03/05 22:06:03 Modified:.Tag: FOP_0-20-0_Alt-Design .classpath .project Log: Revision ChangesPath No revision No revision 1.1.2.7 +2 -1 xml-fop/Attic/.classpath Index: .classpath === RCS file: /home/cvs/xml-fop/Attic/.classpath,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -r1.1.2.6 -r1.1.2.7 --- .classpath21 Jan 2004 11:15:41 - 1.1.2.6 +++ .classpath6 Mar 2004 06:06:03 - 1.1.2.7 @@ -7,7 +7,8 @@ - + + 1.1.2.6 +13 -2 xml-fop/Attic/.project Index: .project === RCS file: /home/cvs/xml-fop/Attic/.project,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- .project 5 Jan 2004 04:06:49 - 1.1.2.5 +++ .project 6 Mar 2004 06:06:03 - 1.1.2.6 @@ -11,7 +11,7 @@ LaunchConfigHandle <?xml version="1.0" encoding="UTF-8"?> -<launchConfiguration local="false" path="/FOP_Alt-Design/.externalToolBuilders/com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder.launch"/> +<launchConfiguration local="false" path="/FOP_Alt-Design/.externalToolBuilders/Alt-design clean.launch"/> @@ -22,7 +22,18 @@ LaunchConfigHandle <?xml version="1.0" encoding="UTF-8"?> -<launchConfiguration local="false" path="/FOP_Alt-Design/.externalToolBuilders/Alt-Design build.xml.launch"/> +<launchConfiguration local="false" path="/FOP_Alt-Design/.externalToolBuilders/Alt-design clean build.launch"/> + + + + + + org.eclipse.ui.externaltools.ExternalToolBuilder + + + LaunchConfigHandle + <?xml version="1.0" encoding="UTF-8"?> +<launchConfiguration local="false" path="/FOP_Alt-Design/.externalToolBuilders/Alt-Design build.launch"/> - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/conf fop.xconf
pbwest 2004/03/05 22:03:44 Added: conf Tag: FOP_0-20-0_Alt-Design fop.xconf Log: For later use in integrating alt-design with HEAD Revision ChangesPath No revision No revision 1.3.2.1 +0 -0 xml-fop/conf/fop.xconf Index: fop.xconf === RCS file: /home/cvs/xml-fop/conf/fop.xconf,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/lib xml-commons.LICENSE.txt
pbwest 2004/03/05 22:02:50 Added: lib Tag: FOP_0-20-0_Alt-Design xml-commons.LICENSE.txt Log: Revision ChangesPath No revision No revision 1.1.2.1 +60 -0 xml-fop/lib/Attic/xml-commons.LICENSE.txt - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/lib commons-cli-1.0.jar
pbwest 2004/03/05 22:00:19 Added: lib Tag: FOP_0-20-0_Alt-Design commons-cli-1.0.jar Log: Used for CLI option sprocessing in FOPOptions Revision ChangesPath No revision No revision 1.1.2.1 +127 -0xml-fop/lib/Attic/commons-cli-1.0.jar <> - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/configuration Configuration.java ConfigurationReader.java ConfigurationParser.java
pbwest 2004/03/05 21:59:10
Modified:src/java/org/apache/fop/configuration Tag:
FOP_0-20-0_Alt-Design Configuration.java
ConfigurationReader.java ConfigurationParser.java
Log:
Made Configuration instance.
Revision ChangesPath
No revision
No revision
1.1.2.7 +89 -62
xml-fop/src/java/org/apache/fop/configuration/Attic/Configuration.java
Index: Configuration.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/configuration/Attic/Configuration.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- Configuration.java19 Feb 2004 03:11:57 - 1.1.2.6
+++ Configuration.java6 Mar 2004 05:59:10 - 1.1.2.7
@@ -36,7 +36,7 @@
*/
public class Configuration {
-protected static final Logger logger = Logger.getLogger(Fop.fopPackage);
+protected final Logger logger = Logger.getLogger(Fop.fopPackage);
/**
* defines role types
*/
@@ -47,25 +47,45 @@
/**
* stores the configuration information
*/
-private static HashMap standardConfiguration = new HashMap(30);
-private static HashMap pdfConfiguration = new HashMap(20);
-private static HashMap awtConfiguration = new HashMap(20);
+private HashMap standardConfiguration = new HashMap();
+private HashMap pdfConfiguration = new HashMap();
+private HashMap awtConfiguration = new HashMap();
/**
* contains a HashMap of existing HashMaps
*/
-private static HashMap configuration = new HashMap(3);
-
-/**
- * loads the configuration types into the configuration HashMap
- */
-static {
+private HashMap configuration = new HashMap(3);
+
+public Configuration() {
configuration.put("standard", standardConfiguration);
configuration.put("pdf", pdfConfiguration);
configuration.put("awt", awtConfiguration);
}
-public static HashMap getConfiguration() {
+public Configuration(int role, HashMap config) {
+this();
+setRole(role, config);
+}
+
+public void setRole(int role, HashMap config) {
+switch (role) {
+case Configuration.STANDARD:
+standardConfiguration = config;
+break;
+case Configuration.PDF:
+pdfConfiguration = config;
+break;
+case Configuration.AWT:
+awtConfiguration = config;
+break;
+default:
+logger.warning(
+"Can't setup configuration. Unknown configuration role/target"
+);
+}
+}
+
+public HashMap getConfiguration() {
return configuration;
}
@@ -78,7 +98,7 @@
* convenience methods, which return the correct form.
* null if the key is not defined.
*/
-public static Object getValue(String key, int role) {
+public Object getValue(String key, int role) {
switch (role) {
case Configuration.STANDARD:
return standardConfiguration.get(key);
@@ -99,8 +119,8 @@
* @return String a string containing the value
* null if the key is not defined.
*/
-public static String getStringValue(String key, int role) {
-Object obj = Configuration.getValue(key, role);
+public String getStringValue(String key, int role) {
+Object obj = getValue(key, role);
if (obj instanceof String) {
return (String)obj;
} else {
@@ -116,8 +136,8 @@
* @return int a int containing the value
* -1 if the key is not defined.
*/
-public static int getIntValue(String key, int role) {
-Object obj = Configuration.getValue(key, role);
+public int getIntValue(String key, int role) {
+Object obj = getValue(key, role);
if (obj instanceof String) {
return Integer.parseInt((String)obj);
} else if (obj instanceof Integer) {
@@ -129,14 +149,14 @@
/**
- * convenience methods to access boolean values in the configuration
+ * convenience methods to access Boolean values in the configuration
* @param key a string containing the key for the configuration value
* role determines the configuration target
* @return Boolean true or false as value
* null if the key is not defined.
*/
-public static Boolean getBooleanValue(String key, int role) {
-Object obj = Configuration.getValue(key, role);
+public Boolean getBooleanObj
cvs commit: xml-fop/src/java/org/apache/fop/xml FoXmlSerialHandler.java
pbwest 2004/03/05 21:56:58
Modified:src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
FoXmlSerialHandler.java
Log:
Adjusted for Configuration instance, and use of java.util.logging
Revision ChangesPath
No revision
No revision
1.1.2.7 +12 -7
xml-fop/src/java/org/apache/fop/xml/Attic/FoXmlSerialHandler.java
Index: FoXmlSerialHandler.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/FoXmlSerialHandler.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FoXmlSerialHandler.java 19 Feb 2004 03:11:56 - 1.1.2.6
+++ FoXmlSerialHandler.java 6 Mar 2004 05:56:58 - 1.1.2.7
@@ -20,6 +20,7 @@
package org.apache.fop.xml;
import java.util.NoSuchElementException;
+import java.util.logging.Level;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
@@ -27,9 +28,8 @@
import org.xml.sax.helpers.AttributesImpl;
import org.xml.sax.helpers.DefaultHandler;
-import org.apache.fop.apps.Driver;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.configuration.Configuration;
+import org.apache.fop.apps.Fop;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.xml.Namespaces;
@@ -68,7 +68,10 @@
this.source = source;
namespaces = events.getNamespaces();
parser.setContentHandler(this);
-errorDump = Configuration.getBooleanValue("debugMode").booleanValue();
+Level level = Fop.logger.getLevel();
+if (level.intValue() <= Level.FINE.intValue()) {
+errorDump = true;
+}
}
public void setFoThread(Thread foThread) {
@@ -83,7 +86,9 @@
try {
parser.parse(source);
} catch (Exception e) {
-if (errorDump) Driver.dumpError(e);
+if (errorDump) {
+e.printStackTrace();
+}
if (foThread != null) {
try {
foThread.interrupt();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FOTree.java
pbwest 2004/03/05 21:55:13
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FOTree.java
Log:
Adjusted for Configuration instance, and use of java.util.logging
Revision ChangesPath
No revision
No revision
1.1.2.7 +13 -7 xml-fop/src/java/org/apache/fop/fo/Attic/FOTree.java
Index: FOTree.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FOTree.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FOTree.java 28 Jan 2004 06:24:30 - 1.1.2.6
+++ FOTree.java 6 Mar 2004 05:55:12 - 1.1.2.7
@@ -18,8 +18,9 @@
*/
package org.apache.fop.fo;
-import org.apache.fop.apps.Driver;
-import org.apache.fop.configuration.Configuration;
+import java.util.logging.Level;
+
+import org.apache.fop.apps.Fop;
import org.apache.fop.datastructs.Tree;
import org.apache.fop.datatypes.Numeric;
import org.apache.fop.datatypes.PropertyValue;
@@ -63,7 +64,10 @@
throws PropertyException
{
super();
-errorDump = Configuration.getBooleanValue("debugMode").booleanValue();
+Level level = Fop.logger.getLevel();
+if (level.intValue() <= Level.FINE.intValue()) {
+errorDump = true;
+}
this.xmlevents = xmlevents;
exprParser = new PropertyParser(this);
@@ -127,7 +131,9 @@
// Get the end of document
xmlevents.getEndDocument();
} catch (Exception e) {
-if (errorDump) Driver.dumpError(e);
+if (errorDump) {
+e.printStackTrace();
+}
if (parserThread != null) {
try {
parserThread.interrupt();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/apps FOPOptions.java FOFileHandler.java XSLTInputHandler.java Driver.java InputHandler.java Fop.java Options.java FOInputHandler.java
pbwest 2004/03/05 21:53:16
Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Driver.java InputHandler.java Fop.java
Added: src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
FOPOptions.java FOFileHandler.java
XSLTInputHandler.java
Removed: src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Options.java FOInputHandler.java
Log:
Aligned Alt-Design apps more with HEAD.
Made Configuration instance.
Echoed HEAD in using of InputHandler, FOFileHandler and XSLTInputHandler
Used org.apache.commons.cli.Options for CLI processing.
Revision ChangesPath
No revision
No revision
1.9.2.11 +42 -26xml-fop/src/java/org/apache/fop/apps/Driver.java
Index: Driver.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
retrieving revision 1.9.2.10
retrieving revision 1.9.2.11
diff -u -r1.9.2.10 -r1.9.2.11
--- Driver.java 19 Feb 2004 03:11:57 - 1.9.2.10
+++ Driver.java 6 Mar 2004 05:53:16 - 1.9.2.11
@@ -42,8 +42,34 @@
*/
public class Driver {
+
+/** private constant to indicate renderer was not defined. */
+private static final int NOT_SET = 0;
+/** Render to PDF. OutputStream must be set */
+public static final int RENDER_PDF = 1;
+/** Render to a GUI window. No OutputStream neccessary */
+public static final int RENDER_AWT = 2;
+/** Render to MIF. OutputStream must be set */
+public static final int RENDER_MIF = 3;
+/** Render to XML. OutputStream must be set */
+public static final int RENDER_XML = 4;
+/** Render to PRINT. No OutputStream neccessary */
+public static final int RENDER_PRINT = 5;
+/** Render to PCL. OutputStream must be set */
+public static final int RENDER_PCL = 6;
+/** Render to Postscript. OutputStream must be set */
+public static final int RENDER_PS = 7;
+/** Render to Text. OutputStream must be set */
+public static final int RENDER_TXT = 8;
+/** Render to SVG. OutputStream must be set */
+public static final int RENDER_SVG = 9;
+/** Render to RTF. OutputStream must be set */
+public static final int RENDER_RTF = 10;
+
/** If true, full error stacks are reported */
-private static boolean _errorDump = false;
+private boolean _errorDump = false;
+private Configuration configuration = null;
+private FOPOptions options = null;
private InputHandler inputHandler;
private XMLReader parser;
@@ -67,9 +93,18 @@
* Error handling, version and logging initialization.
*/
public Driver() {
-_errorDump =
-Configuration.getBooleanValue("debugMode").booleanValue();
String version = Version.getVersion();
+configuration = new Configuration();
+options = new FOPOptions(configuration);
+_errorDump = configuration.isTrue("debugMode");
+Fop.logger.config(version);
+}
+
+public Driver(String[] args, Configuration config, FOPOptions options) {
+String version = Version.getVersion();
+configuration = config;
+this.options = options;
+_errorDump = configuration.isTrue("debugMode");
Fop.logger.config(version);
}
@@ -103,7 +138,7 @@
* @throws FOPException
*/
public void run () throws FOPException {
-setInputHandler(Options.getInputHandler());
+setInputHandler(options.getInputHandler());
parser = inputHandler.getParser();
saxSource = inputHandler.getInputSource();
// Setting of namespace-prefixes feature no longer required
@@ -140,26 +175,7 @@
}
/**
- * Gets the parser Class name.
- *
- * @return a String with the value of the property
- * org.xml.sax.parser or the default value
- * org.apache.xerces.parsers.SAXParser.
- */
-public static final String getParserClassName() {
-String parserClassName = null;
-try {
-parserClassName = System.getProperty("org.xml.sax.parser");
-} catch (SecurityException se) {}
-
-if (parserClassName == null) {
-parserClassName = "org.apache.xerces.parsers.SAXParser";
-}
-return parserClassName;
-}
-
-/**
- * Sets the InputHandler for XML imput as specified in Options.
+ * Sets the InputHandler for XML imput as specified in FOPOptions.
* @param inputHandler the InputHandler
*/
public void setInputHandler(InputHandler inputHandler) {
@@ -180,7 +196
cvs commit: xml-fop/src/java/org/apache/fop/apps CommandLineStarter.java
pbwest 2004/02/29 21:24:38 Removed: src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design CommandLineStarter.java Log: Clean up unused file. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/apps Options.java
pbwest 2004/02/29 21:23:41
Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Options.java
Log:
Removed references to deleted file.
Revision ChangesPath
No revision
No revision
1.1.2.7 +1 -9 xml-fop/src/java/org/apache/fop/apps/Attic/Options.java
Index: Options.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Attic/Options.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- Options.java 19 Feb 2004 03:11:57 - 1.1.2.6
+++ Options.java 1 Mar 2004 05:23:40 - 1.1.2.7
@@ -654,14 +654,6 @@
}
}
-public static CommandLineStarter getStarter() {
-switch (outputmode) {
-
-default:
-return new CommandLineStarter();
-}
-}
-
public static String getInputMode() {
return Configuration.getStringValue("inputMode");
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/datastructs Node.java
pbwest 2004/02/27 18:10:06
Modified:src/java/org/apache/fop/datastructs Tag:
FOP_0-20-0_Alt-Design Node.java
Log:
Removed 'throws IndexOutOfBoundsException' clause from Node(Node) constructor.
Revision ChangesPath
No revision
No revision
1.1.2.8 +3 -4 xml-fop/src/java/org/apache/fop/datastructs/Attic/Node.java
Index: Node.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datastructs/Attic/Node.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- Node.java 4 Feb 2004 12:17:51 - 1.1.2.7
+++ Node.java 28 Feb 2004 02:10:06 - 1.1.2.8
@@ -108,8 +108,7 @@
* node.
*/
-public Node(Node parent)
-throws IndexOutOfBoundsException {
+public Node(Node parent) {
this.parent = parent;
if (parent != null) {
parent.addChild(this);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area/inline InlineArea.java InlineContainer.java
pbwest 2004/02/27 18:03:54
Modified:src/java/org/apache/fop/area/inline Tag:
FOP_0-20-0_Alt-Design InlineArea.java
InlineContainer.java
Log:
Constructor modifications to match superclasses
Revision ChangesPath
No revision
No revision
1.2.2.4 +15 -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.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- InlineArea.java 1 Feb 2004 08:12:00 - 1.2.2.3
+++ InlineArea.java 28 Feb 2004 02:03:54 - 1.2.2.4
@@ -21,6 +21,8 @@
import org.apache.fop.area.Area;
import org.apache.fop.datastructs.Node;
+import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.flow.FoPageSequence;
/**
* @author pbw
@@ -33,9 +35,14 @@
* @param index
* @throws IndexOutOfBoundsException
*/
-public InlineArea(Node parent, int index, Object areaSync)
+public InlineArea(
+FoPageSequence pageSeq,
+FONode generatedBy,
+Node parent,
+int index,
+Object sync)
throws IndexOutOfBoundsException {
-super(parent, index, areaSync);
+super(pageSeq, generatedBy, parent, index, sync);
// TODO Auto-generated constructor stub
}
@@ -43,8 +50,12 @@
* @param parent
* @throws IndexOutOfBoundsException
*/
-public InlineArea(Node parent, Object areaSync) throws
IndexOutOfBoundsException {
-super(parent, areaSync);
+public InlineArea(
+FoPageSequence pageSeq,
+FONode generatedBy,
+Node parent,
+Object sync) {
+super(pageSeq, generatedBy, parent, sync);
// TODO Auto-generated constructor stub
}
1.1.2.5 +10 -16
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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- InlineContainer.java 23 Feb 2004 13:18:37 - 1.1.2.4
+++ InlineContainer.java 28 Feb 2004 02:03:54 - 1.1.2.5
@@ -22,6 +22,8 @@
import org.apache.fop.area.AbstractReferenceArea;
import org.apache.fop.area.ReferenceArea;
import org.apache.fop.datastructs.Node;
+import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.flow.FoPageSequence;
/**
* @author pbw
@@ -33,22 +35,14 @@
/**
* @param parent
- * @param index
* @throws IndexOutOfBoundsException
*/
-public InlineContainer(Node parent, int index, Object areaSync)
-throws IndexOutOfBoundsException {
-super(parent, index, areaSync);
-// TODO Auto-generated constructor stub
-}
-
-/**
- * @param parent
- * @throws IndexOutOfBoundsException
- */
-public InlineContainer(Node parent, Object areaSync)
-throws IndexOutOfBoundsException {
-super(parent, areaSync);
+public InlineContainer(
+FoPageSequence pageSeq,
+FONode generatedBy,
+Node parent,
+Object areaSync) {
+super(pageSeq, generatedBy, parent, areaSync);
// TODO Auto-generated constructor stub
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/declarations FoDeclarations.java FoColorProfile.java
pbwest 2004/02/25 16:00:49 Modified:src/java/org/apache/fop/fo/declarations Tag: FOP_0-20-0_Alt-Design FoDeclarations.java FoColorProfile.java Log: Cleaned up Javadoc link to inaccessible method. Revision ChangesPath No revision No revision 1.1.2.7 +4 -5 xml-fop/src/java/org/apache/fop/fo/declarations/Attic/FoDeclarations.java Index: FoDeclarations.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/declarations/Attic/FoDeclarations.java,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -r1.1.2.6 -r1.1.2.7 --- FoDeclarations.java 19 Feb 2004 03:11:58 - 1.1.2.6 +++ FoDeclarations.java 26 Feb 2004 00:00:49 - 1.1.2.7 @@ -49,8 +49,7 @@ /** Map of Integer indices of sparsePropsSet array. It is indexed by the FO index of the FO associated with a given -position in the sparsePropsSet array. See -[EMAIL PROTECTED] org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}. +position in the sparsePropsSet array. */ private static final int[] sparsePropsMap; 1.1.2.6 +3 -4 xml-fop/src/java/org/apache/fop/fo/declarations/Attic/FoColorProfile.java Index: FoColorProfile.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/declarations/Attic/FoColorProfile.java,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- FoColorProfile.java 19 Feb 2004 03:11:58 - 1.1.2.5 +++ FoColorProfile.java 26 Feb 2004 00:00:49 - 1.1.2.6 @@ -44,8 +44,7 @@ /** Map of Integer indices of sparsePropsSet array. It is indexed by the FO index of the FO associated with a given -position in the sparsePropsSet array. See -[EMAIL PROTECTED] org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}. +position in the sparsePropsSet array. */ private static final int[] sparsePropsMap; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/pagination FoSimplePageMaster.java FoPageSequenceMaster.java FoRegionBody.java FoRegionStartEnd.java FoRegionBeforeAfter.java
pbwest 2004/02/25 16:00:29 Modified:src/java/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design FoSimplePageMaster.java FoPageSequenceMaster.java FoRegionBody.java FoRegionStartEnd.java FoRegionBeforeAfter.java Log: Cleaned up Javadoc link to inaccessible method. Revision ChangesPath No revision No revision 1.1.2.7 +3 -4 xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java Index: FoSimplePageMaster.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -r1.1.2.6 -r1.1.2.7 --- FoSimplePageMaster.java 19 Feb 2004 03:11:56 - 1.1.2.6 +++ FoSimplePageMaster.java 26 Feb 2004 00:00:29 - 1.1.2.7 @@ -49,8 +49,7 @@ /** Map of Integer indices of sparsePropsSet array. It is indexed by the FO index of the FO associated with a given -position in the sparsePropsSet array. See -[EMAIL PROTECTED] org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}. +position in the sparsePropsSet array. */ private static final int[] sparsePropsMap; 1.1.2.9 +3 -4 xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java Index: FoPageSequenceMaster.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -u -r1.1.2.8 -r1.1.2.9 --- FoPageSequenceMaster.java 28 Jan 2004 06:24:30 - 1.1.2.8 +++ FoPageSequenceMaster.java 26 Feb 2004 00:00:29 - 1.1.2.9 @@ -50,8 +50,7 @@ /** Map of Integer indices of sparsePropsSet array. It is indexed by the FO index of the FO associated with a given -position in the sparsePropsSet array. See -[EMAIL PROTECTED] org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}. +position in the sparsePropsSet array. */ private static final int[] sparsePropsMap; 1.1.2.6 +3 -4 xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoRegionBody.java Index: FoRegionBody.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoRegionBody.java,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- FoRegionBody.java 19 Feb 2004 03:11:55 - 1.1.2.5 +++ FoRegionBody.java 26 Feb 2004 00:00:29 - 1.1.2.6 @@ -46,8 +46,7 @@ /** Map of Integer indices of sparsePropsSet array. It is indexed by the FO index of the FO associated with a given -position in the sparsePropsSet array. See -[EMAIL PROTECTED] org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}. +position in the sparsePropsSet array. */ private static final int[] sparsePropsMap; 1.1.2.5 +3 -4 xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoRegionStartEnd.java Index: FoRegionStartEnd.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoRegionStartEnd.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- FoRegionStartEnd.java 19 Feb 2004 03:11:56 - 1.1.2.4 +++ FoRegionStartEnd.java 26 Feb 2004 00:00:29 - 1.1.2.5 @@ -45,8 +45,7 @@ /** Map of Integer indices of sparsePropsSet array. It is indexed by the FO index of the FO associated with a given -position in the sparsePropsSet array. See -[EMAIL PROTECTED] org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}. +position in the sparsePropsSet array. */ protected static final int[] sparsePropsMap; 1.1.2.5 +3 -4 xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoRegionBeforeAfter.java Index: FoRegionBeforeAfter.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoRegionBeforeAfter.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- FoRegionBeforeAfter.java 19 Feb 2004 03:11:56 - 1.1.2.4 +++ FoRegionBeforeAfter.java 26 Feb 2004 00:00:29 - 1.1.2.5 @@ -45,8 +45,7 @@ /** Map of Integer indices of sparsePropsSet array. It is indexed by the FO index of the FO associated with a
cvs commit: xml-fop/src/java/org/apache/fop/tools DocumentReader.java
pbwest 2004/02/25 15:59:56 Modified:src/java/org/apache/fop/tools Tag: FOP_0-20-0_Alt-Design DocumentReader.java Log: Removed Javadoc link to deprecated SAX1 method to stop Eclipse whining Revision ChangesPath No revision No revision 1.1.2.4 +3 -5 xml-fop/src/java/org/apache/fop/tools/DocumentReader.java Index: DocumentReader.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/tools/DocumentReader.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- DocumentReader.java 19 Feb 2004 03:11:58 - 1.1.2.3 +++ DocumentReader.java 25 Feb 2004 23:59:56 - 1.1.2.4 @@ -124,7 +124,7 @@ * The feature name is any fully-qualified URI. It is * possible for an XMLReader to recognize a feature name but * to be unable to set its value; this is especially true - * in the case of an adapter for a SAX1 [EMAIL PROTECTED] org.xml.sax.Parser Parser}, + * in the case of an adapter for a SAX1, * which has no way of affecting whether the underlying parser is * validating, for example. * @@ -163,8 +163,7 @@ * The property name is any fully-qualified URI. It is * possible for an XMLReader to recognize a property name but * to be unable to return its state; this is especially true - * in the case of an adapter for a SAX1 [EMAIL PROTECTED] org.xml.sax.Parser - * Parser}. + * in the case of an adapter for a SAX1. * * XMLReaders are not required to recognize any specific * property names, though an initial core set is documented for @@ -195,8 +194,7 @@ * The property name is any fully-qualified URI. It is * possible for an XMLReader to recognize a property name but * to be unable to set its value; this is especially true - * in the case of an adapter for a SAX1 [EMAIL PROTECTED] org.xml.sax.Parser - * Parser}. + * in the case of an adapter for a SAX1. * * XMLReaders are not required to recognize setting * any specific property names, though a core set is provided with - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FoRoot.java
pbwest 2004/02/25 15:54:47 Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FoRoot.java Log: Cleaned up Javadoc link to inaccessible method. Revision ChangesPath No revision No revision 1.1.2.11 +4 -5 xml-fop/src/java/org/apache/fop/fo/Attic/FoRoot.java Index: FoRoot.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FoRoot.java,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -u -r1.1.2.10 -r1.1.2.11 --- FoRoot.java 28 Jan 2004 06:24:30 - 1.1.2.10 +++ FoRoot.java 25 Feb 2004 23:54:47 - 1.1.2.11 @@ -51,8 +51,7 @@ /** Map of Integer indices of sparsePropsSet array. It is indexed by the FO index of the FO associated with a given -position in the sparsePropsSet array. See -[EMAIL PROTECTED] org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}. +position in the sparsePropsSet array. */ private static final int[] sparsePropsMap; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow FoFootnote.java FoTableColumn.java FoTableBody.java FoRetrieveMarker.java FoMultiCase.java FoMultiPropertySet.java FoListBlock.java FoListItem.java FoTable.java FoPageSequence.java FoFloat.java FoInstreamForeignObject.java FoStaticContent.java FoTitle.java FoFlow.java FoBasicLink.java FoInitialPropertySet.java FoBidiOverride.java FoLeader.java FoTableCell.java FoPageNumberCitation.java FoBlockContainer.java FoMultiToggle.java FoTableRow.java FoMultiProperties.java FoMultiSwitch.java FoWrapper.java FoMarker.java FoTableAndCaption.java FoListItemLabel.java FoTableHeader.java FoPageNumber.java FoFootnoteBody.java FoCharacter.java FoBlock.java FoListItemBody.java FoInline.java FoPcdata.java FoExternalGraphic.java FoNoFo.java FoTableCaption.java FoTableFooter.java FoInlineContainer.java
pbwest 2004/02/25 15:40:30 Modified:src/java/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design FoFootnote.java FoTableColumn.java FoTableBody.java FoRetrieveMarker.java FoMultiCase.java FoMultiPropertySet.java FoListBlock.java FoListItem.java FoTable.java FoPageSequence.java FoFloat.java FoInstreamForeignObject.java FoStaticContent.java FoTitle.java FoFlow.java FoBasicLink.java FoInitialPropertySet.java FoBidiOverride.java FoLeader.java FoTableCell.java FoPageNumberCitation.java FoBlockContainer.java FoMultiToggle.java FoTableRow.java FoMultiProperties.java FoMultiSwitch.java FoWrapper.java FoMarker.java FoTableAndCaption.java FoListItemLabel.java FoTableHeader.java FoPageNumber.java FoFootnoteBody.java FoCharacter.java FoBlock.java FoListItemBody.java FoInline.java FoPcdata.java FoExternalGraphic.java FoNoFo.java FoTableCaption.java FoTableFooter.java FoInlineContainer.java Log: Cleaned up Javadoc link to inaccessible method. Revision ChangesPath No revision No revision 1.1.2.9 +3 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFootnote.java Index: FoFootnote.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFootnote.java,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -u -r1.1.2.8 -r1.1.2.9 --- FoFootnote.java 19 Feb 2004 03:11:38 - 1.1.2.8 +++ FoFootnote.java 25 Feb 2004 23:40:28 - 1.1.2.9 @@ -61,8 +61,7 @@ /** Map of Integer indices of sparsePropsSet array. It is indexed by the FO index of the FO associated with a given -position in the sparsePropsSet array. See -[EMAIL PROTECTED] org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}. +position in the sparsePropsSet array. */ private static final int[] sparsePropsMap; 1.1.2.6 +3 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableColumn.java Index: FoTableColumn.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableColumn.java,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- FoTableColumn.java19 Feb 2004 03:11:38 - 1.1.2.5 +++ FoTableColumn.java25 Feb 2004 23:40:28 - 1.1.2.6 @@ -47,8 +47,7 @@ /** Map of Integer indices of sparsePropsSet array. It is indexed by the FO index of the FO associated with a given -position in the sparsePropsSet array. See -[EMAIL PROTECTED] org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}. +position in the sparsePropsSet array. */ private static final int[] sparsePropsMap; 1.1.2.10 +3 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableBody.java Index: FoTableBody.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableBody.java,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -u -r1.1.2.9 -r1.1.2.10 --- FoTableBody.java 19 Feb 2004 03:11:38 - 1.1.2.9 +++ FoTableBody.java 25 Feb 2004 23:40:28 - 1.1.2.10 @@ -50,8 +50,7 @@ /** Map of Integer indices of sparsePropsSet array. It is indexed by the FO index of the FO associated with a given -position in the sparsePropsSet array. See -[EMAIL PROTECTED] org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}. +position in the sparsePropsSet array. */ private static final int[] sparsePropsMap; 1.1.2.6 +3 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoRetrieveMarker.java Index: FoRetrieveMarker.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoRetrieveMarker.java,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- FoRetrieveMarker.java 19 Feb 2004 03:11:38 - 1.1.2.5 +++ FoRetrieveMarker.java 25 Feb 2004 23:40:28 - 1.1.2.6 @@ -46,8 +46,7 @@ /** Map of Integer indices of sparsePropsSet array. It is indexed by the FO index of the FO associated with a given -position in the sparsePropsSet array. See
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties LeaderAlignment.java
pbwest 2004/02/25 15:12:34
Modified:src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design LeaderAlignment.java
Log:
Renamed variables called 'enum' at the behst of jikes 1.19
Revision ChangesPath
No revision
No revision
1.1.2.4 +3 -3
xml-fop/src/java/org/apache/fop/fo/properties/Attic/LeaderAlignment.java
Index: LeaderAlignment.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/LeaderAlignment.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- LeaderAlignment.java 19 Feb 2004 03:11:39 - 1.1.2.3
+++ LeaderAlignment.java 25 Feb 2004 23:12:34 - 1.1.2.4
@@ -55,8 +55,8 @@
,"reference-area"
,"page"
};
-public int getEnumIndex(String enum) throws PropertyException {
-return enumValueToIndex(enum, rwEnums);
+public int getEnumIndex(String enumval) throws PropertyException {
+return enumValueToIndex(enumval, rwEnums);
}
public String getEnumText(int index) {
return rwEnums[index];
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties StartingState.java
pbwest 2004/02/25 15:10:22
Modified:src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design StartingState.java
Log:
Renamed variables called 'enum' at the behst of jikes 1.19
Revision ChangesPath
No revision
No revision
1.1.2.4 +3 -3
xml-fop/src/java/org/apache/fop/fo/properties/Attic/StartingState.java
Index: StartingState.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/StartingState.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- StartingState.java19 Feb 2004 03:11:41 - 1.1.2.3
+++ StartingState.java25 Feb 2004 23:10:22 - 1.1.2.4
@@ -63,8 +63,8 @@
,"show"
,"hide"
};
-public int getEnumIndex(String enum) throws PropertyException {
-return enumValueToIndex(enum, rwEnums);
+public int getEnumIndex(String enumval) throws PropertyException {
+return enumValueToIndex(enumval, rwEnums);
}
public String getEnumText(int index) {
return rwEnums[index];
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties BorderStartWidth.java RetrievePosition.java ScalingMethod.java PageBreakCommon.java LineHeightShiftAdjustment.java Property.java RegionName.java RenderingIntent.java LeaderPatternWidth.java RelativeAlign.java BackgroundRepeat.java Scaling.java TargetPresentationContext.java WhiteSpaceTreatment.java UnicodeBidi.java LinefeedTreatment.java BorderBeforeWidth.java RetrieveBoundary.java SwitchTo.java BlankOrNotBlank.java BorderLeftWidth.java BorderEndWidth.java PrecedenceCommon.java ShowDestination.java WordSpacingMinimum.java DominantBaseline.java TextTransform.java FontWeight.java BorderCommonWidth.java BorderCommonStyle.java AbsolutePosition.java RuleStyle.java BorderTopWidth.java SuppressAtLineBreak.java BackgroundPosition.java RelativePosition.java Direction.java BorderCollapse.java WordSpacingOptimum.java Position.java BreakCommon.java PageBreakInside.java ColorTransparent.java WhiteSpace.java PagePosition.java TextAlign.java ColorCommon.java VerticalAlign.java BorderAfterWidth.java Conditionality.java Float.java ActiveState.java BaselineShift.java InitialPageNumber.java DisplayAlign.java Span.java BorderBottomWidth.java WordSpacingMaximum.java LeaderPattern.java TextAlignLast.java WritingMode.java Visibility.java WordSpacing.java Keep.java LetterValue.java FontSelectionStrategy.java FontSize.java TargetStylesheet.java BackgroundPositionVertical.java TableLayout.java FontStyle.java Clear.java BackgroundAttachment.java AlignmentAdjust.java OddOrEven.java HyphenationLadderCount.java BorderRightWidth.java ForcePageCount.java FontVariant.java Font.java BorderColor.java LetterSpacing.java AlignmentBaseline.java BorderWidth.java Size.java Overflow.java IntrusionDisplace.java FontStretch.java LineHeight.java TextAltitude.java HyphenationKeep.java CaptionSide.java PageHeightWidth.java EmptyCells.java BackgroundPositionHorizontal.java BorderStyle.java WrapOption.java LineStackingStrategy.java ColorNonTransparent.java ContentDimension.java Background.java MediaUsage.java TargetProcessingContext.java MaximumRepeats.java TextDepth.java
pbwest 2004/02/25 15:09:12 Modified:src/java/org/apache/fop/fo/properties Tag: FOP_0-20-0_Alt-Design BorderStartWidth.java RetrievePosition.java ScalingMethod.java PageBreakCommon.java LineHeightShiftAdjustment.java Property.java RegionName.java RenderingIntent.java LeaderPatternWidth.java RelativeAlign.java BackgroundRepeat.java Scaling.java TargetPresentationContext.java WhiteSpaceTreatment.java UnicodeBidi.java LinefeedTreatment.java BorderBeforeWidth.java RetrieveBoundary.java SwitchTo.java BlankOrNotBlank.java BorderLeftWidth.java BorderEndWidth.java PrecedenceCommon.java ShowDestination.java WordSpacingMinimum.java DominantBaseline.java TextTransform.java FontWeight.java BorderCommonWidth.java BorderCommonStyle.java AbsolutePosition.java RuleStyle.java BorderTopWidth.java SuppressAtLineBreak.java BackgroundPosition.java RelativePosition.java Direction.java BorderCollapse.java WordSpacingOptimum.java Position.java BreakCommon.java PageBreakInside.java ColorTransparent.java WhiteSpace.java PagePosition.java TextAlign.java ColorCommon.java VerticalAlign.java BorderAfterWidth.java Conditionality.java Float.java ActiveState.java BaselineShift.java InitialPageNumber.java DisplayAlign.java Span.java BorderBottomWidth.java WordSpacingMaximum.java LeaderPattern.java TextAlignLast.java WritingMode.java Visibility.java WordSpacing.java Keep.java LetterValue.java FontSelectionStrategy.java FontSize.java TargetStylesheet.java BackgroundPositionVertical.java TableLayout.java FontStyle.java Clear.java BackgroundAttachment.java AlignmentAdjust.java OddOrEven.java HyphenationLadderCount.java BorderRightWidth.java ForcePageCount.java FontVariant.java Font.java BorderColor.java LetterSpacing.java AlignmentBaseline.java BorderWidth.java Size.java Overflow.java IntrusionDisplace.java FontStretch.java LineHeight.java TextAltitude.java HyphenationKeep.java CaptionSide.java PageHeightWidth.java EmptyCells.java BackgroundPositionHorizontal.java BorderStyle.java WrapOption.java LineStackingStrategy.java ColorNonTransparent.java ContentDimension.java Background.java MediaUsage.java TargetProcessingContext.java MaximumRepeats.java TextDepth.java Log: Renamed variables called 'enum' at the behst of jikes 1.19 Revision ChangesPath No revision No revision 1.1.2.4 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderStartWidth.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderStartWidth.java.diff?r1=1.1.2.3&r2=1.1.2.4 1.1.2.4 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/RetrievePosition.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/RetrievePosition.java.diff?r1=1.1.2.3&r2=1.1.2.4 1.1.2.4 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/ScalingMethod.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/ScalingMethod.java.diff?r1=1.1.2.3&r2=1.1.2.4 1.1.2.5 +7 -7 xml-fop/src/java/org/apache/fop/fo/properties/Attic/PageBreakCommon.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/PageBreakCommon.java.diff?r1=1.1.2.4&r2=1.1.2.5 1.1.2.4 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/LineHeightShiftAdjustment.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/LineHeightShiftAdjustment.java.diff?r1=1.1.2.3&r2=1.1.2.4 1.1.2.9 +13 -13xml-fop/src/java/org/apache/fop/fo/properties/Property.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/properties/Property.java.diff?r1=1.1.2.8&r2=1.1.2.9 1.1.2.5 +4 -4
cvs commit: xml-fop/src/java/org/apache/fop/fo/pagination FoLayoutMasterSet.java
pbwest 2004/02/25 14:33:54
Modified:src/java/org/apache/fop/fo/pagination Tag:
FOP_0-20-0_Alt-Design FoLayoutMasterSet.java
Log:
Added makePageId method.
Cleaned up Javadoc link to inaccessible method.
Revision ChangesPath
No revision
No revision
1.1.2.9 +26 -6
xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
Index: FoLayoutMasterSet.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoLayoutMasterSet.java28 Jan 2004 06:24:30 - 1.1.2.8
+++ FoLayoutMasterSet.java25 Feb 2004 22:33:54 - 1.1.2.9
@@ -26,6 +26,7 @@
import java.util.NoSuchElementException;
import org.apache.fop.apps.FOPException;
+import org.apache.fop.apps.Fop;
import org.apache.fop.datastructs.TreeException;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FOTree;
@@ -51,8 +52,7 @@
/** Map of Integer indices of sparsePropsSet array.
It is indexed by the FO index of the FO associated with a given
-position in the sparsePropsSet array. See
-[EMAIL PROTECTED] org.apache.fop.fo.FONode#sparsePropsSet
FONode.sparsePropsSet}.
+position in the sparsePropsSet array.
*/
private static final int[] sparsePropsMap;
@@ -240,5 +240,25 @@
public Map getPageSequenceMasters() {
return finalPageSequenceMasters;
}
-
+
+/**
+ * The genrator field for page ids.
+ * These page ids generated within any given instance of
+ * FoLayoutMasterSet increase monotonically from 1 through
+ * the range of values of long. They wrap around when that
+ * range is exhausted, but the value 0 is never returned.
+ */
+private long pageId = 0;
+
+/**
+ * @return a long page id not equal to 0.
+ */
+public long makePageId() {
+if (++pageId == 0) {
+++pageId; // 0 is invalid
+Fop.logger.warning("Page ID rollover.");
+}
+return pageId;
+}
+
}// FoLayoutMasterSet
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/datastructs SyncedNode.java
pbwest 2004/02/25 14:23:11
Modified:src/java/org/apache/fop/datastructs Tag:
FOP_0-20-0_Alt-Design SyncedNode.java
Log:
Made sync object mutable.
Added getter and setter.
Added constructor for self-synced tree root object.
Revision ChangesPath
No revision
No revision
1.1.2.4 +32 -9
xml-fop/src/java/org/apache/fop/datastructs/Attic/SyncedNode.java
Index: SyncedNode.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/datastructs/Attic/SyncedNode.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- SyncedNode.java 24 Feb 2004 07:56:34 - 1.1.2.3
+++ SyncedNode.java 25 Feb 2004 22:23:11 - 1.1.2.4
@@ -28,9 +28,25 @@
*/
public class SyncedNode extends Node implements Cloneable {
-public final Object sync;
+protected Object sync;
/**
+ * @return the sync
+ */
+public Object getSync() {
+synchronized (sync) {
+return sync;
+}
+}
+/**
+ * @param sync to set
+ */
+public void setSync(Object sync) {
+synchronized (this.sync) {
+this.sync = sync;
+}
+}
+/**
* @param sync the object on which synchronization for this
* node will occur
*/
@@ -40,6 +56,13 @@
}
/**
+ * No argument constructor. Assumes that this node will sync on itself.
+ */
+public SyncedNode() {
+super();
+this.sync = this;
+}
+/**
* @param parent Node of this
* @param index of this in children of parent
* @param sync the object on which synchronization for this
@@ -62,7 +85,7 @@
throws IndexOutOfBoundsException {
super(parent);
this.sync = sync;
-}
+}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area PageViewport.java
pbwest 2004/02/25 14:02:25
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
PageViewport.java
Log:
Added long pageId.
Modified constructors to match.
Removed getKey() method.
Added constructor for self-synchronized tree root object.
Revision ChangesPath
No revision
No revision
1.2.2.2 +42 -23xml-fop/src/java/org/apache/fop/area/PageViewport.java
Index: PageViewport.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/PageViewport.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- PageViewport.java 24 Feb 2004 07:54:00 - 1.2.2.1
+++ PageViewport.java 25 Feb 2004 22:02:25 - 1.2.2.2
@@ -41,7 +41,8 @@
public class PageViewport
extends Area
implements Viewport, Resolveable, Cloneable {
-
+
+private long pageId = 0;
private PageRefArea pageRefArea;
private Rectangle2D viewArea;
private boolean clip = false;
@@ -66,22 +67,45 @@
private Map markerLastAny = null;
/**
+ * Create a page viewport at the root of a tree, synchronized on itself,
+ * with a given page reference area and viewport dimensions
+ * @param pageId
+ * @param p the page reference area for the contents of this page
+ * @param bounds the dimensions of the viewport
+ */
+public PageViewport(long pageId, PageRefArea p, Rectangle2D bounds) {
+super();
+this.pageId = pageId;
+pageRefArea = p;
+viewArea = bounds;
+}
+
+/**
* Create a page viewport.
- * @param p the page reference area that holds the contents
- * @param bounds the bounds of this viewport
+ * @param parent node of this viewport
+ * @param sync object on which teh Area is synchronized
+ * @param pageId the unique identifier of this page
+ * @param p the page reference area for the contents of this page
+ * @param bounds the dimensions of the viewport
*/
public PageViewport(
-Node parent, Object areaSync, PageRefArea p, Rectangle2D bounds) {
-super(parent, areaSync);
+Node parent, Object sync, long pageId,
+PageRefArea p, Rectangle2D bounds) {
+super(parent, sync);
+this.pageId = pageId;
pageRefArea = p;
viewArea = bounds;
}
/**
- * Create a page viewport.
- */
-public PageViewport(Node parent, Object areaSync) {
-super(parent, areaSync);
+ * Create a page viewport with a given parent node, sync object and ID
+ * @param parent
+ * @param sync
+ * @param pageId
+ */
+public PageViewport(Node parent, Object sync, long pageId) {
+super(parent, sync);
+this.pageId = pageId;
pageRefArea = null;
viewArea = null;
}
@@ -127,17 +151,6 @@
}
/**
- * Get the key for this page viewport.
- * This is used so that a serializable key can be used to
- * lookup the page or some other reference.
- *
- * @return a unique page viewport key for this area tree
- */
-public String getKey() {
-return toString();
-}
-
-/**
* Add an unresolved id to this page.
* All unresolved ids for the contents of this page are
* added to this page. This is so that the resolvers can be
@@ -363,9 +376,15 @@
* @return a copy of this page and associated viewports
*/
public Object clone() {
-PageRefArea p = (PageRefArea)pageRefArea.clone();
-PageViewport ret = new PageViewport(parent, sync, p,
(Rectangle2D)viewArea.clone());
-return ret;
+PageViewport pv;
+try {
+pv = (PageViewport)(super.clone());
+} catch (CloneNotSupportedException e) {
+throw new RuntimeException(e);
+}
+pageId = 0; // N.B. This invalidates the page id
+pv.pageRefArea = (PageRefArea)pageRefArea.clone();
+return pv;
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area Area.java
pbwest 2004/02/25 04:28:58
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
Area.java
Log:
Added a no-argument constructor to build a subtree root area synced on itself
Revision ChangesPath
No revision
No revision
1.1.2.6 +7 -0 xml-fop/src/java/org/apache/fop/area/Area.java
Index: Area.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Area.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Area.java 23 Feb 2004 13:18:37 - 1.1.2.5
+++ Area.java 25 Feb 2004 12:28:58 - 1.1.2.6
@@ -72,6 +72,13 @@
}
/**
+ * Construct an Area which is the root of a tree, and is
+ * synchronized on itself
+ */
+public Area() {
+super();
+}
+/**
* @return the bPDim
*/
public Integer getBPDim() {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/apps Fop.java
pbwest 2004/02/24 20:50:17
Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Fop.java
Log:
Logger instance made public
Revision ChangesPath
No revision
No revision
1.1.2.7 +2 -2 xml-fop/src/java/org/apache/fop/apps/Fop.java
Index: Fop.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Fop.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- Fop.java 19 Feb 2004 03:11:57 - 1.1.2.6
+++ Fop.java 25 Feb 2004 04:50:17 - 1.1.2.7
@@ -36,7 +36,7 @@
*/
public static final String fopPackage = "org.apache.fop";
-protected static final Logger logger = Logger.getLogger(fopPackage);
+public static final Logger logger = Logger.getLogger(fopPackage);
public static void main(String[] args) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area FootnoteRefArea.java BeforeFloatRefArea.java
pbwest 2004/02/24 05:41:27 Added: src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design FootnoteRefArea.java BeforeFloatRefArea.java Log: More Area stubs Revision ChangesPath No revision No revision 1.1.2.1 +55 -0 xml-fop/src/java/org/apache/fop/area/Attic/FootnoteRefArea.java 1.1.2.1 +55 -0 xml-fop/src/java/org/apache/fop/area/Attic/BeforeFloatRefArea.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/area RegionBodyRefArea.java
pbwest 2004/02/24 00:53:03
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
RegionBodyRefArea.java
Log:
Updated Licence to 2.0
Adjusted clone()
Revision ChangesPath
No revision
No revision
1.1.2.2 +12 -47
xml-fop/src/java/org/apache/fop/area/Attic/RegionBodyRefArea.java
Index: RegionBodyRefArea.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionBodyRefArea.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- RegionBodyRefArea.java24 Feb 2004 07:54:00 - 1.1.2.1
+++ RegionBodyRefArea.java24 Feb 2004 08:53:03 - 1.1.2.2
@@ -1,52 +1,19 @@
/*
- * $Id$
- *
- *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.
+ * Copyright 1999-2004 The Apache Software Foundation.
*
- * 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.
+ * 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.
*
- * 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/>.
+ * $Id$
*/
package org.apache.fop.area;
@@ -162,9 +129,7 @@
* @return a shallow copy of this object
*/
public Object clone() {
-RegionBodyRefArea br = new RegionBodyRefArea(parent, sync);
-br.setCoordTransformer(getCoordTransformer());
-br.setIPDim(getIPDim());
+RegionBodyRefArea br = (RegionBodyRefArea)(super.clone());
br.columnGap = c
cvs commit: xml-fop/src/java/org/apache/fop/area TransformMatrix.java
pbwest 2004/02/23 23:57:51 Removed: src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design TransformMatrix.java Log: Renamed toi CoordTransformer - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
