You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by pb...@apache.org on 2002/08/27 17:14:50 UTC
cvs commit: xml-fop/src/org/apache/fop/datatypes Angle.java Auto.java Bool.java ColorType.java CountryType.java EnumType.java FontFamilySet.java Frequency.java FromNearestSpecified.java FromParent.java Inherit.java IntegerType.java LanguageType.java Literal.java MappedNumeric.java MimeType.java NCName.java None.java Numeric.java ScriptType.java ShadowEffect.java Slash.java StringType.java TextDecorations.java TextDecorator.java Time.java UriType.java
pbwest 2002/08/27 08:14:50
Modified: src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
Angle.java Auto.java Bool.java ColorType.java
CountryType.java EnumType.java FontFamilySet.java
Frequency.java FromNearestSpecified.java
FromParent.java Inherit.java IntegerType.java
LanguageType.java Literal.java MappedNumeric.java
MimeType.java NCName.java None.java Numeric.java
ScriptType.java ShadowEffect.java Slash.java
StringType.java TextDecorations.java
TextDecorator.java Time.java UriType.java
Log:
Added PropertyValue type field for later use in parsing.
Revision Changes Path
No revision
No revision
1.1.2.4 +5 -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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Angle.java 29 Jul 2002 16:05:05 -0000 1.1.2.3
+++ Angle.java 27 Aug 2002 15:14:48 -0000 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.expr.PropertyValue;
import org.apache.fop.fo.expr.AbstractPropertyValue;
import org.apache.fop.fo.Properties;
@@ -52,7 +53,7 @@
public Angle(int property, int unit, double value)
throws PropertyException
{
- super(property);
+ super(property, PropertyValue.ANGLE);
units = unit;
degrees = value * degPerUnit[unit];
}
@@ -68,7 +69,7 @@
public Angle(String propertyName, int unit, double value)
throws PropertyException
{
- super(propertyName);
+ super(propertyName, PropertyValue.ANGLE);
units = unit;
degrees = value * degPerUnit[unit];
}
1.1.2.3 +6 -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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Auto.java 17 Jun 2002 00:24:49 -0000 1.1.2.2
+++ Auto.java 27 Aug 2002 15:14:48 -0000 1.1.2.3
@@ -1,5 +1,6 @@
package org.apache.fop.datatypes;
+import org.apache.fop.fo.expr.PropertyValue;
import org.apache.fop.fo.expr.AbstractPropertyValue;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.Properties;
@@ -32,7 +33,7 @@
public Auto(int property)
throws PropertyException
{
- super(property);
+ super(property, PropertyValue.AUTO);
}
/**
@@ -43,7 +44,7 @@
public Auto(String propertyName)
throws PropertyException
{
- super(propertyName);
+ super(propertyName, PropertyValue.AUTO);
}
/**
1.1.2.3 +8 -7 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Bool.java 17 Jun 2002 00:24:49 -0000 1.1.2.2
+++ Bool.java 27 Aug 2002 15:14:48 -0000 1.1.2.3
@@ -2,6 +2,7 @@
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.fo.Properties;
@@ -39,7 +40,7 @@
public Bool (int property, boolean bool)
throws PropertyException
{
- super(property);
+ super(property, PropertyValue.BOOL);
this.bool = bool;
}
@@ -53,7 +54,7 @@
public Bool (int property, String boolStr)
throws PropertyException
{
- super(property);
+ super(property, PropertyValue.BOOL);
if (boolStr.equals("true")) bool = true;
else if (boolStr.equals("false")) bool = false;
else throw new PropertyException
@@ -70,7 +71,7 @@
public Bool (String propertyName, String boolStr)
throws PropertyException
{
- super(propertyName);
+ super(propertyName, PropertyValue.BOOL);
if (boolStr.equals("true")) bool = true;
else if (boolStr.equals("false")) bool = false;
else throw new PropertyException
@@ -86,7 +87,7 @@
public Bool (String propertyName, boolean bool)
throws PropertyException
{
- super(propertyName);
+ super(propertyName, PropertyValue.BOOL);
this.bool = bool;
}
1.15.2.5 +8 -7 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.4
retrieving revision 1.15.2.5
diff -u -r1.15.2.4 -r1.15.2.5
--- ColorType.java 17 Jun 2002 00:24:49 -0000 1.15.2.4
+++ ColorType.java 27 Aug 2002 15:14:48 -0000 1.15.2.5
@@ -11,6 +11,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.PropertyConsts;
+import org.apache.fop.fo.expr.PropertyValue;
import org.apache.fop.fo.expr.AbstractPropertyValue;
/**
@@ -48,7 +49,7 @@
public ColorType(int property, float red, float green, float blue)
throws PropertyException
{
- super(property);
+ super(property, PropertyValue.COLOR_TYPE);
color[RED] = red;
color[GREEN] = green;
color[BLUE] = blue;
@@ -82,7 +83,7 @@
public ColorType(int property, int red, int green, int blue)
throws PropertyException
{
- super(property);
+ super(property, PropertyValue.COLOR_TYPE);
if (red > 255) red = 255;
if (green > 255) green = 255;
if (blue > 255) blue = 255;
@@ -116,7 +117,7 @@
* the normalized (0 <= n <= 1) red, green, blue and alpha components.
*/
public ColorType(int property, float[] color) throws PropertyException {
- super(property);
+ super(property, PropertyValue.COLOR_TYPE);
if (color.length != 4) throw new PropertyException
("Attempt to construct a ColorType with array of "
+ color.length + " elements.");
@@ -146,7 +147,7 @@
* @param value a <tt>String</tt>; the system color name.
*/
public ColorType(int property, String value) throws PropertyException {
- super(property);
+ super(property, PropertyValue.COLOR_TYPE);
if (value.startsWith("#")) {
try {
if (value.length() == 4) {
@@ -209,7 +210,7 @@
* @param colorEnum an <tt>int</tt>; the enumeration index.
*/
public ColorType(int property, int colorEnum) throws PropertyException {
- super(property);
+ super(property, PropertyValue.COLOR_TYPE);
String enumText = PropertyConsts.getEnumText(property, colorEnum);
color = (float[])(getStandardColor(enumText).clone());
}
1.1.2.2 +5 -4 xml-fop/src/org/apache/fop/datatypes/Attic/CountryType.java
Index: CountryType.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/CountryType.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- CountryType.java 9 Jul 2002 06:42:51 -0000 1.1.2.1
+++ CountryType.java 27 Aug 2002 15:14:48 -0000 1.1.2.2
@@ -5,6 +5,7 @@
import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.fo.Properties;
import org.apache.fop.configuration.Configuration;
+import org.apache.fop.fo.expr.PropertyValue;
/*
* $Id$
@@ -26,7 +27,7 @@
public CountryType(int property, String countryCode)
throws PropertyException
{
- super(property, countryCode);
+ super(property, countryCode, PropertyValue.COUNTRY);
// Validate the code
if (Configuration.getHashMapEntry("countriesMap", countryCode)
== null) throw new PropertyException
1.1.2.3 +67 -10 xml-fop/src/org/apache/fop/datatypes/Attic/EnumType.java
Index: EnumType.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/EnumType.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- EnumType.java 17 Jun 2002 00:24:49 -0000 1.1.2.2
+++ EnumType.java 27 Aug 2002 15:14:48 -0000 1.1.2.3
@@ -5,6 +5,7 @@
import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.fo.Properties;
import org.apache.fop.messaging.MessageHandler;
+import org.apache.fop.fo.expr.PropertyValue;
/*
* EnumType.java
@@ -42,7 +43,60 @@
public EnumType(int property, String enumText)
throws PropertyException
{
- super(property);
+ this(property, enumText, PropertyValue.ENUM);
+ }
+
+ /**
+ * @param property the <tt>int</tt> index of the property on which
+ * this value is being defined.
+ * @param enum the <tt>int</tt> enumeration constant.
+ * @exception PropertyException
+ */
+ public EnumType(int property, int enum)
+ throws PropertyException
+ {
+ this(property, enum, PropertyValue.ENUM);
+ }
+
+ /**
+ * @param propertyName the <tt>String</tt> name of the property on which
+ * this value is being defined.
+ * @param enumText the <tt>String</tt> containing the enumeration text.
+ * An <i>NCName</i>.
+ * @exception PropertyException
+ */
+ public EnumType(String propertyName, String enumText)
+ throws PropertyException
+ {
+ this(PropertyConsts.getPropertyIndex(propertyName),
+ enumText, PropertyValue.ENUM);
+ }
+
+ /**
+ * @param propertyName the <tt>String</tt> name of the property on which
+ * this value is being defined.
+ * @param enum the <tt>int</tt> enumeration constant.
+ * @exception PropertyException
+ */
+ public EnumType(String propertyName, int enum)
+ throws PropertyException
+ {
+ this(PropertyConsts.getPropertyIndex(propertyName),
+ enum, PropertyValue.ENUM);
+ }
+
+ /**
+ * @param property the <tt>int</tt> index of the property on which
+ * this value is being defined.
+ * @param enumText the <tt>String</tt> containing the enumeration text.
+ * An <i>NCName</i>.
+ * @param type of this value
+ * @exception PropertyException
+ */
+ public EnumType(int property, String enumText, int type)
+ throws PropertyException
+ {
+ super(property, type);
// Get the enum integer or mapped enum integer
enumValue = PropertyConsts.getEnumIndex(property, enumText);
}
@@ -51,12 +105,13 @@
* @param property the <tt>int</tt> index of the property on which
* this value is being defined.
* @param enum the <tt>int</tt> enumeration constant.
+ * @param type of this value
* @exception PropertyException
*/
- public EnumType(int property, int enum)
+ public EnumType(int property, int enum, int type)
throws PropertyException
{
- super(property);
+ super(property, type);
enumValue = enum;
// Validate the text; getEnumText will throw a PropertyException
// if the enum integer is invalid
@@ -68,24 +123,26 @@
* this value is being defined.
* @param enumText the <tt>String</tt> containing the enumeration text.
* An <i>NCName</i>.
+ * @param type of this value
* @exception PropertyException
*/
- public EnumType(String propertyName, String enumText)
+ public EnumType(String propertyName, String enumText, int type)
throws PropertyException
{
- this(PropertyConsts.getPropertyIndex(propertyName), enumText);
+ this(PropertyConsts.getPropertyIndex(propertyName), enumText, type);
}
/**
* @param propertyName the <tt>String</tt> name of the property on which
* this value is being defined.
* @param enum the <tt>int</tt> enumeration constant.
+ * @param type of this value
* @exception PropertyException
*/
- public EnumType(String propertyName, int enum)
+ public EnumType(String propertyName, int enum, int type)
throws PropertyException
{
- this(PropertyConsts.getPropertyIndex(propertyName), enum);
+ this(PropertyConsts.getPropertyIndex(propertyName), enum, type);
}
/**
1.1.2.3 +5 -4 xml-fop/src/org/apache/fop/datatypes/Attic/FontFamilySet.java
Index: FontFamilySet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/FontFamilySet.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FontFamilySet.java 17 Jun 2002 00:24:49 -0000 1.1.2.2
+++ FontFamilySet.java 27 Aug 2002 15:14:48 -0000 1.1.2.3
@@ -8,6 +8,7 @@
import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.fo.Properties;
import org.apache.fop.fo.expr.AbstractPropertyValue;
+import org.apache.fop.fo.expr.PropertyValue;
/*
* FontFamilySet.java
@@ -46,7 +47,7 @@
public FontFamilySet(int property, String[] fontFamilyNames)
throws PropertyException
{
- super(property);
+ super(property, PropertyValue.FONT_FAMILY);
this.fontFamilyNames = fontFamilyNames;
}
1.1.2.4 +4 -3 xml-fop/src/org/apache/fop/datatypes/Attic/Frequency.java
Index: Frequency.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Frequency.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Frequency.java 29 Jul 2002 16:05:05 -0000 1.1.2.3
+++ Frequency.java 27 Aug 2002 15:14:48 -0000 1.1.2.4
@@ -2,6 +2,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.expr.AbstractPropertyValue;
+import org.apache.fop.fo.expr.PropertyValue;
import org.apache.fop.fo.Properties;
/*
@@ -51,7 +52,7 @@
public Frequency(int property, int unit, double value)
throws PropertyException
{
- super(property);
+ super(property, PropertyValue.FREQUENCY);
units = unit;
frequency = value * hzPerUnit[unit];
}
@@ -67,7 +68,7 @@
public Frequency(String propertyName, int unit, double value)
throws PropertyException
{
- super(propertyName);
+ super(propertyName, PropertyValue.FREQUENCY);
units = unit;
frequency = value * hzPerUnit[unit];
}
1.1.2.4 +6 -5 xml-fop/src/org/apache/fop/datatypes/Attic/FromNearestSpecified.java
Index: FromNearestSpecified.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/FromNearestSpecified.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FromNearestSpecified.java 17 Jun 2002 00:24:49 -0000 1.1.2.3
+++ FromNearestSpecified.java 27 Aug 2002 15:14:48 -0000 1.1.2.4
@@ -1,6 +1,7 @@
package org.apache.fop.datatypes;
import org.apache.fop.fo.expr.AbstractPropertyValue;
+import org.apache.fop.fo.expr.PropertyValue;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.Properties;
@@ -66,7 +67,7 @@
public FromNearestSpecified(int property)
throws PropertyException
{
- super(property);
+ super(property, PropertyValue.FROM_NEAREST_SPECIFIED);
}
/**
@@ -77,7 +78,7 @@
public FromNearestSpecified(String propertyName)
throws PropertyException
{
- super(propertyName);
+ super(propertyName, PropertyValue.FROM_NEAREST_SPECIFIED);
}
/**
1.1.2.5 +6 -5 xml-fop/src/org/apache/fop/datatypes/Attic/FromParent.java
Index: FromParent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/FromParent.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FromParent.java 17 Jun 2002 00:24:49 -0000 1.1.2.4
+++ FromParent.java 27 Aug 2002 15:14:48 -0000 1.1.2.5
@@ -1,6 +1,7 @@
package org.apache.fop.datatypes;
import org.apache.fop.fo.expr.AbstractPropertyValue;
+import org.apache.fop.fo.expr.PropertyValue;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.Properties;
@@ -65,7 +66,7 @@
public FromParent(int property)
throws PropertyException
{
- super(property);
+ super(property, PropertyValue.FROM_PARENT);
}
/**
@@ -76,7 +77,7 @@
public FromParent(String propertyName)
throws PropertyException
{
- super(propertyName);
+ super(propertyName, PropertyValue.FROM_PARENT);
}
/**
1.1.2.3 +6 -5 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Inherit.java 17 Jun 2002 00:24:49 -0000 1.1.2.2
+++ Inherit.java 27 Aug 2002 15:14:48 -0000 1.1.2.3
@@ -2,6 +2,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.expr.AbstractPropertyValue;
+import org.apache.fop.fo.expr.PropertyValue;
import org.apache.fop.fo.Properties;
import org.apache.fop.fo.PropertyConsts;
@@ -41,7 +42,7 @@
public Inherit(int property, int sourceProperty)
throws PropertyException
{
- super(property);
+ super(property, PropertyValue.INHERIT);
this.sourceProperty = sourceProperty;
}
@@ -66,7 +67,7 @@
public Inherit(String propertyName, String sourcePropertyName)
throws PropertyException
{
- super(propertyName);
+ super(propertyName, PropertyValue.INHERIT);
property = PropertyConsts.getPropertyIndex(propertyName);
sourceProperty = PropertyConsts.getPropertyIndex(sourcePropertyName);
}
1.1.2.4 +5 -4 xml-fop/src/org/apache/fop/datatypes/Attic/IntegerType.java
Index: IntegerType.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/IntegerType.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- IntegerType.java 29 Jul 2002 16:05:05 -0000 1.1.2.3
+++ IntegerType.java 27 Aug 2002 15:14:48 -0000 1.1.2.4
@@ -3,6 +3,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.expr.AbstractPropertyValue;
+import org.apache.fop.fo.expr.PropertyValue;
import org.apache.fop.fo.Properties;
/*
@@ -34,7 +35,7 @@
public IntegerType (int property, int value)
throws PropertyException
{
- super(property);
+ super(property, PropertyValue.INTEGER);
intval = value;
}
@@ -47,7 +48,7 @@
public IntegerType (String propertyName, int value)
throws PropertyException
{
- super(propertyName);
+ super(propertyName, PropertyValue.INTEGER);
intval = value;
}
1.1.2.2 +5 -4 xml-fop/src/org/apache/fop/datatypes/Attic/LanguageType.java
Index: LanguageType.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/LanguageType.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LanguageType.java 9 Jul 2002 06:42:51 -0000 1.1.2.1
+++ LanguageType.java 27 Aug 2002 15:14:48 -0000 1.1.2.2
@@ -5,6 +5,7 @@
import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.fo.Properties;
import org.apache.fop.configuration.Configuration;
+import org.apache.fop.fo.expr.PropertyValue;
/*
* LanguageType.java
@@ -29,7 +30,7 @@
public LanguageType(int property, String languageCode)
throws PropertyException
{
- super(property, languageCode);
+ super(property, languageCode, PropertyValue.LANGUAGE);
// Validate the code
if (Configuration.getHashMapEntry("languagesMap", languageCode)
== null) throw new PropertyException
1.1.2.3 +5 -4 xml-fop/src/org/apache/fop/datatypes/Attic/Literal.java
Index: Literal.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Literal.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Literal.java 17 Jun 2002 00:24:49 -0000 1.1.2.2
+++ Literal.java 27 Aug 2002 15:14:48 -0000 1.1.2.3
@@ -4,6 +4,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.Properties;
import org.apache.fop.fo.PropertyConsts;
+import org.apache.fop.fo.expr.PropertyValue;
/*
* Literal.java
@@ -33,7 +34,7 @@
public Literal(int property, String string)
throws PropertyException
{
- super(property, string);
+ super(property, string, PropertyValue.LITERAL);
}
/**
1.1.2.3 +9 -8 xml-fop/src/org/apache/fop/datatypes/Attic/MappedNumeric.java
Index: MappedNumeric.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/MappedNumeric.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- MappedNumeric.java 4 Jul 2002 01:57:17 -0000 1.1.2.2
+++ MappedNumeric.java 27 Aug 2002 15:14:48 -0000 1.1.2.3
@@ -2,6 +2,7 @@
import org.apache.fop.datatypes.EnumType;
import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.expr.PropertyValue;
import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.fo.Properties;
import org.apache.fop.fo.FOTree;
@@ -45,8 +46,8 @@
{
// Set property index in AbstractPropertyValue
// and enumValue enum constant in EnumType
- super(property, enumText);
- mappedNum = foTree.getMappedNumArrayValue(property, enumValue);
+ super(property, enumText, PropertyValue.MAPPED_NUMERIC);
+ mappedNum = PropertyConsts.getMappedNumeric(property, enumValue);
}
/**
@@ -62,8 +63,8 @@
{
// Set property index in AbstractPropertyValue
// and enumValue enum constant in EnumType
- super(propertyName, enumText);
- mappedNum = foTree.getMappedNumArrayValue(property, enumValue);
+ super(propertyName, enumText, PropertyValue.MAPPED_NUMERIC);
+ mappedNum = PropertyConsts.getMappedNumeric(property, enumValue);
}
/**
@@ -78,7 +79,7 @@
* validate the <i>MappedNumeric</i> against the associated property.
*/
public void validate() throws PropertyException {
- super.validate(Properties.MAPPED_NUMERIC);
+ super.validate(Properties.MAPPED_LENGTH);
}
public String toString() {
1.1.2.3 +6 -5 xml-fop/src/org/apache/fop/datatypes/Attic/MimeType.java
Index: MimeType.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/MimeType.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- MimeType.java 17 Jun 2002 00:24:49 -0000 1.1.2.2
+++ MimeType.java 27 Aug 2002 15:14:48 -0000 1.1.2.3
@@ -2,6 +2,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.expr.AbstractPropertyValue;
+import org.apache.fop.fo.expr.PropertyValue;
import org.apache.fop.fo.Properties;
/*
@@ -40,7 +41,7 @@
public MimeType(int property, String mimetype)
throws PropertyException
{
- super(property);
+ super(property, PropertyValue.MIME_TYPE);
this.mimetype = mimetype;
}
@@ -54,7 +55,7 @@
public MimeType(String propertyName, String mimetype)
throws PropertyException
{
- super(propertyName);
+ super(propertyName, PropertyValue.MIME_TYPE);
this.mimetype = mimetype;
}
1.1.2.3 +40 -6 xml-fop/src/org/apache/fop/datatypes/Attic/NCName.java
Index: NCName.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/NCName.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- NCName.java 17 Jun 2002 00:24:49 -0000 1.1.2.2
+++ NCName.java 27 Aug 2002 15:14:48 -0000 1.1.2.3
@@ -4,6 +4,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.Properties;
import org.apache.fop.datatypes.StringType;
+import org.apache.fop.fo.expr.PropertyValue;
/*
* NCName.java
@@ -17,7 +18,8 @@
* @version $Revision$ $Name$
*/
/**
- * An NCName.
+ * An NCName. NCName may be instantiated directly, and it also serves as a
+ * base class for a number of specific <tt>PropertyValue</tt> types.
*/
public class NCName extends StringType {
@@ -26,6 +28,8 @@
private static final String revision = "$Revision$";
/**
+ * Used when <tt>NCName</tt> is used directly as the
+ * <tt>PropertyValue</tt> type.
* @param property the <tt>int</tt> index of the property on which
* this value is being defined.
* @param string the <tt>String</tt>.
@@ -34,10 +38,12 @@
public NCName (int property, String string)
throws PropertyException
{
- super(property, string);
+ super(property, string, PropertyValue.NCNAME);
}
/**
+ * Used when <tt>NCName</tt> is used directly as the
+ * <tt>PropertyValue</tt> type.
* @param propertyName the <tt>String</tt< name of the property on which
* this value is being defined.
* @param string the <tt>String</tt>.
@@ -46,7 +52,35 @@
public NCName (String propertyName, String string)
throws PropertyException
{
- super(propertyName, string);
+ super(propertyName, string, PropertyValue.NCNAME);
+ }
+
+ /**
+ * Used when <tt>NCName</tt> is a base class for another type.
+ * @param property the <tt>int</tt> index of the property on which
+ * this value is being defined.
+ * @param string the <tt>String</tt>.
+ * @param type the type of <tt>PropertyValue</tt> being instantiated.
+ * @exception PropertyException
+ */
+ public NCName (int property, String string, int type)
+ throws PropertyException
+ {
+ super(property, string, type);
+ }
+
+ /**
+ * Used when <tt>NCName</tt> is a base class for another type.
+ * @param propertyName the <tt>String</tt< name of the property on which
+ * this value is being defined.
+ * @param string the <tt>String</tt>.
+ * @param type the type of <tt>PropertyValue</tt> being instantiated.
+ * @exception PropertyException
+ */
+ public NCName (String propertyName, String string, int type)
+ throws PropertyException
+ {
+ super(propertyName, string, type);
}
/**
1.1.2.3 +6 -5 xml-fop/src/org/apache/fop/datatypes/Attic/None.java
Index: None.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/None.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- None.java 17 Jun 2002 00:24:49 -0000 1.1.2.2
+++ None.java 27 Aug 2002 15:14:48 -0000 1.1.2.3
@@ -1,5 +1,6 @@
package org.apache.fop.datatypes;
+import org.apache.fop.fo.expr.PropertyValue;
import org.apache.fop.fo.expr.AbstractPropertyValue;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.Properties;
@@ -32,7 +33,7 @@
public None(int property)
throws PropertyException
{
- super(property);
+ super(property, PropertyValue.NONE);
}
/**
@@ -43,7 +44,7 @@
public None(String propertyName)
throws PropertyException
{
- super(propertyName);
+ super(propertyName, PropertyValue.NONE);
}
/**
1.1.2.6 +5 -4 xml-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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Numeric.java 12 Aug 2002 15:55:12 -0000 1.1.2.5
+++ Numeric.java 27 Aug 2002 15:14:48 -0000 1.1.2.6
@@ -16,6 +16,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.expr.PropertyValue;
/**
@@ -162,7 +163,7 @@
(int property, double value, int baseunit, int power, int unit)
throws PropertyException
{
- super(property);
+ super(property, PropertyValue.NUMERIC);
// baseunit must be a power of 2 <= the LAST_BASEUNIT
if ((baseunit & (baseunit - 1)) != 0
|| baseunit > LAST_BASEUNIT)
1.1.2.2 +5 -4 xml-fop/src/org/apache/fop/datatypes/Attic/ScriptType.java
Index: ScriptType.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/ScriptType.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ScriptType.java 9 Jul 2002 06:42:51 -0000 1.1.2.1
+++ ScriptType.java 27 Aug 2002 15:14:48 -0000 1.1.2.2
@@ -5,6 +5,7 @@
import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.fo.Properties;
import org.apache.fop.configuration.Configuration;
+import org.apache.fop.fo.expr.PropertyValue;
/*
* ScriptType.java
@@ -28,7 +29,7 @@
public ScriptType(int property, String scriptCode) throws PropertyException
{
- super(property, scriptCode);
+ super(property, scriptCode, PropertyValue.SCRIPT);
// Validate the code
if (Configuration.getHashMapEntry("scriptsMap", scriptCode)
== null) throw new PropertyException
1.1.2.3 +5 -4 xml-fop/src/org/apache/fop/datatypes/Attic/ShadowEffect.java
Index: ShadowEffect.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/ShadowEffect.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ShadowEffect.java 17 Jun 2002 00:24:49 -0000 1.1.2.2
+++ ShadowEffect.java 27 Aug 2002 15:14:48 -0000 1.1.2.3
@@ -1,5 +1,6 @@
package org.apache.fop.datatypes;
+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.fo.expr.PropertyException;
@@ -65,7 +66,7 @@
public ShadowEffect(int property, PropertyValueList list)
throws PropertyException
{
- super(property);
+ super(property, PropertyValue.SHADOW_EFFECT);
Object entry;
Iterator entries = list.iterator();
switch (list.size()) {
1.1.2.3 +6 -5 xml-fop/src/org/apache/fop/datatypes/Attic/Slash.java
Index: Slash.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Slash.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Slash.java 4 Jul 2002 00:37:06 -0000 1.1.2.2
+++ Slash.java 27 Aug 2002 15:14:48 -0000 1.1.2.3
@@ -2,6 +2,7 @@
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.fo.Properties;
@@ -35,7 +36,7 @@
public Slash (int property)
throws PropertyException
{
- super(property);
+ super(property, PropertyValue.SLASH);
}
/**
@@ -46,7 +47,7 @@
public Slash (String propertyName)
throws PropertyException
{
- super(propertyName);
+ super(propertyName, PropertyValue.SLASH);
}
public String toString() {
1.1.2.3 +13 -8 xml-fop/src/org/apache/fop/datatypes/Attic/StringType.java
Index: StringType.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/StringType.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- StringType.java 17 Jun 2002 00:24:49 -0000 1.1.2.2
+++ StringType.java 27 Aug 2002 15:14:48 -0000 1.1.2.3
@@ -2,6 +2,7 @@
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.fo.Properties;
@@ -17,7 +18,9 @@
* @version $Revision$ $Name$
*/
/**
- * The base class for most datatypes which resolve to a <tt>String</tt>.
+ * <tt>StringType</tt> is not intended to be instantiated directly. It
+ * is a base class for the two basic types of <tt>String</tt>
+ * properties: <tt>NCName</tt> and <tt>Literal</tt>.
*/
public class StringType extends AbstractPropertyValue {
@@ -31,12 +34,13 @@
* @param property the <tt>int</tt> index of the property on which
* this value is being defined.
* @param string the <tt>String</tt>.
+ * @param type the type of <tt>PropertyValue</tt> being instantiated.
* @exception PropertyException
*/
- public StringType (int property, String string)
+ public StringType (int property, String string, int type)
throws PropertyException
{
- super(property);
+ super(property, type);
this.string = string;
}
@@ -44,12 +48,13 @@
* @param propertyName the <tt>String</tt< name of the property on which
* this value is being defined.
* @param string the <tt>String</tt>.
+ * @param type the type of <tt>PropertyValue</tt> being instantiated.
* @exception PropertyException
*/
- public StringType (String propertyName, String string)
+ public StringType (String propertyName, String string, int type)
throws PropertyException
{
- super(propertyName);
+ super(propertyName, type);
this.string = string;
}
1.1.2.5 +6 -5 xml-fop/src/org/apache/fop/datatypes/Attic/TextDecorations.java
Index: TextDecorations.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/TextDecorations.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- TextDecorations.java 17 Jun 2002 00:30:39 -0000 1.1.2.4
+++ TextDecorations.java 27 Aug 2002 15:14:48 -0000 1.1.2.5
@@ -1,5 +1,6 @@
package org.apache.fop.datatypes;
+import org.apache.fop.fo.expr.PropertyValue;
import org.apache.fop.fo.expr.AbstractPropertyValue;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.Properties;
@@ -44,7 +45,7 @@
public TextDecorations(int property, byte decorations)
throws PropertyException
{
- super(property);
+ super(property, PropertyValue.TEXT_DECORATIONS);
this.decorations = decorations;
}
@@ -56,7 +57,7 @@
public TextDecorations(String propertyName)
throws PropertyException
{
- super(propertyName);
+ super(propertyName, PropertyValue.TEXT_DECORATIONS);
this.decorations = decorations;
}
1.1.2.3 +6 -5 xml-fop/src/org/apache/fop/datatypes/Attic/TextDecorator.java
Index: TextDecorator.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/TextDecorator.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TextDecorator.java 17 Jun 2002 00:24:49 -0000 1.1.2.2
+++ TextDecorator.java 27 Aug 2002 15:14:48 -0000 1.1.2.3
@@ -1,5 +1,6 @@
package org.apache.fop.datatypes;
+import org.apache.fop.fo.expr.PropertyValue;
import org.apache.fop.fo.expr.AbstractPropertyValue;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.Properties;
@@ -46,7 +47,7 @@
public TextDecorator(int property, byte onMask, byte offMask)
throws PropertyException
{
- super(property);
+ super(property, PropertyValue.TEXT_DECORATOR);
this.onMask = onMask;
this.offMask = offMask;
}
@@ -59,7 +60,7 @@
public TextDecorator(String propertyName, byte onMask, byte offMask)
throws PropertyException
{
- super(propertyName);
+ super(propertyName, PropertyValue.TEXT_DECORATOR);
this.onMask = onMask;
this.offMask = offMask;
}
1.1.2.4 +6 -5 xml-fop/src/org/apache/fop/datatypes/Attic/Time.java
Index: Time.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Time.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Time.java 29 Jul 2002 16:05:05 -0000 1.1.2.3
+++ Time.java 27 Aug 2002 15:14:48 -0000 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.expr.PropertyValue;
import org.apache.fop.fo.expr.AbstractPropertyValue;
import org.apache.fop.fo.Properties;
@@ -52,7 +53,7 @@
public Time(int property, int unit, double value)
throws PropertyException
{
- super(property);
+ super(property, PropertyValue.TIME);
units = unit;
time = value * msPerUnit[unit];
}
@@ -68,7 +69,7 @@
public Time(String propertyName, int unit, double value)
throws PropertyException
{
- super(propertyName);
+ super(propertyName, PropertyValue.TIME);
units = unit;
time = value * msPerUnit[unit];
}
1.1.2.3 +6 -5 xml-fop/src/org/apache/fop/datatypes/Attic/UriType.java
Index: UriType.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/UriType.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- UriType.java 17 Jun 2002 00:24:49 -0000 1.1.2.2
+++ UriType.java 27 Aug 2002 15:14:48 -0000 1.1.2.3
@@ -1,5 +1,6 @@
package org.apache.fop.datatypes;
+import org.apache.fop.fo.expr.PropertyValue;
import org.apache.fop.fo.expr.AbstractPropertyValue;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.Properties;
@@ -39,7 +40,7 @@
public UriType(int property, String uri)
throws PropertyException
{
- super(property);
+ super(property, PropertyValue.URI_TYPE);
this.uri = uri;
}
@@ -53,7 +54,7 @@
public UriType(String propertyName, String uri)
throws PropertyException
{
- super(propertyName);
+ super(propertyName, PropertyValue.URI_TYPE);
this.uri = uri;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org