cvs commit: xml-fop/src/org/apache/fop/datatypes Inherit.java
pbwest 2002/09/17 22:52:58
Modified:src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
Inherit.java
Log:
Two-arg constructor made public.
Revision ChangesPath
No revision
No revision
1.1.2.6 +5 -6 xml-fop/src/org/apache/fop/datatypes/Attic/Inherit.java
Index: Inherit.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Inherit.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Inherit.java 16 Sep 2002 05:35:07 - 1.1.2.5
+++ Inherit.java 18 Sep 2002 05:52:58 - 1.1.2.6
@@ -4,6 +4,7 @@
import org.apache.fop.fo.expr.PropertyValue;
import org.apache.fop.fo.expr.PropertyTriplet;
import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.FONode;
import org.apache.fop.datatypes.IndirectValue;
/*
@@ -31,15 +32,13 @@
/**
* Override the dual-property constructor of ttIndirectValue/tt.
- * i'inherit'/i cannot draw a value from a different property from
- * the one on which it was defined, so this constructor is private.
* @param property the ttint/tt index of the property on which
* this value is being defined.
* @param sourceProperty the ttint/tt index of the property from
* which the inherited value is derived.
* @exception PropertyException
*/
-private Inherit(int property, int sourceProperty)
+public Inherit(int property, int sourceProperty)
throws PropertyException
{
super(property, PropertyValue.INHERIT, sourceProperty);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datatypes InheritedValue.java
pbwest 2002/09/17 22:55:24
Modified:src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
InheritedValue.java
Log:
Changes to validate().
Revision ChangesPath
No revision
No revision
1.1.2.2 +15 -21xml-fop/src/org/apache/fop/datatypes/Attic/InheritedValue.java
Index: InheritedValue.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/InheritedValue.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- InheritedValue.java 15 Sep 2002 05:47:50 - 1.1.2.1
+++ InheritedValue.java 18 Sep 2002 05:55:24 - 1.1.2.2
@@ -4,6 +4,8 @@
import org.apache.fop.fo.expr.PropertyValue;
import org.apache.fop.fo.expr.PropertyTriplet;
import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.datatypes.IndirectValue;
/*
@@ -88,30 +90,22 @@
/**
* validate the iInheritedValue/i against the associated property.
+ * TODO: validate is a total mess. It will all require a rethink
+ * when the expression parsing is being finalised.
+ * @param type - an ttint/tt bitmap of datatypes. Irrelevant here.
*/
-public void validate(int property) throws PropertyException {
+public void validate(int type) throws PropertyException {
String propStr = Unknown;
String spropStr = Unknown;
-int sprop = getSourceProperty();
-if (property != sprop) {
-try {
-propStr = PropNames.getPropertyName(this.property);
-spropStr = PropNames.getPropertyName(sprop);
-} catch (PropertyException e) {}
-throw new PropertyException
-(InheritedValue for property + this.property
- + ( + propStr + ) can only be validated against its
- + source property + sprop + ( + spropStr + ).);
-}
// Property must be inheritable
-if (PropertyConsts.inheritance(sprop) == Properties.NO) {
+if (PropertyConsts.inheritance(sourceProperty) == Properties.NO) {
try {
-propStr = PropNames.getPropertyName(this.property);
-spropStr = PropNames.getPropertyName(sprop);
+propStr = PropNames.getPropertyName(property);
+spropStr = PropNames.getPropertyName(sourceProperty);
} catch (PropertyException e) {}
throw new PropertyException
-(Source property + sprop + ( + spropStr + ) for
- + this.property + ( + propStr
+(Source property + sourceProperty + ( + spropStr
+ + ) for + this.property + ( + propStr
+ ) is not inheritable.);
}
}
@@ -120,7 +114,7 @@
* validate the iInheritedValue/i against the isource/i property.
*/
public void validate() throws PropertyException {
-validate(getSourceProperty());
+validate(Properties.ANY_TYPE);
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FONode.java
pbwest 2002/09/17 23:01:51
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FONode.java
Log:
Added getParentTriplet(), getNearestSpecifiedTriplet(),
fromNearestSpecified() and fromParent() methods.
Revision ChangesPath
No revision
No revision
1.19.2.7 +127 -5xml-fop/src/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
retrieving revision 1.19.2.6
retrieving revision 1.19.2.7
diff -u -r1.19.2.6 -r1.19.2.7
--- FONode.java 16 Sep 2002 05:03:03 - 1.19.2.6
+++ FONode.java 18 Sep 2002 06:01:51 - 1.19.2.7
@@ -7,7 +7,9 @@
import org.apache.fop.fo.expr.PropertyParser;
import org.apache.fop.fo.expr.PropertyValue;
import org.apache.fop.fo.expr.PropertyValueList;
+import org.apache.fop.fo.expr.PropertyTriplet;
import org.apache.fop.datastructs.Tree;
+import org.apache.fop.datatypes.Inherit;
import org.apache.fop.apps.FOPException;
import org.apache.fop.xml.XMLEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
@@ -16,6 +18,7 @@
import org.xml.sax.Attributes;
import java.util.LinkedList;
+import java.util.Iterator;
import java.util.ArrayList;
import java.util.HashMap;
import java.lang.reflect.Method;
@@ -63,8 +66,6 @@
protected XMLNamespaces namespaces;
/** The FO type. */
public final int type;
-/** The node identifier obtained from ttfoTree/tt. */
-public final int id;
/** The array of property value stacks */
protected LinkedList[] propertyStacks;
/** The attributes defined on this node. */
@@ -98,7 +99,6 @@
namespaces = xmlevents.getNamespaces();
propertyStacks = foTree.propertyStacks;
exprParser = foTree.exprParser;
-id = foTree.nextNodeID();
foAttributes = new FOAttributes(event, this);
if ( ! (attrSet == MARKER)) {
processProperties();
@@ -135,6 +135,128 @@
} catch (InvocationTargetException e) {
throw new PropertyException (e.getMessage());
}
+}
+
+/**
+ * Get the parent's ttPropertyTriplet/tt for the given property.
+ * @param property - the property of interest.
+ * @return the ttPropertyTriplet/tt of the parent node.
+ */
+public PropertyTriplet getParentTriplet(int property) {
+PropertyTriplet triplet = null;
+LinkedList stack = foTree.propertyStacks[property];
+int size = stack.size();
+int next = size;
+// There must be at least one
+triplet = (PropertyTriplet)(stack.get(--next));
+// Following equality can't be the case for initial values,
+// as their stackedBy will be null.
+if (triplet.getStackedBy() == this) {
+triplet = (PropertyTriplet)(stack.get(--next));
+}
+return triplet;
+}
+
+/**
+ * Get the ttPropertyTriplet/tt of the nearest ancestor with a
+ * specified value for the given property.
+ * @param property - the property of interest.
+ * @return the nearest specified ttPropertyTriplet/tt.
+ */
+public PropertyTriplet getNearestSpecifiedTriplet(int property)
+throws PropertyException
+{
+PropertyTriplet triplet = null;
+PropertyValue value = null;
+Iterator stackp = foTree.propertyStacks[property].iterator();
+while (stackp.hasNext()) {
+triplet = (PropertyTriplet)(stackp.next());
+// Following equality can't be the case for initial values,
+// as their stackedBy will be null.
+if (triplet.getStackedBy() == this) continue;
+if ((value = triplet.getSpecified()) != null) break;
+}
+if (value == null)
+throw new PropertyException
+(No specified value in stack for + property + :
+ + PropNames.getPropertyName(property));
+return triplet;
+}
+
+/**
+ * Get the computed value from nearest ancestor with a specified value.
+ * @param property - the index of both target and source properties.
+ * @return - the computed value corresponding to the nearest specified
+ * value (which may be the initial value) if it exists. If no computed
+ * value is available, return an ttInherit/tt object with a reference
+ * to the PropertyTriplet.
+ */
+public PropertyValue fromNearestSpecified(int property)
+throws PropertyException
+{
+return fromNearestSpecified(property, property);
+}
+
+/**
+ * Get the computed value from nearest ancestor with a specified value
cvs commit: xml-fop/src/org/apache/fop/fo FOTree.java
pbwest 2002/09/17 23:06:24
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FOTree.java
Log:
Removed nodeID. Changed some RuntimeExceptions to
PropertyExceptions. Added cloneCurrentFontSize().
Removed getInheritedTriplet().
Revision ChangesPath
No revision
No revision
1.1.2.10 +35 -78xml-fop/src/org/apache/fop/fo/Attic/FOTree.java
Index: FOTree.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOTree.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FOTree.java 16 Sep 2002 05:21:00 - 1.1.2.9
+++ FOTree.java 18 Sep 2002 06:06:24 - 1.1.2.10
@@ -3,6 +3,7 @@
import org.apache.fop.datastructs.Tree;
import org.apache.fop.datatypes.Ints;
import org.apache.fop.datatypes.Numeric;
+import org.apache.fop.datatypes.Inherit;
import org.apache.fop.datatypes.Auto;
import org.apache.fop.datatypes.None;
import org.apache.fop.datatypes.TextDecorations;
@@ -86,24 +87,6 @@
protected LinkedList[] propertyStacks;
/**
- * An FONode identifier. This is available to be incremented for
- * each FONode created. The only requirement is that active FONodes
- * have a unique identifier. An accessor function is defined.
- */
-private int nodeID = 0;
-
-/**
- * Get the next node identifier. There is no need to synchronize this
- * as FONodes are created within a single thread.
- * N.B. If more than one thread gains the ability to create new nodes,
- * this method will have to be synchronized.
- * @return the next node identifier
- */
-public int nextNodeID() {
-return ++nodeID;
-}
-
-/**
* @param xmlevents the buffer from which ttXMLEvent/tts from the
* parser are read.
*/
@@ -117,55 +100,38 @@
// Initialise the propertyStacks
propertyStacks = new LinkedList[PropNames.LAST_PROPERTY_INDEX + 1];
+PropertyValue prop;
for (int i = 0; i = PropNames.LAST_PROPERTY_INDEX; i++)
propertyStacks[i] = new LinkedList();
// Initialize the FontSize first. Any lengths defined in ems must
// be resolved relative to the current font size. This may happen
// during setup of initial values.
-try {
-// Set the initial value
-propertyStacks[PropNames.FONT_SIZE].addLast
-(new PropertyTriplet
- (PropNames.FONT_SIZE,
- PropertyConsts.getInitialValue(PropNames.FONT_SIZE)));
-PropertyValue prop =
-getInitialSpecifiedValue(PropNames.FONT_SIZE);
-if ( ! (prop instanceof Numeric)
- || ! ((Numeric)prop).isLength())
-throw new RuntimeException(
-Initial font-size is not a Length);
-propertyStacks[PropNames.FONT_SIZE].addLast
-(new PropertyTriplet(PropNames.FONT_SIZE, prop, prop));
-} catch (PropertyException e) {
-throw new RuntimeException
-(PropertyException: + e.getMessage());
-}
+// Set the initial value
+prop = PropertyConsts.getInitialValue(PropNames.FONT_SIZE);
+if ( ! (prop instanceof Numeric) || ! ((Numeric)prop).isLength())
+throw new PropertyException(Initial font-size is not a Length);
+propertyStacks[PropNames.FONT_SIZE].addFirst
+(new PropertyTriplet(PropNames.FONT_SIZE, prop, prop));
for (int i = 0; i = PropNames.LAST_PROPERTY_INDEX; i++) {
String cname = ;
if (i == PropNames.FONT_SIZE) continue;
-try {
-// Set up the initial values for each property
-propertyStacks[i].addLast
-(new PropertyTriplet
- (i, PropertyConsts.getInitialValue(i)));
-}
-catch (PropertyException e) {
-throw new RuntimeException
-(PropertyException: + e.getMessage());
-}
+// Set up the initial values for each property
+prop = PropertyConsts.getInitialValue(i);
+propertyStacks[i].addFirst(new PropertyTriplet(i, prop, prop));
}
}
/**
- * Get the font size from the ifont-size/i property stack.
+ * Clone the font size from the ifont-size/i property stack.
* @return a ttNumeric/tt containing the current font size
* @exception PropertyException if current font size is not defined,
- * or is not expressed as a ttNumeric/tt
cvs commit: xml-fop/src/org/apache/fop/fo FObject.java
pbwest 2002/09/18 06:56:24 Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FObject.java Log: Added tag and revision. Revision ChangesPath No revision No revision 1.1.2.3 +3 -3 xml-fop/src/org/apache/fop/fo/Attic/FObject.java Index: FObject.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FObject.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- FObject.java 27 Jun 2002 12:55:18 - 1.1.2.2 +++ FObject.java 18 Sep 2002 13:56:24 - 1.1.2.3 @@ -10,7 +10,7 @@ import org.apache.fop.apps.FOPException; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.for.FObjects; +import org.apache.fop.fo.FObjects; /** * Base class for all Flow Objects - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/expr AbstractPropertyValue.java PropertyValue.java PropertyValueList.java PropertyTriplet.java
pbwest 2002/09/18 07:02:02 Removed: src/org/apache/fop/fo/expr Tag: FOP_0-20-0_Alt-Design AbstractPropertyValue.java PropertyValue.java PropertyValueList.java PropertyTriplet.java Log: Moved to org.apache.fop.datatypes. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datatypes AbstractPropertyValue.java PropertyValue.java PropertyValueList.java PropertyTriplet.java
pbwest 2002/09/18 07:02:48 Added: src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design AbstractPropertyValue.java PropertyValue.java PropertyValueList.java PropertyTriplet.java Log: Moved from org.apache.fop.fo.expr. Revision ChangesPath No revision No revision 1.1.2.1 +140 -0 xml-fop/src/org/apache/fop/datatypes/Attic/AbstractPropertyValue.java 1.1.2.1 +85 -0 xml-fop/src/org/apache/fop/datatypes/Attic/PropertyValue.java 1.1.2.1 +253 -0 xml-fop/src/org/apache/fop/datatypes/Attic/PropertyValueList.java 1.1.2.1 +238 -0xml-fop/src/org/apache/fop/datatypes/Attic/PropertyTriplet.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datatypes/indirect - New directory
pbwest 2002/09/18 07:06:29 xml-fop/src/org/apache/fop/datatypes/indirect - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datatypes/indirect FromNearestSpecified.java FromParent.java IndirectValue.java InheritedValue.java Inherit.java
pbwest 2002/09/18 07:21:07 Added: src/org/apache/fop/datatypes/indirect Tag: FOP_0-20-0_Alt-Design FromNearestSpecified.java FromParent.java IndirectValue.java InheritedValue.java Inherit.java Log: Moved from org.apache.fop.datatypes Revision ChangesPath No revision No revision 1.1.2.1 +106 -0 xml-fop/src/org/apache/fop/datatypes/indirect/Attic/FromNearestSpecified.java 1.1.2.1 +85 -0 xml-fop/src/org/apache/fop/datatypes/indirect/Attic/FromParent.java 1.1.2.1 +190 -0 xml-fop/src/org/apache/fop/datatypes/indirect/Attic/IndirectValue.java 1.1.2.1 +120 -0 xml-fop/src/org/apache/fop/datatypes/indirect/Attic/InheritedValue.java 1.1.2.1 +92 -0 xml-fop/src/org/apache/fop/datatypes/indirect/Attic/Inherit.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datatypes AbstractPropertyValue.java Angle.java Auto.java Bool.java ColorType.java CountryType.java EnumType.java FontFamilySet.java Frequency.java InheritCompound.java IntegerType.java LanguageType.java Literal.java MappedNumeric.java MimeType.java NCName.java None.java Numeric.java PropertyTriplet.java PropertyValue.java PropertyValueList.java ScriptType.java ShadowEffect.java Slash.java StringType.java TextDecorations.java TextDecorator.java Time.java UriType.java
pbwest 2002/09/18 08:24:13 Modified:src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design AbstractPropertyValue.java Angle.java Auto.java Bool.java ColorType.java CountryType.java EnumType.java FontFamilySet.java Frequency.java InheritCompound.java IntegerType.java LanguageType.java Literal.java MappedNumeric.java MimeType.java NCName.java None.java Numeric.java PropertyTriplet.java PropertyValue.java PropertyValueList.java ScriptType.java ShadowEffect.java Slash.java StringType.java TextDecorations.java TextDecorator.java Time.java UriType.java Log: Changes to import names. Revision ChangesPath No revision No revision 1.1.2.2 +4 -4 xml-fop/src/org/apache/fop/datatypes/Attic/AbstractPropertyValue.java Index: AbstractPropertyValue.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/AbstractPropertyValue.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- AbstractPropertyValue.java18 Sep 2002 14:02:47 - 1.1.2.1 +++ AbstractPropertyValue.java18 Sep 2002 15:24:11 - 1.1.2.2 @@ -1,10 +1,10 @@ -package org.apache.fop.fo.expr; +package org.apache.fop.datatypes; import org.apache.fop.fo.PropertyConsts; import org.apache.fop.fo.PropNames; import org.apache.fop.fo.Properties; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.expr.PropertyValue; +import org.apache.fop.datatypes.PropertyValue; /* * AbstractPropertyValue.java 1.1.2.5 +4 -4 xml-fop/src/org/apache/fop/datatypes/Attic/Angle.java Index: Angle.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Angle.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- Angle.java27 Aug 2002 15:14:48 - 1.1.2.4 +++ Angle.java18 Sep 2002 15:24:11 - 1.1.2.5 @@ -1,8 +1,8 @@ package org.apache.fop.datatypes; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.expr.PropertyValue; -import org.apache.fop.fo.expr.AbstractPropertyValue; +import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.datatypes.AbstractPropertyValue; import org.apache.fop.fo.Properties; /* 1.1.2.4 +5 -5 xml-fop/src/org/apache/fop/datatypes/Attic/Auto.java Index: Auto.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Auto.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- Auto.java 27 Aug 2002 15:14:48 - 1.1.2.3 +++ Auto.java 18 Sep 2002 15:24:11 - 1.1.2.4 @@ -1,7 +1,7 @@ package org.apache.fop.datatypes; -import org.apache.fop.fo.expr.PropertyValue; -import org.apache.fop.fo.expr.AbstractPropertyValue; +import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.datatypes.AbstractPropertyValue; import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.fo.Properties; 1.1.2.4 +5 -5 xml-fop/src/org/apache/fop/datatypes/Attic/Bool.java Index: Bool.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Bool.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- Bool.java 27 Aug 2002 15:14:48 - 1.1.2.3 +++ Bool.java 18 Sep 2002 15:24:11 - 1.1.2.4 @@ -2,8 +2,8 @@ package org.apache.fop.datatypes; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.expr.PropertyValue; -import org.apache.fop.fo.expr.AbstractPropertyValue; +import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.datatypes.AbstractPropertyValue; import org.apache.fop.fo.Properties; /* 1.15.2.6 +4 -4 xml-fop/src/org/apache/fop/datatypes/ColorType.java Index: ColorType.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/ColorType.java,v retrieving revision 1.15.2.5 retrieving revision 1.15.2.6 diff -u -r1.15.2.5 -r1.15.2.6 --- ColorType.java27 Aug 2002 15:14:48 - 1.15.2.5 +++ ColorType.java18 Sep 2002 15:24:11 - 1.15.2.6 @@ -11,8 +11,8 @@ import org.apache.fop.fo.expr.PropertyException; import
cvs commit: xml-fop/src/org/apache/fop/fo/expr PropertyParser.java SystemFontFunction.java
pbwest 2002/09/18 08:35:03 Modified:src/org/apache/fop/fo/expr Tag: FOP_0-20-0_Alt-Design PropertyParser.java SystemFontFunction.java Log: Changes to import names. Revision ChangesPath No revision No revision 1.5.2.10 +8 -8 xml-fop/src/org/apache/fop/fo/expr/PropertyParser.java Index: PropertyParser.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/expr/PropertyParser.java,v retrieving revision 1.5.2.9 retrieving revision 1.5.2.10 diff -u -r1.5.2.9 -r1.5.2.10 --- PropertyParser.java 16 Sep 2002 05:23:50 - 1.5.2.9 +++ PropertyParser.java 18 Sep 2002 15:35:03 - 1.5.2.10 @@ -13,8 +13,8 @@ import org.apache.fop.fo.FOTree; import org.apache.fop.fo.expr.SystemFontFunction; -import org.apache.fop.fo.expr.PropertyValue; -import org.apache.fop.fo.expr.PropertyValueList; +import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.datatypes.PropertyValueList; import org.apache.fop.datatypes.Numeric; import org.apache.fop.datatypes.Literal; import org.apache.fop.datatypes.NCName; @@ -26,8 +26,6 @@ import org.apache.fop.datatypes.Frequency; import org.apache.fop.datatypes.Angle; import org.apache.fop.datatypes.Bool; -import org.apache.fop.datatypes.Inherit; -import org.apache.fop.datatypes.InheritedValue; import org.apache.fop.datatypes.Auto; import org.apache.fop.datatypes.None; import org.apache.fop.datatypes.Slash; @@ -35,8 +33,10 @@ import org.apache.fop.datatypes.StringType; import org.apache.fop.datatypes.MimeType; import org.apache.fop.datatypes.UriType; -import org.apache.fop.datatypes.FromParent; -import org.apache.fop.datatypes.FromNearestSpecified; +import org.apache.fop.datatypes.indirect.Inherit; +import org.apache.fop.datatypes.indirect.InheritedValue; +import org.apache.fop.datatypes.indirect.FromParent; +import org.apache.fop.datatypes.indirect.FromNearestSpecified; import java.util.HashMap; 1.1.2.4 +5 -3 xml-fop/src/org/apache/fop/fo/expr/Attic/SystemFontFunction.java Index: SystemFontFunction.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/expr/Attic/SystemFontFunction.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- SystemFontFunction.java 28 Jun 2002 03:32:29 - 1.1.2.3 +++ SystemFontFunction.java 18 Sep 2002 15:35:03 - 1.1.2.4 @@ -13,6 +13,8 @@ import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.fo.expr.FunctionNotImplementedException; import org.apache.fop.datastructs.ROIntArray; +import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.datatypes.PropertyValueList; /** * Implement the system font function. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FONode.java FOTree.java Properties.java PropertyConsts.java PropertySets.java
pbwest 2002/09/18 08:42:13
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FONode.java
FOTree.java Properties.java PropertyConsts.java
PropertySets.java
Log:
Changes to import names.
Revision ChangesPath
No revision
No revision
1.19.2.8 +6 -6 xml-fop/src/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
retrieving revision 1.19.2.7
retrieving revision 1.19.2.8
diff -u -r1.19.2.7 -r1.19.2.8
--- FONode.java 18 Sep 2002 06:01:51 - 1.19.2.7
+++ FONode.java 18 Sep 2002 15:42:12 - 1.19.2.8
@@ -5,11 +5,11 @@
import org.apache.fop.fo.FObjects;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.expr.PropertyParser;
-import org.apache.fop.fo.expr.PropertyValue;
-import org.apache.fop.fo.expr.PropertyValueList;
-import org.apache.fop.fo.expr.PropertyTriplet;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.PropertyValueList;
+import org.apache.fop.datatypes.PropertyTriplet;
import org.apache.fop.datastructs.Tree;
-import org.apache.fop.datatypes.Inherit;
+import org.apache.fop.datatypes.indirect.Inherit;
import org.apache.fop.apps.FOPException;
import org.apache.fop.xml.XMLEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
1.1.2.11 +5 -5 xml-fop/src/org/apache/fop/fo/Attic/FOTree.java
Index: FOTree.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOTree.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FOTree.java 18 Sep 2002 06:06:24 - 1.1.2.10
+++ FOTree.java 18 Sep 2002 15:42:12 - 1.1.2.11
@@ -3,7 +3,7 @@
import org.apache.fop.datastructs.Tree;
import org.apache.fop.datatypes.Ints;
import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.datatypes.Inherit;
+import org.apache.fop.datatypes.indirect.Inherit;
import org.apache.fop.datatypes.Auto;
import org.apache.fop.datatypes.None;
import org.apache.fop.datatypes.TextDecorations;
@@ -16,8 +16,8 @@
import org.apache.fop.fo.Properties;
import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.expr.PropertyValue;
-import org.apache.fop.fo.expr.PropertyTriplet;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.PropertyTriplet;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.expr.PropertyParser;
1.1.2.24 +11 -10xml-fop/src/org/apache/fop/fo/Attic/Properties.java
Index: Properties.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/Properties.java,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -r1.1.2.23 -r1.1.2.24
--- Properties.java 15 Sep 2002 05:00:54 - 1.1.2.23
+++ Properties.java 18 Sep 2002 15:42:12 - 1.1.2.24
@@ -25,9 +25,9 @@
import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FObjects;
-import org.apache.fop.fo.expr.PropertyValue;
-import org.apache.fop.fo.expr.AbstractPropertyValue;
-import org.apache.fop.fo.expr.PropertyValueList;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.AbstractPropertyValue;
+import org.apache.fop.datatypes.PropertyValueList;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.expr.PropertyNotImplementedException;
import org.apache.fop.fo.expr.SystemFontFunction;
@@ -53,15 +53,15 @@
import org.apache.fop.datatypes.Literal;
import org.apache.fop.datatypes.Auto;
import org.apache.fop.datatypes.None;
-import org.apache.fop.datatypes.Inherit;
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.datatypes.FontFamilySet;
import org.apache.fop.datatypes.TextDecorations;
import org.apache.fop.datatypes.TextDecorator;
import org.apache.fop.datatypes.ShadowEffect;
-import org.apache.fop.datatypes.FromParent;
-import org.apache.fop.datatypes.FromNearestSpecified;
import org.apache.fop.datatypes.Slash;
+import org.apache.fop.datatypes.indirect.Inherit;
+import org.apache.fop.datatypes.indirect.FromParent;
+import org.apache.fop.datatypes.indirect.FromNearestSpecified;
/**
* Parent class for all of the individual property classes. It also contains
@@ -4385,7 +4385,8 @@
// First, check that we have a list
if (type != PropertyValue.LIST) {
if ( ! nested type == PropertyValue.INHERIT
cvs commit: xml-fop/src/org/apache/fop/datatypes PropertyValue.java
pbwest 2002/09/20 21:13:23 Modified:src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design PropertyValue.java Log: Added INHERITED_VALUE type Revision ChangesPath No revision No revision 1.1.2.3 +19 -18xml-fop/src/org/apache/fop/datatypes/Attic/PropertyValue.java Index: PropertyValue.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/PropertyValue.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- PropertyValue.java18 Sep 2002 15:24:12 - 1.1.2.2 +++ PropertyValue.java21 Sep 2002 04:13:23 - 1.1.2.3 @@ -32,22 +32,23 @@ ,FROM_NEAREST_SPECIFIED = 9 ,FROM_PARENT = 10 ,INHERIT = 11 - ,INTEGER = 12 - ,LANGUAGE = 13 - ,LITERAL = 14 -,MAPPED_NUMERIC = 15 - ,MIME_TYPE = 16 -,NCNAME = 17 - ,NONE = 18 - ,NUMERIC = 19 -,SCRIPT = 20 - ,SHADOW_EFFECT = 21 - ,SLASH = 22 - ,TEXT_DECORATIONS = 23 -,TEXT_DECORATOR = 24 - ,TIME = 25 - ,URI_TYPE = 26 - ,LIST = 27 + ,INHERITED_VALUE = 12 + ,INTEGER = 13 + ,LANGUAGE = 14 + ,LITERAL = 15 +,MAPPED_NUMERIC = 16 + ,MIME_TYPE = 17 +,NCNAME = 18 + ,NONE = 19 + ,NUMERIC = 20 +,SCRIPT = 21 + ,SHADOW_EFFECT = 22 + ,SLASH = 23 + ,TEXT_DECORATIONS = 24 +,TEXT_DECORATOR = 25 + ,TIME = 26 + ,URI_TYPE = 27 + ,LIST = 28 ,LAST_PROPERTY_TYPE = LIST; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo PropertySets.java
pbwest 2002/09/20 21:32:12
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
PropertySets.java
Log:
Comment extended
Revision ChangesPath
No revision
No revision
1.1.2.13 +8 -3 xml-fop/src/org/apache/fop/fo/Attic/PropertySets.java
Index: PropertySets.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropertySets.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- PropertySets.java 18 Sep 2002 15:42:12 - 1.1.2.12
+++ PropertySets.java 21 Sep 2002 04:32:12 - 1.1.2.13
@@ -718,6 +718,11 @@
int expandedProp = expansion.get(i);
PropertyValue expandedPropValue;
// The PropertyValue must be cloneable
+// Generally, this method will be called with one of the
+// pseudo-values - Inherit, FromParent or FromNearestSpecified
+// e.g. - and becaue those properties may have individual
+// IndirectValue settings, the value for each expanded
+// property must be unique.`
try {
expandedPropValue = (PropertyValue)(value.clone());
} catch (CloneNotSupportedException e) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo PropertyConsts.java
pbwest 2002/09/20 21:34:41
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
PropertyConsts.java
Log:
Added and applied static final arrays to Method.invoke()
Revision ChangesPath
No revision
No revision
1.1.2.9 +68 -22xml-fop/src/org/apache/fop/fo/Attic/PropertyConsts.java
Index: PropertyConsts.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropertyConsts.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- PropertyConsts.java 18 Sep 2002 15:42:12 - 1.1.2.8
+++ PropertyConsts.java 21 Sep 2002 04:34:40 - 1.1.2.9
@@ -24,6 +24,7 @@
import java.util.StringTokenizer;
import org.apache.fop.fo.FOTree;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.Properties;
import org.apache.fop.fo.expr.PropertyException;
@@ -64,6 +65,26 @@
private static final String packageName = org.apache.fop.fo;
/**
+ * Single element ttClass/tt array for serial use by static methods.
+ */
+private static final Class[] oneClass = new Class[1];
+/**
+ * Two element ttClass/tt array for serial use by static methods.
+ */
+private static final Class[] twoClasses = new Class[2];
+/**
+ * Single element ttObject/tt array for serial use by static methods.
+ */
+private static final Object[] oneObject = new Object[1];
+/**
+ * Two element ttObject/tt array for serial use by static methods.
+ */
+private static final Object[] twoObjects = new Object[2];
+private static final Class intClass = int.class;
+private static final Class integerClass = Integer.class;
+
+/**
+ * Get the property index of a property name.
* @param property ttString/tt name of the FO property
* @return ttint/tt index of the named FO property in the array of
* property names.
@@ -72,7 +93,7 @@
public static int getPropertyIndex(String property)
throws PropertyException
{
-Integer integer = (Integer)toIndex.get((Object)property);
+Integer integer = (Integer)toIndex.get(property);
if (integer == null)
throw new PropertyException
(Property + property + not found.);
@@ -80,6 +101,7 @@
}
/**
+ * Get the property index of a property class name.
* @param propertyClassName String name of the FO property class
* @return int index of the named FO property class in the array of
* property class names.
@@ -89,7 +111,7 @@
throws PropertyException
{
Integer integer =
-(Integer)classToIndex.get((Object)propertyClass);
+(Integer)classToIndex.get(propertyClass);
if (integer == null)
throw new PropertyException
(Property class + propertyClass + not found.);
@@ -97,6 +119,7 @@
}
/**
+ * Get the initial value type for a property name.
* @param property String name of the FO property
* @return int enumerated initialValueType. These constants are defined
* as static final ints in this class. Note that an undefined property
@@ -110,6 +133,7 @@
}
/**
+ * get the initial value type for a property index.
* @param propertyIndex int index of the FO property
* @return int enumerated initialValueType. These constants are defined
* as static final ints in this class. Note that an undefined property
@@ -120,6 +144,7 @@
}
/**
+ * Get the initial value for a property index.
* @param property ttint/tt index of the property
* @return ttPropertyValue/tt from property's igetInitialValue/i
* method
@@ -130,11 +155,10 @@
{
Method method = null;
try {
-method = classes[property].getMethod
-(getInitialValue, new Class[] {int.class});
-return (PropertyValue)
-(method.invoke
- (null, new Object[] {Ints.consts.get(property)}));
+oneClass[0] = intClass;
+method = classes[property].getMethod(getInitialValue, oneClass);
+oneObject[0] = Ints.consts.get(property);
+return (PropertyValue)(method.invoke(null, oneObject));
} catch (NoSuchMethodException nsme) {
throw new PropertyException
(No getInitialValue method in
@@ -146,6 +170,30 @@
}
}
+/**
+ * @param foNode the node whose properties
cvs commit: xml-fop/src/org/apache/fop/fo Properties.java
pbwest 2002/09/20 21:39:32
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
Properties.java
Log:
Changed FOTree arg to refineParsing() to FONode.
Added resolve() calls to IndirectValues.
Added refineExpansionList() and applied to shorthand expansions.
Revision ChangesPath
No revision
No revision
1.1.2.25 +245 -155 xml-fop/src/org/apache/fop/fo/Attic/Properties.java
Index: Properties.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/Properties.java,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -u -r1.1.2.24 -r1.1.2.25
--- Properties.java 18 Sep 2002 15:42:12 - 1.1.2.24
+++ Properties.java 21 Sep 2002 04:39:30 - 1.1.2.25
@@ -60,6 +60,7 @@
import org.apache.fop.datatypes.ShadowEffect;
import org.apache.fop.datatypes.Slash;
import org.apache.fop.datatypes.indirect.Inherit;
+import org.apache.fop.datatypes.indirect.InheritedValue;
import org.apache.fop.datatypes.indirect.FromParent;
import org.apache.fop.datatypes.indirect.FromNearestSpecified;
@@ -313,19 +314,19 @@
*
* pThis method is overriden by individual property classes which
* require specific processing.
- * @param foTree - the ttFOTree/tt being built
+ * @param foNode - the ttFONode/tt being built
* @param value - ttPropertyValue/tt returned by the parser
*/
public static PropertyValue refineParsing
-(FOTree foTree, PropertyValue value)
+(FONode foNode, PropertyValue value)
throws PropertyException
{
-return refineParsing(foTree, value, NOT_NESTED);
+return refineParsing(foNode, value, NOT_NESTED);
}
/**
* Do the work for the two argument refineParsing method.
- * @param foTree - the ttFOTree/tt being built
+ * @param foNode - the ttFONode/tt being built
* @param value - ttPropertyValue/tt returned by the parser
* @param nested - ttboolean/tt indicating whether this method is
* called normally (false), or as part of another irefineParsing/i
@@ -333,13 +334,14 @@
* @see #refineParsing(FOTree,PropertyValue)
*/
protected static PropertyValue refineParsing
-(FOTree foTree, PropertyValue value, boolean nested)
+(FONode foNode, PropertyValue value, boolean nested)
throws PropertyException
{
int property = value.getProperty();
String propName = PropNames.getPropertyName(property);
int datatype = PropertyConsts.dataTypes.get(property);
int proptype = value.getType();
+PropertyValue pv;
switch (proptype) {
case PropertyValue.NUMERIC:
// Can be any of
@@ -363,7 +365,7 @@
if ((datatype ENUM) != 0)
return new EnumType(property, ncname);
if ((datatype MAPPED_LENGTH) != 0)
-return (new MappedNumeric(property, ncname, foTree))
+return (new MappedNumeric(property, ncname, foNode.foTree))
.getMappedNumValue();
case PropertyValue.LITERAL:
// Can be LITERAL or CHARACTER_T
@@ -396,10 +398,28 @@
if ((datatype MIMETYPE) != 0) return value;
throw new PropertyException
(mimetype invalid for + propName);
+// The following types cannot have their values validated in advance.
+// The result must be validated from within the property type.
+case PropertyValue.FROM_PARENT:
+pv = ((FromParent)value).resolve(foNode);
+if (pv == value) return value; // unable to resolve
+// TODO: validate here
+return pv;
+case PropertyValue.FROM_NEAREST_SPECIFIED:
+pv = ((FromNearestSpecified)value).resolve(foNode);
+if (pv == value) return value; // unable to resolve
+// TODO: validate here
+return pv;
+case PropertyValue.INHERITED_VALUE:
+pv = ((InheritedValue)value).resolve(foNode);
+if (pv == value) return value; // unable to resolve
+// TODO: validate here
+return pv;
default:
if ( ! nested) {
if (proptype == PropertyValue.INHERIT) {
-if ((datatype INHERIT) != 0) return value;
+if ((datatype INHERIT) != 0)
+return ((Inherit)value).resolve(foNode);
throw new PropertyException
('inherit
cvs commit: xml-fop/src/org/apache/fop/fo Properties.java
pbwest 2002/09/22 23:33:28 Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design Properties.java Log: Name change to initialValueSHandExpansion(). Revision ChangesPath No revision No revision 1.1.2.26 +5 -5 xml-fop/src/org/apache/fop/fo/Attic/Properties.java Index: Properties.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/Properties.java,v retrieving revision 1.1.2.25 retrieving revision 1.1.2.26 diff -u -r1.1.2.25 -r1.1.2.26 --- Properties.java 21 Sep 2002 04:39:30 - 1.1.2.25 +++ Properties.java 23 Sep 2002 06:33:27 - 1.1.2.26 @@ -1999,7 +1999,7 @@ } // Construct the shorthand expansion list PropertyValueList borderexp = -PropertySets.initialValueExpansion +PropertySets.initialValueSHandExpansion (foNode.foTree, PropNames.BORDER); if (style != null) borderexp = PropertySets.overrideSHandElements(borderexp, @@ -4373,7 +4373,7 @@ // values of individual components newlist = -PropertySets.initialValueExpansion +PropertySets.initialValueSHandExpansion (foNode.foTree, PropNames.FONT); // For each discovered property, override the value in the // initial value expansion. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo PropertySets.java
pbwest 2002/09/22 23:37:35
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
PropertySets.java
Log:
Changed initialValueExpansion() to initialValueSHandExpansion().
Added expandCompoundProperty(), copyValueToSet()
and initialValueCompoundExpansion().
Revision ChangesPath
No revision
No revision
1.1.2.14 +100 -33 xml-fop/src/org/apache/fop/fo/Attic/PropertySets.java
Index: PropertySets.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropertySets.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- PropertySets.java 21 Sep 2002 04:32:12 - 1.1.2.13
+++ PropertySets.java 23 Sep 2002 06:37:35 - 1.1.2.14
@@ -714,30 +714,13 @@
int property = value.getProperty();
ROIntArray expansion = getSHandExpansionSet(property);
PropertyValueList list = new PropertyValueList(property);
-for (int i = 0; i expansion.length; i++) {
-int expandedProp = expansion.get(i);
-PropertyValue expandedPropValue;
-// The PropertyValue must be cloneable
-// Generally, this method will be called with one of the
-// pseudo-values - Inherit, FromParent or FromNearestSpecified
-// e.g. - and becaue those properties may have individual
-// IndirectValue settings, the value for each expanded
-// property must be unique.`
-try {
-expandedPropValue = (PropertyValue)(value.clone());
-} catch (CloneNotSupportedException e) {
-throw new PropertyException(e.getMessage());
-}
-
-expandedPropValue.setProperty(expandedProp);
-list.add(expandedPropValue);
-}
-return list;
+return copyValueToSet(value, expansion, list);
}
/**
* Generate a list of the intial values of each property in a
- * shorthand expansion
+ * shorthand expansion. Note that this will be a list of
+ * breferences/b to the initial values.
* @param foTree the ttFOTree/tt for which properties are being
* processed
* @param property ttint/tt property index
@@ -745,7 +728,7 @@
* expansions for the (shorthand) property
* @exception ttPropertyException/tt
*/
-public static PropertyValueList initialValueExpansion
+public static PropertyValueList initialValueSHandExpansion
(FOTree foTree, int property)
throws PropertyException
{
@@ -753,17 +736,9 @@
PropertyValueList list = new PropertyValueList(property);
for (int i = 0; i expansion.length; i++) {
int expandedProp = expansion.get(i);
-PropertyValue expandedPropValue;
PropertyValue specified
= foTree.getInitialSpecifiedValue(expandedProp);
-// The PropertyValue must be cloneable
-try {
-expandedPropValue = (PropertyValue)(specified.clone());
-} catch (CloneNotSupportedException e) {
-throw new PropertyException(e.getMessage());
-}
-
-list.add(expandedPropValue);
+list.add(specified);
}
return list;
}
@@ -1203,6 +1178,98 @@
,spaceStartNonCopyExpansion
,wordSpacingNonCopyExpansion
};
+
+/**
+ * Expand the ttPropertyValue/tt assigned to a compound property
+ * into ttpropertyValues/tt for the individual property components.
+ * N.B. This method assumes that the set of expansion properties is
+ * comprised of a copy and a non-copy set. For example, lt;spacegt;
+ * compounds have a copy set of .minimum, .optimum and .maximum, and a
+ * non-copy set of .precedence and .conditionality. For each element of
+ * the copy set, the given value is cloned. For each member of the
+ * non-copy set, a reference to the initial value is taken. Any
+ * properties for which the non-copy set takes other than the initial
+ * value will have to arrange to override this method of the method from
+ * which it is invoked.
+ */
+public static PropertyValueList expandCompoundProperty
+(FOTree foTree, PropertyValue value)
+throws PropertyException
+{
+int property = value.getProperty();
+Integer compoundX =
+(Integer)(compoundMap.get(Ints.consts.get(property)));
+if (compoundX == null)
+throw new PropertyException
+(PropNames.getPropertyName(property) + ( + property
cvs commit: xml-fop/src/org/apache/fop/fo/expr PropertyParser.java
pbwest 2002/09/23 22:26:42
Modified:src/org/apache/fop/fo/expr Tag: FOP_0-20-0_Alt-Design
PropertyParser.java
Log:
Invoke parser with FONode arg.
Call fromParent() and fromNearestSpecified() methods in FONode.
Revision ChangesPath
No revision
No revision
1.5.2.11 +200 -155 xml-fop/src/org/apache/fop/fo/expr/PropertyParser.java
Index: PropertyParser.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/expr/PropertyParser.java,v
retrieving revision 1.5.2.10
retrieving revision 1.5.2.11
diff -u -r1.5.2.10 -r1.5.2.11
--- PropertyParser.java 18 Sep 2002 15:35:03 - 1.5.2.10
+++ PropertyParser.java 24 Sep 2002 05:26:42 - 1.5.2.11
@@ -11,6 +11,7 @@
import org.apache.fop.fo.Properties;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.FOTree;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.expr.SystemFontFunction;
import org.apache.fop.datatypes.PropertyValue;
@@ -56,6 +57,8 @@
/** The FO tree which has initiated this parser */
private FOTree foTree;
+/** The FONode which has initiated this parser */
+private FONode node;
public PropertyParser(FOTree foTree) {
super();
@@ -112,14 +115,16 @@
*
* pNote: If the property expression String is empty, a StringProperty
* object holding an empty String is returned.
- * @param property an ttint/tt containing the property index.
+ * @param node - the ttFONode/tt for which the property expression
+ * is being resolved.
+ * @param property - an ttint/tt containing the property index.
* which the property expression is to be evaluated.
- * @param expr The specified value (attribute on the xml element).
- * @return A PropertyValue holding the parsed result.
- * @throws PropertyException If the expr cannot be parsed as a
+ * @param expr - the specified value (attribute on the xml element).
+ * @return a PropertyValue holding the parsed result.
+ * @throws PropertyException if the expr cannot be parsed as a
* PropertyValue.
*/
-public PropertyValue parse(int property, String expr)
+public PropertyValue parse(FONode node, int property, String expr)
throws PropertyException
{
synchronized (this) {
@@ -128,6 +133,7 @@
throw new PropertyException
(PropertyParser is currently active.);
initialize(property, expr);
+this.node = node;
}
next();
@@ -167,8 +173,8 @@
/**
* pParse a property values sublist - a list of whitespace separated
* ttPropertyValue/tts.
- * /pp
- * Property value expressions for various properties may contaiin lists
+ * p
+ * Property value expressions for various properties may contain lists
* of values, which may be separated by whitespace or by commas. See,
* e.g., 7.6.17 voice-family and 7.8.2 font-family. The shorthands
* may also contain lists of elements, generally (or exclusively)
@@ -404,164 +410,203 @@
// processing, so, like LPAR processing, next() is not called
// and the return from this method must be premature
prop = null;
-// Numeric functions
-if (currentTokenValue.equals(floor)) {
-PropertyValue[] args = parseArgs(1);
-prop = new Numeric
-(property, ((Numeric)args[0]).floor());
-}
-else if (currentTokenValue.equals(ceiling)) {
-PropertyValue[] args = parseArgs(1);
-prop = new Numeric
-(property, ((Numeric)args[0]).ceiling());
-}
-else if (currentTokenValue.equals(round)) {
-PropertyValue[] args = parseArgs(1);
-prop = new Numeric
-(property, ((Numeric)args[0]).round());
-}
-else if (currentTokenValue.equals(min)) {
-PropertyValue[] args = parseArgs(2);
-prop = new Numeric
+int funcType = PropertyValue.NO_TYPE;
+do {
+// Numeric functions
+if (currentTokenValue.equals(floor)) {
+PropertyValue[] args = parseArgs(1);
+prop = new Numeric
+(property, ((Numeric)args[0]).floor());
+break;
+}
+if (currentTokenValue.equals(ceiling)) {
+PropertyValue[] args = parseArgs(1);
+prop = new Numeric
cvs commit: xml-fop/src/org/apache/fop/fo FONode.java
pbwest 2002/09/23 22:28:50
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FONode.java
Log:
Changed invocation of parse()
Revision ChangesPath
No revision
No revision
1.19.2.9 +4 -4 xml-fop/src/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
retrieving revision 1.19.2.8
retrieving revision 1.19.2.9
diff -u -r1.19.2.8 -r1.19.2.9
--- FONode.java 18 Sep 2002 15:42:12 - 1.19.2.8
+++ FONode.java 24 Sep 2002 05:28:50 - 1.19.2.9
@@ -123,8 +123,8 @@
{
// parse the expression
exprParser.resetParser();
-foTree.args[0] = foTree;
-foTree.args[1] = exprParser.parse(property, attrValue);
+foTree.args[0] = this;
+foTree.args[1] = exprParser.parse(this, property, attrValue);
try {
return (PropertyValue)
(((Method)PropertyConsts.refineParsingMethods
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo PropertySets.java
pbwest 2002/09/23 22:29:31 Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design PropertySets.java Log: Changed comment Revision ChangesPath No revision No revision 1.1.2.15 +12 -8 xml-fop/src/org/apache/fop/fo/Attic/PropertySets.java Index: PropertySets.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropertySets.java,v retrieving revision 1.1.2.14 retrieving revision 1.1.2.15 diff -u -r1.1.2.14 -r1.1.2.15 --- PropertySets.java 23 Sep 2002 06:37:35 - 1.1.2.14 +++ PropertySets.java 24 Sep 2002 05:29:30 - 1.1.2.15 @@ -1180,17 +1180,21 @@ }; /** - * Expand the ttPropertyValue/tt assigned to a compound property + * Expand the ttPropertyValue/tt assigned to a compound property * into ttpropertyValues/tt for the individual property components. * N.B. This method assumes that the set of expansion properties is * comprised of a copy and a non-copy set. For example, lt;spacegt; * compounds have a copy set of .minimum, .optimum and .maximum, and a * non-copy set of .precedence and .conditionality. For each element of * the copy set, the given value is cloned. For each member of the - * non-copy set, a reference to the initial value is taken. Any - * properties for which the non-copy set takes other than the initial - * value will have to arrange to override this method of the method from - * which it is invoked. + * non-copy set, a reference to the initial value is taken. + * @param foTree - the ttFOTree/tt for which properties are being + * developed. + * @param value - the ttPropertyValue/tt to be cloned for the copy + * set members. + * @return a ttPropertyValueList/tt containing the copy set + * expansions followed by the non-copy set expansions, in the order + * they are defined in appropriate ttROIntArray/tts in this class. */ public static PropertyValueList expandCompoundProperty (FOTree foTree, PropertyValue value) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo PropertyConsts.java
pbwest 2002/09/23 22:30:05
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
PropertyConsts.java
Log:
Added isCompound().
Revision ChangesPath
No revision
No revision
1.1.2.10 +22 -3 xml-fop/src/org/apache/fop/fo/Attic/PropertyConsts.java
Index: PropertyConsts.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropertyConsts.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- PropertyConsts.java 21 Sep 2002 04:34:40 - 1.1.2.9
+++ PropertyConsts.java 24 Sep 2002 05:30:05 - 1.1.2.10
@@ -260,6 +260,25 @@
}
/**
+ * @param propertyIndex int index of the FO property
+ * @return ttboolean/tt is property a compound?
+ */
+public static boolean isCompound(int propertyIndex) {
+return (datatypes[propertyIndex] Properties.COMPOUND) != 0;
+}
+
+/**
+ * @param property String name of the FO property
+ * @return ttboolean/tt is property a compound?
+ */
+public static boolean isCompound(String property)
+throws PropertyException
+{
+return (datatypes[getPropertyIndex(property)] Properties.COMPOUND)
+!= 0;
+}
+
+/**
* Map the String value of an enum to its integer equivalent.
* @param value the enum text
* @param values an ttROStringArray/tt of all of the enum text values.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo Properties.java
pbwest 2002/09/26 07:27:49 Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design Properties.java Log: Modifications to data type sepcifications. Removed calls to initialValueSHandExpansion(). Added compound expansions. Revision ChangesPath No revision No revision 1.1.2.27 +107 -94 xml-fop/src/org/apache/fop/fo/Attic/Properties.java Index: Properties.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/Properties.java,v retrieving revision 1.1.2.26 retrieving revision 1.1.2.27 diff -u -r1.1.2.26 -r1.1.2.27 --- Properties.java 23 Sep 2002 06:33:27 - 1.1.2.26 +++ Properties.java 26 Sep 2002 14:27:48 - 1.1.2.27 @@ -105,31 +105,31 @@ ,PERCENTAGE = 16 ,CHARACTER_T = 32 ,LITERAL = 64 - ,NAME = 128 +,NCNAME = 128 ,COLOR_T = 256 ,COUNTRY_T = 512 ,LANGUAGE_T = 1024 ,SCRIPT_T = 2048 - ,ID_T = 4096 - ,IDREF = 8192 - ,URI_SPECIFICATION = 16384 - ,TIME = 32768 - ,FREQUENCY = 65536 + ,URI_SPECIFICATION = 4096 + ,TIME = 8192 + ,FREQUENCY = 16384 // Pseudotypes - ,BOOL = 131072 - ,INHERIT = 262144 - ,ENUM = 524288 - ,MAPPED_LENGTH = 1048576 - ,SHORTHAND = 2097152 - ,COMPLEX = 4194304 - ,AUTO = 8388608 - ,NONE = 16777216 - ,AURAL = 33554432 + ,BOOL = 32768 + ,INHERIT = 65536 + ,ENUM = 131072 + ,MAPPED_LENGTH = 262144 + ,SHORTHAND = 524288 + ,COMPLEX = 1048576 + ,AUTO = 2097152 + ,NONE = 4194304 + ,AURAL = 8388608 // Color plus transparent - ,COLOR_TRANS = 67108864 - ,MIMETYPE = 134217728 - ,FONTSET = 268435456 - ,COMPOUND = 536870912 + ,COLOR_TRANS = 16777216 + ,MIMETYPE = 33554432 + ,FONTSET = 67108864 + ,COMPOUND = 134217728 +// ,SPARE = 268435456 +// ,SPARE = 536870912 // ,SPARE = 1073741824 // ,SPARE = -2147483648 @@ -145,11 +145,10 @@ ,NUMBER = FLOAT | INTEGER ,ENUM_TYPE = ENUM | MAPPED_LENGTH -,STRING = LITERAL | ENUM_TYPE +,STRING = LITERAL | NCNAME ,HYPH_TYPE = COUNTRY_T | LANGUAGE_T | SCRIPT_T - ,ID_TYPE = ID_T | IDREF -,NCNAME = NAME | ID_TYPE | HYPH_TYPE | ENUM_TYPE - ,STRING_TYPE = STRING | NCNAME + ,NAME_TYPE = NCNAME | HYPH_TYPE | ENUM_TYPE + ,STRING_TYPE = STRING | NAME_TYPE ,ANY_TYPE = ~0 ; @@ -172,13 +171,11 @@ if ((datatypes PERCENTAGE) != 0) typeNames += percentage|; if ((datatypes CHARACTER_T) != 0) typeNames += character|; if ((datatypes STRING) != 0) typeNames += string|; -if ((datatypes NAME) != 0) typeNames += name|; +if ((datatypes NCNAME) != 0) typeNames += ncname|; if ((datatypes COLOR_T) != 0) typeNames += color|; if ((datatypes COUNTRY_T) != 0) typeNames += country|; if ((datatypes LANGUAGE_T) != 0) typeNames += language|; if ((datatypes SCRIPT_T) != 0) typeNames += script|; -if ((datatypes ID_T) != 0) typeNames += id|; -if ((datatypes IDREF) != 0) typeNames += idref|; if ((datatypes URI_SPECIFICATION) != 0) typeNames += uri-specification|; if ((datatypes TIME) != 0) typeNames += time|; @@ -212,7 +209,7 @@ ,PERCENTAGE_IT = 16 ,CHARACTER_IT = 32 ,LITERAL_IT = 64 - ,NAME_IT = 128 + ,NCNAME_IT = 128 ,COLOR_IT = 256 ,COUNTRY_IT = 512 ,URI_SPECIFICATION_IT = 1024
cvs commit: xml-fop/src/org/apache/fop/fo FOTree.java
pbwest 2002/09/26 07:32:09
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FOTree.java
Log:
Fixed first index in initialisations.
Revision ChangesPath
No revision
No revision
1.1.2.12 +5 -5 xml-fop/src/org/apache/fop/fo/Attic/FOTree.java
Index: FOTree.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOTree.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- FOTree.java 18 Sep 2002 15:42:12 - 1.1.2.11
+++ FOTree.java 26 Sep 2002 14:32:09 - 1.1.2.12
@@ -101,7 +101,7 @@
// Initialise the propertyStacks
propertyStacks = new LinkedList[PropNames.LAST_PROPERTY_INDEX + 1];
PropertyValue prop;
-for (int i = 0; i = PropNames.LAST_PROPERTY_INDEX; i++)
+for (int i = 1; i = PropNames.LAST_PROPERTY_INDEX; i++)
propertyStacks[i] = new LinkedList();
// Initialize the FontSize first. Any lengths defined in ems must
// be resolved relative to the current font size. This may happen
@@ -114,8 +114,8 @@
(new PropertyTriplet(PropNames.FONT_SIZE, prop, prop));
-for (int i = 0; i = PropNames.LAST_PROPERTY_INDEX; i++) {
-String cname = ;
+for (int i = 1; i = PropNames.LAST_PROPERTY_INDEX; i++) {
+System.out.println(Set initial value: + i);
if (i == PropNames.FONT_SIZE) continue;
// Set up the initial values for each property
prop = PropertyConsts.getInitialValue(i);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo Properties.java
pbwest 2002/10/01 09:30:36
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
Properties.java
Log:
AURAL type PropertyNotImplementedException in
refineParsing(). Changed AURAL_IT initial value types to NOTYPE_IT.
Revision ChangesPath
No revision
No revision
1.1.2.28 +28 -32xml-fop/src/org/apache/fop/fo/Attic/Properties.java
Index: Properties.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/Properties.java,v
retrieving revision 1.1.2.27
retrieving revision 1.1.2.28
diff -u -r1.1.2.27 -r1.1.2.28
--- Properties.java 26 Sep 2002 14:27:48 - 1.1.2.27
+++ Properties.java 1 Oct 2002 16:30:33 - 1.1.2.28
@@ -346,6 +346,9 @@
int datatype = PropertyConsts.dataTypes.get(property);
int proptype = value.getType();
PropertyValue pv;
+if ((datatype AURAL) != 0)
+throw new PropertyNotImplementedException
+(AURAL properties are not supported);
switch (proptype) {
case PropertyValue.NUMERIC:
// Can be any of
@@ -544,10 +547,8 @@
public static PropertyValue getInitialValue(int property)
throws PropertyException
{
-System.out.println(Invoking default getInitialValue(+property+));
Method method = null;
int initialValueType = PropertyConsts.getInitialValueType(property);
-System.out.println(initialValueType: + initialValueType);
if ((initialValueType Properties.USE_GET_IT_FUNCTION) != 0)
throw new PropertyException
(Properties.getInitialValue() called for property with
@@ -561,12 +562,7 @@
case NONE_IT:
return new None(property);
case AURAL_IT:
-System.out.println(In AURAL_IT);
-System.out.println
-(Aural properties not implemented:
-+ PropNames.getPropertyName(property));
-//throw new PropertyNotImplementedException
-throw new PropertyException
+throw new PropertyNotImplementedException
(Aural properties not implemented:
+ PropNames.getPropertyName(property));
default:
@@ -1077,7 +1073,7 @@
public static class Azimuth extends Properties {
public static final int dataTypes = AURAL;
public static final int traitMapping = RENDERING;
-public static final int initialValueType = AURAL_IT;
+public static final int initialValueType = NOTYPE_IT;
public static final int inherited = COMPUTED;
}
@@ -3666,7 +3662,7 @@
public static class Cue extends Properties {
public static final int dataTypes = SHORTHAND;
public static final int traitMapping = SHORTHAND_MAP;
-public static final int initialValueType = AURAL_IT;
+public static final int initialValueType = NOTYPE_IT;
public static final int inherited = NO;
/**
@@ -3735,14 +3731,14 @@
public static class CueAfter extends Properties {
public static final int dataTypes = AURAL;
public static final int traitMapping = RENDERING;
-public static final int initialValueType = AURAL_IT;
+public static final int initialValueType = NOTYPE_IT;
public static final int inherited = NO;
}
public static class CueBefore extends Properties {
public static final int dataTypes = AURAL;
public static final int traitMapping = RENDERING;
-public static final int initialValueType = AURAL_IT;
+public static final int initialValueType = NOTYPE_IT;
public static final int inherited = NO;
}
@@ -3847,7 +3843,7 @@
public static class Elevation extends Properties {
public static final int dataTypes = AURAL;
public static final int traitMapping = RENDERING;
-public static final int initialValueType = AURAL_IT;
+public static final int initialValueType = NOTYPE_IT;
public static final int inherited = COMPUTED;
}
@@ -5474,7 +5470,7 @@
public static final int dataTypes =
COMPOUND| PERCENTAGE | LENGTH | NUMBER | MAPPED_LENGTH | INHERIT;
public static final int traitMapping = FORMATTING;
-public static final int initialValueType = LENGTH_IT;
+public static final int initialValueType = NOTYPE_IT;
public static final int NORMAL = 1;
public static final int inherited = NO;
@@ -6580,42 +6576,42 @@
public static class Pause extends Properties {
public static final int dataTypes = AURAL;
public
cvs commit: xml-fop/src/org/apache/fop/fo FOAttributes.java
pbwest 2002/10/01 09:34:44
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FOAttributes.java
Log:
Added foAttrKeys[] sorted key array.
Obtain DefAttrNSIndex from XMLNamespaces.
Revision ChangesPath
No revision
No revision
1.1.2.6 +46 -9 xml-fop/src/org/apache/fop/fo/Attic/FOAttributes.java
Index: FOAttributes.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOAttributes.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FOAttributes.java 16 Sep 2002 05:01:58 - 1.1.2.5
+++ FOAttributes.java 1 Oct 2002 16:34:44 - 1.1.2.6
@@ -16,6 +16,7 @@
import java.util.List;
import java.util.Map;
import java.util.Collections;
+import java.util.Arrays;
/*
* FOAttributes.java
@@ -63,7 +64,18 @@
*/
private HashMap foAttrMap = new HashMap(0);
-private int DefAttrNSIndex = XMLNamespaces.DefAttrNSIndex;
+/**
+ * An sorted array of the keys (property indices) of the values in
+ * ifoAttrMap/i.
+ */
+private Integer[] foAttrKeys = null;
+
+/**
+ * A static array of ttInteger/tt as a template for the generation
+ * of the ifoAttrKeys/i array.
+ */
+private static Integer[] integerArray
+= new Integer[] { Ints.consts.get(0) };
private FONode foNode;
@@ -105,7 +117,7 @@
int attrUriIndex = foNode.namespaces.getURIIndex(attrUri);
//System.out.println(FONode: + event);
-if (attrUriIndex == DefAttrNSIndex) {
+if (attrUriIndex == XMLNamespaces.DefAttrNSIndex) {
// Standard FO namespace
// Catch default namespace declaration here. This seems to
// be a kludge. Should 'xmlns' come through here?
@@ -130,7 +142,7 @@
System.out.println(Creating nSpaceAttrMaps);
nSpaceAttrMaps = new ArrayList(attrUriIndex + 1);
// Add the fo list
-for (j = 0; j DefAttrNSIndex; j++)
+for (j = 0; j XMLNamespaces.DefAttrNSIndex; j++)
nSpaceAttrMaps.add(new HashMap(0));
System.out.println(Adding foAttrMap);
@@ -151,9 +163,17 @@
tmpHash.put(attrLocalname, attrValue);
}
}
+// Set up the sorted array of the foAttr keys, if foAttrMap has
+// any entries.
+if (foAttrMap.size() 0) {
+foAttrKeys = (Integer[])(foAttrMap.keySet().toArray(integerArray));
+Arrays.sort(foAttrKeys);
+}
}
/**
+ * Get the default namespace attribute values as an unmodifiable
+ * ttMap/tt.
* @return a unmodifiable ttMap/tt containing the the attribute
* values for all of the default attribute namespace attributes in this
* attribute list, indexed by the property name index from
@@ -164,6 +184,7 @@
}
/**
+ * Get the ttHashMap/tt of all default namespace attributes.
* @return ttHashMap/tt ifoAttrMap/i containing the the attribute
* values for all of the default attribute namespace attributes in this
* attribute list, indexed by the property name index from
@@ -175,6 +196,19 @@
}
/**
+ * Get the sorted array of property index keys for the default namespace
+ * attributes.
+ * @return ttInteger[]/tt ifoAttrKeys/i containing the the
+ * sorted keys (the property indices from ttPropNames/tt) of the
+ * attribute values for all of the default attribute namespace attributes
+ * in this attribute list.
+ * Warning: This array may be changed by the calling process.
+ */
+public Integer[] getFoAttrKeys() {
+return foAttrKeys;
+}
+
+/**
* A convenience method for accessing attribute values from the default
* attribute namespace.
* @param property an ttint/tt containing the property name index
@@ -199,6 +233,8 @@
}
/**
+ * Get an unmodifiable ttMap/tt of the attribute values for a
+ * particular namespace.
* @param uriIndex an ttint/tt containing the index of the attribute
* values namespace, maintained in an ttXMLEvent/tt ttstatic/tt
* array.
@@ -208,7 +244,7 @@
* derived from the one maintained in inSpaceAttrMaps/i.
*/
public Map getAttrMap(int uriIndex) {
-if (uriIndex == DefAttrNSIndex)
+if (uriIndex == XMLNamespaces.DefAttrNSIndex)
return Collections.unmodifiableMap((Map)foAttrMap);
if (nSpaceAttrMaps != null
cvs commit: xml-fop/src/org/apache/fop/fo FONode.java
pbwest 2002/10/01 09:40:23
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FONode.java
Log:
Moved attribute set name constants to FObjects.
Changed stacks from LinkedList to ArrayList implementation.
Changed processProperties() to processAttributes().
Added stackValue() and unstackValues() methods.
Removed all PropertyTriplet references. Properties will now be held
directly.
Revision ChangesPath
No revision
No revision
1.19.2.10 +96 -66xml-fop/src/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
retrieving revision 1.19.2.9
retrieving revision 1.19.2.10
diff -u -r1.19.2.9 -r1.19.2.10
--- FONode.java 24 Sep 2002 05:28:50 - 1.19.2.9
+++ FONode.java 1 Oct 2002 16:40:23 - 1.19.2.10
@@ -7,9 +7,10 @@
import org.apache.fop.fo.expr.PropertyParser;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.datatypes.PropertyTriplet;
import org.apache.fop.datastructs.Tree;
+import org.apache.fop.datastructs.ROBitSet;
import org.apache.fop.datatypes.indirect.Inherit;
+import org.apache.fop.datatypes.indirect.IndirectValue;
import org.apache.fop.apps.FOPException;
import org.apache.fop.xml.XMLEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
@@ -17,7 +18,7 @@
import org.xml.sax.Attributes;
-import java.util.LinkedList;
+import java.util.BitSet;
import java.util.Iterator;
import java.util.ArrayList;
import java.util.HashMap;
@@ -44,20 +45,10 @@
private static final String tag = $Name$;
private static final String revision = $Revision$;
-/**
- * Constants for the set of attributes of interest with this FONode
- */
-public static final int
-NONE = 0
- ,ROOT = 1
- ,LAYOUT = 2
-,PAGESEQ = 3
- ,FLOW = 4
- ,STATIC = 5
- ,MARKER = 6
-;
/** The ttFOTree/tt of which this node is a member. */
protected FOTree foTree;
+/** The parent ttFONode/tt of this node. */
+protected FONode parent;
/** The ttXMLEvent/tt which triggered this node. */
protected XMLEvent event;
/** The buffer from which parser events are drawn. */
@@ -66,14 +57,25 @@
protected XMLNamespaces namespaces;
/** The FO type. */
public final int type;
-/** The array of property value stacks */
-protected LinkedList[] propertyStacks;
/** The attributes defined on this node. */
public FOAttributes foAttributes;
-/** The properties defined on this node. */
+/** The unmodifiable map of properties defined on this node. */
public HashMap foProperties = null;
+/** The sorted keys of ifoProperties/i. */
+protected Integer[] foKeys = null;
+/** The size of ifoKeys/i. */
+private int numAttrs = 0;
/** The property expression parser in the FOTree. */
protected PropertyParser exprParser;
+/** The property set for this node. */
+protected PropertyValue[] propertySet;
+/** BitSet of properties for which specified values have been stacked. */
+private BitSet stackedProps =
+new BitSet(PropNames.LAST_PROPERTY_INDEX + 1);
+/** The iattrSet/i argument. */
+public final int attrSet;
+/** The ttROBitSet/tt of the iattrSet/i argument. */
+protected ROBitSet nodeAttrBitSet;
/** Ancestor reference area of this FONode. */
protected FONode ancestorRefArea = null;
@@ -94,26 +96,48 @@
foTree.super(parent);
this.foTree = foTree;
this.type = type;
+this.parent = parent;
this.event = event;
+this.attrSet = attrSet;
xmlevents = foTree.xmlevents;
namespaces = xmlevents.getNamespaces();
-propertyStacks = foTree.propertyStacks;
exprParser = foTree.exprParser;
+propertySet = new PropertyValue[PropNames.LAST_PROPERTY_INDEX + 1];
foAttributes = new FOAttributes(event, this);
-if ( ! (attrSet == MARKER)) {
-processProperties();
+if ( ! (attrSet == FObjects.MARKER_SET)) {
+processAttributes();
}
}
-private void processProperties() throws PropertyException {
+private void processAttributes() throws PropertyException {
// Process the FOAttributes - parse and stack the values
// Build a HashMap of the properties defined on this node
foProperties = foAttributes.getFoAttrMap();
-PropertyValue props;
-for (int prop = 1; prop = PropNames.LAST_PROPERTY_INDEX; prop++) {
-String value
cvs commit: xml-fop/src/org/apache/fop/fo FOTree.java
pbwest 2002/10/01 18:17:14
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FOTree.java
Log:
Changed stacks implementation from LinkedList to
ArrayList. Removed all PropertyTriplet references.
Revision ChangesPath
No revision
No revision
1.1.2.13 +58 -78xml-fop/src/org/apache/fop/fo/Attic/FOTree.java
Index: FOTree.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOTree.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FOTree.java 26 Sep 2002 14:32:09 - 1.1.2.12
+++ FOTree.java 2 Oct 2002 01:17:14 - 1.1.2.13
@@ -25,7 +25,6 @@
import org.xml.sax.XMLReader;
import java.util.HashMap;
-import java.util.LinkedList;
import java.util.ArrayList;
import java.lang.reflect.InvocationTargetException;
@@ -74,7 +73,7 @@
/**
* The array of stacks for resolving properties during FO tree building.
- * An Array of LinkedList[]. Each LinkedList is a stack containing the
+ * An Array of ArrayList[]. Each ArrayList is a stack containing the
* most recently specified value of a particular property. The first
* element of each stack will contain the initial value.
* p
@@ -82,9 +81,9 @@
* constants in this file, and are the effective index values for the
* PropNames.propertyNames and classNames arrays.
* p
- * LinkedList is part of the 1.2 Collections framework.
+ * ArrayList is part of the 1.2 Collections framework.
*/
-protected LinkedList[] propertyStacks;
+protected ArrayList[] propertyStacks;
/**
* @param xmlevents the buffer from which ttXMLEvent/tts from the
@@ -99,10 +98,10 @@
exprParser = new PropertyParser(this);
// Initialise the propertyStacks
-propertyStacks = new LinkedList[PropNames.LAST_PROPERTY_INDEX + 1];
+propertyStacks = new ArrayList[PropNames.LAST_PROPERTY_INDEX + 1];
PropertyValue prop;
for (int i = 1; i = PropNames.LAST_PROPERTY_INDEX; i++)
-propertyStacks[i] = new LinkedList();
+propertyStacks[i] = new ArrayList(1);
// Initialize the FontSize first. Any lengths defined in ems must
// be resolved relative to the current font size. This may happen
// during setup of initial values.
@@ -110,16 +109,14 @@
prop = PropertyConsts.getInitialValue(PropNames.FONT_SIZE);
if ( ! (prop instanceof Numeric) || ! ((Numeric)prop).isLength())
throw new PropertyException(Initial font-size is not a Length);
-propertyStacks[PropNames.FONT_SIZE].addFirst
-(new PropertyTriplet(PropNames.FONT_SIZE, prop, prop));
+propertyStacks[PropNames.FONT_SIZE].add(prop);
for (int i = 1; i = PropNames.LAST_PROPERTY_INDEX; i++) {
-System.out.println(Set initial value: + i);
if (i == PropNames.FONT_SIZE) continue;
// Set up the initial values for each property
prop = PropertyConsts.getInitialValue(i);
-propertyStacks[i].addFirst(new PropertyTriplet(i, prop, prop));
+propertyStacks[i].add(prop);
}
}
@@ -132,11 +129,9 @@
* supported.
*/
public Numeric cloneCurrentFontSize() throws PropertyException {
-Numeric tmpval = (Numeric)
-(((PropertyTriplet)propertyStacks[PropNames.FONT_SIZE].getLast())
-.getComputed());
-if (tmpval == null)
-throw new PropertyException('font-size' not computed.);
+Numeric tmpval =
+(Numeric)(propertyStacks[PropNames.FONT_SIZE]
+.get(propertyStacks[PropNames.FONT_SIZE].size() - 1));
try {
return (Numeric)(tmpval.clone());
} catch (CloneNotSupportedException e) {
@@ -152,12 +147,8 @@
* or is not expressed as a ttNumeric/tt.
*/
public Numeric currentFontSize() throws PropertyException {
-Numeric tmpval = (Numeric)
-(((PropertyTriplet)propertyStacks[PropNames.FONT_SIZE].getLast())
-.getComputed());
-if (tmpval == null)
-throw new PropertyException('font-size' not computed.);
-return (Numeric)tmpval;
+return (Numeric)(propertyStacks[PropNames.FONT_SIZE]
+.get(propertyStacks[PropNames.FONT_SIZE].size() - 1));
}
/**
@@ -168,26 +159,23 @@
public void setInitialValue(PropertyValue value)
throws PropertyException
{
-int property = value.getProperty();
-propertyStacks[property].addFirst
cvs commit: xml-fop/src/org/apache/fop/fo FoRoot.java
pbwest 2002/10/01 18:25:21
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FoRoot.java
Log:
attrSet constants now in FObjects.
Revision ChangesPath
No revision
No revision
1.1.2.5 +5 -6 xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java
Index: FoRoot.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoRoot.java 16 Sep 2002 05:19:06 - 1.1.2.4
+++ FoRoot.java 2 Oct 2002 01:25:21 - 1.1.2.5
@@ -41,7 +41,6 @@
private static final String revision = $Revision$;
private FoLayoutMasterSet layoutMasters;
-private SyncedXmlEventsBuffer xmlevents;
/**
* @param foTree the FO tree being built
@@ -53,7 +52,7 @@
throws Tree.TreeException, FOPException, PropertyException
{
// This is the root node of the tree; hence the null argument
-super(foTree, FObjectNames.ROOT, null, event, FONode.ROOT);
+super(foTree, FObjectNames.ROOT, null, event, FObjects.ROOT_SET);
}
/**
@@ -82,7 +81,7 @@
*/
public void buildFoTree() throws FOPException{
XMLEvent ev;
-//System.out.println(buildFoTree: + event);
+System.out.println(buildFoTree: + event);
// Look for layout-master-set
try {
ev = xmlevents.expectStartElement
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo PropertyConsts.java
pbwest 2002/10/01 18:26:53
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
PropertyConsts.java
Log:
Made nonInheritedProps an ROBitSet.
Revision ChangesPath
No revision
No revision
1.1.2.12 +19 -9 xml-fop/src/org/apache/fop/fo/Attic/PropertyConsts.java
Index: PropertyConsts.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropertyConsts.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- PropertyConsts.java 26 Sep 2002 14:33:17 - 1.1.2.11
+++ PropertyConsts.java 2 Oct 2002 01:26:53 - 1.1.2.12
@@ -32,6 +32,7 @@
import org.apache.fop.datatypes.Ints;
import org.apache.fop.datastructs.ROIntArray;
import org.apache.fop.datastructs.ROStringArray;
+import org.apache.fop.datastructs.ROBitSet;
import org.apache.fop.datatypes.PropertyValue;
/**
@@ -166,7 +167,7 @@
} catch (IllegalAccessException iae) {
throw new PropertyException(iae.getMessage());
} catch (InvocationTargetException ite) {
-throw new PropertyException(ite.getMessage());
+throw new PropertyException(ite);
}
}
@@ -460,14 +461,22 @@
public static final ROIntArray inherited;
/**
+ * An ttROBitSet/tt of properties which are not normally inherited.
+ * It is defined relative to the set of all properties; i.e. the
+ * non-inheritance of any property can be established by testing the
+ * bit in this set that corresponds to the queried property's index.
+ */
+public static final ROBitSet nonInheritedProps;
+
+/**
* A ttBitSet/tt of properties which are not normally inherited.
* It is defined relative to the set of all properties; i.e. the
* non-inheritance of any property can be established by testing the
* bit in this set that corresponds to the queried property's index.
- * pThe ttBitSet/tt is private. An accessor method is defined
- * which returns a clone of this set.
+ * pThe ttBitSet/tt is private and is the basis for
+ * inonInheritedProperties/i.
*/
-private static final BitSet nonInheritedProps;
+private static final BitSet noninheritedprops;
/** p
* An int[] array of the types of the iinitialValue/i field of each
@@ -551,7 +560,7 @@
toIndex = new HashMap(PropNames.LAST_PROPERTY_INDEX + 1);
classToIndex = new HashMap(PropNames.LAST_PROPERTY_INDEX + 1);
inherit = new int[PropNames.LAST_PROPERTY_INDEX + 1];
-nonInheritedProps= new BitSet(PropNames.LAST_PROPERTY_INDEX + 1);
+noninheritedprops= new BitSet(PropNames.LAST_PROPERTY_INDEX + 1);
initialValueTypes= new int[PropNames.LAST_PROPERTY_INDEX + 1];
traitMappings= new int[PropNames.LAST_PROPERTY_INDEX + 1];
datatypes= new int[PropNames.LAST_PROPERTY_INDEX + 1];
@@ -622,7 +631,7 @@
Class vclass = classes[i];
cname = vclass.getName();
inherit[i] = classes[i].getField(inherited).getInt(null);
-if (inherit[i] == Properties.NO) nonInheritedProps.set(i);
+if (inherit[i] == Properties.NO) noninheritedprops.set(i);
initialValueTypes[i] =
classes[i].getField(initialValueType).getInt(null);
traitMappings[i] =
@@ -659,6 +668,7 @@
propertyClasses = Collections.unmodifiableList
(Arrays.asList(classes));
inherited= new ROIntArray(inherit);
+nonInheritedProps= new ROBitSet(noninheritedprops);
dataTypes= new ROIntArray(datatypes);
refineParsingMethods = Collections.unmodifiableList
(Arrays.asList(refineparsingmethods));
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoLayoutMasterSet.java FoPageSequenceMaster.java FoSimplePageMaster.java
pbwest 2002/10/01 18:30:59
Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java FoPageSequenceMaster.java
FoSimplePageMaster.java
Log:
attrSet constants now in FObjects.java
Revision ChangesPath
No revision
No revision
1.1.2.3 +5 -4
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
Index: FoLayoutMasterSet.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoLayoutMasterSet.java16 Sep 2002 05:31:16 - 1.1.2.2
+++ FoLayoutMasterSet.java2 Oct 2002 01:30:59 - 1.1.2.3
@@ -6,6 +6,7 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.xml.XMLEvent;
+import org.apache.fop.fo.FObjects;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FONode;
@@ -61,7 +62,7 @@
throws Tree.TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.LAYOUT_MASTER_SET, parent, event,
- FONode.LAYOUT);
+ FObjects.LAYOUT_SET);
}
/**
1.1.2.3 +5 -4
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
Index: FoPageSequenceMaster.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoPageSequenceMaster.java 16 Sep 2002 05:31:16 - 1.1.2.2
+++ FoPageSequenceMaster.java 2 Oct 2002 01:30:59 - 1.1.2.3
@@ -20,6 +20,7 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.FObjects;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FONode;
@@ -46,7 +47,7 @@
throws Tree.TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.PAGE_SEQUENCE_MASTER, parent, null,
- FONode.LAYOUT);
+ FObjects.LAYOUT_SET);
this.masterName = masterName;
}
@@ -54,7 +55,7 @@
throws Tree.TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.PAGE_SEQUENCE_MASTER, parent, event,
- FONode.LAYOUT);
+ FObjects.LAYOUT_SET);
if (event == null) {
System.out.println(Null event; throwing FOPException);
throw new FOPException
1.1.2.3 +4 -3
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java
Index: FoSimplePageMaster.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoSimplePageMaster.java 16 Sep 2002 05:31:16 - 1.1.2.2
+++ FoSimplePageMaster.java 2 Oct 2002 01:30:59 - 1.1.2.3
@@ -13,6 +13,7 @@
import org.apache.fop.fo.FOAttributes;
import org.apache.fop.xml.XMLEvent;
import org.apache.fop.apps.FOPException;
+import org.apache.fop.fo.FObjects;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FOTree;
@@ -39,7 +40,7 @@
throws Tree.TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.SIMPLE_PAGE_MASTER, parent, event,
- FONode.LAYOUT);
+ FObjects.LAYOUT_SET);
System.out.println(FOAttributes: + event);
try {
masterName = foAttributes.getFoAttrValue(master-name);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo PropertySets.java
pbwest 2002/10/01 18:28:16
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
PropertySets.java
Log:
Changed getInitialSpecifiedValue() to getIntialValue().
Revision ChangesPath
No revision
No revision
1.1.2.17 +4 -4 xml-fop/src/org/apache/fop/fo/Attic/PropertySets.java
Index: PropertySets.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropertySets.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- PropertySets.java 26 Sep 2002 14:34:14 - 1.1.2.16
+++ PropertySets.java 2 Oct 2002 01:28:16 - 1.1.2.17
@@ -1278,7 +1278,7 @@
for (int i = 0; i expansion.length; i++) {
int expandedProp = expansion.get(i);
PropertyValue specified
-= foTree.getInitialSpecifiedValue(expandedProp);
+= foTree.getInitialValue(expandedProp);
list.add(specified);
}
return list;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datatypes AbstractPropertyValue.java
pbwest 2002/10/01 23:58:25
Modified:src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
AbstractPropertyValue.java
Log:
Added stackedBy.
Revision ChangesPath
No revision
No revision
1.1.2.3 +26 -5
xml-fop/src/org/apache/fop/datatypes/Attic/AbstractPropertyValue.java
Index: AbstractPropertyValue.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/AbstractPropertyValue.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- AbstractPropertyValue.java18 Sep 2002 15:24:11 - 1.1.2.2
+++ AbstractPropertyValue.java2 Oct 2002 06:58:25 - 1.1.2.3
@@ -3,6 +3,7 @@
import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.datatypes.PropertyValue;
@@ -22,19 +23,24 @@
public abstract class AbstractPropertyValue
implements PropertyValue, Cloneable
- {
-
+{
+
/**
* An integer index to the type of property of which this is a value.
*/
protected int property;
-
+
/**
* An integer property type.
*/
public final int type;
/**
+ * The ttFONode/tt that stacked this value.
+ */
+private FONode stackedBy = null;
+
+/**
* @param index index of the property in the property arrays.
* @param type of this value
*/
@@ -81,6 +87,21 @@
*/
public int getType() {
return type;
+}
+
+/**
+ * Set the node that stacked this value.
+ * @param node - the ttFONode/tt that stacked this value.
+ */
+public void setStackedBy(FONode node) {
+stackedBy = node;
+}
+
+/**
+ * Get the node that stacked this value.
+ */
+public FONode getStackedBy() {
+return stackedBy;
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datatypes PropertyValue.java PropertyValueList.java
pbwest 2002/10/02 00:00:08
Modified:src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
PropertyValue.java PropertyValueList.java
Log:
Added stackedBy.
Revision ChangesPath
No revision
No revision
1.1.2.4 +16 -2 xml-fop/src/org/apache/fop/datatypes/Attic/PropertyValue.java
Index: PropertyValue.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/PropertyValue.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- PropertyValue.java21 Sep 2002 04:13:23 - 1.1.2.3
+++ PropertyValue.java2 Oct 2002 07:00:08 - 1.1.2.4
@@ -1,6 +1,7 @@
package org.apache.fop.datatypes;
import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FONode;
/*
* PropertyValue.java
@@ -59,9 +60,22 @@
public void setProperty(int index) throws PropertyException;
/**
+ * Get the ttint/tt type of property value.
* @return type field of the ttPropertyValue/tt.
*/
public int getType();
+
+/**
+ * Set the reference to the ttFONode/tt that stacked this value.
+ * @param node - the stacking tt.FONode/tt.
+ */
+public void setStackedBy(FONode node);
+
+/**
+ * Get a reference to the ttFONode/tt that stacked this value.
+ * @return ttFONode/tt that stacked this value.
+ */
+public FONode getStackedBy();
/**
* In some circumstances, the property against which a type is to be
1.1.2.3 +23 -2
xml-fop/src/org/apache/fop/datatypes/Attic/PropertyValueList.java
Index: PropertyValueList.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/PropertyValueList.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PropertyValueList.java18 Sep 2002 15:24:12 - 1.1.2.2
+++ PropertyValueList.java2 Oct 2002 07:00:08 - 1.1.2.3
@@ -7,6 +7,7 @@
import org.apache.fop.fo.Properties;
import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.fo.expr.PropertyException;
@@ -38,6 +39,11 @@
public final int type;
/**
+ * The ttFONode/tt that stacked this value.
+ */
+private FONode stackedBy = null;
+
+/**
* @param property ttint/tt index of the property.
*/
public PropertyValueList(int property) throws PropertyException {
@@ -175,6 +181,21 @@
*/
public int getType() {
return type;
+}
+
+/**
+ * Set the node that stacked this value.
+ * @param node - the ttFONode/tt that stacked this value.
+ */
+public void setStackedBy(FONode node) {
+stackedBy = node;
+}
+
+/**
+ * Get the node that stacked this value.
+ */
+public FONode getStackedBy() {
+return stackedBy;
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo Properties.java
pbwest 2002/10/02 00:06:27
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
Properties.java
Log:
Split ShorthandPropSets from PropertySets.
Revision ChangesPath
No revision
No revision
1.1.2.29 +40 -38xml-fop/src/org/apache/fop/fo/Attic/Properties.java
Index: Properties.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/Properties.java,v
retrieving revision 1.1.2.28
retrieving revision 1.1.2.29
diff -u -r1.1.2.28 -r1.1.2.29
--- Properties.java 1 Oct 2002 16:30:33 - 1.1.2.28
+++ Properties.java 2 Oct 2002 07:06:25 - 1.1.2.29
@@ -23,6 +23,7 @@
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.PropertyConsts;
+import org.apache.fop.fo.ShorthandPropSets;
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FObjects;
import org.apache.fop.datatypes.PropertyValue;
@@ -425,7 +426,7 @@
default:
if ( ! nested) {
if ((datatype COMPOUND) != 0)
-return PropertySets.expandCompoundProperty
+return ShorthandPropSets.expandCompoundProperty
(foNode.foTree, value);
if (proptype == PropertyValue.INHERIT) {
if ((datatype INHERIT) != 0)
@@ -597,7 +598,7 @@
* a border-EDGE-width MappedNumeric or inheritance value
*
* N.B. this is the order of elements defined in
- * PropertySets.borderRightExpansion
+ * ShorthandPropSets.borderRightExpansion
*/
protected static PropertyValue borderEdge(FONode foNode,
PropertyValue value, int styleProp, int colorProp, int widthProp)
@@ -635,7 +636,7 @@
{
// Copy the value to each member of the shorthand expansion
return refineExpansionList
-(foNode, PropertySets.expandAndCopySHand(value));
+(foNode, ShorthandPropSets.expandAndCopySHand(value));
}
}
// Make a list and pass to processList
@@ -1138,7 +1139,7 @@
{
// Copy the value to each member of the shorthand expansion
return refineExpansionList
-(foNode, PropertySets.expandAndCopySHand(value));
+(foNode, ShorthandPropSets.expandAndCopySHand(value));
} else {
// Make a list and pass to processList
PropertyValueList tmpList
@@ -1503,7 +1504,7 @@
type == PropertyValue.FROM_NEAREST_SPECIFIED) {
// Copy the value to each member of the shorthand
newlist = refineExpansionList
-(foNode, PropertySets.expandAndCopySHand(value));
+(foNode, ShorthandPropSets.expandAndCopySHand(value));
}
}
@@ -1951,7 +1952,7 @@
type == PropertyValue.FROM_NEAREST_SPECIFIED)
// Copy the value to each member of the shorthand expansion
return refineExpansionList
-(foNode, PropertySets.expandAndCopySHand(value));
+(foNode, ShorthandPropSets.expandAndCopySHand(value));
PropertyValueList ssList = null;
// Must be a space-separated list or a single value from the
@@ -2245,7 +2246,7 @@
* a border-EDGE-width MappedNumeric or inheritance value
*
* N.B. this is the order of elements defined in
- * PropertySets.borderRightExpansion
+ * ShorthandPropSets.borderRightExpansion
*
* @param foNode - the ttFONode/tt being built
* @param value ttPropertyValue/tt returned by the parser
@@ -2397,12 +2398,12 @@
if (type == PropertyValue.INHERIT ||
type == PropertyValue.FROM_PARENT ||
type == PropertyValue.FROM_NEAREST_SPECIFIED)
-return refineExpansionList
-(foNode, PropertySets.expandAndCopySHand(value));
+return refineExpansionList(foNode,
+ShorthandPropSets.expandAndCopySHand(value));
}
if (type == PropertyValue.COLOR_TYPE)
return refineExpansionList
-(foNode, PropertySets.expandAndCopySHand(value));
+(foNode, ShorthandPropSets.expandAndCopySHand(value));
if (type == PropertyValue.NCNAME
cvs commit: xml-fop/src/org/apache/fop/fo FObjects.java
pbwest 2002/10/02 00:07:20
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FObjects.java
Log:
Added getAttrSetName().
Revision ChangesPath
No revision
No revision
1.1.2.7 +23 -3 xml-fop/src/org/apache/fop/fo/Attic/FObjects.java
Index: FObjects.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FObjects.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FObjects.java 2 Oct 2002 01:24:22 - 1.1.2.6
+++ FObjects.java 2 Oct 2002 07:07:19 - 1.1.2.7
@@ -58,6 +58,26 @@
,LAST_SET = MARKER_SET
;
+public static String getAttrSetName(int attrSet) throws FOPException {
+switch (attrSet) {
+case ROOT_SET:
+return ROOT;
+case DECLARATIONS_SET:
+return DECLARATIONS;
+case LAYOUT_SET:
+return LAYOUT;
+case PAGESEQ_SET:
+return PAGESEQ;
+case FLOW_SET:
+return FLOW;
+case STATIC_SET:
+return STATIC;
+case MARKER_SET:
+return MARKER;
+}
+throw new FOPException(Invalid attribute set: + attrSet);
+}
+
public static ROBitSet getAttrROBitSet(int attrSet)
throws FOPException
{
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FONode.java
pbwest 2002/10/02 00:08:26
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FONode.java
Log:
Ignore properties not in attribute set for this node.
Revision ChangesPath
No revision
No revision
1.19.2.11 +31 -10xml-fop/src/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
retrieving revision 1.19.2.10
retrieving revision 1.19.2.11
diff -u -r1.19.2.10 -r1.19.2.11
--- FONode.java 1 Oct 2002 16:40:23 - 1.19.2.10
+++ FONode.java 2 Oct 2002 07:08:26 - 1.19.2.11
@@ -15,6 +15,7 @@
import org.apache.fop.xml.XMLEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.XMLNamespaces;
+import org.apache.fop.messaging.MessageHandler;
import org.xml.sax.Attributes;
@@ -99,6 +100,7 @@
this.parent = parent;
this.event = event;
this.attrSet = attrSet;
+nodeAttrBitSet = FObjects.getAttrROBitSet(attrSet);
xmlevents = foTree.xmlevents;
namespaces = xmlevents.getNamespaces();
exprParser = foTree.exprParser;
@@ -109,7 +111,7 @@
}
}
-private void processAttributes() throws PropertyException {
+private void processAttributes() throws FOPException, PropertyException {
// Process the FOAttributes - parse and stack the values
// Build a HashMap of the properties defined on this node
foProperties = foAttributes.getFoAttrMap();
@@ -120,23 +122,42 @@
for (int propx = 0; propx numAttrs; propx++) {
PropertyValue props;
int type;
+int property;
int prop = foKeys[propx].intValue();
String attrValue = foAttributes.getFoAttrValue(prop);
props = handleAttrValue(prop, attrValue);
type = props.getType();
if (type != PropertyValue.LIST) {
-stackValue(props);
-// Handle corresponding properties here
-// Update the propertySet
-propertySet[props.getProperty()] = props;
+property = props.getProperty();
+if ( ! nodeAttrBitSet.get(property)) {
+MessageHandler.log(Ignoring property
+ + PropNames.getPropertyName(property)
+ + for attribute set
+ + FObjects.getAttrSetName(attrSet)
+ + .);
+} else {
+stackValue(props);
+// Handle corresponding properties here
+// Update the propertySet
+propertySet[props.getProperty()] = props;
+}
} else { // a list
PropertyValue value;
Iterator propvals = ((PropertyValueList)props).iterator();
while (propvals.hasNext()) {
value = (PropertyValue)(propvals.next());
-stackValue(value);
-// Handle corresponding properties here
-propertySet[value.getProperty()] = value;
+property = value.getProperty();
+if ( ! nodeAttrBitSet.get(property)) {
+MessageHandler.log(Ignoring property
+ + PropNames.getPropertyName(property)
+ + for attribute set
+ + FObjects.getAttrSetName(attrSet)
+ + .);
+} else {
+stackValue(value);
+// Handle corresponding properties here
+propertySet[value.getProperty()] = value;
+}
}
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/expr SystemFontFunction.java
pbwest 2002/10/02 00:10:37
Modified:src/org/apache/fop/fo/expr Tag: FOP_0-20-0_Alt-Design
SystemFontFunction.java
Log:
Split ShorthandPropSets from PropertySets.
Revision ChangesPath
No revision
No revision
1.1.2.5 +7 -7 xml-fop/src/org/apache/fop/fo/expr/Attic/SystemFontFunction.java
Index: SystemFontFunction.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/expr/Attic/SystemFontFunction.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- SystemFontFunction.java 18 Sep 2002 15:35:03 - 1.1.2.4
+++ SystemFontFunction.java 2 Oct 2002 07:10:37 - 1.1.2.5
@@ -9,7 +9,7 @@
import org.apache.fop.fo.Properties.Font;
import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
+import org.apache.fop.fo.ShorthandPropSets;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.expr.FunctionNotImplementedException;
import org.apache.fop.datastructs.ROIntArray;
@@ -29,7 +29,7 @@
* Return the ttPropertyValue/tt appropriate to the emproperty/em
* of the argument. emproperty/em must be one of the font
* characteristic properties in the expansion set of the emfont/em
- * shorthand property; emPropertySets.fontExpansion/em.
+ * shorthand property; emShorthandPropSets.fontExpansion/em.
* @param property ttint/tt index of the font characteristic property
* to be returned.
* @param font ttString/tt name of the system font
@@ -50,7 +50,7 @@
* font characteristic, named by empropName/em, defined on the
* system font named by emfont/em. empropName/em must be one of
* characteristic properties in the expansion set of the emfont/em
- * shorthand property; emPropertySets.fontExpansion/em.
+ * shorthand property; emShorthandPropSets.fontExpansion/em.
* @param property ttint/tt index of the property for the
* ttPropertyValue/tt to be returned.
* @param font ttString/tt name of the system font
@@ -88,7 +88,7 @@
{
// Get the array of indices of the properties in the
// expansion of this shorthand
-ROIntArray expansion = PropertySets.fontExpansion;
+ROIntArray expansion = ShorthandPropSets.fontExpansion;
PropertyValueList list = new PropertyValueList(property);
for (int i = 0; i expansion.length; i++) {
list.add(systemFontCharacteristic(expansion.get(i), font));
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/expr DataTypeNotImplementedException.java FunctionNotImplementedException.java PropertyNotImplementedException.java
pbwest 2002/10/02 00:12:29
Modified:src/org/apache/fop/fo/expr Tag: FOP_0-20-0_Alt-Design
DataTypeNotImplementedException.java
FunctionNotImplementedException.java
PropertyNotImplementedException.java
Log:
Added constructor with Throwable.
Revision ChangesPath
No revision
No revision
1.1.2.3 +6 -2
xml-fop/src/org/apache/fop/fo/expr/Attic/DataTypeNotImplementedException.java
Index: DataTypeNotImplementedException.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/expr/Attic/DataTypeNotImplementedException.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- DataTypeNotImplementedException.java 25 Jun 2002 13:37:32 - 1.1.2.2
+++ DataTypeNotImplementedException.java 2 Oct 2002 07:12:28 - 1.1.2.3
@@ -15,4 +15,8 @@
super(detail);
}
+public DataTypeNotImplementedException(Throwable e) {
+super(e);
+}
+
}
1.1.2.3 +6 -2
xml-fop/src/org/apache/fop/fo/expr/Attic/FunctionNotImplementedException.java
Index: FunctionNotImplementedException.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/expr/Attic/FunctionNotImplementedException.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FunctionNotImplementedException.java 25 Jun 2002 13:37:32 - 1.1.2.2
+++ FunctionNotImplementedException.java 2 Oct 2002 07:12:28 - 1.1.2.3
@@ -15,4 +15,8 @@
super(detail);
}
+public FunctionNotImplementedException(Throwable e) {
+super(e);
+}
+
}
1.1.2.4 +6 -2
xml-fop/src/org/apache/fop/fo/expr/Attic/PropertyNotImplementedException.java
Index: PropertyNotImplementedException.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/expr/Attic/PropertyNotImplementedException.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- PropertyNotImplementedException.java 2 Jul 2002 17:00:22 - 1.1.2.3
+++ PropertyNotImplementedException.java 2 Oct 2002 07:12:28 - 1.1.2.4
@@ -15,4 +15,8 @@
super(detail);
}
+public PropertyNotImplementedException(Throwable e) {
+super(e);
+}
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/expr PropertyTokenizer.java
pbwest 2002/10/02 00:19:59
Modified:src/org/apache/fop/fo/expr Tag: FOP_0-20-0_Alt-Design
PropertyTokenizer.java
Log:
Fixed bug in numeric unit handling.
Revision ChangesPath
No revision
No revision
1.4.4.4 +31 -22xml-fop/src/org/apache/fop/fo/expr/PropertyTokenizer.java
Index: PropertyTokenizer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/expr/PropertyTokenizer.java,v
retrieving revision 1.4.4.3
retrieving revision 1.4.4.4
diff -u -r1.4.4.3 -r1.4.4.4
--- PropertyTokenizer.java4 Jul 2002 00:59:40 - 1.4.4.3
+++ PropertyTokenizer.java2 Oct 2002 07:19:59 - 1.4.4.4
@@ -72,8 +72,9 @@
*/
int currentToken = EOF;
String currentTokenValue = null;
-protected int currentUnitLength = 0;
+protected int currentUnitIndex = 0;
protected int currentUnit;
+protected String unitString;
protected String uri;
private int currentTokenStartIndex = 0;
@@ -96,6 +97,7 @@
expr = s;
exprLength = s.length();
this.property = property;
+//System.out.println(-Tokenizer initialized: + expr);
}
/**
@@ -109,6 +111,15 @@
currentToken = EOF;
currentTokenValue = null;
property = 0;
+//System.out.println(-Tokenizer reset.);
+}
+
+/**
+ * Get the current expression
+ * @return - the expression.
+ */
+public String getExpr() {
+return expr;
}
/**
@@ -194,12 +205,11 @@
}
} else
bSawDecimal = false;
+currentUnitIndex = exprIndex;
if (exprIndex exprLength expr.charAt(exprIndex) == '%') {
currentToken = PERCENT;
-currentTokenValue = expr.substring(currentTokenStartIndex,
- exprIndex);
+unitString = %;
exprIndex++;
-return;
} else {
// Check for possible unit name following number
currentToken = scanUnitName();
@@ -207,7 +217,7 @@
currentToken = bSawDecimal ? FLOAT : INTEGER;
}
currentTokenValue = expr.substring(currentTokenStartIndex,
- exprIndex);
+ currentUnitIndex);
return;
case '.':
@@ -343,49 +353,48 @@
* @exception PropertyException if an NCName not a UnitName recognized.
*/
private int scanUnitName() throws PropertyException {
-String unit;
-currentUnitLength = exprIndex;
+currentUnitIndex = exprIndex;
scanName();
-if ((currentUnitLength = exprIndex - currentUnitLength) 0) {
-unit = expr.substring(currentUnitLength, exprIndex);
-if (unit.equals(em)) return RELATIVE_LENGTH;
-if (unit.equals(cm)) {
+if (currentUnitIndex exprIndex) {
+unitString = expr.substring(currentUnitIndex, exprIndex);
+if (unitString.equals(em)) return RELATIVE_LENGTH;
+if (unitString.equals(cm)) {
currentUnit = Length.CM;
return ABSOLUTE_LENGTH;
}
-if (unit.equals(mm)) {
+if (unitString.equals(mm)) {
currentUnit = Length.MM;
return ABSOLUTE_LENGTH;
}
-if (unit.equals(in)) {
+if (unitString.equals(in)) {
currentUnit = Length.IN;
return ABSOLUTE_LENGTH;
}
-if (unit.equals(pt)) {
+if (unitString.equals(pt)) {
currentUnit = Length.PT;
return ABSOLUTE_LENGTH;
}
-if (unit.equals(pc)) {
+if (unitString.equals(pc)) {
currentUnit = Length.PC;
return ABSOLUTE_LENGTH;
}
-if (unit.equals(px)) {
+if (unitString.equals(px)) {
currentUnit = Length.PX;
return ABSOLUTE_LENGTH;
}
-if (unit.equals(s)) {
+if (unitString.equals(s)) {
currentUnit = Time.SEC;
return TIME;
}
-if (unit.equals(ms)) {
+if (unitString.equals(ms)) {
currentUnit = Time.MSEC;
return TIME;
}
-if (unit.equals(Hz
cvs commit: xml-fop/src/org/apache/fop/fo/expr PropertyParser.java
pbwest 2002/10/02 00:23:18
Modified:src/org/apache/fop/fo/expr Tag: FOP_0-20-0_Alt-Design
PropertyParser.java
Log:
Add explicit reset()s. Add InheritedValue handling.
Access tokenizer expr value via method call.
Revision ChangesPath
No revision
No revision
1.5.2.12 +32 -17xml-fop/src/org/apache/fop/fo/expr/PropertyParser.java
Index: PropertyParser.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/expr/PropertyParser.java,v
retrieving revision 1.5.2.11
retrieving revision 1.5.2.12
diff -u -r1.5.2.11 -r1.5.2.12
--- PropertyParser.java 24 Sep 2002 05:26:42 - 1.5.2.11
+++ PropertyParser.java 2 Oct 2002 07:23:18 - 1.5.2.12
@@ -127,11 +127,13 @@
public PropertyValue parse(FONode node, int property, String expr)
throws PropertyException
{
+//System.out.println(-Entering parse:
+// + PropNames.getPropertyName(property) + + expr);
synchronized (this) {
// make sure this parser is available
-if (expr != null) // the parser is currently active
+if (getExpr() != null) // the parser is currently active
throw new PropertyException
-(PropertyParser is currently active.);
+(PropertyParser is currently active: + getExpr());
initialize(property, expr);
this.node = node;
}
@@ -149,8 +151,10 @@
// end of the expression - add to list and go
if (propList.size() != 0) {
propList.add(prop);
+reset();
return propList;
} else { // list is empty
+reset();
return prop;
}
}
@@ -164,8 +168,10 @@
propList.add(prop);
} else { // whitespace separates list elements; make a sublist
propList.add(parseSublist(prop));
-if (currentToken == EOF)
+if (currentToken == EOF) {
+reset();
return propList;
+}
}
}
}
@@ -489,29 +495,38 @@
}
// Property value functions
+if (currentTokenValue.equals(label-end)) {
+PropertyValue[] args = parseArgs(0);
+throw new FunctionNotImplementedException(label-end);
+//break;
+}
+if (currentTokenValue.equals(body-start)) {
+PropertyValue[] args = parseArgs(0);
+throw new FunctionNotImplementedException(body-start);
+//break;
+}
if (currentTokenValue.equals(inherited-property-value)) {
int propindex = property;
PropertyValue[] args = parseArgs(0, 1);
if (args.length != 0)
propindex = PropertyConsts.getPropertyIndex(
((StringType)args[0]).getString());
-if (PropertyConsts.inheritance(propindex) == Properties.NO)
+
+// If it's a compound, return an InheritedValue object
+if (PropertyConsts.isCompound(propindex)) {
+prop = new InheritedValue(property, propindex);
+break;
+}
+// Is it an inherited property?
+if (PropertyConsts.inheritance(propindex)
+== Properties.NO)
throw new PropertyException
(inherited-property-value:
+ PropNames.getPropertyName(propindex)
+ is not inherited.);
-prop = new InheritedValue(property, propindex);
+// Not a compound, and inherited - try to resolve it
+prop = node.fromParent(property, propindex);
break;
-}
-if (currentTokenValue.equals(label-end)) {
-PropertyValue[] args = parseArgs(0);
-throw new FunctionNotImplementedException(label-end);
-//break;
-}
-if (currentTokenValue.equals(body-start)) {
-PropertyValue[] args = parseArgs(0);
-throw new FunctionNotImplementedException(body-start);
-//break
cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoSimplePageMaster.java
pbwest 2002/10/02 00:26:01
Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoSimplePageMaster.java
Log:
Access master-name through propertySets.
Revision ChangesPath
No revision
No revision
1.1.2.4 +12 -7
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java
Index: FoSimplePageMaster.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FoSimplePageMaster.java 2 Oct 2002 01:30:59 - 1.1.2.3
+++ FoSimplePageMaster.java 2 Oct 2002 07:26:01 - 1.1.2.4
@@ -11,6 +11,7 @@
// FOP
import org.apache.fop.fo.FOAttributes;
+import org.apache.fop.fo.PropNames;
import org.apache.fop.xml.XMLEvent;
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.FObjects;
@@ -19,6 +20,8 @@
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.datastructs.Tree;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.NCName;
/**
* Implements the fo:simple-page-master flow object
@@ -42,11 +45,13 @@
super(foTree, FObjectNames.SIMPLE_PAGE_MASTER, parent, event,
FObjects.LAYOUT_SET);
System.out.println(FOAttributes: + event);
-try {
-masterName = foAttributes.getFoAttrValue(master-name);
-} catch (PropertyException e) {
-throw new FOPException(e.getMessage());
-}
+// Check that the property has been set
+PropertyValue name = propertySet[PropNames.MASTER_NAME];
+if (name == null)
+throw new PropertyException(master-name property not set);
+if (name.getType() != PropertyValue.NCNAME)
+throw new PropertyException(master-name property not an NCName.);
+masterName = ((NCName)name).getNCName();
// Process regions here
XMLEvent ev = xmlevents.getEndElement(event);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FONode.java FoRoot.java Properties.java
pbwest 2002/10/02 08:14:29
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FONode.java
FoRoot.java Properties.java
Log:
Moved FObjects to FOPropertySets.
Revision ChangesPath
No revision
No revision
1.19.2.12 +8 -7 xml-fop/src/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
retrieving revision 1.19.2.11
retrieving revision 1.19.2.12
diff -u -r1.19.2.11 -r1.19.2.12
--- FONode.java 2 Oct 2002 07:08:26 - 1.19.2.11
+++ FONode.java 2 Oct 2002 15:14:21 - 1.19.2.12
@@ -2,7 +2,7 @@
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FOAttributes;
-import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.expr.PropertyParser;
import org.apache.fop.datatypes.PropertyValue;
@@ -100,15 +100,16 @@
this.parent = parent;
this.event = event;
this.attrSet = attrSet;
-nodeAttrBitSet = FObjects.getAttrROBitSet(attrSet);
+nodeAttrBitSet = FOPropertySets.getAttrROBitSet(attrSet);
xmlevents = foTree.xmlevents;
namespaces = xmlevents.getNamespaces();
exprParser = foTree.exprParser;
propertySet = new PropertyValue[PropNames.LAST_PROPERTY_INDEX + 1];
foAttributes = new FOAttributes(event, this);
-if ( ! (attrSet == FObjects.MARKER_SET)) {
+if ( ! (attrSet == FOPropertySets.MARKER_SET)) {
processAttributes();
}
+// Set up the remaining properties.
}
private void processAttributes() throws FOPException, PropertyException {
@@ -133,7 +134,7 @@
MessageHandler.log(Ignoring property
+ PropNames.getPropertyName(property)
+ for attribute set
- + FObjects.getAttrSetName(attrSet)
+ + FOPropertySets.getAttrSetName(attrSet)
+ .);
} else {
stackValue(props);
@@ -151,7 +152,7 @@
MessageHandler.log(Ignoring property
+ PropNames.getPropertyName(property)
+ for attribute set
- + FObjects.getAttrSetName(attrSet)
+ + FOPropertySets.getAttrSetName(attrSet)
+ .);
} else {
stackValue(value);
1.1.2.6 +5 -5 xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java
Index: FoRoot.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoRoot.java 2 Oct 2002 01:25:21 - 1.1.2.5
+++ FoRoot.java 2 Oct 2002 15:14:21 - 1.1.2.6
@@ -11,7 +11,7 @@
package org.apache.fop.fo;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.datastructs.Tree;
import org.apache.fop.fo.FOTree;
@@ -52,7 +52,7 @@
throws Tree.TreeException, FOPException, PropertyException
{
// This is the root node of the tree; hence the null argument
-super(foTree, FObjectNames.ROOT, null, event, FObjects.ROOT_SET);
+super(foTree, FObjectNames.ROOT, null, event, FOPropertySets.ROOT_SET);
}
/**
1.1.2.30 +4 -4 xml-fop/src/org/apache/fop/fo/Attic/Properties.java
Index: Properties.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/Properties.java,v
retrieving revision 1.1.2.29
retrieving revision 1.1.2.30
diff -u -r1.1.2.29 -r1.1.2.30
--- Properties.java 2 Oct 2002 07:06:25 - 1.1.2.29
+++ Properties.java 2 Oct 2002 15:14:21 - 1.1.2.30
@@ -25,7 +25,7 @@
import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.fo.ShorthandPropSets;
import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.AbstractPropertyValue;
import org.apache.fop.datatypes.PropertyValueList
cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoSimplePageMaster.java FoPageSequenceMaster.java FoLayoutMasterSet.java
pbwest 2002/10/02 08:19:59
Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoSimplePageMaster.java FoPageSequenceMaster.java
FoLayoutMasterSet.java
Log:
Moved FObjects to FOPropertySets.
Revision ChangesPath
No revision
No revision
1.1.2.5 +4 -4
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java
Index: FoSimplePageMaster.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoSimplePageMaster.java 2 Oct 2002 07:26:01 - 1.1.2.4
+++ FoSimplePageMaster.java 2 Oct 2002 15:19:59 - 1.1.2.5
@@ -14,7 +14,7 @@
import org.apache.fop.fo.PropNames;
import org.apache.fop.xml.XMLEvent;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FOTree;
@@ -43,7 +43,7 @@
throws Tree.TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.SIMPLE_PAGE_MASTER, parent, event,
- FObjects.LAYOUT_SET);
+ FOPropertySets.LAYOUT_SET);
System.out.println(FOAttributes: + event);
// Check that the property has been set
PropertyValue name = propertySet[PropNames.MASTER_NAME];
1.1.2.4 +5 -5
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
Index: FoPageSequenceMaster.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FoPageSequenceMaster.java 2 Oct 2002 01:30:59 - 1.1.2.3
+++ FoPageSequenceMaster.java 2 Oct 2002 15:19:59 - 1.1.2.4
@@ -20,7 +20,7 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.Properties;
-import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FONode;
@@ -47,7 +47,7 @@
throws Tree.TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.PAGE_SEQUENCE_MASTER, parent, null,
- FObjects.LAYOUT_SET);
+ FOPropertySets.LAYOUT_SET);
this.masterName = masterName;
}
@@ -55,7 +55,7 @@
throws Tree.TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.PAGE_SEQUENCE_MASTER, parent, event,
- FObjects.LAYOUT_SET);
+ FOPropertySets.LAYOUT_SET);
if (event == null) {
System.out.println(Null event; throwing FOPException);
throw new FOPException
1.1.2.4 +5 -5
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
Index: FoLayoutMasterSet.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FoLayoutMasterSet.java2 Oct 2002 01:30:59 - 1.1.2.3
+++ FoLayoutMasterSet.java2 Oct 2002 15:19:59 - 1.1.2.4
@@ -6,7 +6,7 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.xml.XMLEvent;
-import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FONode;
@@ -62,7 +62,7 @@
throws Tree.TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.LAYOUT_MASTER_SET, parent, event,
- FObjects.LAYOUT_SET);
+ FOPropertySets.LAYOUT_SET);
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FOTree.java
pbwest 2002/10/02 20:13:32 Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FOTree.java Log: Removed PropertyTriplet import. Revision ChangesPath No revision No revision 1.1.2.14 +3 -4 xml-fop/src/org/apache/fop/fo/Attic/FOTree.java Index: FOTree.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOTree.java,v retrieving revision 1.1.2.13 retrieving revision 1.1.2.14 diff -u -r1.1.2.13 -r1.1.2.14 --- FOTree.java 2 Oct 2002 01:17:14 - 1.1.2.13 +++ FOTree.java 3 Oct 2002 03:13:32 - 1.1.2.14 @@ -3,6 +3,7 @@ import org.apache.fop.datastructs.Tree; import org.apache.fop.datatypes.Ints; import org.apache.fop.datatypes.Numeric; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.indirect.Inherit; import org.apache.fop.datatypes.Auto; import org.apache.fop.datatypes.None; @@ -16,8 +17,6 @@ import org.apache.fop.fo.Properties; import org.apache.fop.fo.PropertyConsts; import org.apache.fop.fo.PropNames; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.PropertyTriplet; import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.fo.expr.PropertyParser; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo PropertyConsts.java
pbwest 2002/10/02 20:14:29
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
PropertyConsts.java
Log:
Removed getNonInheritedSet() method.
Revision ChangesPath
No revision
No revision
1.1.2.13 +3 -11 xml-fop/src/org/apache/fop/fo/Attic/PropertyConsts.java
Index: PropertyConsts.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropertyConsts.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- PropertyConsts.java 2 Oct 2002 01:26:53 - 1.1.2.12
+++ PropertyConsts.java 3 Oct 2002 03:14:29 - 1.1.2.13
@@ -235,13 +235,6 @@
}
/**
- * @return ttBitSet/tt of non-inherited properties
- */
-public static BitSet getNonInheritedSet() {
-return (BitSet)nonInheritedProps.clone();
-}
-
-/**
* @param propertyIndex int index of the FO property
* @return ttboolean/tt is property a shorthand?
*/
@@ -680,4 +673,3 @@
private PropertyConsts (){}
}
-
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FOPropertySets.java
pbwest 2002/10/02 20:16:51 Added: src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FOPropertySets.java Log: Added inherited and non-inherited bitsets for sub-tree attribute sets, with initializers and accessors. Revision ChangesPath No revision No revision 1.1.2.1 +2259 -0 xml-fop/src/org/apache/fop/fo/Attic/FOPropertySets.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo ShorthandPropSets.java
pbwest 2002/10/02 20:23:32
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
ShorthandPropSets.java
Log:
Fixed initialization of shorthand and compound property bitmaps.
Revision ChangesPath
No revision
No revision
1.1.2.2 +40 -3 xml-fop/src/org/apache/fop/fo/Attic/ShorthandPropSets.java
Index: ShorthandPropSets.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/ShorthandPropSets.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ShorthandPropSets.java2 Oct 2002 07:04:03 - 1.1.2.1
+++ ShorthandPropSets.java3 Oct 2002 03:23:32 - 1.1.2.2
@@ -13,6 +13,7 @@
import java.lang.CloneNotSupportedException;
import java.util.Set;
+import java.util.BitSet;
import java.util.HashSet;
import java.util.HashMap;
import java.util.List;
@@ -26,6 +27,7 @@
import org.apache.fop.datatypes.PropertyValueList;
import org.apache.fop.fo.PropNames;
import org.apache.fop.datastructs.ROIntArray;
+import org.apache.fop.datastructs.ROBitSet;
import org.apache.fop.datatypes.Ints;
/**
@@ -293,6 +295,18 @@
new ROIntArray(shorthands);
/**
+ * A ttROBitSet/tt of the shorthand properties.
+ */
+public static final ROBitSet shorthandPropSet;
+private static final BitSet shorthandpropset;
+static {
+shorthandpropset = new BitSet(PropNames.LAST_PROPERTY_INDEX + 1);
+for (int i = 0; i shorthands.length; i++)
+shorthandpropset.set(shorthands[i]);
+shorthandPropSet = new ROBitSet(shorthandpropset);
+}
+
+/**
* Array of iROIntArray/ib in same order as ishorthands/i/b
* iROIntArray/i.
* If a public view of this is required, use
@@ -774,6 +788,29 @@
public static final ROIntArray roCompounds;
static {
roCompounds = new ROIntArray(compounds);
+}
+
+/**
+ * A ttROBitSet/tt of the compound properties.
+ */
+public static final ROBitSet compoundPropSet;
+private static final BitSet compoundpropset;
+
+/**
+ * a ttROBitSet of shorthand and compound properties.
+ */
+public static final ROBitSet shorthandCompoundProps;
+private static final BitSet shorthandcompoundprops;
+
+static {
+compoundpropset = new BitSet(PropNames.LAST_PROPERTY_INDEX + 1);
+for (int i = 0; i compounds.length; i++)
+compoundpropset.set(compounds[i]);
+compoundPropSet = new ROBitSet(compoundpropset);
+shorthandcompoundprops = new BitSet();
+shorthandcompoundprops.or(compoundpropset);
+shorthandcompoundprops.or(shorthandpropset);
+shorthandCompoundProps = new ROBitSet(shorthandcompoundprops);
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/xml XMLNamespaces.java
pbwest 2002/10/02 20:27:29
Modified:src/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
XMLNamespaces.java
Log:
Fixed problem adding namespace.
Revision ChangesPath
No revision
No revision
1.1.2.2 +6 -4 xml-fop/src/org/apache/fop/xml/Attic/XMLNamespaces.java
Index: XMLNamespaces.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/xml/Attic/XMLNamespaces.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- XMLNamespaces.java16 Sep 2002 04:20:25 - 1.1.2.1
+++ XMLNamespaces.java3 Oct 2002 03:27:29 - 1.1.2.2
@@ -36,7 +36,7 @@
public static final int DefAttrNSIndex = 0;
public static final int XSLNSpaceIndex = 1;
public static final int SVGNSpaceIndex = 2;
-public static final int XLinkNSpaceIndex = 1;
+public static final int XLinkNSpaceIndex = 3;
/**
* A ttHashMap/tt mapping a namespace URI to an ttint/tt
@@ -99,7 +99,9 @@
if (intg == null) {
// update the indices
i = uris.size();
+//System.out.println(Adding namespace + uri + + i);
uriIndices.put(uri, Ints.consts.get(i));
+uris.add(i, uri);
return i;
}
// not null - found the integer
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datastructs SyncedCircularBuffer.java
pbwest 2002/10/02 20:29:02
Modified:src/org/apache/fop/datastructs Tag: FOP_0-20-0_Alt-Design
SyncedCircularBuffer.java
Log:
Fixed exception message.
Revision ChangesPath
No revision
No revision
1.1.2.2 +3 -3
xml-fop/src/org/apache/fop/datastructs/Attic/SyncedCircularBuffer.java
Index: SyncedCircularBuffer.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/datastructs/Attic/SyncedCircularBuffer.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SyncedCircularBuffer.java 7 May 2002 04:37:53 - 1.1.2.1
+++ SyncedCircularBuffer.java 3 Oct 2002 03:29:02 - 1.1.2.2
@@ -99,7 +99,7 @@
synchronized (this) {
Object obj;
if (Thread.interrupted()) {
-throw new InterruptedException(Producer interrupted);
+throw new InterruptedException(Consumer interrupted);
}
if (pushBackBuf != null) {
obj = pushBackBuf;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datastructs ROIntArray.java
pbwest 2002/10/02 20:30:34 Modified:src/org/apache/fop/datastructs Tag: FOP_0-20-0_Alt-Design ROIntArray.java Log: Fixed initialization problem with int[][] constructor. Revision ChangesPath No revision No revision 1.1.2.3 +9 -4 xml-fop/src/org/apache/fop/datastructs/Attic/ROIntArray.java Index: ROIntArray.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/datastructs/Attic/ROIntArray.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- ROIntArray.java 18 Sep 2002 05:20:29 - 1.1.2.2 +++ ROIntArray.java 3 Oct 2002 03:30:34 - 1.1.2.3 @@ -43,8 +43,13 @@ i = 0; for (j = 0; j iarrays.length; j++) for (k = 0; k iarrays[j].length; k++) -iarray[i++] = iarrays[j][k]; -length = iarray.length; +i++; +length = i; +iarray = new int[length]; +i = 0; +for (j = 0; j iarrays.length; j++) +for (k = 0; k iarrays[j].length; k++) +iarray[i++] = iarrays[j][k]; } /** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/xml SyncedXmlEventsBuffer.java
pbwest 2002/10/02 20:37:27
Modified:src/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
SyncedXmlEventsBuffer.java
Log:
Rethrow InterruptedException directly.
Revision ChangesPath
No revision
No revision
1.1.2.2 +4 -3 xml-fop/src/org/apache/fop/xml/Attic/SyncedXmlEventsBuffer.java
Index: SyncedXmlEventsBuffer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/xml/Attic/SyncedXmlEventsBuffer.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SyncedXmlEventsBuffer.java16 Sep 2002 04:20:24 - 1.1.2.1
+++ SyncedXmlEventsBuffer.java3 Oct 2002 03:37:26 - 1.1.2.2
@@ -72,7 +72,7 @@
//System.out.println(getEvent: + ev);
return ev;
} catch (InterruptedException e) {
-throw new FOPException(InterruptedException);
+throw new FOPException(e);
}
}
@@ -221,6 +221,7 @@
public XMLEvent expectStartElement(int uriIndex, String localName)
throws FOPException
{
+//System.out.println(In expectStartElement..);
XMLEvent ev = getEvent();
if (ev != null
(ev.type == XMLEvent.STARTELEMENT
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datatypes PropertyTriplet.java
pbwest 2002/10/03 04:55:58 Removed: src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design PropertyTriplet.java Log: Removed. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datatypes/indirect InheritedValue.java Inherit.java
pbwest 2002/10/03 05:02:25 Modified:src/org/apache/fop/datatypes/indirect Tag: FOP_0-20-0_Alt-Design InheritedValue.java Inherit.java Log: Removed PropertyTriplet import. Revision ChangesPath No revision No revision 1.1.2.3 +3 -4 xml-fop/src/org/apache/fop/datatypes/indirect/Attic/InheritedValue.java Index: InheritedValue.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/indirect/Attic/InheritedValue.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- InheritedValue.java 18 Sep 2002 15:31:14 - 1.1.2.2 +++ InheritedValue.java 3 Oct 2002 12:02:25 - 1.1.2.3 @@ -2,7 +2,6 @@ import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.PropertyTriplet; import org.apache.fop.fo.Properties; import org.apache.fop.fo.PropNames; import org.apache.fop.fo.PropertyConsts; 1.1.2.3 +3 -4 xml-fop/src/org/apache/fop/datatypes/indirect/Attic/Inherit.java Index: Inherit.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/indirect/Attic/Inherit.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- Inherit.java 18 Sep 2002 15:31:14 - 1.1.2.2 +++ Inherit.java 3 Oct 2002 12:02:25 - 1.1.2.3 @@ -2,7 +2,6 @@ import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.PropertyTriplet; import org.apache.fop.fo.Properties; import org.apache.fop.fo.FONode; import org.apache.fop.datatypes.indirect.IndirectValue; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datatypes/indirect FromNearestSpecified.java
pbwest 2002/10/03 05:10:17
Modified:src/org/apache/fop/datatypes/indirect Tag:
FOP_0-20-0_Alt-Design FromNearestSpecified.java
Log:
Changed call to getNearestSpecifiedTriplet() to
getNearestSpecifiedValue().
Revision ChangesPath
No revision
No revision
1.1.2.3 +7 -7
xml-fop/src/org/apache/fop/datatypes/indirect/Attic/FromNearestSpecified.java
Index: FromNearestSpecified.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/datatypes/indirect/Attic/FromNearestSpecified.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FromNearestSpecified.java 18 Sep 2002 15:31:14 - 1.1.2.2
+++ FromNearestSpecified.java 3 Oct 2002 12:10:17 - 1.1.2.3
@@ -80,17 +80,17 @@
/**
* Attempt to resolve this object into a real property value. If the
- * object has no iinheritedTriplet/i, obtain and set one. The
- * obtained triplet is from the nearest ancestor node on which a value
+ * object has no iinheritedValue/i, obtain and set one. The
+ * obtained value is from the nearest ancestor node on which a value
* has been specified.
* Then invoke the superclass' iresolve()/i method.
* @param node - the ttFONode/tt with which this object is associated.
* @return the resulting ttPropertyValue/tt. Either a resolved value
- * or ithis/i, if bequeathing triplet has no resolved computed value.
+ * or ithis/i, if bequeathing value has no resolved computed value.
*/
public PropertyValue resolve(FONode node) throws PropertyException {
if (inheritedValue == null) {
-inheritedValue = node.getNearestSpecifiedTriplet(sourceProperty);
+inheritedValue = node.getNearestSpecifiedValue(sourceProperty);
}
return super.resolve(node);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datatypes/indirect IndirectValue.java
pbwest 2002/10/03 05:47:23
Modified:src/org/apache/fop/datatypes/indirect Tag:
FOP_0-20-0_Alt-Design IndirectValue.java
Log:
Imports: -PropertyTriplet +Numeric.
Replaced PropertyTriplet references with PropertyValue.
Removed getInheritedTriplet().
Added isUnresolved().
Revision ChangesPath
No revision
No revision
1.1.2.3 +30 -36
xml-fop/src/org/apache/fop/datatypes/indirect/Attic/IndirectValue.java
Index: IndirectValue.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/datatypes/indirect/Attic/IndirectValue.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- IndirectValue.java18 Sep 2002 15:31:14 - 1.1.2.2
+++ IndirectValue.java3 Oct 2002 12:47:23 - 1.1.2.3
@@ -3,7 +3,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.datatypes.AbstractPropertyValue;
import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.PropertyTriplet;
+import org.apache.fop.datatypes.Numeric;
import org.apache.fop.fo.Properties;
import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.fo.FONode;
@@ -24,11 +24,11 @@
* These include ttInherit/tt, ttFromParent/tt and
* ttFromNearestSpecified/tt objects. If an ttInheritedValue/tt
* object is defined, it will also extend this class.
- * pThe required value is usually the computed field of the
- * ttPropertyTriplet/tt for the source property on the source node. This
+ * pThe required value is usually the computed value of the
+ * ttPropertyValue/tt of the source property on the source node. This
* property may be different from the property of this object. This class
- * provides accessors for the referenced ttPropertyTriplet/tt and the
- * computed value of that triplet. In some cases, the specified value is
+ * provides accessors for the referenced ttPropertyValue/tt.
+ * In some cases, the specified value is
* required. It is the responsibility of the subclass to determine and
* act upon these cases. At the time of writing, the only such exception is
* when a iline-height/i is defined as a lt;numbergt;.
@@ -46,11 +46,11 @@
protected int sourceProperty;
/**
- * The ttPropertyTriplet/tt from which this object is being
+ * The ttPropertyValue/tt from which this object is being
* inherited. Set when the inheritance cannot be immediately resolved,
* e.g. when the specified value is a percentage.
*/
-protected PropertyTriplet inheritedValue = null;
+protected PropertyValue inheritedValue = null;
/**
* @param property - the ttint/tt index of the property on which
@@ -115,64 +115,51 @@
}
/**
- * @return ttPropertyTriplet/tt which contains or will contain the
+ * @return ttPropertyValue/tt which contains or will contain the
* the computed value being inherited. This field will be null except
* when an unresolved computed value is being inherited. If so,
- * a null value will be returned. N.B. This triplet will have a
- * property value different from this iIndirectValue/i object.
- */
-public PropertyTriplet getInheritedTriplet() {
-return inheritedValue;
-}
-
-/**
- * @return computed ttPropertyValue/tt field from the
- * ttPropertyTriplet/tt from which this object is inherting.
- * If the iinheritedValue/i field is null, no resolution of the
- * inheritance has yet been attempted, and a null value is returned.
- * If the iinheritedValue/i field is not null, return the
- * icomputed/i field, which may be null. N.B. This
+ * a null value will be returned. N.B. This
* ttPropertyValue/tt may have a property field different from
* this iIndirectValue/i object. The source property field is held in
* the isourceProperty/i field.
*/
public PropertyValue getInheritedValue() {
-if (inheritedValue != null) return inheritedValue.getComputed();
-return null;
+return inheritedValue;
}
/**
- * Set the reference to the ttPropertyTriplet/tt from which the
+ * Set the reference to the ttPropertyValue/tt from which the
* value is being inherited.
- * @param bequeathed - the ttPropertyTriplet/tt which contains
+ * @param bequeathed - the ttPropertyValue/tt which contains
* or will contain the the computed value of the percentage being
* inherited.
*/
-public void setInheritedTriplet(PropertyTriplet bequeathed) {
+public void setInheritedValue(PropertyValue bequeathed) {
inheritedValue = bequeathed
cvs commit: xml-fop/src/org/apache/fop/fo FObjectNames.java
pbwest 2002/10/03 06:13:51
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FObjectNames.java
Log:
Added getFOName().
Revision ChangesPath
No revision
No revision
1.1.2.4 +19 -2 xml-fop/src/org/apache/fop/fo/Attic/FObjectNames.java
Index: FObjectNames.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FObjectNames.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FObjectNames.java 3 Sep 2002 03:30:51 - 1.1.2.3
+++ FObjectNames.java 3 Oct 2002 13:13:51 - 1.1.2.4
@@ -10,6 +10,8 @@
package org.apache.fop.fo;
+import org.apache.fop.apps.FOPException;
+
/**
* Data class containing the Flow Object names and associated integer
* constants.
@@ -153,4 +155,19 @@
,{ title, fo.sequences} //55
,{ wrapper, fo.sequences} //56
};
+
+/**
+ * @param foType ttint/tt index of the FO type.
+ * @return ttString/tt name of the FO.
+ * @exception FOPException if the FO index is invalid.
+ */
+public static String getFOName(int foType)
+throws FOPException
+{
+if (foType 0 || foType LAST_FO)
+throw new FOPException
+(getFOName: type is invalid: + foType);
+return foLocalNames[foType][0];
+}
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FONode.java
pbwest 2002/10/03 06:24:57
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FONode.java
Log:
Added inherited and non-inherited bitsets.
Set inherited and non-inherited properties through bitsets.
Moved test of specified property against subtree attribute set to
top of attributes handling.
Revision ChangesPath
No revision
No revision
1.19.2.13 +50 -30xml-fop/src/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
retrieving revision 1.19.2.12
retrieving revision 1.19.2.13
diff -u -r1.19.2.12 -r1.19.2.13
--- FONode.java 2 Oct 2002 15:14:21 - 1.19.2.12
+++ FONode.java 3 Oct 2002 13:24:56 - 1.19.2.13
@@ -2,6 +2,7 @@
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FOAttributes;
+import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.expr.PropertyParser;
@@ -76,7 +77,13 @@
/** The iattrSet/i argument. */
public final int attrSet;
/** The ttROBitSet/tt of the iattrSet/i argument. */
-protected ROBitSet nodeAttrBitSet;
+protected ROBitSet attrBitSet;
+/** The ttROBitSet/tt of inherited properties for the
+iattrSet/i argument. */
+protected ROBitSet inheritedBitSet;
+/** The ttROBitSet/tt of non-inherited prperties for the
+iattrSet/i argument. */
+protected ROBitSet nonInheritedBitSet;
/** Ancestor reference area of this FONode. */
protected FONode ancestorRefArea = null;
@@ -100,7 +107,9 @@
this.parent = parent;
this.event = event;
this.attrSet = attrSet;
-nodeAttrBitSet = FOPropertySets.getAttrROBitSet(attrSet);
+attrBitSet = FOPropertySets.getAttrROBitSet(attrSet);
+inheritedBitSet = FOPropertySets.getInheritedROBitSet(attrSet);
+nonInheritedBitSet = FOPropertySets.getNonInheritedROBitSet(attrSet);
xmlevents = foTree.xmlevents;
namespaces = xmlevents.getNamespaces();
exprParser = foTree.exprParser;
@@ -110,6 +119,23 @@
processAttributes();
}
// Set up the remaining properties.
+for (int prop = inheritedBitSet.nextSetBit(0);
+ prop = 0;
+ prop = inheritedBitSet.nextSetBit(++prop))
+{
+if (parent != null)
+propertySet[prop] = parent.propertySet[prop];
+else
+propertySet[prop] = foTree.getInitialValue(prop);
+}
+
+for (int prop = nonInheritedBitSet.nextSetBit(0);
+ prop = 0;
+ prop = inheritedBitSet.nextSetBit(++prop))
+{
+propertySet[prop] = foTree.getInitialValue(prop);
+}
+
}
private void processAttributes() throws FOPException, PropertyException {
@@ -122,43 +148,37 @@
}
for (int propx = 0; propx numAttrs; propx++) {
PropertyValue props;
-int type;
+int ptype;
int property;
int prop = foKeys[propx].intValue();
+if ( ! attrBitSet.get(prop)) {
+MessageHandler.log(Ignoring
+ + PropNames.getPropertyName(prop)
+ + on
+ + FObjectNames.getFOName(type)
+ + for attribute set
+ + FOPropertySets.getAttrSetName(attrSet)
+ + .);
+continue;
+}
String attrValue = foAttributes.getFoAttrValue(prop);
props = handleAttrValue(prop, attrValue);
-type = props.getType();
-if (type != PropertyValue.LIST) {
+ptype = props.getType();
+if (ptype != PropertyValue.LIST) {
property = props.getProperty();
-if ( ! nodeAttrBitSet.get(property)) {
-MessageHandler.log(Ignoring property
- + PropNames.getPropertyName(property)
- + for attribute set
- + FOPropertySets.getAttrSetName(attrSet)
- + .);
-} else {
-stackValue(props);
-// Handle corresponding properties here
-// Update the propertySet
-propertySet[props.getProperty()] = props;
-}
+stackValue(props
cvs commit: xml-fop/src/org/apache/fop/datatypes NoType.java AbstractPropertyValue.java
pbwest 2002/10/04 08:49:33
Modified:src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
AbstractPropertyValue.java
Added: src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
NoType.java
Log:
Added support for NoType PropertyValue for use with empty initial values and
unsupported properties.
Revision ChangesPath
No revision
No revision
1.1.2.4 +4 -4
xml-fop/src/org/apache/fop/datatypes/Attic/AbstractPropertyValue.java
Index: AbstractPropertyValue.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/AbstractPropertyValue.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- AbstractPropertyValue.java2 Oct 2002 06:58:25 - 1.1.2.3
+++ AbstractPropertyValue.java4 Oct 2002 15:49:33 - 1.1.2.4
@@ -49,7 +49,7 @@
{
if (index 1 || index PropNames.LAST_PROPERTY_INDEX)
throw new PropertyException(Invalid property index: + index);
-if (type 1 || type PropertyValue.LAST_PROPERTY_TYPE)
+if (type 0 || type PropertyValue.LAST_PROPERTY_TYPE)
throw new PropertyException(Invalid property type: + type);
property = index;
this.type = type;
@@ -64,7 +64,7 @@
property = PropertyConsts.getPropertyIndex(propertyName);
if (property 1 || property PropNames.LAST_PROPERTY_INDEX)
throw new PropertyException(Invalid property index: + property);
-if (type 1 || type PropertyValue.LAST_PROPERTY_TYPE)
+if (type 0 || type PropertyValue.LAST_PROPERTY_TYPE)
throw new PropertyException(Invalid property type: + type);
this.type = type;
}
No revision
No revision
1.1.2.1 +67 -0 xml-fop/src/org/apache/fop/datatypes/Attic/NoType.java
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datatypes Compound.java InheritCompound.java Keep.java
pbwest 2002/10/04 08:53:38 Removed: src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design Compound.java InheritCompound.java Keep.java Log: Compounds not required. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo Properties.java
pbwest 2002/10/04 08:57:57
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
Properties.java
Log:
Added support for NoType PropertyValue.
Revision ChangesPath
No revision
No revision
1.1.2.31 +5 -4 xml-fop/src/org/apache/fop/fo/Attic/Properties.java
Index: Properties.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/Properties.java,v
retrieving revision 1.1.2.30
retrieving revision 1.1.2.31
diff -u -r1.1.2.30 -r1.1.2.31
--- Properties.java 2 Oct 2002 15:14:21 - 1.1.2.30
+++ Properties.java 4 Oct 2002 15:57:56 - 1.1.2.31
@@ -35,6 +35,7 @@
import org.apache.fop.datastructs.ROStringArray;
import org.apache.fop.datastructs.ROIntArray;
import org.apache.fop.datatypes.Ints;
+import org.apache.fop.datatypes.NoType;
import org.apache.fop.datatypes.StringType;
import org.apache.fop.datatypes.NCName;
import org.apache.fop.datatypes.CountryType;
@@ -557,7 +558,7 @@
+ PropNames.getPropertyName(property));
switch (initialValueType) {
case NOTYPE_IT:
-return null;
+return new NoType(property);
case AUTO_IT:
return new Auto(property);
case NONE_IT:
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo PropertyConsts.java
pbwest 2002/10/04 09:08:26 Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design PropertyConsts.java Log: Added inheritedProps ROBitSet. Revision ChangesPath No revision No revision 1.1.2.14 +28 -4 xml-fop/src/org/apache/fop/fo/Attic/PropertyConsts.java Index: PropertyConsts.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropertyConsts.java,v retrieving revision 1.1.2.13 retrieving revision 1.1.2.14 diff -u -r1.1.2.13 -r1.1.2.14 --- PropertyConsts.java 3 Oct 2002 03:14:29 - 1.1.2.13 +++ PropertyConsts.java 4 Oct 2002 16:08:26 - 1.1.2.14 @@ -471,6 +471,26 @@ */ private static final BitSet noninheritedprops; +/** + * An ttROBitSet/tt of properties which are normally inherited + * (strictly, not not inherited). + * It is defined relative to the set of all properties; i.e. the + * inheritability of any property can be established by testing the + * bit in this set that corresponds to the queried property's index. + */ +public static final ROBitSet inheritedProps; + +/** + * A ttBitSet/tt of properties which are normally inherited + * (strictly, not not inherited). + * It is defined relative to the set of all properties; i.e. the + * inheritability of any property can be established by testing the + * bit in this set that corresponds to the queried property's index. + * pThe ttBitSet/tt is private and is the basis for + * iinheritedProperties/i. + */ +private static final BitSet inheritedprops; + /** p * An int[] array of the types of the iinitialValue/i field of each * property. The array is indexed by the index value constants that are @@ -657,11 +677,15 @@ } // Initialise the RO arrays +inheritedprops = (BitSet)noninheritedprops.clone(); +inheritedprops.flip(1, inheritedprops.length() - 1); + propertyClassNames = new ROStringArray(classNames); propertyClasses = Collections.unmodifiableList -(Arrays.asList(classes)); +(Arrays.asList(classes)); inherited= new ROIntArray(inherit); nonInheritedProps= new ROBitSet(noninheritedprops); +inheritedProps = new ROBitSet(inheritedprops); dataTypes= new ROIntArray(datatypes); refineParsingMethods = Collections.unmodifiableList (Arrays.asList(refineparsingmethods)); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FOTree.java
pbwest 2002/10/04 09:16:23
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FOTree.java
Log:
Added initialValues[]. Changed getInitialValue() to use the array.
Revision ChangesPath
No revision
No revision
1.1.2.15 +19 -7 xml-fop/src/org/apache/fop/fo/Attic/FOTree.java
Index: FOTree.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOTree.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- FOTree.java 3 Oct 2002 03:13:32 - 1.1.2.14
+++ FOTree.java 4 Oct 2002 16:16:23 - 1.1.2.15
@@ -84,6 +84,9 @@
*/
protected ArrayList[] propertyStacks;
+protected PropertyValue[] initialValues
+= new PropertyValue[PropNames.LAST_PROPERTY_INDEX + 1];
+
/**
* @param xmlevents the buffer from which ttXMLEvent/tts from the
* parser are read.
@@ -109,6 +112,7 @@
if ( ! (prop instanceof Numeric) || ! ((Numeric)prop).isLength())
throw new PropertyException(Initial font-size is not a Length);
propertyStacks[PropNames.FONT_SIZE].add(prop);
+initialValues[PropNames.FONT_SIZE] = prop;
for (int i = 1; i = PropNames.LAST_PROPERTY_INDEX; i++) {
@@ -116,6 +120,9 @@
// Set up the initial values for each property
prop = PropertyConsts.getInitialValue(i);
propertyStacks[i].add(prop);
+System.out.println(Setting initial value:
+ + i + ((prop == null) ? NULL : notNULL));
+initialValues[i] = prop;
}
}
@@ -126,6 +133,7 @@
* @exception PropertyException if current font size is not defined,
* or is not expressed as a ttNumeric/tt, or if cloning is not
* supported.
+ * [REMOVE]
*/
public Numeric cloneCurrentFontSize() throws PropertyException {
Numeric tmpval =
@@ -144,6 +152,7 @@
* @return a ttNumeric/tt containing the current font size
* @exception PropertyException if current font size is not defined,
* or is not expressed as a ttNumeric/tt.
+ * [REMOVE]
*/
public Numeric currentFontSize() throws PropertyException {
return (Numeric)(propertyStacks[PropNames.FONT_SIZE]
@@ -184,7 +193,8 @@
/**
* Get the ttPropertyValue/tt at the top of the stack for a
- * given property.
+ * given property. Note that this is a braw/b value; if it is
+ * an unresolved percentage that value will be returned.
* @param index - the property index.
* @return a ttPropertyValue/tt containing the latest property
* value for the indexed property.
@@ -198,7 +208,8 @@
/**
* Clone the ttPropertyValue/tt at the top of the stack for a
- * given property.
+ * given property. Note that this is a braw/b value; if it is
+ * an unresolved percentage that value will be cloned.
* @param index - the property index.
* @return a ttPropertyValue/tt containing the latest property
* value for the indexed property.
@@ -230,8 +241,9 @@
}
/**
- * Get the initial value ttPropertyValue/tt from the bottom of the
- * stack for a given property.
+ * Get the initial value ttPropertyValue/tt for a given property.
+ * Note that this is a braw/b value; if it is
+ * an unresolved percentage that value will be returned.
* @param index - the property index.
* @return a ttPropertyValue/tt containing the property
* value element at the bottom of the stack for the indexed property.
@@ -239,7 +251,7 @@
public PropertyValue getInitialValue(int index)
throws PropertyException
{
-return (PropertyValue)(propertyStacks[index].get(0));
+return initialValues[index];
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FOPropertySets.java
pbwest 2002/10/04 09:18:09 Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FOPropertySets.java Log: Added page-sequence-master subtree property bitsets. Revision ChangesPath No revision No revision 1.1.2.2 +74 -33xml-fop/src/org/apache/fop/fo/Attic/FOPropertySets.java Index: FOPropertySets.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOPropertySets.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- FOPropertySets.java 3 Oct 2002 03:16:51 - 1.1.2.1 +++ FOPropertySets.java 4 Oct 2002 16:18:09 - 1.1.2.2 @@ -50,10 +50,11 @@ ,ROOT_SET = 1 ,DECLARATIONS_SET = 2 ,LAYOUT_SET = 3 -,PAGESEQ_SET = 4 - ,FLOW_SET = 5 - ,STATIC_SET = 6 - ,MARKER_SET = 7 + ,SEQ_MASTER_SET = 4 +,PAGESEQ_SET = 5 + ,FLOW_SET = 6 + ,STATIC_SET = 7 + ,MARKER_SET = 8 ,LAST_SET = MARKER_SET ; @@ -66,6 +67,8 @@ return DECLARATIONS; case LAYOUT_SET: return LAYOUT; +case SEQ_MASTER_SET: +return SEQ_MASTER; case PAGESEQ_SET: return PAGESEQ; case FLOW_SET: @@ -88,6 +91,8 @@ return declarationsAll; case LAYOUT_SET: return layoutMasterSet; +case SEQ_MASTER_SET: +return seqMasterSet; case PAGESEQ_SET: return pageSeqSet; case FLOW_SET: @@ -110,6 +115,8 @@ return declarationsInherited; case LAYOUT_SET: return inheritedLayoutSet; +case SEQ_MASTER_SET: +return inheritedSeqMasterSet; case PAGESEQ_SET: return inheritedPageSeqSet; case FLOW_SET: @@ -132,6 +139,8 @@ return declarationsNonInherited; case LAYOUT_SET: return nonInheritedLayoutSet; +case SEQ_MASTER_SET: +return nonInheritedSeqMasterSet; case PAGESEQ_SET: return nonInheritedPageSeqSet; case FLOW_SET: @@ -1926,6 +1935,22 @@ /** * set of all properties which are + * usable within the page-sequence-master-set subtree. + */ +public static final ROBitSet seqMasterSet; +/** + * set of all inherited properties which are + * usable within the page-sequence-master-set subtree. + */ +public static final ROBitSet inheritedSeqMasterSet; +/** + * set of all non-inherited properties which are + * usable within the page-sequence-master-set subtree. + */ +public static final ROBitSet nonInheritedSeqMasterSet; + +/** + * set of all properties which are * usable within the layout-master-set subtree. */ public static final ROBitSet layoutMasterSet; @@ -2046,33 +2071,43 @@ //declarations only set of properties - properties for exclusive use // in the declarations SUBTREE -BitSet declarationsonly = -new BitSet(PropNames.LAST_PROPERTY_INDEX + 1); +BitSet declarationsonly = new BitSet(); declarationsonly.set(PropNames.COLOR_PROFILE_NAME); declarationsonly.set(PropNames.RENDERING_INTENT); // set of all declarations properties - properties which may be // used in the declarations SUBTREE -BitSet declarationsall = -new BitSet(PropNames.LAST_PROPERTY_INDEX + 1); +BitSet declarationsall = (BitSet)declarationsonly.clone(); declarationsall.set(PropNames.SRC); -declarationsall.or(declarationsonly); declarationsAll = new ROBitSet(declarationsall); // None of the declarations properties are inherited declarationsInherited = new ROBitSet(new BitSet(1)); declarationsNonInherited = new ROBitSet(declarationsall); +// seq-master-only set of properties for exclusive use within +// the page-sequence-master subtree +BitSet seqmasteronly = new BitSet(); +seqmasteronly.set(PropNames.MAXIMUM_REPEATS); +seqmasteronly.set(PropNames.PAGE_POSITION); +seqmasteronly.set(PropNames.ODD_OR_EVEN); +seqmasteronly.set(PropNames.BLANK_OR_NOT_BLANK); + +// seq-master-set set of properties for use within +// the page-sequence-master subtree +BitSet seqmasterset = (BitSet)seqmasteronly.clone(); +seqmasterset.set(PropNames.MASTER_NAME); +seqmasterset.set(PropNames.MASTER_REFERENCE
cvs commit: xml-fop/src/org/apache/fop/fo FONode.java
pbwest 2002/10/04 09:28:58
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FONode.java
Log:
Changed stackedProps to specifiedProps.
Set inherited and non-inherited properties which had not been specified.
Removed getParentPropertyValue().
Added getCurrentFontSize() and getPropertyValue().
Revision ChangesPath
No revision
No revision
1.19.2.14 +83 -44xml-fop/src/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
retrieving revision 1.19.2.13
retrieving revision 1.19.2.14
diff -u -r1.19.2.13 -r1.19.2.14
--- FONode.java 3 Oct 2002 13:24:56 - 1.19.2.13
+++ FONode.java 4 Oct 2002 16:28:57 - 1.19.2.14
@@ -71,8 +71,8 @@
protected PropertyParser exprParser;
/** The property set for this node. */
protected PropertyValue[] propertySet;
-/** BitSet of properties for which specified values have been stacked. */
-private BitSet stackedProps =
+/** BitSet of properties for which have been specified on this node. */
+private BitSet specifiedProps =
new BitSet(PropNames.LAST_PROPERTY_INDEX + 1);
/** The iattrSet/i argument. */
public final int attrSet;
@@ -120,18 +120,16 @@
}
// Set up the remaining properties.
for (int prop = inheritedBitSet.nextSetBit(0);
- prop = 0;
- prop = inheritedBitSet.nextSetBit(++prop))
-{
-if (parent != null)
-propertySet[prop] = parent.propertySet[prop];
-else
-propertySet[prop] = foTree.getInitialValue(prop);
-}
+ prop = 0;
+ prop = inheritedBitSet.nextSetBit(++prop)) {
+System.out.println(...Setting inherited prop + prop
+ + + PropNames.getPropertyName(prop));
+propertySet[prop] = fromParent(prop);
+}
for (int prop = nonInheritedBitSet.nextSetBit(0);
- prop = 0;
- prop = inheritedBitSet.nextSetBit(++prop))
+ prop = 0;
+ prop = inheritedBitSet.nextSetBit(++prop))
{
propertySet[prop] = foTree.getInitialValue(prop);
}
@@ -210,13 +208,13 @@
foTree.popPropertyValue(property);
value.setStackedBy(this);
foTree.pushPropertyValue(value);
-stackedProps.set(property);
+specifiedProps.set(property);
}
private void unstackValues() throws PropertyException {
-for (int prop = stackedProps.nextSetBit(0);
+for (int prop = specifiedProps.nextSetBit(0);
prop =0;
- prop = stackedProps.nextSetBit(++prop)
+ prop = specifiedProps.nextSetBit(++prop)
) {
PropertyValue value = foTree.popPropertyValue(prop);
if (value.getStackedBy() != this)
@@ -226,15 +224,6 @@
}
/**
- * Get the parent's ttPropertyValue/tt for the given property.
- * @param property - the property of interest.
- * @return the ttPropertyValue/tt of the parent node.
- */
-public PropertyValue getParentPropertyValue(int property) {
-return parent.propertySet[property];
-}
-
-/**
* Get the ttPropertyValue/tt of the nearest ancestor with a
* specified value for the given property.
* @param property - the property of interest.
@@ -296,12 +285,12 @@
}
/**
- * Get the computed value from the parent FO of the source property.
+ * Get the adjusted value from the parent FO of the source property.
+ * @see #fromParent(init,int)
+ * @see #getPropertyValue(int)
* @param property - the index of both target and source properties.
- * @return - the computed value from the parent FO node, if it exists.
- * If not, get the computed initial value. If no computed
- * value is available, return an ttInherit/tt object with a reference
- * to the PropertyTriplet.
+ * @return - the adjusted value from the parent FO node, if it exists.
+ * If not, get the adjusted initial value.
*/
public PropertyValue fromParent(int property)
throws PropertyException
@@ -310,25 +299,75 @@
}
/**
- * Get the computed value from the parent FO of the source property.
+ * Get the adjusted ttPropertyValue/tt for the given source property
+ * on the parent ttFONode/tt. If this node is not the root,
+ * call the igetPropertyValue/i method in the parent node, adjust that
+ * that value, and return
cvs commit: xml-fop/src/org/apache/fop/datatypes/indirect IndirectValue.java
pbwest 2002/10/04 19:40:31
Modified:src/org/apache/fop/datatypes/indirect Tag:
FOP_0-20-0_Alt-Design IndirectValue.java
Log:
Added adjustedPropertyValue() to generate Inherit object
if property value is unresolved.
Prevent cloning when resolve() returns an indirect value.
Revision ChangesPath
No revision
No revision
1.1.2.4 +18 -4
xml-fop/src/org/apache/fop/datatypes/indirect/Attic/IndirectValue.java
Index: IndirectValue.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/datatypes/indirect/Attic/IndirectValue.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- IndirectValue.java3 Oct 2002 12:47:23 - 1.1.2.3
+++ IndirectValue.java5 Oct 2002 02:40:31 - 1.1.2.4
@@ -156,12 +156,15 @@
public PropertyValue resolve(FONode node) throws PropertyException {
PropertyValue pv;
if (inheritedValue == null)
-inheritedValue = node.getParentPropertyValue(sourceProperty);
+inheritedValue = node.fromParent(sourceProperty);
if (isUnresolved(inheritedValue))
return this;
pv = inheritedValue;
// Check that the property is the same
if (property != pv.getProperty()) {
+// Don't clone if it's another indirect value - just keep this one
+// When the value finally resolves into a length, we will clone.
+if (pv instanceof IndirectValue) return this;
try {
pv = (PropertyValue)(pv.clone());
} catch (CloneNotSupportedException e) {
@@ -176,6 +179,17 @@
{
return (value.getType() == PropertyValue.NUMERIC
((Numeric)(value)).isPercentage());
+}
+
+public static PropertyValue adjustedPropertyValue(PropertyValue value)
+throws PropertyException
+{
+if (isUnresolved(value)) {
+Inherit inherit = new Inherit(value.getProperty());
+inherit.setInheritedValue(value);
+return inherit;
+}
+return value;
}
// N.B. no validation on this class - subclasses will validate
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datatypes/indirect InheritedValue.java
pbwest 2002/10/04 19:42:21
Modified:src/org/apache/fop/datatypes/indirect Tag:
FOP_0-20-0_Alt-Design InheritedValue.java
Log:
Throw PropertyException in constructor if property in not inherited.
Revision ChangesPath
No revision
No revision
1.1.2.4 +11 -3
xml-fop/src/org/apache/fop/datatypes/indirect/Attic/InheritedValue.java
Index: InheritedValue.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/datatypes/indirect/Attic/InheritedValue.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- InheritedValue.java 3 Oct 2002 12:02:25 - 1.1.2.3
+++ InheritedValue.java 5 Oct 2002 02:42:21 - 1.1.2.4
@@ -50,6 +50,10 @@
throws PropertyException
{
super(property, PropertyValue.INHERIT, sourceProperty);
+if (PropertyConsts.nonInheritedProps.get(sourceProperty))
+throw new PropertyException
+(Non-inherited property
+ + PropNames.getPropertyName(sourceProperty));
}
/**
@@ -74,6 +78,10 @@
throws PropertyException
{
super(propertyName, PropertyValue.INHERIT, sourcePropertyName);
+if (PropertyConsts.nonInheritedProps.get(
+PropertyConsts.getPropertyIndex(sourcePropertyName)))
+throw new PropertyException
+(Non-inherited property + sourcePropertyName);
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FOTree.java FONode.java
pbwest 2002/10/04 19:44:24
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FOTree.java
FONode.java
Log:
Completed removal of propertyStacks from FOTree, and shift of associated
functionality into FONode.
Revision ChangesPath
No revision
No revision
1.1.2.16 +4 -152xml-fop/src/org/apache/fop/fo/Attic/FOTree.java
Index: FOTree.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOTree.java,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- FOTree.java 4 Oct 2002 16:16:23 - 1.1.2.15
+++ FOTree.java 5 Oct 2002 02:44:24 - 1.1.2.16
@@ -4,10 +4,6 @@
import org.apache.fop.datatypes.Ints;
import org.apache.fop.datatypes.Numeric;
import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.indirect.Inherit;
-import org.apache.fop.datatypes.Auto;
-import org.apache.fop.datatypes.None;
-import org.apache.fop.datatypes.TextDecorations;
import org.apache.fop.xml.XMLEvent;
import org.apache.fop.xml.XMLNamespaces;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
@@ -70,20 +66,6 @@
*/
Object[] args = new Object[2];
-/**
- * The array of stacks for resolving properties during FO tree building.
- * An Array of ArrayList[]. Each ArrayList is a stack containing the
- * most recently specified value of a particular property. The first
- * element of each stack will contain the initial value.
- * p
- * The array is indexed by the same index values that are defined as
- * constants in this file, and are the effective index values for the
- * PropNames.propertyNames and classNames arrays.
- * p
- * ArrayList is part of the 1.2 Collections framework.
- */
-protected ArrayList[] propertyStacks;
-
protected PropertyValue[] initialValues
= new PropertyValue[PropNames.LAST_PROPERTY_INDEX + 1];
@@ -99,19 +81,14 @@
this.xmlevents = xmlevents;
exprParser = new PropertyParser(this);
-// Initialise the propertyStacks
-propertyStacks = new ArrayList[PropNames.LAST_PROPERTY_INDEX + 1];
-PropertyValue prop;
-for (int i = 1; i = PropNames.LAST_PROPERTY_INDEX; i++)
-propertyStacks[i] = new ArrayList(1);
// Initialize the FontSize first. Any lengths defined in ems must
// be resolved relative to the current font size. This may happen
// during setup of initial values.
// Set the initial value
-prop = PropertyConsts.getInitialValue(PropNames.FONT_SIZE);
+PropertyValue prop =
+PropertyConsts.getInitialValue(PropNames.FONT_SIZE);
if ( ! (prop instanceof Numeric) || ! ((Numeric)prop).isLength())
throw new PropertyException(Initial font-size is not a Length);
-propertyStacks[PropNames.FONT_SIZE].add(prop);
initialValues[PropNames.FONT_SIZE] = prop;
@@ -119,7 +96,6 @@
if (i == PropNames.FONT_SIZE) continue;
// Set up the initial values for each property
prop = PropertyConsts.getInitialValue(i);
-propertyStacks[i].add(prop);
System.out.println(Setting initial value:
+ i + ((prop == null) ? NULL : notNULL));
initialValues[i] = prop;
@@ -128,119 +104,6 @@
}
/**
- * Clone the font size from the ifont-size/i property stack.
- * @return a ttNumeric/tt containing the current font size
- * @exception PropertyException if current font size is not defined,
- * or is not expressed as a ttNumeric/tt, or if cloning is not
- * supported.
- * [REMOVE]
- */
-public Numeric cloneCurrentFontSize() throws PropertyException {
-Numeric tmpval =
-(Numeric)(propertyStacks[PropNames.FONT_SIZE]
-.get(propertyStacks[PropNames.FONT_SIZE].size() - 1));
-try {
-return (Numeric)(tmpval.clone());
-} catch (CloneNotSupportedException e) {
-throw new PropertyException(Clone not supported.);
-}
-}
-
-/**
- * Get the font size from the ifont-size/i property stack. This is
- * a reference to the value on the stack.
- * @return a ttNumeric/tt containing the current font size
- * @exception PropertyException if current font size is not defined,
- * or is not expressed as a ttNumeric/tt.
- * [REMOVE]
- */
-public Numeric currentFontSize() throws PropertyException {
-return (Numeric)(propertyStacks[PropNames.FONT_SIZE
cvs commit: xml-fop/src/org/apache/fop/fo/pagination PageMasterAlternatives.java PageCondition.java
pbwest 2002/10/06 06:56:15 Added: src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design PageMasterAlternatives.java PageCondition.java Log: Classes for constructing page master alternatives. Revision ChangesPath No revision No revision 1.1.2.1 +64 -0 xml-fop/src/org/apache/fop/fo/pagination/Attic/PageMasterAlternatives.java 1.1.2.1 +49 -0 xml-fop/src/org/apache/fop/fo/pagination/Attic/PageCondition.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoSinglePageMasterReference.java FoSimplePageMaster.java
pbwest 2002/10/06 07:01:19
Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoSinglePageMasterReference.java
FoSimplePageMaster.java
Log:
Get master-name directly from propertySet[].
Revision ChangesPath
No revision
No revision
1.1.2.2 +6 -8
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSinglePageMasterReference.java
Index: FoSinglePageMasterReference.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSinglePageMasterReference.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoSinglePageMasterReference.java 7 May 2002 05:50:04 - 1.1.2.1
+++ FoSinglePageMasterReference.java 6 Oct 2002 14:01:19 - 1.1.2.2
@@ -16,20 +16,18 @@
import org.apache.fop.xml.XMLEvent;
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.SyncedCircularBuffer;
+import org.apache.fop.datastructs.SyncedXmlEventsBuffer;
-public class FoSinglePageMasterReference implements SubSequenceSpecifier {
-
-private FOAttributes attributes
-private masterReference;
+public class FoSinglePageMasterReference extends FONode {
public FoSinglePageMasterReference
(SyncedCircularBuffer xmlevents, XMLEvent event) throws FOPException {
-
+ super(foTree, FObjectNames.SINGLE_PAGE_MASTER_REFERENCE, parent,
+ event, FOPropertySets.SEQ_MASTER_SET);
}
public getMasterReference() {
-return masterReference;
+return getPropertyValue(PropNames.MASTER_REFERENCE);
}
}// FoSinglePageMasterReference
1.1.2.6 +5 -15
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java
Index: FoSimplePageMaster.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoSimplePageMaster.java 2 Oct 2002 15:19:59 - 1.1.2.5
+++ FoSimplePageMaster.java 6 Oct 2002 14:01:19 - 1.1.2.6
@@ -31,8 +31,6 @@
private static final String tag = $Name$;
private static final String revision = $Revision$;
-private String masterName;
-
/**
* @param foTree the FO tree being built
* @param parent the parent FONode of this node
@@ -40,18 +38,10 @@
* this node
*/
public FoSimplePageMaster(FOTree foTree, FONode parent, XMLEvent event)
-throws Tree.TreeException, FOPException, PropertyException
+throws Tree.TreeException, FOPException
{
super(foTree, FObjectNames.SIMPLE_PAGE_MASTER, parent, event,
FOPropertySets.LAYOUT_SET);
-System.out.println(FOAttributes: + event);
-// Check that the property has been set
-PropertyValue name = propertySet[PropNames.MASTER_NAME];
-if (name == null)
-throw new PropertyException(master-name property not set);
-if (name.getType() != PropertyValue.NCNAME)
-throw new PropertyException(master-name property not an NCName.);
-masterName = ((NCName)name).getNCName();
// Process regions here
XMLEvent ev = xmlevents.getEndElement(event);
}
@@ -59,7 +49,7 @@
/**
* @return a ttString/tt with the master-name attribute value.
*/
-public String getMasterName() {
-return masterName;
+public String getMasterName() throws PropertyException {
+return ((NCName)propertySet[PropNames.MASTER_NAME]).getNCName();
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoPageSequenceMaster.java
pbwest 2002/10/06 07:15:11
Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoPageSequenceMaster.java
Log:
Remove all SubSequenceSpecifier code.
Removed no-event constructor.
Revision ChangesPath
No revision
No revision
1.1.2.5 +14 -93
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
Index: FoPageSequenceMaster.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoPageSequenceMaster.java 2 Oct 2002 15:19:59 - 1.1.2.4
+++ FoPageSequenceMaster.java 6 Oct 2002 14:15:11 - 1.1.2.5
@@ -20,11 +20,14 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FONode;
import org.apache.fop.datastructs.Tree;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.NCName;
/**
* Implements the fo:page-sequence-master flow object. These Fos are
@@ -42,30 +45,19 @@
private ArrayList subSequenceList = new ArrayList(1);
-public FoPageSequenceMaster
-(FOTree foTree, FONode parent, String masterName)
-throws Tree.TreeException, FOPException, PropertyException
-{
-super(foTree, FObjectNames.PAGE_SEQUENCE_MASTER, parent, null,
- FOPropertySets.LAYOUT_SET);
-this.masterName = masterName;
-}
-
public FoPageSequenceMaster(FOTree foTree, FONode parent, XMLEvent event)
throws Tree.TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.PAGE_SEQUENCE_MASTER, parent, event,
- FOPropertySets.LAYOUT_SET);
-if (event == null) {
-System.out.println(Null event; throwing FOPException);
-throw new FOPException
-(Null event passed to FoPageSequenceMaster constructor);
-}
-try {
-masterName = foAttributes.getFoAttrValue(master-name);
-} catch (PropertyException e) {
-throw new FOPException(e.getMessage());
-}
+ FOPropertySets.SEQ_MASTER_SET);
+// Check that the property has been set
+PropertyValue name = propertySet[PropNames.MASTER_NAME];
+if (name == null)
+throw new PropertyException(master-name property not set);
+if (name.getType() != PropertyValue.NCNAME)
+throw new PropertyException
+(master-name property not an NCName.);
+masterName = ((NCName)name).getNCName();
// Process sequence members here
LinkedList list = new LinkedList();
list.add((Object)(new XMLEvent.UriLocalName
@@ -108,75 +100,4 @@
return masterName;
}
-/**
- * iSubSequenceSpecifer/i objects contain the information about an
- * individual sub-sequence. They do inot/i extend ttFONode/tt
- * because they are maintained only in the isubSequenceList/i of an
- * ttFoPageSequenceMaster/tt object.
- * pWhen created from ifo:single-page-master-reference/i,
- * ifo:repeatable-page-master-reference/i or
- * ifo:repeatable-page-master-alternatives/i and
- * ifo:conditional-page-master-reference/is, the attributes on those
- * nodes are merged into the attributes of the parent
- * ttFoPageSequenceMaster/tt object, so that they will be available
- * to any children of this node, both
- * during the parsing of the fo input and during the page construction
- * process.
- * pNote that there is some ambiguity about the place of properties
- * defined on the members of the ilayout-master-set/i subtree. Do
- * these properties participate in the properties environment of
- * elements in page-sequence subtrees?
- */
-public class SubSequenceSpecifier {
-public static final int UNBOUNDED = -1;
-private int minRepeats = 1;
-private int maxRepeats = UNBOUNDED;
-private ArrayList conditionals = new ArrayList(1);
-
-public SubSequenceSpecifier() {
-// Insert the SSS into the parent FoPageSequenceMaster's
-// list
-FoPageSequenceMaster.this.subSequenceList.add(this);
-}
-
-public SubSequenceSpecifier(int maxRepeats
cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoLayoutMasterSet.java
pbwest 2002/10/06 07:18:05
Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java
Log:
Removed SubSequenceSpecifier references.
Simplified exception catching and handling.
Revision ChangesPath
No revision
No revision
1.1.2.5 +9 -31
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
Index: FoLayoutMasterSet.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoLayoutMasterSet.java2 Oct 2002 15:19:59 - 1.1.2.4
+++ FoLayoutMasterSet.java6 Oct 2002 14:18:05 - 1.1.2.5
@@ -15,9 +15,6 @@
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.datastructs.Tree;
import org.apache.fop.fo.pagination.FoPageSequenceMaster;
-import org.apache.fop.fo.pagination.FoPageSequenceMaster.SubSequenceSpecifier;
-import org.apache.fop.fo.pagination
-.FoPageSequenceMaster.SubSequenceSpecifier.ConditionalPageMasterReference;
/*
* $Id$
@@ -66,8 +63,7 @@
}
/**
- * Set up all the page masters. !!!Note that the masters are not entered
- * in the FO tree.!!!
+ * Set up all the page masters.
* fo:layout-master-set contents are
* (simple-page-master|page-sequence-master)+
*/
@@ -88,12 +84,7 @@
localName = ev.getLocalName();
if (localName.equals(simple-page-master)) {
System.out.println(Found simple-page-master);
-try {
-simple = new FoSimplePageMaster(foTree, this, ev);
-} catch (Tree.TreeException e) {
-throw new FOPException
-(TreeException: + e.getMessage());
-}
+simple = new FoSimplePageMaster(foTree, this, ev);
simpleName = simple.getMasterName();
if (pageMasters == null)
pageMasters = new HashMap();
@@ -112,22 +103,6 @@
(simple-page-master master-name clash in
+ simplePageMasters: + simpleName);
simplePageMasters.put(simpleName, simple);
-FoPageSequenceMaster seqMaster;
-try {
-// Construct a new PageSequenceMaster
-seqMaster = new FoPageSequenceMaster
-(foTree, this, simpleName);
-} catch(Tree.TreeException e) {
-throw new FOPException
-(TreeException: + e.getMessage());
-}
-// Construct a SubSequence
-SubSequenceSpecifier subSeq =
-seqMaster.new SubSequenceSpecifier();
-// Construct a default ConditionalPageMasterReference
-ConditionalPageMasterReference cond = subSeq.new
-ConditionalPageMasterReference(simpleName);
-pageMasters.put(simpleName, seqMaster);
} else if (localName.equals(page-sequence-master)) {
System.out.println(Found page-sequence-master);
try {
@@ -153,7 +128,10 @@
// Masters exhausted
}
catch (PropertyException e) {
-throw new FOPException(PropertyException: + e.getMessage());
+throw new FOPException(e);
+}
+catch (Tree.TreeException e) {
+throw new FOPException(e);
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FoRoot.java
pbwest 2002/10/06 07:28:02
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FoRoot.java
Log:
Changed exception handler.
Revision ChangesPath
No revision
No revision
1.1.2.7 +5 -5 xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java
Index: FoRoot.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FoRoot.java 2 Oct 2002 15:14:21 - 1.1.2.6
+++ FoRoot.java 6 Oct 2002 14:28:02 - 1.1.2.7
@@ -58,7 +58,7 @@
/**
* Process the FO tree, starting with this fo:root element.
* N.B. the FO tree is a collection of trees.
- * Trees only occur with fo:flow and fo:static-content. These will
+ * Layout trees only occur with fo:flow and fo:static-content. These will
* be built at the appropriate places as part of the FO tree processing.
* Terminates at the completion of FO tree processing.
* p
@@ -87,7 +87,7 @@
ev = xmlevents.expectStartElement
(XMLNamespaces.XSLNSpaceIndex, layout-master-set);
} catch (NoSuchElementException e) {
-throw new FOPException(e.getMessage());
+throw new FOPException(e);
}
// Process the layout-master-set
try {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/build/classes/conf userconfig.xml
pbwest 2002/10/08 21:42:14 Modified:build/classes/conf Tag: FOP_0-20-0_Alt-Design userconfig.xml Log: Changed location of debugging test file. Revision ChangesPath No revision No revision 1.1.2.2 +2 -7 xml-fop/build/classes/conf/Attic/userconfig.xml Index: userconfig.xml === RCS file: /home/cvs/xml-fop/build/classes/conf/Attic/userconfig.xml,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- userconfig.xml8 May 2002 05:29:03 - 1.1.2.1 +++ userconfig.xml9 Oct 2002 04:42:14 - 1.1.2.2 @@ -15,18 +15,13 @@ /entry entry -keyfoFileName/key -value/home/pbw/public_html/xml/newtest3.fo/value - /entry - - entry keyinputMode/key valuefo/value /entry entry keyfoFileName/key -value/home/pbw/public_html/xml/newtest3.fo/value +value/usr/local/src/xml-fop_20_Alt/docs/examples/fo/test.fo/value /entry entry @@ -36,7 +31,7 @@ entry keyoutputFileName/key -value/home/pbw/public_html/xml/newtest3.pdf/value +value/usr/local/src/xml-fop_20_Alt/docs/examples/tests/test.pdf/value /entry !-- NOT IMPLEMENTED - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/conf userconfig.xml
pbwest 2002/10/08 21:43:32 Modified:conf Tag: FOP_0-20-0_Alt-Design userconfig.xml Log: Changed location of debugging test file. Revision ChangesPath No revision No revision 1.5.4.2 +2 -7 xml-fop/conf/Attic/userconfig.xml Index: userconfig.xml === RCS file: /home/cvs/xml-fop/conf/Attic/userconfig.xml,v retrieving revision 1.5.4.1 retrieving revision 1.5.4.2 diff -u -r1.5.4.1 -r1.5.4.2 --- userconfig.xml7 May 2002 14:42:58 - 1.5.4.1 +++ userconfig.xml9 Oct 2002 04:43:32 - 1.5.4.2 @@ -15,18 +15,13 @@ /entry entry -keyfoFileName/key -value/home/pbw/public_html/xml/newtest3.fo/value - /entry - - entry keyinputMode/key valuefo/value /entry entry keyfoFileName/key -value/home/pbw/public_html/xml/newtest3.fo/value +value/usr/local/src/xml-fop_20_Alt/docs/examples/fo/test.fo/value /entry entry @@ -36,7 +31,7 @@ entry keyoutputFileName/key -value/home/pbw/public_html/xml/newtest3.pdf/value +value/usr/local/src/xml-fop_20_Alt/docs/examples/tests/test.pdf/value /entry !-- NOT IMPLEMENTED - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datatypes AbstractPropertyValue.java
pbwest 2002/10/08 21:50:24
Modified:src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
AbstractPropertyValue.java
Log:
Removed stackedBy references.
Added typeString(). Modified toString().
Revision ChangesPath
No revision
No revision
1.1.2.5 +10 -23
xml-fop/src/org/apache/fop/datatypes/Attic/AbstractPropertyValue.java
Index: AbstractPropertyValue.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/AbstractPropertyValue.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- AbstractPropertyValue.java4 Oct 2002 15:49:33 - 1.1.2.4
+++ AbstractPropertyValue.java9 Oct 2002 04:50:24 - 1.1.2.5
@@ -34,11 +34,6 @@
* An integer property type.
*/
public final int type;
-
-/**
- * The ttFONode/tt that stacked this value.
- */
-private FONode stackedBy = null;
/**
* @param index index of the property in the property arrays.
@@ -90,21 +85,6 @@
}
/**
- * Set the node that stacked this value.
- * @param node - the ttFONode/tt that stacked this value.
- */
-public void setStackedBy(FONode node) {
-stackedBy = node;
-}
-
-/**
- * Get the node that stacked this value.
- */
-public FONode getStackedBy() {
-return stackedBy;
-}
-
-/**
* In some circumstances, the property against which a type is to be
* validated may not be the same as the property against which this
* iAbstractPropertyValue/i is defined.
@@ -146,10 +126,17 @@
validate(property, type);
}
+public static String typeString(int type) {
+if (type 0 || type PropertyValue.LAST_PROPERTY_TYPE)
+return Property type out of range;
+return PropertyValue.propertyTypes.get(type);
+}
+
public String toString() {
try {
return Property: + PropNames.getPropertyName(property)
-+ Index: + property;
++ Index: + property + Type: +
+typeString(type);
} catch (PropertyException e) {
throw new RuntimeException(e.getMessage());
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datatypes PropertyValueList.java
pbwest 2002/10/08 21:52:21
Modified:src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
PropertyValueList.java
Log:
Removed stackedBy references. Modified toString().
Revision ChangesPath
No revision
No revision
1.1.2.4 +17 -24
xml-fop/src/org/apache/fop/datatypes/Attic/PropertyValueList.java
Index: PropertyValueList.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/PropertyValueList.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- PropertyValueList.java2 Oct 2002 07:00:08 - 1.1.2.3
+++ PropertyValueList.java9 Oct 2002 04:52:21 - 1.1.2.4
@@ -1,5 +1,7 @@
package org.apache.fop.datatypes;
+import java.lang.reflect.InvocationTargetException;
+
import java.util.LinkedList;
import java.util.Collection;
import java.util.Iterator;
@@ -39,11 +41,6 @@
public final int type;
/**
- * The ttFONode/tt that stacked this value.
- */
-private FONode stackedBy = null;
-
-/**
* @param property ttint/tt index of the property.
*/
public PropertyValueList(int property) throws PropertyException {
@@ -184,21 +181,6 @@
}
/**
- * Set the node that stacked this value.
- * @param node - the ttFONode/tt that stacked this value.
- */
-public void setStackedBy(FONode node) {
-stackedBy = node;
-}
-
-/**
- * Get the node that stacked this value.
- */
-public FONode getStackedBy() {
-return stackedBy;
-}
-
-/**
* In some circumstances, the property against which a type is to be
* validated may not be the same as the property against which this
* iAbstractPropertyValue/i is defined.
@@ -248,9 +230,20 @@
Iterator contents = iterator();
while (contents.hasNext()) {
int i = 0, j = 0;
-cstr = contents.next().toString();
+Object obj = contents.next();
+try {
+cstr = (String)(obj.getClass()
+.getMethod(toString, null)
+.invoke(obj, null));
+} catch (IllegalAccessException e) {
+throw new PropertyException (e);
+} catch (NoSuchMethodException e) {
+throw new PropertyException (e);
+} catch (InvocationTargetException e) {
+throw new PropertyException (e);
+}
while (i cstr.length() j = 0) {
-j = cstr.indexOf('\n');
+j = cstr.indexOf('\n', j);
if (j = 0) {
str = str + + cstr.substring(i, ++j);
i = j;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datatypes PropertyValue.java
pbwest 2002/10/08 21:54:47
Modified:src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
PropertyValue.java
Log:
Removed stackedBy references. Added ROStringArray propertyTypes.
Revision ChangesPath
No revision
No revision
1.1.2.5 +36 -14xml-fop/src/org/apache/fop/datatypes/Attic/PropertyValue.java
Index: PropertyValue.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/PropertyValue.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- PropertyValue.java2 Oct 2002 07:00:08 - 1.1.2.4
+++ PropertyValue.java9 Oct 2002 04:54:46 - 1.1.2.5
@@ -2,6 +2,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.FONode;
+import org.apache.fop.datastructs.ROStringArray;
/*
* PropertyValue.java
@@ -53,6 +54,39 @@
,LAST_PROPERTY_TYPE = LIST;
+public static final ROStringArray propertyTypes =
+new ROStringArray(new String[] {
+NO_TYPE
+,ANGLE
+,AUTO
+,BOOL
+,COLOR_TYPE
+,COUNTRY
+,ENUM
+,FONT_FAMILY
+,FREQUENCY
+,FROM_NEAREST_SPECIFIED
+,FROM_PARENT
+,INHERIT
+,INHERITED_VALUE
+,INTEGER
+,LANGUAGE
+,LITERAL
+,MAPPED_NUMERIC
+,MIME_TYPE
+,NCNAME
+,NONE
+,NUMERIC
+,SCRIPT
+,SHADOW_EFFECT
+,SLASH
+,TEXT_DECORATIONS
+,TEXT_DECORATOR
+,TIME
+,URI_LIST
+,LIST
+});
+
/**
* @return ttint/tt property index.
*/
@@ -64,18 +98,6 @@
* @return type field of the ttPropertyValue/tt.
*/
public int getType();
-
-/**
- * Set the reference to the ttFONode/tt that stacked this value.
- * @param node - the stacking tt.FONode/tt.
- */
-public void setStackedBy(FONode node);
-
-/**
- * Get a reference to the ttFONode/tt that stacked this value.
- * @return ttFONode/tt that stacked this value.
- */
-public FONode getStackedBy();
/**
* In some circumstances, the property against which a type is to be
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datatypes Numeric.java
pbwest 2002/10/08 22:45:57
Modified:src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
Numeric.java
Log:
Modified abs() to return Numeric. Works with any kind of Numeric value.
Modified max() and min() to return Numeric and to operate on any Numerics of the
same baseunit and power.
Added setValue() and setPower() for use with the modified methods.
Revision ChangesPath
No revision
No revision
1.1.2.8 +66 -29xml-fop/src/org/apache/fop/datatypes/Attic/Numeric.java
Index: Numeric.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Numeric.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- Numeric.java 18 Sep 2002 15:24:12 - 1.1.2.7
+++ Numeric.java 9 Oct 2002 05:45:56 - 1.1.2.8
@@ -271,6 +271,15 @@
}
/**
+ * Set the value. This used on ttNumeric/tt clones in the iabs/i
+ * imin/i and imax/i operations.
+ * @param value - the ttdouble/tt value.
+ */
+protected void setValue(double value) {
+this.value = value;
+}
+
+/**
* @return ttint/tt unit power of this iNumeric/i.
*/
public int getPower() {
@@ -278,6 +287,14 @@
}
/**
+ * Set the power. A complement to the isetValue/i method.
+ * @param power - the ttint/tt power.
+ */
+protected void setPower(int power) {
+this.power = power;
+}
+
+/**
* @return ttint/tt current baseunit of this iNumeric/i.
*/
public int getBaseunit() {
@@ -673,57 +690,77 @@
}
/**
- * Return the absolute value of this ttNumeric/tt. This is an
+ * Return a new ttNumeric/tt with the absolute value of this.
+ * This is an
* implementation of the core function library ttabs/tt function.
- * It is only valid on an absolute numeric of unit power zero.
* @return A ttdouble/tt containing the absolute value.
- * @exception PropertyException if ivalue/i is not unit power zero.
+ * @exception PropertyException if cloning fails.
*/
-public double abs() throws PropertyException {
-if (power != 0)
-throw new PropertyException
-(abs requires absolute numeric of unit power zero);
-return Math.abs(value);
+public Numeric abs() throws PropertyException {
+Numeric n;
+try {
+n = (Numeric)(this.clone());
+} catch (CloneNotSupportedException e) {
+throw new PropertyException(e);
+}
+n.setValue(Math.abs(value));
+return n;
}
/**
- * Return a ttdouble/tt which is the maximum of the current value and
+ * Return a ttNumeric/tt which is the maximum of the current value and
* the operand. This is an implementation of the core function library
* ttmax/tt function. It is only valid for comparison of two
- * absolute ttNumeric/tt values.
+ * values of the same unit power and same type, i.e. both absolute or
+ * both percentages.
* @param op a ttNumeric/tt representing the comparison value.
* @return a ttdouble/tt representing the imax/i of
* ithis.value/i and the ivalue/i of iop/i.
- * @throws PropertyException If the power of this
- * object and the operand are different or not 0.
+ * @throws PropertyException If the baseunit or power of this
+ * object and the operand are different, or if cloning fails.
*/
-public double max(Numeric op) throws PropertyException {
-// Only compare if both have unit power 0
-if (power == op.power power == 0) {
-return Math.max(value, op.value);
+public Numeric max(Numeric op) throws PropertyException {
+Numeric n;
+// Only compare if both have same unit power and same baseunit
+if (power == op.power baseunit == op.baseunit) {
+try {
+n = (Numeric)(this.clone());
+} catch (CloneNotSupportedException e) {
+throw new PropertyException(e);
+}
+n.setValue(Math.max(value, op.value));
+return n;
}
throw new PropertyException
-(max() must compare numerics of unit power 0.);
+(max() must compare numerics of same baseunit unit power.);
}
/**
- * Return a ttdouble/tt which is the minimum of the current value and
+ * Return a ttNumeric/tt which is the minimum of the current value and
* the operand. This is an implementation of the core function library
* ttmin/tt function
cvs commit: xml-fop/src/org/apache/fop/fo Properties.java
pbwest 2002/10/08 22:53:32
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
Properties.java
Log:
Added specific error test for LIST passed to refineParsing().
Revision ChangesPath
No revision
No revision
1.1.2.32 +8 -3 xml-fop/src/org/apache/fop/fo/Attic/Properties.java
Index: Properties.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/Properties.java,v
retrieving revision 1.1.2.31
retrieving revision 1.1.2.32
diff -u -r1.1.2.31 -r1.1.2.32
--- Properties.java 4 Oct 2002 15:57:56 - 1.1.2.31
+++ Properties.java 9 Oct 2002 05:53:30 - 1.1.2.32
@@ -424,6 +424,11 @@
if (pv == value) return value; // unable to resolve
// TODO: validate here
return pv;
+case PropertyValue.LIST:
+System.out.println((PropertyValueList)value);
+throw new PropertyException
+(PropertyValueList passed to Properties.refineParsing for
++ propName);
default:
if ( ! nested) {
if ((datatype COMPOUND) != 0)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FOTree.java
pbwest 2002/10/08 22:55:06 Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FOTree.java Log: Commented out debugging output. Revision ChangesPath No revision No revision 1.1.2.17 +4 -4 xml-fop/src/org/apache/fop/fo/Attic/FOTree.java Index: FOTree.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOTree.java,v retrieving revision 1.1.2.16 retrieving revision 1.1.2.17 diff -u -r1.1.2.16 -r1.1.2.17 --- FOTree.java 5 Oct 2002 02:44:24 - 1.1.2.16 +++ FOTree.java 9 Oct 2002 05:55:06 - 1.1.2.17 @@ -96,8 +96,8 @@ if (i == PropNames.FONT_SIZE) continue; // Set up the initial values for each property prop = PropertyConsts.getInitialValue(i); -System.out.println(Setting initial value: - + i + ((prop == null) ? NULL : notNULL)); +//System.out.println(Setting initial value: +// + i + ((prop == null) ? NULL : notNULL)); initialValues[i] = prop; } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FoRoot.java
pbwest 2002/10/08 22:56:31
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FoRoot.java
Log:
Modified signatures for xmlevents.get?Element() methods.
Revision ChangesPath
No revision
No revision
1.1.2.8 +9 -8 xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java
Index: FoRoot.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoRoot.java 6 Oct 2002 14:28:02 - 1.1.2.7
+++ FoRoot.java 9 Oct 2002 05:56:31 - 1.1.2.8
@@ -85,7 +85,8 @@
// Look for layout-master-set
try {
ev = xmlevents.expectStartElement
-(XMLNamespaces.XSLNSpaceIndex, layout-master-set);
+(XMLNamespaces.XSLNSpaceIndex, layout-master-set,
+XMLEvent.DISCARD_W_SPACE);
} catch (NoSuchElementException e) {
throw new FOPException(e);
}
@@ -99,15 +100,15 @@
}
layoutMasters.setupPageMasters();
// Stub - flush the layout masters
-ev = xmlevents.getEndElement
-(XMLNamespaces.XSLNSpaceIndex, layout-master-set);
+ev = xmlevents.getEndElement(ev);
// Look for optional declarations
try {
xmlevents.expectStartElement
-(XMLNamespaces.XSLNSpaceIndex, declarations);
+(XMLNamespaces.XSLNSpaceIndex, declarations,
+XMLEvent.DISCARD_W_SPACE);
// process the declarations
xmlevents.getEndElement
-(XMLNamespaces.XSLNSpaceIndex, declarations);
+(XMLNamespaces.XSLNSpaceIndex, declarations);
} catch (NoSuchElementException e) {
// Take no notice - declarations is optional
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FONode.java
pbwest 2002/10/08 22:57:10
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FONode.java
Log:
Modified exception handling.
Revision ChangesPath
No revision
No revision
1.19.2.16 +4 -4 xml-fop/src/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
retrieving revision 1.19.2.15
retrieving revision 1.19.2.16
diff -u -r1.19.2.15 -r1.19.2.16
--- FONode.java 5 Oct 2002 02:44:24 - 1.19.2.15
+++ FONode.java 9 Oct 2002 05:57:09 - 1.19.2.16
@@ -184,9 +184,9 @@
.get(property))
.invoke(null, foTree.args));
} catch (IllegalAccessException e) {
-throw new PropertyException (e.getMessage());
+throw new PropertyException (e);
} catch (InvocationTargetException e) {
-throw new PropertyException (e.getMessage());
+throw new PropertyException (e);
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FOAttributes.java
pbwest 2002/10/08 22:57:50
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FOAttributes.java
Log:
Comment change.
Revision ChangesPath
No revision
No revision
1.1.2.7 +6 -6 xml-fop/src/org/apache/fop/fo/Attic/FOAttributes.java
Index: FOAttributes.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOAttributes.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FOAttributes.java 1 Oct 2002 16:34:44 - 1.1.2.6
+++ FOAttributes.java 9 Oct 2002 05:57:49 - 1.1.2.7
@@ -45,7 +45,8 @@
* ttHashMap/tts which contain the attribute lists for each
* namespace which may be active for a particular FO element. The
* ttArrayList/tt is indexed by the URIIndex for this namespace
- * which is statically maintained by ttXMLEvent/tt. The
+ * which is maintained in an ttXMLNamespaces/tt object by the
+ * ttFOTree/tt object which is processing the FO input. The
* values in the ttHashMap/tts are indexed by the local name of the
* attribute.
* The ttArrayList/tt will not be created for a particular instance
@@ -119,8 +120,7 @@
//System.out.println(FONode: + event);
if (attrUriIndex == XMLNamespaces.DefAttrNSIndex) {
// Standard FO namespace
-// Catch default namespace declaration here. This seems to
-// be a kludge. Should 'xmlns' come through here?
+// Catch default namespace declaration here.
if (attrLocalname.equals(xmlns)) break;
// Is this a known (valid) property?
try {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoLayoutMasterSet.java FoPageSequenceMaster.java
pbwest 2002/10/08 23:00:49
Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java FoPageSequenceMaster.java
Log:
Use array argument for multiple choice expectStartElement() calls.
Revision ChangesPath
No revision
No revision
1.1.2.6 +20 -10
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
Index: FoLayoutMasterSet.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoLayoutMasterSet.java6 Oct 2002 14:18:05 - 1.1.2.5
+++ FoLayoutMasterSet.java9 Oct 2002 06:00:49 - 1.1.2.6
@@ -11,6 +11,7 @@
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.xml.XMLEvent;
import org.apache.fop.xml.XMLNamespaces;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.datastructs.Tree;
@@ -37,6 +38,18 @@
private static final String revision = $Revision$;
/**
+ * An array with ttXMLEvent.UriLocalName/tt objects identifying
+ * ttsimple-page-master/tt and ttpage-sequence-master/tt
+ * XML events.
+ */
+private static final XMLEvent.UriLocalName[] simpleOrSequenceMaster = {
+new XMLEvent.UriLocalName
+ (XMLNamespaces.XSLNSpaceIndex, simple-page-master),
+new XMLEvent.UriLocalName
+ (XMLNamespaces.XSLNSpaceIndex, page-sequence-master)
+};
+
+/**
* Hash of SimplePageMaster and PageSequenceMaster objects,
* indexed by master-name of the object.
*/
@@ -68,19 +81,16 @@
* (simple-page-master|page-sequence-master)+
*/
public void setupPageMasters() throws FOPException {
-// Set up a list with the two possibilities
-LinkedList list = new LinkedList();
-list.add((Object)(new XMLEvent.UriLocalName
- (XMLNamespaces.XSLNSpaceIndex, simple-page-master)));
-list.add((Object)(new XMLEvent.UriLocalName
- (XMLNamespaces.XSLNSpaceIndex, page-sequence-master)));
+// Use an array with the two possibilities
try {
do {
FoSimplePageMaster simple;
String simpleName;
String localName;
FoPageSequenceMaster pageSeq;
-XMLEvent ev = xmlevents.expectStartElement(list);
+XMLEvent ev =
+xmlevents.expectStartElement
+(simpleOrSequenceMaster, XMLEvent.DISCARD_W_SPACE);
localName = ev.getLocalName();
if (localName.equals(simple-page-master)) {
System.out.println(Found simple-page-master);
1.1.2.6 +21 -13
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
Index: FoPageSequenceMaster.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoPageSequenceMaster.java 6 Oct 2002 14:15:11 - 1.1.2.5
+++ FoPageSequenceMaster.java 9 Oct 2002 06:00:49 - 1.1.2.6
@@ -28,6 +28,7 @@
import org.apache.fop.datastructs.Tree;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.NCName;
+import org.apache.fop.xml.XMLEvent;
/**
* Implements the fo:page-sequence-master flow object. These Fos are
@@ -41,6 +42,22 @@
private static final String tag = $Name$;
private static final String revision = $Revision$;
+/**
+ * An array with ttXMLEvent.UriLocalName/tt objects identifying
+ * ttsingle-page-master-reference/tt,
+ * ttrepeatable-page-master-reference/tt and
+ * ttrepeatable-page-master-alternatives/tt XML events.
+ */
+private static final XMLEvent.UriLocalName[]
+singleOrRepeatableMasterRefs = {
+new XMLEvent.UriLocalName
+ (XMLNamespaces.XSLNSpaceIndex, single-page-master-reference),
+new XMLEvent.UriLocalName
+ (XMLNamespaces.XSLNSpaceIndex, repeatable-page-master-reference),
+new XMLEvent.UriLocalName
+ (XMLNamespaces.XSLNSpaceIndex, repeatable-page-master-alternatives)
+};
+
private String masterName;
private ArrayList subSequenceList = new ArrayList(1);
@@ -59,19 +76,10 @@
(master
cvs commit: xml-fop/src/org/apache/fop/fo/expr PropertyParser.java PropertyTokenizer.java
pbwest 2002/10/08 23:02:51
Modified:src/org/apache/fop/fo/expr Tag: FOP_0-20-0_Alt-Design
PropertyParser.java PropertyTokenizer.java
Log:
Bug fixes and debugging output.
Revision ChangesPath
No revision
No revision
1.5.2.13 +133 -44 xml-fop/src/org/apache/fop/fo/expr/PropertyParser.java
Index: PropertyParser.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/expr/PropertyParser.java,v
retrieving revision 1.5.2.12
retrieving revision 1.5.2.13
diff -u -r1.5.2.12 -r1.5.2.13
--- PropertyParser.java 2 Oct 2002 07:23:18 - 1.5.2.12
+++ PropertyParser.java 9 Oct 2002 06:02:51 - 1.5.2.13
@@ -237,6 +237,7 @@
*/
private PropertyValue parseAdditiveExpr() throws PropertyException {
// Evaluate and put result on the operand stack
+System.out.println(parseAdd);
PropertyValue prop = parseMultiplicativeExpr();
loop:
for (; ; ) {
@@ -261,24 +262,109 @@
* the resulting PropertyValue.
*/
private PropertyValue parseMultiplicativeExpr() throws PropertyException {
+System.out.println(parseMult);
PropertyValue prop = parseUnaryExpr();
-loop:
+PropertyValue pv;
+outer:
+// Outer loop exists to handle a sequence of multiplicative operations
+// e.g. 5 * 4 / 2
+// break outer; will terminate the multiplicative expression parsing
+// break inner; will look for another trailing multiplicative
+// operator.
for (; ; ) {
-switch (currentToken) {
-case DIV:
-next();
-((Numeric)prop).divide((Numeric)parseUnaryExpr());
-break;
-case MOD:
-next();
-((Numeric)prop).mod((Numeric)parseUnaryExpr());
-break;
-case MULTIPLY:
-next();
-((Numeric)prop).multiply((Numeric)parseUnaryExpr());
-break;
+inner:
+switch (prop.getType()) {
+case PropertyValue.NUMERIC:
+switch (currentToken) {
+case DIV:
+next();
+System.out.println(Dividing..);
+pv = parseUnaryExpr();
+if (pv.getType() == PropertyValue.INTEGER) {
+((Numeric)prop).divide
+((double)(((IntegerType)pv).getInt()));
+break inner;
+} // else must be Numeric
+((Numeric)prop).divide((Numeric)pv);
+break inner;
+case MOD:
+next();
+pv = parseUnaryExpr();
+if (pv.getType() == PropertyValue.INTEGER) {
+((Numeric)prop).mod
+((double)(((IntegerType)pv).getInt()));
+break inner;
+} // else must be Numeric
+((Numeric)prop).mod((Numeric)parseUnaryExpr());
+break inner;
+case MULTIPLY:
+next();
+System.out.println(Multiplying..);
+pv = parseUnaryExpr();
+System.out.println(...by + pv);
+if (pv.getType() == PropertyValue.INTEGER) {
+((Numeric)prop).multiply
+((double)(((IntegerType)pv).getInt()));
+break inner;
+} // else must be Numeric
+((Numeric)prop).multiply((Numeric)pv);
+break inner;
+default:
+break outer;
+}
+// N.B. The above case cannot fall through to here
+case PropertyValue.INTEGER:
+// This code treats all multiplicative operations as implicit
+// operations on doubles. It might be reasonable to allow
+// an integer multiply.
+switch (currentToken) {
+case DIV:
+next();
+System.out.println(Dividing..);
+pv = parseUnaryExpr();
+if (pv.getType() == PropertyValue.INTEGER) {
+prop = new Numeric(property,
+(double)(((IntegerType)prop).getInt()) /
+ ((IntegerType)pv).getInt());
+break inner
cvs commit: xml-fop/src/org/apache/fop/xml SyncedXmlEventsBuffer.java
pbwest 2002/10/08 23:07:04
Modified:src/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
SyncedXmlEventsBuffer.java
Log:
Added get/expectTypedEvent. Modified all other get/expect methods to use these.
Added array arguments to multiple choice get/expectStartElement().
Revision ChangesPath
No revision
No revision
1.1.2.3 +429 -170 xml-fop/src/org/apache/fop/xml/Attic/SyncedXmlEventsBuffer.java
Index: SyncedXmlEventsBuffer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/xml/Attic/SyncedXmlEventsBuffer.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SyncedXmlEventsBuffer.java3 Oct 2002 03:37:26 - 1.1.2.2
+++ SyncedXmlEventsBuffer.java9 Oct 2002 06:07:03 - 1.1.2.3
@@ -69,7 +69,7 @@
XMLEvent ev;
try {
ev = (XMLEvent)get();
-//System.out.println(getEvent: + ev);
+System.out.println(getEvent: + ev);
return ev;
} catch (InterruptedException e) {
throw new FOPException(e);
@@ -77,68 +77,244 @@
}
/**
- * @return an ENDDOCUMENT event
- * @exception FOPException if buffer errors or interrupts occur
- * @exception NoSuchElementException if the event is not found
+ * Get the next event of the given type from the buffer. Discard
+ * intervening events.
+ * @param eventType - the ttint/tt event type.
+ * @return an event of the given type.
+ * @exception FOPException if buffer errors or interrupts occur.
+ * @exception NoSuchElementException if the event is not found.
*/
-public XMLEvent getEndDocument() throws FOPException {
+public XMLEvent getTypedEvent(int eventType) throws FOPException {
XMLEvent ev = getEvent();
-while (ev != null ev.type != XMLEvent.ENDDOCUMENT) {
+while (ev != null ev.type != eventType) {
ev = getEvent();
}
if (ev == null) {
-throw new NoSuchElementException(EndDocument not found.);
+throw new NoSuchElementException
+(XMLEvent.eventTypeName(eventType) + not found.);
}
return ev;
}
/**
- * @return an ENDDOCUMENT event
- * @exception FOPException if buffer errors or interrupts occur
- * @exception NoSuchElementException if ENDDOCUMENT is not the next
- * event detected. The erroneous event is pushed back.
+ * Get the next event of the given type and with the given ttQName/tt
+ * from the buffer. Discard intervening events.
+ * @param eventType - the ttint/tt event type.
+ * @param qName a ttString/tt with the ttQName/tt of the
+ * required element.
+ * @return an event of the given type.
+ * @exception FOPException if buffer errors or interrupts occur.
+ * @exception NoSuchElementException if the event is not found.
*/
-public XMLEvent expectEndDocument() throws FOPException {
+public XMLEvent getTypedEvent(int eventType, String qName)
+throws FOPException
+{
+XMLEvent ev = getEvent();
+while (ev != null
+ ! (ev.type == eventType ev.qName.equals(qName))) {
+ev = getEvent();
+}
+if (ev == null) {
+throw new NoSuchElementException
+(XMLEvent.eventTypeName(eventType) + + qName + not found.);
+}
+return ev;
+}
+
+/**
+ * Get the next event of the given type, and with the given URI index and
+ * local name, from the buffer. Discard intervening events.
+ * @param eventType - the ttint/tt event type.
+ * @param uriIndex - the ttint/tt URI index maintained in the
+ * ttXMLNamespaces/tt object.
+ * @param localName a ttString/tt with the local name of the
+ * required element.
+ * @return an event of the given type.
+ * @exception FOPException if buffer errors or interrupts occur.
+ * @exception NoSuchElementException if the event is not found.
+ */
+public XMLEvent getTypedEvent
+(int eventType, int uriIndex, String localName)
+throws FOPException
+{
XMLEvent ev = getEvent();
-if (ev != null ev.type == XMLEvent.ENDDOCUMENT) {
+while (ev != null
+ ! (ev.type == eventType
+ ev.type == eventType
+ ev.localName.equals(localName))) {
+ev = getEvent();
+}
+if (ev == null)
+throw new NoSuchElementException
+(XMLEvent.eventTypeName(eventType
cvs commit: xml-fop/src/org/apache/fop/xml XMLEvent.java
pbwest 2002/10/08 23:08:37
Modified:src/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
XMLEvent.java
Log:
Added eventTypeName().
Revision ChangesPath
No revision
No revision
1.1.2.3 +26 -25xml-fop/src/org/apache/fop/xml/Attic/XMLEvent.java
Index: XMLEvent.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/xml/Attic/XMLEvent.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- XMLEvent.java 16 Sep 2002 04:26:31 - 1.1.2.2
+++ XMLEvent.java 9 Oct 2002 06:08:37 - 1.1.2.3
@@ -34,6 +34,28 @@
private static final int MIN_XML_EV_TYPE = NOEVENT;
private static final int MAX_XML_EV_TYPE = CHARACTERS;
+public static final boolean DISCARD_W_SPACE = true;
+public static final boolean RETAIN_W_SPACE = false;
+
+public static String eventTypeName(int type) {
+switch (type) {
+case NOEVENT:
+return NOEVENT;
+case STARTDOCUMENT:
+return STARTDOCUMENT;
+case ENDDOCUMENT:
+return ENDDOCUMENT;
+case STARTELEMENT:
+return STARTELEMENT;
+case ENDELEMENT:
+return ENDELEMENT;
+case CHARACTERS:
+return CHARACTERS;
+default:
+return Unknown type + type;
+}
+}
+
// These are made public specifically so the the values of individual
// XMLEvent instances can be changed directly, on the assumption that
// the basic XML events are unlikely to change.
@@ -171,28 +193,7 @@
public String toString() {
String tstr;
-switch (type) {
-case NOEVENT:
-tstr = NOEVENT;
-break;
-case STARTDOCUMENT:
-tstr = STARTDOCUMENT;
-break;
-case ENDDOCUMENT:
-tstr = ENDDOCUMENT;
-break;
-case STARTELEMENT:
-tstr = STARTELEMENT;
-break;
-case ENDELEMENT:
-tstr = ENDELEMENT;
-break;
-case CHARACTERS:
-tstr = CHARACTERS;
-break;
-default:
-tstr = Unknown type + type;
-}
+tstr = eventTypeName(type);
tstr = tstr + \nURI
+ uriIndex + + namespaces.getIndexURI(uriIndex);
tstr = tstr + \n + Local Name + localName;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FOAttributes.java
pbwest 2002/10/09 20:16:12
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FOAttributes.java
Log:
Remove xmlns attributes before processing.
Delete Attributes object from event after processing.
Revision ChangesPath
No revision
No revision
1.1.2.8 +10 -4 xml-fop/src/org/apache/fop/fo/Attic/FOAttributes.java
Index: FOAttributes.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOAttributes.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FOAttributes.java 9 Oct 2002 05:57:49 - 1.1.2.7
+++ FOAttributes.java 10 Oct 2002 03:16:12 - 1.1.2.8
@@ -114,6 +114,10 @@
for (int i = 0; i attributes.getLength(); i++) {
String attrUri = attributes.getURI(i);
String attrLocalname = attributes.getLocalName(i);
+String attrQName = attributes.getQName(i);
+int sep = attrQName.indexOf(':');
+String prefix = attrQName.substring(0, (sep == -1 ? 0 : sep));
+if (prefix.equals(xmlns)) break;
String attrValue = attributes.getValue(i);
int attrUriIndex = foNode.namespaces.getURIIndex(attrUri);
@@ -132,7 +136,7 @@
} catch (PropertyException e) {
// Not known - ignore
MessageHandler.errorln(event.getQName() +
- + attributes.getQName(i)
+ + attrQName
+ not recognized. Ignoring.);
}
} else { // Not the XSL FO namespace
@@ -169,6 +173,8 @@
foAttrKeys = (Integer[])(foAttrMap.keySet().toArray(integerArray));
Arrays.sort(foAttrKeys);
}
+// Finished with the Attributes object
+event.setAttributes(null);
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/expr PropertyParser.java
pbwest 2002/10/09 20:27:01
Modified:src/org/apache/fop/fo/expr Tag: FOP_0-20-0_Alt-Design
PropertyParser.java
Log:
Allow IntegerType PropertyValues as arguments to parseAdditiveExpr() and
parseUnaryExpr().
Restructure parseMultiplicativeExpr() to include arithmetic exceptions.
Revision ChangesPath
No revision
No revision
1.5.2.14 +156 -62 xml-fop/src/org/apache/fop/fo/expr/PropertyParser.java
Index: PropertyParser.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/expr/PropertyParser.java,v
retrieving revision 1.5.2.13
retrieving revision 1.5.2.14
diff -u -r1.5.2.13 -r1.5.2.14
--- PropertyParser.java 9 Oct 2002 06:02:51 - 1.5.2.13
+++ PropertyParser.java 10 Oct 2002 03:27:01 - 1.5.2.14
@@ -232,26 +232,99 @@
}
/**
+ * Generate an arithmetic error string.
+ * @return arithmetic error message.
+ */
+private String arithErrorStr() {
+return Arithmetic operator not followed by Numeric or integer:
++ getExpr();
+}
+
+/**
* Try to parse an addition or subtraction expression and return the
* resulting PropertyValue.
*/
private PropertyValue parseAdditiveExpr() throws PropertyException {
// Evaluate and put result on the operand stack
-System.out.println(parseAdd);
+//System.out.println(parseAdd);
PropertyValue prop = parseMultiplicativeExpr();
-loop:
+PropertyValue pv;
+outer:
for (; ; ) {
-switch (currentToken) {
-case PLUS:
-next();
-((Numeric)prop).add((Numeric)parseMultiplicativeExpr());
-break;
-case MINUS:
-next();
-((Numeric)prop).subtract((Numeric)parseMultiplicativeExpr());
-break;
+inner:
+switch (prop.getType()) {
+case PropertyValue.NUMERIC: {
+switch (currentToken) {
+case PLUS:
+next();
+pv = parseMultiplicativeExpr();
+switch (pv.getType()) {
+case PropertyValue.NUMERIC:
+((Numeric)prop).add((Numeric)pv);
+break inner;
+case PropertyValue.INTEGER:
+((Numeric)prop).add((double)
+(((IntegerType)pv).getInt()));
+break inner;
+default:
+throw new PropertyException(arithErrorStr());
+}
+case MINUS:
+next();
+pv = parseMultiplicativeExpr();
+switch (pv.getType()) {
+case PropertyValue.NUMERIC:
+((Numeric)prop).subtract((Numeric)pv);
+break inner;
+case PropertyValue.INTEGER:
+((Numeric)prop).subtract((double)
+ (((IntegerType)pv).getInt()));
+break inner;
+default:
+throw new PropertyException(arithErrorStr());
+}
+default:
+break outer;
+}
+}
+case PropertyValue.INTEGER: {
+int intVal = ((IntegerType)prop).getInt();
+switch (currentToken) {
+case PLUS:
+next();
+pv = parseMultiplicativeExpr();
+switch (pv.getType()) {
+case PropertyValue.NUMERIC:
+prop = ((Numeric)pv).add((double)intVal);
+break inner;
+case PropertyValue.INTEGER:
+((IntegerType)prop).setInt(intVal +
+((IntegerType)pv).getInt());
+break inner;
+default:
+throw new PropertyException(arithErrorStr());
+}
+case MINUS:
+next();
+pv = parseMultiplicativeExpr();
+switch (pv.getType()) {
+case PropertyValue.NUMERIC:
+((Numeric)pv).add((double)(-intVal));
+prop = ((Numeric)pv).negate();
+break inner;
+case PropertyValue.INTEGER
cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoLayoutMasterSet.java
pbwest 2002/10/10 10:07:00 Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design FoLayoutMasterSet.java Log: Immediate initialisation of pageMasters and simplePageMasters. Revision ChangesPath No revision No revision 1.1.2.7 +5 -7 xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java Index: FoLayoutMasterSet.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -r1.1.2.6 -r1.1.2.7 --- FoLayoutMasterSet.java9 Oct 2002 06:00:49 - 1.1.2.6 +++ FoLayoutMasterSet.java10 Oct 2002 17:06:59 - 1.1.2.7 @@ -53,13 +53,13 @@ * Hash of SimplePageMaster and PageSequenceMaster objects, * indexed by master-name of the object. */ -private HashMap pageMasters; +private HashMap pageMasters = new HashMap(); /** * Hash of SimplePageMaster objects, * indexed by master-name of the object. */ -private HashMap simplePageMasters; +private HashMap simplePageMasters = new HashMap(); /** * @param foTree the FO tree being built @@ -96,8 +96,6 @@ System.out.println(Found simple-page-master); simple = new FoSimplePageMaster(foTree, this, ev); simpleName = simple.getMasterName(); -if (pageMasters == null) -pageMasters = new HashMap(); if (pageMasters.get ((Object)(simpleName)) != null) throw new FOPException - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/xml XMLEvent.java
pbwest 2002/10/10 10:10:44
Modified:src/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
XMLEvent.java
Log:
Make components of XMLEvent.UriLocalName public.
Revision ChangesPath
No revision
No revision
1.1.2.4 +6 -6 xml-fop/src/org/apache/fop/xml/Attic/XMLEvent.java
Index: XMLEvent.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/xml/Attic/XMLEvent.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XMLEvent.java 9 Oct 2002 06:08:37 - 1.1.2.3
+++ XMLEvent.java 10 Oct 2002 17:10:44 - 1.1.2.4
@@ -218,11 +218,11 @@
/**
* A nested class for holding an passing a URI index and local name
- * pair, as used in the contain ttXMLEvent/tt class.
+ * pair, as used in the containing ttXMLEvent/tt class.
*/
public static class UriLocalName {
-private int uriIndex;
-private String localName;
+public int uriIndex;
+public String localName;
/**
* @param uriIndex - the index of the namespace URI maintained in
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/bin fopcomp
pbwest 2002/10/11 20:27:04
Modified:bin Tag: FOP_0-20-0_Alt-Design fopcomp
Log:
Added -g flag support.
Revision ChangesPath
No revision
No revision
1.1.2.2 +18 -8 xml-fop/bin/Attic/fopcomp
Index: fopcomp
===
RCS file: /home/cvs/xml-fop/bin/Attic/fopcomp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- fopcomp 8 May 2002 05:17:34 - 1.1.2.1
+++ fopcomp 12 Oct 2002 03:27:03 - 1.1.2.2
@@ -1,13 +1,23 @@
-#!/bin/ksh
+#!/bin/sh
function prefix {
typeset path
path=`pwd`
expr $path : '\(.*\)src/org/apache/fop/.*'
}
-set -x
-if [ $1 = -j ]; then
- shift
- javac -verbose -d `prefix`build/classes -sourcepath `prefix`src $@
-else
- jikes -verbose +F -d `prefix`build/classes -sourcepath `prefix`src $@
-fi
+#set -x
+compiler=jikes
+until case $1 in
+ -j) compiler=javac
+ echo Using javac
+ false
+ ;;
+ -g) debug=-g
+ echo Debugging on
+ false
+ ;;
+ esac
+do
+shift
+done
+
+$compiler $debug -verbose -d `prefix`build/classes -sourcepath `prefix`src $@
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoPageSequenceMaster.java
pbwest 2002/10/11 20:55:30
Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoPageSequenceMaster.java
Log:
Removed subSequenceList. Handle SubSequences
within FONode. Change getMasterName() to derive name directly from the
PropertySet on the FONode.
Revision ChangesPath
No revision
No revision
1.1.2.8 +25 -19
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
Index: FoPageSequenceMaster.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoPageSequenceMaster.java 10 Oct 2002 17:05:02 - 1.1.2.7
+++ FoPageSequenceMaster.java 12 Oct 2002 03:55:30 - 1.1.2.8
@@ -63,21 +63,13 @@
private String masterName;
-private ArrayList subSequenceList = new ArrayList(1);
+//private ArrayList subSequenceList = new ArrayList(1);
public FoPageSequenceMaster(FOTree foTree, FONode parent, XMLEvent event)
throws Tree.TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.PAGE_SEQUENCE_MASTER, parent, event,
FOPropertySets.SEQ_MASTER_SET);
-// Check that the property has been set
-PropertyValue name = propertySet[PropNames.MASTER_NAME];
-if (name == null)
-throw new PropertyException(master-name property not set);
-if (name.getType() != PropertyValue.NCNAME)
-throw new PropertyException
-(master-name property not an NCName.);
-masterName = ((NCName)name).getNCName();
// Process sequence members here
try {
do {
@@ -86,20 +78,23 @@
String localName = ev.getLocalName();
if (localName.equals(single-page-master-reference)) {
System.out.println(Found single-page-master-reference);
- subSequenceList.add(new FoSinglePageMasterReference
- (foTree, this, ev));
+ //subSequenceList.add(new FoSinglePageMasterReference
+ //(foTree, this, ev));
+ new FoSinglePageMasterReference(foTree, this, ev);
} else if (localName.equals
(repeatable-page-master-reference)) {
System.out.println
(Found repeatable-page-master-reference);
- subSequenceList.add(new FoRepeatablePageMasterReference
- (foTree, this, ev));
+ //subSequenceList.add(new FoRepeatablePageMasterReference
+ //(foTree, this, ev));
+ new FoRepeatablePageMasterReference(foTree, this, ev);
} else if (localName.equals
(repeatable-page-master-alternatives)) {
System.out.println
(Found repeatable-page-master-alternatives);
- subSequenceList.add(new FoRepeatablePageMasterAlternatives
- (foTree, this, ev));
+ //subSequenceList.add(new FoRepeatablePageMasterAlternatives
+ //(foTree, this, ev));
+ new FoRepeatablePageMasterAlternatives(foTree, this, ev);
} else
throw new FOPException
(Aargh! expectStartElement(events, list));
@@ -113,8 +108,17 @@
/**
* @return a ttString/tt with the master-name attribute value.
*/
-public String getMasterName() {
-return masterName;
+public String getMasterName() throws PropertyException {
+ if (masterName == null) {
+ PropertyValue name = propertySet[PropNames.MASTER_NAME];
+ if (name == null)
+ throw new PropertyException(master-name property not set);
+ if (name.getType() != PropertyValue.NCNAME)
+ throw new PropertyException
+ (master-name property not an NCName.);
+ masterName = ((NCName)name).getNCName();
+ }
+ return masterName;
}
/**
@@ -208,6 +212,7 @@
parent, event, FOPropertySets.SEQ_MASTER_SET);
}
+ /*
public PropertyValue getMasterReference() throws PropertyException
{
return
cvs commit: xml-fop/src/org/apache/fop/fo FoRoot.java
pbwest 2002/10/11 20:59:11
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FoRoot.java
Log:
setupPageMasters() now done within the FoLayoutMasterSet constructor. End event of
layout-master-set flushed within FoLayoutMasterSet constructor.
Revision ChangesPath
No revision
No revision
1.1.2.9 +3 -6 xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java
Index: FoRoot.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoRoot.java 9 Oct 2002 05:56:31 - 1.1.2.8
+++ FoRoot.java 12 Oct 2002 03:59:11 - 1.1.2.9
@@ -98,9 +98,6 @@
} catch(PropertyException e) {
throw new FOPException(PropertyException: + e.getMessage());
}
-layoutMasters.setupPageMasters();
-// Stub - flush the layout masters
-ev = xmlevents.getEndElement(ev);
// Look for optional declarations
try {
xmlevents.expectStartElement
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/pagination PageMasterAlternatives.java
pbwest 2002/10/11 16:46:51
Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
PageMasterAlternatives.java
Log:
Replaced iterator with getLength/get(i).
Revision ChangesPath
No revision
No revision
1.1.2.2 +16 -7
xml-fop/src/org/apache/fop/fo/pagination/Attic/PageMasterAlternatives.java
Index: PageMasterAlternatives.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/PageMasterAlternatives.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PageMasterAlternatives.java 6 Oct 2002 13:56:15 - 1.1.2.1
+++ PageMasterAlternatives.java 11 Oct 2002 23:46:51 - 1.1.2.2
@@ -10,7 +10,6 @@
package org.apache.fop.fo.pagination;
import java.util.ArrayList;
-import java.util.Iterator;
// FOP
import org.apache.fop.fo.pagination.PageCondition;
@@ -55,10 +54,20 @@
}
/**
- * Get an ttIterator/tt over the set of alternative conditions.
- * @return the ttIterator/tt.
+ * Get the length of the ialternatives/i ttArrayList/tt.
+ * @return - the length.
*/
-public Iterator conditions() {
- return alternatives.iterator();
+public int getAlternativesLength() {
+return alternatives.size();
}
+
+/**
+ * Get the indexed ttPageMasterAlternatives/tt master.
+ * @param i - the index of the master to retrieve.
+ * @return - the indexed ttPageMasterAlternatives/tt master.
+ */
+public PageCondition getAlternative(int i) {
+return (PageCondition)(alternatives.get(i));
+}
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/pagination PageCondition.java PageMasterAlternatives.java
pbwest 2002/10/11 17:15:23 Removed: src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design PageCondition.java PageMasterAlternatives.java Log: Incorporated as member classes in PageSequenceMaster.java. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/lib batik.jar bsf.jar buildtools.jar jimi-1.0.jar jimi-License.txt stylebook.jar xalan-1.2.2.jar xalan-2.0.0.jar xalanj1compat.jar
pbwest 2002/10/18 19:11:54 Removed: lib Tag: FOP_0-20-0_Alt-Design batik.jar bsf.jar buildtools.jar jimi-1.0.jar jimi-License.txt stylebook.jar xalan-1.2.2.jar xalan-2.0.0.jar xalanj1compat.jar Log: Only using parser for testing - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datastructs SyncedCircularBuffer.java
pbwest 2002/10/18 20:09:04
Modified:src/org/apache/fop/datastructs Tag: FOP_0-20-0_Alt-Design
SyncedCircularBuffer.java
Log:
DEFAULTBUFSIZE increased to 128.
Revision ChangesPath
No revision
No revision
1.1.2.3 +3 -3
xml-fop/src/org/apache/fop/datastructs/Attic/SyncedCircularBuffer.java
Index: SyncedCircularBuffer.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/datastructs/Attic/SyncedCircularBuffer.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SyncedCircularBuffer.java 3 Oct 2002 03:29:02 - 1.1.2.2
+++ SyncedCircularBuffer.java 19 Oct 2002 03:09:04 - 1.1.2.3
@@ -28,7 +28,7 @@
*/
public class SyncedCircularBuffer {
-private final static int DEFAULTBUFSIZE = 32;
+private final static int DEFAULTBUFSIZE = 128;
private Object[] buf;
private int size = 0;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datatypes AbstractPropertyValue.java Angle.java Auto.java Bool.java ColorSpace.java ColorType.java CountryType.java Ems.java EnumType.java FontFamilySet.java Frequency.java IntegerType.java Ints.java LanguageType.java Length.java Literal.java MappedNumeric.java MimeType.java NCName.java None.java NoType.java Percentage.java PropertyValue.java PropertyValueList.java ScriptType.java ShadowEffect.java Slash.java StringType.java TextDecorations.java TextDecorator.java Time.java UriType.java
pbwest 2002/10/18 20:27:09
Modified:src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
AbstractPropertyValue.java Angle.java Auto.java
Bool.java ColorSpace.java ColorType.java
CountryType.java Ems.java EnumType.java
FontFamilySet.java Frequency.java IntegerType.java
Ints.java LanguageType.java Length.java
Literal.java MappedNumeric.java MimeType.java
NCName.java None.java NoType.java Percentage.java
PropertyValue.java PropertyValueList.java
ScriptType.java ShadowEffect.java Slash.java
StringType.java TextDecorations.java
TextDecorator.java Time.java UriType.java
Log:
PropertyConsts now instantiated.
PropertyConsts data is accessed through a singleton object.
getPropertyIndex() moved to PropNames.
Properties split into properties.Property and properties.property.
Revision ChangesPath
No revision
No revision
1.1.2.6 +15 -8
xml-fop/src/org/apache/fop/datatypes/Attic/AbstractPropertyValue.java
Index: AbstractPropertyValue.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/AbstractPropertyValue.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- AbstractPropertyValue.java9 Oct 2002 04:50:24 - 1.1.2.5
+++ AbstractPropertyValue.java19 Oct 2002 03:27:07 - 1.1.2.6
@@ -2,7 +2,7 @@
import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.properties.*;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.datatypes.PropertyValue;
@@ -34,6 +34,11 @@
* An integer property type.
*/
public final int type;
+
+/**
+ * The PropertyConsts singleton.
+ */
+public final PropertyConsts propertyConsts;
/**
* @param index index of the property in the property arrays.
@@ -48,6 +53,7 @@
throw new PropertyException(Invalid property type: + type);
property = index;
this.type = type;
+propertyConsts = PropertyConsts.getPropertyConsts();
}
/**
@@ -56,7 +62,8 @@
public AbstractPropertyValue(String propertyName, int type)
throws PropertyException
{
-property = PropertyConsts.getPropertyIndex(propertyName);
+propertyConsts = PropertyConsts.getPropertyConsts();
+property = PropNames.getPropertyIndex(propertyName);
if (property 1 || property PropNames.LAST_PROPERTY_INDEX)
throw new PropertyException(Invalid property index: + property);
if (type 0 || type PropertyValue.LAST_PROPERTY_TYPE)
@@ -104,14 +111,14 @@
// unless the property is NOT inherited.
// I can't remember why I put this
// condition in here. Removing it. pbw 2002/02/18
-//if (PropertyConsts.inherited.get(testProperty) == Properties.NO
-// (PropertyConsts.dataTypes.get(testProperty) type) == 0) {
+//if (propertyConsts.inherited.get(testProperty) == Property.NO
+// (propertyConsts.getDataTypes(testProperty) type) == 0) {
-if ((PropertyConsts.dataTypes.get(testProperty) type) == 0) {
+if ((propertyConsts.getDataTypes(testProperty) type) == 0) {
String pname = PropNames.getPropertyName(testProperty);
throw new PropertyException
(Datatype(s) +
- Properties.listDataTypes(type) +
+ Property.listDataTypes(type) +
not defined on + pname);
}
}
1.1.2.6 +4 -4 xml-fop/src/org/apache/fop/datatypes/Attic/Angle.java
Index: Angle.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Angle.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Angle.java18 Sep 2002 15:24:11 - 1.1.2.5
+++ Angle.java19 Oct 2002 03:27:07 - 1.1.2.6
@@ -3,7 +3,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.AbstractPropertyValue;
-import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.properties.*;
/*
* Angle.java
@@ -128,7 +128,7 @@
* validate the iAngle/i against the associated property.
*/
public void
