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 Changes Path
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.java 9 Oct 2002 04:50:24 -0000 1.1.2.5
+++ AbstractPropertyValue.java 19 Oct 2002 03:27:07 -0000 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.java 18 Sep 2002 15:24:11 -0000 1.1.2.5
+++ Angle.java 19 Oct 2002 03:27:07 -0000 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 <i>Angle</i> against the associated property.
*/
public void validate() throws PropertyException {
- super.validate(Properties.ANGLE);
+ super.validate(Property.ANGLE);
}
public String toString() {
1.1.2.5 +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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- Auto.java 18 Sep 2002 15:24:11 -0000 1.1.2.4
+++ Auto.java 19 Oct 2002 03:27:07 -0000 1.1.2.5
@@ -3,7 +3,7 @@
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;
+import org.apache.fop.fo.properties.*;
/*
* Auto.java
@@ -51,7 +51,7 @@
* validate the <i>Auto</i> against the associated property.
*/
public void validate() throws PropertyException {
- super.validate(Properties.AUTO);
+ super.validate(Property.AUTO);
}
}
1.1.2.5 +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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- Bool.java 18 Sep 2002 15:24:11 -0000 1.1.2.4
+++ Bool.java 19 Oct 2002 03:27:07 -0000 1.1.2.5
@@ -4,7 +4,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.*;
/*
* Bool.java
@@ -102,7 +102,7 @@
* validate the <i>Bool</i> against the associated property.
*/
public void validate() throws PropertyException {
- super.validate(Properties.BOOL);
+ super.validate(Property.BOOL);
}
public String toString() {
1.3.4.3 +3 -3 xml-fop/src/org/apache/fop/datatypes/Attic/ColorSpace.java
Index: ColorSpace.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/ColorSpace.java,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -u -r1.3.4.2 -r1.3.4.3
1.15.2.7 +9 -8 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.6
retrieving revision 1.15.2.7
diff -u -r1.15.2.6 -r1.15.2.7
--- ColorType.java 18 Sep 2002 15:24:11 -0000 1.15.2.6
+++ ColorType.java 19 Oct 2002 03:27:07 -0000 1.15.2.7
@@ -10,6 +10,7 @@
import java.util.HashMap;
import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.AbstractPropertyValue;
@@ -67,7 +68,7 @@
public ColorType(String propertyName, float red, float green, float blue)
throws PropertyException
{
- this(PropertyConsts.getPropertyIndex(propertyName),
+ this(PropNames.getPropertyIndex(propertyName),
red, green, blue);
}
@@ -107,7 +108,7 @@
public ColorType(String propertyName, int red, int green, int blue)
throws PropertyException
{
- this(PropertyConsts.getPropertyIndex(propertyName),
+ this(PropNames.getPropertyIndex(propertyName),
red, green, blue);
}
@@ -132,7 +133,7 @@
public ColorType(String propertyName, float[] color)
throws PropertyException
{
- this(PropertyConsts.getPropertyIndex(propertyName), color);
+ this(PropNames.getPropertyIndex(propertyName), color);
}
/**
@@ -200,7 +201,7 @@
public ColorType(String propertyName, String value)
throws PropertyException
{
- this(PropertyConsts.getPropertyIndex(propertyName), value);
+ this(PropNames.getPropertyIndex(propertyName), value);
}
/**
@@ -211,7 +212,7 @@
*/
public ColorType(int property, int colorEnum) throws PropertyException {
super(property, PropertyValue.COLOR_TYPE);
- String enumText = PropertyConsts.getEnumText(property, colorEnum);
+ String enumText = propertyConsts.getEnumText(property, colorEnum);
color = (float[])(getStandardColor(enumText).clone());
}
@@ -224,7 +225,7 @@
public ColorType(String propertyName, int colorEnum)
throws PropertyException
{
- this(PropertyConsts.getPropertyIndex(propertyName), colorEnum);
+ this(PropNames.getPropertyIndex(propertyName), colorEnum);
}
/**
1.1.2.4 +7 -6 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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- CountryType.java 18 Sep 2002 15:24:11 -0000 1.1.2.3
+++ CountryType.java 19 Oct 2002 03:27:07 -0000 1.1.2.4
@@ -2,8 +2,9 @@
package org.apache.fop.datatypes;
import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.properties.*;
import org.apache.fop.configuration.Configuration;
import org.apache.fop.datatypes.PropertyValue;
@@ -37,7 +38,7 @@
public CountryType(String propertyName, String countryCode)
throws PropertyException
{
- this(PropertyConsts.getPropertyIndex(propertyName), countryCode);
+ this(PropNames.getPropertyIndex(propertyName), countryCode);
}
/**
@@ -51,7 +52,7 @@
* Validate the <i>CountryType</i> against the associated property.
*/
public void validate() throws PropertyException {
- super.validate(Properties.COUNTRY_T);
+ super.validate(Property.COUNTRY_T);
}
}
1.1.2.3 +5 -4 xml-fop/src/org/apache/fop/datatypes/Attic/Ems.java
Index: Ems.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Ems.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Ems.java 17 Jun 2002 00:24:49 -0000 1.1.2.2
+++ Ems.java 19 Oct 2002 03:27:07 -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.PropNames;
import org.apache.fop.fo.PropertyConsts;
/*
@@ -54,7 +55,7 @@
public static Numeric makeEms (String propertyName, double value)
throws PropertyException
{
- return makeEms(PropertyConsts.getPropertyIndex(propertyName), value);
+ return makeEms(PropNames.getPropertyIndex(propertyName), value);
}
}
1.1.2.5 +14 -13 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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- EnumType.java 18 Sep 2002 15:24:11 -0000 1.1.2.4
+++ EnumType.java 19 Oct 2002 03:27:07 -0000 1.1.2.5
@@ -2,8 +2,9 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.datatypes.AbstractPropertyValue;
+import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.properties.*;
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.datatypes.PropertyValue;
@@ -68,7 +69,7 @@
public EnumType(String propertyName, String enumText)
throws PropertyException
{
- this(PropertyConsts.getPropertyIndex(propertyName),
+ this(PropNames.getPropertyIndex(propertyName),
enumText, PropertyValue.ENUM);
}
@@ -81,7 +82,7 @@
public EnumType(String propertyName, int enum)
throws PropertyException
{
- this(PropertyConsts.getPropertyIndex(propertyName),
+ this(PropNames.getPropertyIndex(propertyName),
enum, PropertyValue.ENUM);
}
@@ -98,7 +99,7 @@
{
super(property, type);
// Get the enum integer or mapped enum integer
- enumValue = PropertyConsts.getEnumIndex(property, enumText);
+ enumValue = propertyConsts.getEnumIndex(property, enumText);
}
/**
@@ -115,7 +116,7 @@
enumValue = enum;
// Validate the text; getEnumText will throw a PropertyException
// if the enum integer is invalid
- String enumText = PropertyConsts.getEnumText(property, enum);
+ String enumText = propertyConsts.getEnumText(property, enum);
}
/**
@@ -129,7 +130,7 @@
public EnumType(String propertyName, String enumText, int type)
throws PropertyException
{
- this(PropertyConsts.getPropertyIndex(propertyName), enumText, type);
+ this(PropNames.getPropertyIndex(propertyName), enumText, type);
}
/**
@@ -142,7 +143,7 @@
public EnumType(String propertyName, int enum, int type)
throws PropertyException
{
- this(PropertyConsts.getPropertyIndex(propertyName), enum, type);
+ this(PropNames.getPropertyIndex(propertyName), enum, type);
}
/**
@@ -156,20 +157,20 @@
* @return the <tt>String</tt> enumeration token.
*/
public String getEnumToken() throws PropertyException {
- return PropertyConsts.getEnumText(property, enumValue);
+ return propertyConsts.getEnumText(property, enumValue);
}
/**
* validate the <i>EnumType</i> against the associated property.
*/
public void validate() throws PropertyException {
- super.validate(Properties.ENUM);
+ super.validate(Property.ENUM);
}
public String toString() {
String enumText;
try {
- enumText = PropertyConsts.getEnumText(property, enumValue);
+ enumText = propertyConsts.getEnumText(property, enumValue);
} catch (PropertyException e) {
throw new RuntimeException(e.getMessage());
}
1.1.2.5 +7 -6 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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FontFamilySet.java 18 Sep 2002 15:24:11 -0000 1.1.2.4
+++ FontFamilySet.java 19 Oct 2002 03:27:07 -0000 1.1.2.5
@@ -5,8 +5,9 @@
import java.util.NoSuchElementException;
import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.properties.*;
import org.apache.fop.datatypes.AbstractPropertyValue;
import org.apache.fop.datatypes.PropertyValue;
@@ -62,14 +63,14 @@
public FontFamilySet(String propertyName, String[] fontFamilyNames)
throws PropertyException
{
- this(PropertyConsts.getPropertyIndex(propertyName), fontFamilyNames);
+ this(PropNames.getPropertyIndex(propertyName), fontFamilyNames);
}
/**
* Validate the <i>FontFamilySet</i> against the associated property.
*/
public void validate() throws PropertyException {
- super.validate(Properties.FONTSET);
+ super.validate(Property.FONTSET);
}
/**
1.1.2.6 +3 -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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Frequency.java 18 Sep 2002 15:24:11 -0000 1.1.2.5
+++ Frequency.java 19 Oct 2002 03:27:07 -0000 1.1.2.6
@@ -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.fo.Properties;
+import org.apache.fop.fo.properties.*;
/*
* Frequency.java
@@ -125,7 +125,7 @@
* validate the <i>Frequency</i> against the associated property.
*/
public void validate() throws PropertyException {
- super.validate(Properties.FREQUENCY);
+ super.validate(Property.FREQUENCY);
}
public String toString() {
1.1.2.6 +4 -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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- IntegerType.java 18 Sep 2002 15:24:11 -0000 1.1.2.5
+++ IntegerType.java 19 Oct 2002 03:27:07 -0000 1.1.2.6
@@ -4,7 +4,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.datatypes.AbstractPropertyValue;
import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.properties.*;
/*
* IntegerType.java
@@ -70,7 +70,7 @@
* validate the <i>IntegerType</i> against the associated property.
*/
public void validate() throws PropertyException {
- super.validate(Properties.INTEGER);
+ super.validate(Property.INTEGER);
}
public String toString() {
1.1.2.3 +1 -1 xml-fop/src/org/apache/fop/datatypes/Attic/Ints.java
Index: Ints.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Ints.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
1.1.2.4 +7 -6 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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- LanguageType.java 18 Sep 2002 15:24:11 -0000 1.1.2.3
+++ LanguageType.java 19 Oct 2002 03:27:07 -0000 1.1.2.4
@@ -2,8 +2,9 @@
package org.apache.fop.datatypes;
import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.properties.*;
import org.apache.fop.configuration.Configuration;
import org.apache.fop.datatypes.PropertyValue;
@@ -40,14 +41,14 @@
public LanguageType(String propertyName, String languageCode)
throws PropertyException
{
- this(PropertyConsts.getPropertyIndex(propertyName), languageCode);
+ this(PropNames.getPropertyIndex(propertyName), languageCode);
}
/**
* Validate the <i>LanguageType</i> against the associated property.
*/
public void validate() throws PropertyException {
- super.validate(Properties.LANGUAGE_T);
+ super.validate(Property.LANGUAGE_T);
}
/**
1.12.2.3 +1 -1 xml-fop/src/org/apache/fop/datatypes/Length.java
Index: Length.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Length.java,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -u -r1.12.2.2 -r1.12.2.3
1.1.2.5 +8 -7 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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- Literal.java 18 Sep 2002 15:24:11 -0000 1.1.2.4
+++ Literal.java 19 Oct 2002 03:27:07 -0000 1.1.2.5
@@ -2,7 +2,8 @@
package org.apache.fop.datatypes;
import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.properties.*;
+import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.datatypes.PropertyValue;
@@ -46,7 +47,7 @@
public Literal(String propertyName, String string)
throws PropertyException
{
- this(PropertyConsts.getPropertyIndex(propertyName), string);
+ this(PropNames.getPropertyIndex(propertyName), string);
}
/**
@@ -57,10 +58,10 @@
*/
public void validate() throws PropertyException {
try {
- super.validate(Properties.LITERAL);
+ super.validate(Property.LITERAL);
} catch (PropertyException e) {
if (string.length() == 1) {
- super.validate(Properties.CHARACTER_T);
+ super.validate(Property.CHARACTER_T);
} else {
throw new PropertyException(e.getMessage());
}
1.1.2.5 +7 -7 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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- MappedNumeric.java 18 Sep 2002 15:24:11 -0000 1.1.2.4
+++ MappedNumeric.java 19 Oct 2002 03:27:07 -0000 1.1.2.5
@@ -4,7 +4,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.properties.*;
import org.apache.fop.fo.FOTree;
/*
@@ -47,7 +47,7 @@
// Set property index in AbstractPropertyValue
// and enumValue enum constant in EnumType
super(property, enumText, PropertyValue.MAPPED_NUMERIC);
- mappedNum = PropertyConsts.getMappedNumeric(property, enumValue);
+ mappedNum = propertyConsts.getMappedNumeric(property, enumValue);
}
/**
@@ -64,7 +64,7 @@
// Set property index in AbstractPropertyValue
// and enumValue enum constant in EnumType
super(propertyName, enumText, PropertyValue.MAPPED_NUMERIC);
- mappedNum = PropertyConsts.getMappedNumeric(property, enumValue);
+ mappedNum = propertyConsts.getMappedNumeric(property, enumValue);
}
/**
@@ -79,7 +79,7 @@
* validate the <i>MappedNumeric</i> against the associated property.
*/
public void validate() throws PropertyException {
- super.validate(Properties.MAPPED_LENGTH);
+ super.validate(Property.MAPPED_LENGTH);
}
public String toString() {
1.1.2.5 +5 -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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- MimeType.java 18 Sep 2002 15:24:11 -0000 1.1.2.4
+++ MimeType.java 19 Oct 2002 03:27:07 -0000 1.1.2.5
@@ -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.fo.Properties;
+import org.apache.fop.fo.properties.*;
/*
* MimeType.java
@@ -70,7 +70,7 @@
* validate the <i>MimeType</i> against the associated property.
*/
public void validate() throws PropertyException {
- super.validate(Properties.MIMETYPE);
+ super.validate(Property.MIMETYPE);
}
}
1.1.2.5 +5 -5 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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- NCName.java 18 Sep 2002 15:24:11 -0000 1.1.2.4
+++ NCName.java 19 Oct 2002 03:27:07 -0000 1.1.2.5
@@ -2,7 +2,7 @@
package org.apache.fop.datatypes;
import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.properties.*;
import org.apache.fop.datatypes.StringType;
import org.apache.fop.datatypes.PropertyValue;
@@ -94,7 +94,7 @@
* validate the <i>NCName</i> against the associated property.
*/
public void validate() throws PropertyException {
- super.validate(Properties.NCNAME);
+ super.validate(Property.NCNAME);
}
}
1.1.2.5 +5 -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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- None.java 18 Sep 2002 15:24:11 -0000 1.1.2.4
+++ None.java 19 Oct 2002 03:27:07 -0000 1.1.2.5
@@ -3,7 +3,7 @@
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;
+import org.apache.fop.fo.properties.*;
/*
* None.java
@@ -51,7 +51,7 @@
* validate the <i>None</i> against the associated property.
*/
public void validate() throws PropertyException {
- super.validate(Properties.NONE);
+ super.validate(Property.NONE);
}
}
1.1.2.2 +7 -7 xml-fop/src/org/apache/fop/datatypes/Attic/NoType.java
Index: NoType.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/NoType.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- NoType.java 4 Oct 2002 15:49:33 -0000 1.1.2.1
+++ NoType.java 19 Oct 2002 03:27:07 -0000 1.1.2.2
@@ -3,7 +3,7 @@
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;
+import org.apache.fop.fo.properties.*;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertyConsts;
@@ -54,10 +54,10 @@
* validate the <i>None</i> against the associated property.
*/
public void validate() throws PropertyException {
- if ((PropertyConsts.dataTypes.get(property) & Properties.AURAL) != 0)
+ if ((propertyConsts.getDataTypes(property) & Property.AURAL) != 0)
return;
- if (PropertyConsts.getInitialValueType(property)
- == Properties.NOTYPE_IT)
+ if (propertyConsts.getInitialValueType(property)
+ == Property.NOTYPE_IT)
return;
throw new PropertyException
("NoType property is invalid for property "
1.1.2.3 +0 -0 xml-fop/src/org/apache/fop/datatypes/Attic/Percentage.java
Index: Percentage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Percentage.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
1.1.2.6 +1 -1 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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
1.1.2.5 +18 -9
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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- PropertyValueList.java 9 Oct 2002 04:52:21 -0000 1.1.2.4
+++ PropertyValueList.java 19 Oct 2002 03:27:07 -0000 1.1.2.5
@@ -6,7 +6,7 @@
import java.util.Collection;
import java.util.Iterator;
-import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.properties.*;
import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.FONode;
@@ -41,6 +41,11 @@
public final int type;
/**
+ * The PropertyConsts singleton.
+ */
+ public final PropertyConsts propertyConsts;
+
+ /**
* @param property <tt>int</tt> index of the property.
*/
public PropertyValueList(int property) throws PropertyException {
@@ -49,6 +54,7 @@
throw new PropertyException("Invalid property index: " + property);
this.property = property;
type = PropertyValue.LIST;
+ propertyConsts = PropertyConsts.getPropertyConsts();
}
/**
@@ -58,10 +64,11 @@
throws PropertyException
{
super();
- property = PropertyConsts.getPropertyIndex(propertyName);
+ property = PropNames.getPropertyIndex(propertyName);
if (property < 1 || property > PropNames.LAST_PROPERTY_INDEX)
throw new PropertyException("Invalid property index: " + property);
type = PropertyValue.LIST;
+ propertyConsts = PropertyConsts.getPropertyConsts();
}
/**
@@ -86,6 +93,7 @@
throw new PropertyException("Invalid property index: " + property);
this.property = property;
type = PropertyValue.LIST;
+ propertyConsts = PropertyConsts.getPropertyConsts();
}
/**
@@ -106,10 +114,11 @@
if (! (c instanceof PropertyValueList))
throw new IllegalArgumentException
("Collection is not a PropertyValueList.");
- property = PropertyConsts.getPropertyIndex(propertyName);
+ property = PropNames.getPropertyIndex(propertyName);
if (property < 1 || property > PropNames.LAST_PROPERTY_INDEX)
throw new PropertyException("Invalid property index: " + property);
type = PropertyValue.LIST;
+ propertyConsts = PropertyConsts.getPropertyConsts();
}
/**
@@ -200,14 +209,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.4 +7 -6 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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ScriptType.java 18 Sep 2002 15:24:12 -0000 1.1.2.3
+++ ScriptType.java 19 Oct 2002 03:27:08 -0000 1.1.2.4
@@ -2,8 +2,9 @@
package org.apache.fop.datatypes;
import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.properties.*;
import org.apache.fop.configuration.Configuration;
import org.apache.fop.datatypes.PropertyValue;
@@ -39,7 +40,7 @@
public ScriptType(String propertyName, String scriptCode)
throws PropertyException
{
- this(PropertyConsts.getPropertyIndex(propertyName), scriptCode);
+ this(PropNames.getPropertyIndex(propertyName), scriptCode);
}
/**
@@ -53,7 +54,7 @@
* Validate the <i>ScriptType</i> against the associated property.
*/
public void validate() throws PropertyException {
- super.validate(Properties.SCRIPT_T);
+ super.validate(Property.SCRIPT_T);
}
}
1.1.2.5 +6 -6 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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- ShadowEffect.java 18 Sep 2002 15:24:12 -0000 1.1.2.4
+++ ShadowEffect.java 19 Oct 2002 03:27:08 -0000 1.1.2.5
@@ -4,7 +4,7 @@
import org.apache.fop.datatypes.AbstractPropertyValue;
import org.apache.fop.datatypes.PropertyValueList;
import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.properties.*;
import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.fo.PropNames;
@@ -119,7 +119,7 @@
public ShadowEffect(String propertyName, PropertyValueList list)
throws PropertyException
{
- this(PropertyConsts.getPropertyIndex(propertyName), list);
+ this(PropNames.getPropertyIndex(propertyName), list);
}
/**
@@ -175,7 +175,7 @@
} else if (entry instanceof NCName) {
color = new ColorType
(property,
- PropertyConsts.getEnumIndex
+ propertyConsts.getEnumIndex
(PropNames.TEXT_SHADOW, ((NCName)entry).getNCName()));
}
}
1.1.2.5 +4 -4 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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- Slash.java 18 Sep 2002 15:24:12 -0000 1.1.2.4
+++ Slash.java 19 Oct 2002 03:27:08 -0000 1.1.2.5
@@ -4,7 +4,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.*;
/*
* Slash.java
1.1.2.5 +5 -5 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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- StringType.java 18 Sep 2002 15:24:12 -0000 1.1.2.4
+++ StringType.java 19 Oct 2002 03:27:08 -0000 1.1.2.5
@@ -4,7 +4,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.*;
/*
* StringType.java
@@ -69,7 +69,7 @@
* validate the <i>StringType</i> against the associated property.
*/
public void validate() throws PropertyException {
- super.validate(Properties.STRING_TYPE);
+ super.validate(Property.STRING_TYPE);
}
public String toString() {
1.1.2.7 +4 -4 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.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- TextDecorations.java 18 Sep 2002 15:24:12 -0000 1.1.2.6
+++ TextDecorations.java 19 Oct 2002 03:27:08 -0000 1.1.2.7
@@ -3,7 +3,7 @@
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;
+import org.apache.fop.fo.properties.*;
import org.apache.fop.fo.PropNames;
import org.apache.fop.datatypes.TextDecorator;
1.1.2.5 +4 -4 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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- TextDecorator.java 18 Sep 2002 15:24:12 -0000 1.1.2.4
+++ TextDecorator.java 19 Oct 2002 03:27:08 -0000 1.1.2.5
@@ -3,7 +3,7 @@
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;
+import org.apache.fop.fo.properties.*;
import org.apache.fop.fo.PropNames;
/*
1.1.2.6 +5 -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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Time.java 18 Sep 2002 15:24:12 -0000 1.1.2.5
+++ Time.java 19 Oct 2002 03:27:08 -0000 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.*;
/*
* Time.java
@@ -125,7 +125,7 @@
* validate the <i>Time</i> against the associated property.
*/
public void validate() throws PropertyException {
- super.validate(Properties.TIME);
+ super.validate(Property.TIME);
}
public String toString() {
1.1.2.5 +5 -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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- UriType.java 18 Sep 2002 15:24:12 -0000 1.1.2.4
+++ UriType.java 19 Oct 2002 03:27:08 -0000 1.1.2.5
@@ -3,7 +3,7 @@
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;
+import org.apache.fop.fo.properties.*;
/*
* UriType.java
@@ -69,7 +69,7 @@
* validate the <i>UriType</i> against the associated property.
*/
public void validate() throws PropertyException {
- super.validate(Properties.URI_SPECIFICATION);
+ super.validate(Property.URI_SPECIFICATION);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
