pbwest 2002/11/01 16:32:08
Modified: src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
CountryType.java LanguageType.java ScriptType.java
StringType.java
Log:
Changes to use CountryLanguageScript for code validation.
Revision Changes Path
No revision
No revision
1.1.2.5 +8 -7 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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- CountryType.java 19 Oct 2002 03:27:07 -0000 1.1.2.4
+++ CountryType.java 2 Nov 2002 00:32:08 -0000 1.1.2.5
@@ -1,11 +1,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.configuration.Configuration;
import org.apache.fop.datatypes.PropertyValue;
/*
@@ -30,9 +28,12 @@
{
super(property, countryCode, PropertyValue.COUNTRY);
// Validate the code
- if (Configuration.getHashMapEntry("countriesMap", countryCode)
- == null) throw new PropertyException
+ String code;
+ if ((code = CountryLanguageScript.canonicalCountryCode(countryCode))
+ == null)
+ throw new PropertyException
("Invalid country code: " + countryCode);
+ setString(code);
}
public CountryType(String propertyName, String countryCode)
1.1.2.5 +8 -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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- LanguageType.java 19 Oct 2002 03:27:07 -0000 1.1.2.4
+++ LanguageType.java 2 Nov 2002 00:32:08 -0000 1.1.2.5
@@ -5,7 +5,6 @@
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.fo.properties.*;
-import org.apache.fop.configuration.Configuration;
import org.apache.fop.datatypes.PropertyValue;
/*
@@ -33,9 +32,12 @@
{
super(property, languageCode, PropertyValue.LANGUAGE);
// Validate the code
- if (Configuration.getHashMapEntry("languagesMap", languageCode)
- == null) throw new PropertyException
+ String code;
+ if ((code = CountryLanguageScript.canonicalLangCode(languageCode))
+ == null)
+ throw new PropertyException
("Invalid language code: " + languageCode);
+ setString(code);
}
public LanguageType(String propertyName, String languageCode)
1.1.2.5 +8 -7 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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- ScriptType.java 19 Oct 2002 03:27:08 -0000 1.1.2.4
+++ ScriptType.java 2 Nov 2002 00:32:08 -0000 1.1.2.5
@@ -1,11 +1,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.configuration.Configuration;
import org.apache.fop.datatypes.PropertyValue;
/*
@@ -32,9 +30,12 @@
{
super(property, scriptCode, PropertyValue.SCRIPT);
// Validate the code
- if (Configuration.getHashMapEntry("scriptsMap", scriptCode)
- == null) throw new PropertyException
+ String code;
+ if ((code = CountryLanguageScript.canonicalScriptCode(scriptCode))
+ == null)
+ throw new PropertyException
("Invalid script code: " + scriptCode);
+ setString(code);
}
public ScriptType(String propertyName, String scriptCode)
1.1.2.6 +12 -3 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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- StringType.java 19 Oct 2002 03:27:08 -0000 1.1.2.5
+++ StringType.java 2 Nov 2002 00:32:08 -0000 1.1.2.6
@@ -59,6 +59,15 @@
}
/**
+ * Set the string value.
+ * @param string - the <tt>String</tt> value.
+ */
+ protected void setString(String string) {
+ this.string = string;
+ }
+
+ /**
+ * Get the string value.
* @return the String.
*/
public String getString() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
