- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 14 Sep 2005 15:14:20 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/aural
In directory hutz:/tmp/cvs-serv9389/org/w3c/css/properties/aural
Modified Files:
ACssAzimuth.java ACssCue.java ACssCueAfter.java
ACssCueBefore.java ACssElevation.java ACssInterpretAs.java
ACssPause.java ACssPauseAfter.java ACssPauseBefore.java
ACssPhonemes.java ACssPitch.java ACssPitchRange.java
ACssPlayDuring.java ACssProperties.java ACssRichness.java
ACssSpeak.java ACssSpeakCSS3.java ACssSpeakDate.java
ACssSpeakNumeral.java ACssSpeakPunctuation.java
ACssSpeakTime.java ACssSpeechRate.java ACssStress.java
ACssStyle.java ACssVoiceBalance.java ACssVoiceDuration.java
ACssVoiceFamily.java ACssVoiceFamilyCSS3.java
ACssVoicePitchRange.java ACssVoiceRate.java
ACssVoiceStress.java ACssVoiceVolume.java ACssVolume.java
Log Message:
>From Jean-Guilhem Rouel (again!)
Reformatting of code
Fix for bug 774 [1] (even more warnings)
Fix for bug 768 [2]
Modification of the soap output format (each warning list and error list has
the URI it refers to)
[1] http://www.w3.org/Bugs/Public/show_bug.cgi?id=774
[2] http://www.w3.org/Bugs/Public/show_bug.cgi?id=768
Index: ACssRichness.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssRichness.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssRichness.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssRichness.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -32,31 +32,31 @@
* @version $Revision$
*/
public class ACssRichness extends ACssProperty {
-
+
CssValue value;
-
+
static CssValue DefaultValue = new CssNumber(null, 50);
-
+
/**
* Create a new ACssRichness
*/
public ACssRichness() {
value = DefaultValue;
- }
-
+ }
+
/**
* Creates a new ACssRichness
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public ACssRichness(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
this();
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
int index;
@@ -67,7 +67,7 @@
return;
} else if (val instanceof CssNumber) {
float f = ((CssNumber) val).getValue();
- if ((f < 0) || (f > 100)) {
+ if ((f < 0) || (f > 100)) {
throw new InvalidParamException("range", null, ac);
}
value = val;
@@ -75,31 +75,31 @@
return;
}
- throw new InvalidParamException("value",
- expression.getValue().toString(),
+ throw new InvalidParamException("value",
+ expression.getValue().toString(),
getPropertyName(), ac);
}
-
+
public ACssRichness(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "richness";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value is equals to inherit
@@ -107,14 +107,14 @@
public boolean isSoftlyInherited() {
return value.equals(inherit);
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -125,23 +125,23 @@
style.addRedefinitionWarning(ac, this);
((ACssStyle) style).acssRichness = this;
}
-
+
/**
* Compares two properties for equality.
*
* @param property The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof ACssRichness &&
+ return (property instanceof ACssRichness &&
value.equals(((ACssRichness) property).value));
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((ACssStyle) style).getRichness();
@@ -149,6 +149,6 @@
return ((ACssStyle) style).acssRichness;
}
}
-
+
}
Index: ACssProperties.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssProperties.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ACssProperties.java 23 Aug 2005 16:51:43 -0000 1.1
+++ ACssProperties.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -16,9 +16,9 @@
*/
public class ACssProperties {
public static Utf8Properties properties;
-
+
public static Utf8Properties UAproperties;
-
+
public static Float getValue(CssProperty property, String prop) {
String value = UAproperties.getProperty(property.getPropertyName()
+ "." + prop);
@@ -36,15 +36,15 @@
}
}
}
-
+
public static String getString(CssProperty property, String prop) {
return properties.getProperty(property.getPropertyName() + "." + prop);
}
-
+
public static boolean getInheritance(CssProperty property) {
return getString(property, "inherited").equals("true");
}
-
+
static {
UAproperties = new Utf8Properties();
try {
@@ -58,7 +58,7 @@
.println("CSS.ACSSProperties.ACssProperties: couldn't load UA properties ");
System.err.println(" " + e.toString());
}
-
+
properties = new Utf8Properties();
try {
URL url = ACssProperties.class
Index: ACssPauseAfter.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssPauseAfter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssPauseAfter.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssPauseAfter.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -33,12 +33,12 @@
* @version $Revision$
*/
public class ACssPauseAfter extends ACssProperty {
-
+
CssValue value;
-
+
/**
* Create a new ACssPauseAfter
- */
+ */
public ACssPauseAfter() {
// Initial is User Agent Specific
if (defaultValue == null) {
@@ -46,29 +46,29 @@
}
value = defaultValue;
}
-
+
/**
* Create a new ACssPauseAfter
- */
+ */
public ACssPauseAfter(ACssPauseBefore pauseBefore) {
value = pauseBefore.value;
}
-
+
/**
* Creates a new ACssPauseAfter
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
+ */
public ACssPauseAfter(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
-
+
setByUser();
if (val.equals(inherit)) {
value = inherit;
@@ -95,30 +95,30 @@
value = ((CssNumber) val).getTime();
expression.next();
}
-
+
throw new InvalidParamException("value", val.toString(), getPropertyName(),
ac);
}
-
+
public ACssPauseAfter(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns some usable value of this property...
*/
public int getValue() { // vm
return ((Float) value.get()).intValue();
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value is equals to inherit
@@ -126,7 +126,7 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -136,15 +136,15 @@
else
return null;
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "pause-after";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -156,26 +156,26 @@
style.addRedefinitionWarning(ac, this);
acssPause.pauseAfter = this;
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (value != null)
- return (property instanceof ACssPauseAfter &&
+ return (property instanceof ACssPauseAfter &&
value.equals(((ACssPauseAfter) property).value));
else
return false;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((ACssStyle) style).getPauseAfter();
@@ -183,6 +183,6 @@
return ((ACssStyle) style).acssPause.pauseAfter;
}
}
-
+
private static CssTime defaultValue;
}
Index: ACssVoiceDuration.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssVoiceDuration.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssVoiceDuration.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssVoiceDuration.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -62,11 +62,11 @@
*/
public ACssVoiceDuration(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -94,7 +94,7 @@
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
*/
Index: ACssPauseBefore.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssPauseBefore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssPauseBefore.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssPauseBefore.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -40,14 +40,14 @@
* @version $Revision$
*/
public class ACssPauseBefore extends ACssProperty {
-
+
CssValue value;
-
+
private static CssTime defaultValue;
/**
* Create a new ACssPauseBefore
- */
+ */
public ACssPauseBefore() {
// Initial is User Agent Specific
if (defaultValue == null) {
@@ -55,22 +55,22 @@
}
value = defaultValue;
}
-
+
/**
* Creates a new ACssPauseBefore
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
+ */
public ACssPauseBefore(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
-
+
setByUser();
if (val.equals(inherit)) {
@@ -80,7 +80,7 @@
} else if (val instanceof CssPercentage) {
float num = ((Float) val.get()).floatValue();
if (num < 0) {
- throw new InvalidParamException("negative-value",
+ throw new InvalidParamException("negative-value",
val.toString(), ac);
}
value = val;
@@ -89,7 +89,7 @@
} else if (val instanceof CssTime) {
float num = ((Float) val.get()).floatValue();
if (num < 0) {
- throw new InvalidParamException("negative-value",
+ throw new InvalidParamException("negative-value",
val.toString(), ac);
}
value = val;
@@ -99,30 +99,30 @@
value = ((CssNumber) val).getTime();
expression.next();
}
-
- throw new InvalidParamException("value", val.toString(),
+
+ throw new InvalidParamException("value", val.toString(),
getPropertyName(), ac);
}
-
+
public ACssPauseBefore(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns some usable value of this property...
*/
public int getValue() { // vm
return ((Float) value.get()).intValue();
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value is equals to inherit
@@ -130,7 +130,7 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -140,15 +140,15 @@
else
return null;
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "pause-before";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -160,28 +160,28 @@
style.addRedefinitionWarning(ac, this);
acssPause.pauseBefore = this;
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (value != null) {
- return (property instanceof ACssPauseBefore &&
+ return (property instanceof ACssPauseBefore &&
value.equals(((ACssPauseBefore) property).value));
} else {
return false;
}
}
-
-
+
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((ACssStyle) style).getPauseBefore();
@@ -189,5 +189,5 @@
return ((ACssStyle) style).acssPause.pauseBefore;
}
}
-
+
}
Index: ACssPhonemes.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssPhonemes.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssPhonemes.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssPhonemes.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -39,11 +39,11 @@
*/
public ACssPhonemes(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -66,7 +66,7 @@
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
*/
Index: ACssPause.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssPause.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssPause.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssPause.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -45,24 +45,24 @@
* @version $Revision$
*/
public class ACssPause extends ACssProperty implements CssOperator {
-
+
ACssPauseBefore pauseBefore;
ACssPauseAfter pauseAfter;
boolean same;
-
+
/**
* Create a new ACssPause
*/
public ACssPause() {
- }
-
+ }
+
/**
* Create a new ACssPause
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public ACssPause(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
CssValue val = expression.getValue();
@@ -76,7 +76,7 @@
pauseAfter = new ACssPauseAfter(pauseBefore);
return;
}
-
+
switch (expression.getCount()) {
case 1:
this.same = true;
@@ -85,7 +85,7 @@
break;
case 2:
if (expression.getOperator() != SPACE) {
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
(new Character(expression.getOperator()).toString()),
ac);
}
@@ -98,40 +98,40 @@
}
}
}
-
+
public ACssPause(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return pauseBefore;
}
-
+
/**
* Get the before property
*/
public ACssPauseBefore getBefore() {
return pauseBefore;
}
-
+
/**
* Get the after property
*/
public ACssPauseAfter getAfter() {
return pauseAfter;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "pause";
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -143,17 +143,17 @@
return pauseBefore + " " + pauseAfter;
}
}
-
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
super.setImportant();
pauseBefore.setImportant();
pauseAfter.setImportant();
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -162,21 +162,21 @@
return ((pauseAfter == null || pauseAfter.getImportant()) &&
(pauseBefore == null || pauseBefore.getImportant()));
}
-
+
/**
* Print this property.
*
* @param printer The printer.
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if ((pauseBefore != null && pauseAfter != null) &&
(getImportant() ||
(!pauseBefore.getImportant() &&
!pauseAfter.getImportant()))) {
printer.print(this);
- } else {
+ } else {
if (pauseBefore != null) {
pauseBefore.print(printer);
}
@@ -185,7 +185,7 @@
}
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -197,30 +197,30 @@
pauseBefore.addToStyle(ac, style);
pauseAfter.addToStyle(ac, style);
}
-
+
/**
* Update the source file and the line.
* Overrides this method for a macro
*
* @param line The line number where this property is defined
* @param source The source file where this property is defined
- */
+ */
public void setInfo(int line, String source) {
super.setInfo(line, source);
// pauseBefore and pauseAfter can't be null ...
pauseBefore.setInfo(line, source);
pauseAfter.setInfo(line, source);
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return false; // @FIXME
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -237,13 +237,13 @@
pauseAfter.setSelectors(selector);
}
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((ACssStyle) style).getPause();
@@ -251,5 +251,5 @@
return ((ACssStyle) style).acssPause;
}
}
-
+
}
Index: ACssVoiceFamily.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssVoiceFamily.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssVoiceFamily.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssVoiceFamily.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -21,17 +21,17 @@
import org.w3c.css.values.CssString;
import org.w3c.css.values.CssValue;
-/**
+/**
* <H3>5.2 'voice-family'</H3>
* <P>
- * <EM>Value:</EM> [[<specific-voice> | <generic-voice>],]*
+ * <EM>Value:</EM> [[<specific-voice> | <generic-voice>],]*
* [<specific-voice> | <generic-voice>]<BR>
* <EM>Initial:</EM> UA <BR>
* <EM>Applies to:</EM> all elements<BR>
* <EM>Inherited:</EM> yes<BR>
* <EM>Percentage values:</EM> NA
*
- * <P>The value is a prioritized list of voice family names (compare
+ * <P>The value is a prioritized list of voice family names (compare
* with '<a
* href="/pub/WWW/TR/REC-CSS1##font-family">font-family</a>'. Suggested
* genric families: male, female, child.
@@ -51,26 +51,26 @@
* fonts). If so, what are the values that describe these voice families
* in a way that is independent of speech synthesizer?
*
- * @version $Revision$
+ * @version $Revision$
*/
public class ACssVoiceFamily extends ACssProperty implements CssOperator {
-
+
Vector family_name = new Vector();
boolean inheritValue;
-
+
static String[] genericFamily = { "male", "female", "child" };
-
+
static int[] genericFamilyHash;
boolean withSpace = false;
-
+
/**
* Create a new ACssVoiceFamily
*/
public ACssVoiceFamily() {
// depends on user agent
- }
-
+ }
+
/**
* Create a new ACssVoiceFamily
* @param value the voice name
@@ -82,7 +82,7 @@
CssValue val = value.getValue();
char op;
//@@ and if name is already in the vector ?
-
+
setByUser();
if (val.equals(inherit)) {
if(value.getCount() > 1) {
@@ -91,20 +91,20 @@
inheritValue = true;
return;
}
-
+
while (family) {
val = value.getValue();
op = value.getOperator();
-
+
if ((op != COMMA) && (op != SPACE)) {
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
(new Character(op)).toString(), ac);
}
-
+
if(val != null && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
if (val instanceof CssString) {
String familyName = null;
if (op == COMMA) { // "helvetica", "roman"
@@ -133,10 +133,10 @@
value.next();
} else {
CssValue next = value.getNextValue();
-
- if (next != null && next instanceof CssIdent) {
+
+ if (next != null && next instanceof CssIdent) {
// @@ null and instanceof
- CssIdent New = new CssIdent(val.get()
+ CssIdent New = new CssIdent(val.get()
+ " " + next.get());
withSpace = true;
value.remove();
@@ -151,42 +151,42 @@
}
}
} else {
- throw new InvalidParamException("value", val.toString(),
+ throw new InvalidParamException("value", val.toString(),
getPropertyName(), ac);
}
}
-
- }
-
+
+ }
+
public ACssVoiceFamily(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns all voices name
- */
+ */
public Enumeration elements() {
return family_name.elements();
}
-
+
/**
* Returns the size
*/
public int size() {
return family_name.size();
}
-
+
/**
* Returns the voice (null if no voice)
- */
+ */
public Object get() {
if (family_name.size() == 0) {
return null;
}
return family_name.firstElement();
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value is equals to inherit
@@ -194,15 +194,15 @@
public boolean isSoftlyInherited() {
return inheritValue;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
if (inheritValue) {
return inherit.toString();
} else {
-
+
String r = "";
for (Enumeration e = elements(); e.hasMoreElements();)
// r += ", " + e.nextElement().toString();
@@ -213,14 +213,14 @@
return r.substring(2);
}
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "voice-family";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -231,22 +231,22 @@
style.addRedefinitionWarning(ac, this);
((ACssStyle) style).acssVoiceFamily = this;
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return false; //@@ FIXME
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((ACssStyle) style).getVoiceFamily();
@@ -254,30 +254,30 @@
return ((ACssStyle) style).acssVoiceFamily;
}
}
-
+
private static String trimToOneSpace(String name) {
int count = name.length();
char[] dst = new char[count];
char[] src = new char[count];
int index = -1;
-
+
name.getChars(0, count, src, 0);
for(int i=0; i < count; i++)
- if ( i == 0 || ! Util.isWhiteSpace(src[i]) ||
+ if ( i == 0 || ! Util.isWhiteSpace(src[i]) ||
( Util.isWhiteSpace(src[i]) && !Util.isWhiteSpace(dst[index]) ) )
dst[++index] = src[i];
-
+
return new String(dst, 0, index+1);
}
-
+
/**
* Returns true if this property contains a generic family name
- */
+ */
public boolean containsGenericFamily() {
if (family_name.size() == 0) {
return true;
} else {
- for (Enumeration e = family_name.elements();
+ for (Enumeration e = family_name.elements();
e.hasMoreElements();) {
int hash = ((String) e.nextElement()).toLowerCase().hashCode();
for (int i = 0; i < genericFamilyHash.length; i++) {
@@ -288,8 +288,8 @@
return false;
}
}
-
-
+
+
static {
genericFamilyHash = new int[genericFamily.length];
for (int i = 0; i < genericFamily.length; i++) {
Index: ACssSpeechRate.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssSpeechRate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssSpeechRate.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssSpeechRate.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -34,40 +34,40 @@
* @see org.w3c.css.properties.css1.CssFontWeight
*/
public class ACssSpeechRate extends ACssProperty {
-
+
CssValue value;
-
+
private static int[] hash_values;
-
- private static String[] SPEECHRATE = { "x-slow", "slow", "medium",
- "fast", "x-fast", "faster",
+
+ private static String[] SPEECHRATE = { "x-slow", "slow", "medium",
+ "fast", "x-fast", "faster",
"slower" };
private static CssIdent defaultValue = new CssIdent(SPEECHRATE[2]);
-
+
/**
* Create a new ACssSpeechRate
*/
public ACssSpeechRate() {
value = defaultValue;
- }
-
+ }
+
/**
* Creates a new ACssSpeechRate
*
* @param expression The expression for this property
* @exception InvalidParamException Expressions are incorrect
- */
+ */
public ACssSpeechRate(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
this();
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
int index;
-
+
setByUser();
if (val.equals(inherit)) {
value = inherit;
@@ -76,33 +76,33 @@
} else if (val instanceof CssNumber) {
value = val;
} else {
- throw new InvalidParamException("value",
- expression.getValue().toString(),
+ throw new InvalidParamException("value",
+ expression.getValue().toString(),
getPropertyName(), ac);
}
expression.next();
}
-
+
public ACssSpeechRate(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "speech-rate";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value is equals to inherit
@@ -110,14 +110,14 @@
public boolean isSoftlyInherited() {
return value.equals(inherit);
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -128,17 +128,17 @@
style.addRedefinitionWarning(ac, this);
((ACssStyle) style).acssSpeechRate = this;
}
-
+
/**
* Compares two properties for equality.
*
* @param property The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof ACssSpeechRate &&
+ return (property instanceof ACssSpeechRate &&
value.equals(((ACssSpeechRate) property).value));
}
-
+
private CssIdent checkIdent(ApplContext ac, CssIdent ident) throws InvalidParamException {
int hash = ident.hashCode();
for (int i = 0; i < SPEECHRATE.length; i++) {
@@ -146,18 +146,18 @@
return ident;
}
}
-
- throw new InvalidParamException("value",
- ident.toString(),
+
+ throw new InvalidParamException("value",
+ ident.toString(),
getPropertyName(), ac);
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((ACssStyle) style).getSpeechRate();
@@ -165,7 +165,7 @@
return ((ACssStyle) style).acssSpeechRate;
}
}
-
+
static {
hash_values = new int[SPEECHRATE.length];
for (int i = 0; i < SPEECHRATE.length; i++)
Index: ACssVoiceVolume.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssVoiceVolume.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssVoiceVolume.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssVoiceVolume.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -125,11 +125,11 @@
public ACssVoiceVolume(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
this();
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
int index;
@@ -160,7 +160,7 @@
expression.next();
}
-
+
public ACssVoiceVolume(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
Index: ACssStress.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssStress.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssStress.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssStress.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -30,7 +30,7 @@
* speaking voice. English is a <strong>stressed</strong> language, and
* different parts of a sentence are assigned primary, secondary or
* tertiary stress. The value of property 'stress' controls the amount of
- * inflection that results from these stress markers.
+ * inflection that results from these stress markers.
*
* <P>Increasing the value of this property results in the speech being
* more strongly inflected. It is in a sense dual to property
@@ -44,9 +44,9 @@
* @version $Revision$
*/
public class ACssStress extends ACssProperty {
-
+
CssValue value;
-
+
static CssValue DefaultValue = new CssNumber(null, 50);
/**
@@ -54,21 +54,21 @@
*/
public ACssStress() {
value = DefaultValue;
- }
-
+ }
+
/**
* Creates a new ACssStress
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public ACssStress(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
this();
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
int index;
setByUser();
@@ -79,7 +79,7 @@
return;
} else if (val instanceof CssNumber) {
float f = ((CssNumber) val).getValue();
- if ((f < 0) || (f > 100)) {
+ if ((f < 0) || (f > 100)) {
throw new InvalidParamException("range", null, ac);
}
value = val;
@@ -87,31 +87,31 @@
return;
}
- throw new InvalidParamException("value",
- expression.getValue().toString(),
+ throw new InvalidParamException("value",
+ expression.getValue().toString(),
getPropertyName(), ac);
}
-
+
public ACssStress(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "stress";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value is equals to inherit
@@ -119,41 +119,42 @@
public boolean isSoftlyInherited() {
return value.equals(inherit);
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((ACssStyle) style).acssStress != null)
+ if (((ACssStyle) style).acssStress != null) {
style.addRedefinitionWarning(ac, this);
+ }
((ACssStyle) style).acssStress = this;
}
-
+
/**
* Compares two properties for equality.
*
* @param property The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof ACssStress &&
+ return (property instanceof ACssStress &&
value.equals(((ACssStress) property).value));
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((ACssStyle) style).getStress();
@@ -161,6 +162,6 @@
return ((ACssStyle) style).acssStress;
}
}
-
+
}
Index: ACssVoiceRate.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssVoiceRate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssVoiceRate.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssVoiceRate.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -58,11 +58,11 @@
public ACssVoiceRate(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
this();
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
int index;
@@ -85,7 +85,7 @@
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
Index: ACssAzimuth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssAzimuth.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssAzimuth.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssAzimuth.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -21,49 +21,49 @@
* @version $Revision$
*/
public class ACssAzimuth extends ACssProperty {
-
+
CssValue value;
boolean isBehind;
-
+
private static int[] hash_values;
-
+
private static String[] AZIMUTH = { "left-side", "far-left", "left",
"center-left", "center", "center-right",
"right", "far-right", "right-side" };
-
+
private static CssIdent defaultIdentValue = new CssIdent(AZIMUTH[4]);
private static CssIdent behind = new CssIdent("behind");
private static CssIdent leftwards = new CssIdent("leftwards");
private static CssIdent rightwards = new CssIdent("rightwards");
-
+
/**
* Create a new ACssAzimuth
*/
public ACssAzimuth() {
value = defaultIdentValue;
- }
-
+ }
+
/**
* Creates a new ACssAzimuth
*
* @param expression The expression for this property
* @exception InvalidParamException Expressions are incorrect
- */
+ */
public ACssAzimuth(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
+
this();
-
+
if(check && expression.getCount() > 2) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
int index;
-
+
setByUser();
-
+
if (val.equals(leftwards)) {
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
@@ -85,7 +85,7 @@
value = rightwards;
expression.next();
return;
- } else if (val.equals(behind)) {
+ } else if (val.equals(behind)) {
isBehind = true;
expression.next();
CssValue valnext = expression.getValue();
@@ -131,32 +131,32 @@
expression.next();
return;
}
-
- throw new InvalidParamException("value",
- expression.getValue().toString(),
+
+ throw new InvalidParamException("value",
+ expression.getValue().toString(),
getPropertyName(), ac);
}
-
+
public ACssAzimuth(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "azimuth";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value is equals to inherit
@@ -164,7 +164,7 @@
public boolean isSoftlyInherited() {
return value.equals(inherit);
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -179,7 +179,7 @@
return value.toString();
}
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -190,60 +190,60 @@
style.addRedefinitionWarning(ac, this);
((ACssStyle) style).acssAzimuth = this;
}
-
+
/**
* Compares two properties for equality.
*
* @param property The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof ACssAzimuth &&
+ return (property instanceof ACssAzimuth &&
value.equals(((ACssAzimuth) property).value));
}
-
- private CssIdent checkIdent(ApplContext ac, CssIdent ident)
+
+ private CssIdent checkIdent(ApplContext ac, CssIdent ident)
throws InvalidParamException {
-
+
int hash = ident.hashCode();
-
+
for (int i = 0; i < AZIMUTH.length; i++) {
if (hash_values[i] == hash) {
return ident;
}
- }
- throw new InvalidParamException("value",
- ident.toString(),
+ }
+ throw new InvalidParamException("value",
+ ident.toString(),
getPropertyName(), ac);
}
-
+
/** @deprecated */
- private Float ValueOfIdent(ApplContext ac, CssIdent ident, boolean b)
+ private Float ValueOfIdent(ApplContext ac, CssIdent ident, boolean b)
throws InvalidParamException {
-
+
int hash = ident.hashCode();
-
+
for (int i = 0; i < AZIMUTH.length; i++) {
if (hash_values[i] == hash) {
if (b) {
- return ACssProperties.getValue(this,
+ return ACssProperties.getValue(this,
behind.toString() + "." + AZIMUTH[i]);
} else {
return ACssProperties.getValue(this, AZIMUTH[i]);
}
}
}
-
- throw new InvalidParamException("value",
- ident.toString(),
+
+ throw new InvalidParamException("value",
+ ident.toString(),
getPropertyName(), ac);
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((ACssStyle) style).getAzimuth();
@@ -251,7 +251,7 @@
return ((ACssStyle) style).acssAzimuth;
}
}
-
+
static {
hash_values = new int[AZIMUTH.length];
for (int i = 0; i < AZIMUTH.length; i++)
Index: ACssVoiceStress.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssVoiceStress.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssVoiceStress.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssVoiceStress.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -43,11 +43,11 @@
public ACssVoiceStress(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
this();
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
int index;
@@ -70,7 +70,7 @@
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
Index: ACssSpeakCSS3.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssSpeakCSS3.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssSpeakCSS3.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssSpeakCSS3.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -44,11 +44,11 @@
public ACssSpeakCSS3(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
this();
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
int index;
@@ -71,7 +71,7 @@
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
Index: ACssPitch.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssPitch.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssPitch.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssPitch.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -31,15 +31,15 @@
* @version $Revision$
*/
public class ACssPitch extends ACssProperty {
-
+
CssValue value;
-
+
private static int[] hash_values;
-
- private static String[] PITCH = { "x-low", "low", "medium",
+
+ private static String[] PITCH = { "x-low", "low", "medium",
"high", "x-high" };
-
+
private static CssIdent defaultValue = new CssIdent(PITCH[2]);
/**
@@ -47,24 +47,24 @@
*/
public ACssPitch() {
value = defaultValue;
- }
-
+ }
+
/**
* Creates a new ACssPitch
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public ACssPitch(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
this();
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
-
+
setByUser();
if (val.equals(inherit)) {
@@ -74,48 +74,48 @@
} else if (val instanceof CssFrequency) {
value = val;
} else {
- throw new InvalidParamException("value",
- expression.getValue().toString(),
+ throw new InvalidParamException("value",
+ expression.getValue().toString(),
getPropertyName(), ac);
}
expression.next();
}
-
+
public ACssPitch(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
-
+
+
/**
* Returns some usable value of this property...
*/
public int getValue() { // vm
return ((Float) value.get()).intValue();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "pitch";
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -126,17 +126,17 @@
style.addRedefinitionWarning(ac, this);
((ACssStyle) style).acssPitch = this;
}
-
+
/**
* Compares two properties for equality.
*
* @param property The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof ACssPitch &&
+ return (property instanceof ACssPitch &&
value.equals(((ACssPitch) property).value));
}
-
+
private CssIdent checkIdent(ApplContext ac, CssIdent ident) throws InvalidParamException {
int hash = ident.hashCode();
for (int i = 0; i < PITCH.length; i++) {
@@ -144,18 +144,18 @@
return ident;
}
}
-
- throw new InvalidParamException("value",
- ident.toString(),
+
+ throw new InvalidParamException("value",
+ ident.toString(),
getPropertyName(), ac);
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((ACssStyle) style).getPitch();
@@ -163,7 +163,7 @@
return ((ACssStyle) style).acssPitch;
}
}
-
+
static {
hash_values = new int[PITCH.length];
for (int i = 0; i < PITCH.length; i++)
Index: ACssVoiceBalance.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssVoiceBalance.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssVoiceBalance.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssVoiceBalance.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -46,11 +46,11 @@
public ACssVoiceBalance(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
this();
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
int index;
@@ -84,7 +84,7 @@
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
Index: ACssSpeakDate.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssSpeakDate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssSpeakDate.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssSpeakDate.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -33,7 +33,7 @@
*
* <pre>
* <p>The campaign started on <date value="1874-oct-21">
- * the twenty-first of that month</date> and finished
+ * the twenty-first of that month</date> and finished
* <date value="1874-oct-28">a week later</date>
* </pre>
*
@@ -41,31 +41,31 @@
* @version $Revision$
*/
public class ACssSpeakDate extends ACssProperty {
-
+
CssValue value;
-
+
/**
* Create a new ACssSpeakDate
- */
+ */
public ACssSpeakDate() {
value = myd; // browser specific
}
-
+
/**
* Creates a new ACssSpeakDate
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
- public ACssSpeakDate(ApplContext ac, CssExpression expression, boolean check)
+ */
+ public ACssSpeakDate(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
-
+
if (val.equals(dmy)) {
value = dmy;
expression.next();
@@ -79,37 +79,37 @@
expression.next();
return;
}
-
+
throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
}
-
+
public ACssSpeakDate(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "speak-date";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -120,24 +120,24 @@
((ACssStyle) style).addRedefinitionWarning(ac, this);
((ACssStyle) style).acssSpeakDate = this;
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof ACssSpeakDate &&
+ return (property instanceof ACssSpeakDate &&
value.equals(((ACssSpeakDate) property).value));
}
-
-
+
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((ACssStyle) style).getSpeakDate();
@@ -145,7 +145,7 @@
return ((ACssStyle) style).acssSpeakDate;
}
}
-
+
private static CssIdent myd = new CssIdent("myd");
private static CssIdent dmy = new CssIdent("dmy");
private static CssIdent ymd = new CssIdent("ymd");
Index: ACssSpeakNumeral.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssSpeakNumeral.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssSpeakNumeral.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssSpeakNumeral.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -28,35 +28,35 @@
* @version $Revision$
*/
public class ACssSpeakNumeral extends ACssProperty {
-
+
CssValue value;
-
+
private static CssIdent none = new CssIdent("none");
private static CssIdent digits = new CssIdent("digits");
private static CssIdent continuous = new CssIdent("continuous");
/**
* Create a new ACssSpeakNumeral
- */
+ */
public ACssSpeakNumeral() {
value = none;
}
-
+
/**
* Creates a new ACssSpeakNumeral
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
+ */
public ACssSpeakNumeral(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
-
+
if (val.equals(inherit)) {
value = inherit;
expression.next();
@@ -74,22 +74,22 @@
expression.next();
return;
}
-
+
throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
}
-
+
public ACssSpeakNumeral(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value is equals to inherit
@@ -97,22 +97,22 @@
public boolean isSoftlyInherited() {
return value.equals(inherit);
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "speak-numeral";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -123,24 +123,24 @@
((ACssStyle) style).addRedefinitionWarning(ac, this);
((ACssStyle) style).acssSpeakNumeral = this;
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof ACssSpeakNumeral &&
+ return (property instanceof ACssSpeakNumeral &&
value.equals(((ACssSpeakNumeral) property).value));
}
-
-
+
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((ACssStyle) style).getSpeakNumeral();
@@ -148,5 +148,5 @@
return ((ACssStyle) style).acssSpeakNumeral;
}
}
-
+
}
Index: ACssVoiceFamilyCSS3.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssVoiceFamilyCSS3.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssVoiceFamilyCSS3.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssVoiceFamilyCSS3.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -105,7 +105,7 @@
if(val != null && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
if (val instanceof CssString) { //specific voice
String familyName = null;
if (op == COMMA) { // "helvetica", "roman"
@@ -224,7 +224,7 @@
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns all voices name
*/
Index: ACssInterpretAs.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssInterpretAs.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssInterpretAs.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssInterpretAs.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -47,17 +47,17 @@
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
*/
- public ACssInterpretAs(ApplContext ac, CssExpression expression,
+ public ACssInterpretAs(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
-
+
setByUser();
-
+
if (val.equals(inherit)) {
value = inherit;
expression.next();
@@ -84,16 +84,16 @@
}
}
}
-
+
throw new InvalidParamException("value", val.toString(),
getPropertyName(), ac);
}
-
+
public ACssInterpretAs(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
*/
@@ -144,7 +144,7 @@
style.addRedefinitionWarning(ac, this);
((ACssStyle) style).acssInterpretAs = this;
}
-
+
/**
* Compares two properties for equality.
*
@@ -158,8 +158,8 @@
return false;
}
}
-
-
+
+
/**
* Get this property in the style.
*
Index: ACssPlayDuring.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssPlayDuring.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssPlayDuring.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssPlayDuring.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -32,12 +32,12 @@
*
* <p>Similar to the cue-before and cue-after properties, this indicates
* sound to be played during an element as a background (ie the sound is
- * mixed in with the speech).
+ * mixed in with the speech).
*
* <p>The optional 'mix' keyword means the sound inherited from the parent
* element's play-during property continues to play and the current
* element sound (pointed to by the URL) is mixed with it. If mix is not
- * specified, the sound replaces the sound of the parent element.
+ * specified, the sound replaces the sound of the parent element.
*
* <p>The optional 'repeat' keyword means the sound will repeat if it is
* too short to fill the entire duration of the element. Without this
@@ -46,7 +46,7 @@
* element, it is clipped once the element is spoken.
*
* <p>Auto
- * means that the sound of the parent element continues to play
+ * means that the sound of the parent element continues to play
* (it is not restarted, which would have been the case if
* this property inherited)and none means that there is silence -
* the sound of the parent element (if any) is silent for the current
@@ -75,13 +75,13 @@
* @version $Revision$
*/
public class ACssPlayDuring extends ACssProperty implements CssOperator {
-
+
CssValue value;
boolean mix;
boolean repeat;
-
- private URL url;
-
+
+ private URL url;
+
private static CssIdent NONE = new CssIdent("none");
private static CssIdent AUTO = new CssIdent("auto");
private static CssIdent MIX = new CssIdent("mix");
@@ -89,44 +89,44 @@
/**
* Create a new ACssPlayDuring
- */
+ */
public ACssPlayDuring() {
value = AUTO;
}
-
+
/**
* Creates a new ACssPlayDuring
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
+ */
public ACssPlayDuring(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
int valuesNb = expression.getCount();
-
+
if(check && valuesNb > 3) {
- throw new InvalidParamException("unrecognize", ac);
+ throw new InvalidParamException("unrecognize", ac);
}
-
- CssValue val = expression.getValue();
-
+
+ CssValue val = expression.getValue();
+
if (val instanceof CssURL) {
- this.value = val;
+ this.value = val;
if (valuesNb == 3) {
if (expression.getOperator() != SPACE) {
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
(new Character(expression.getOperator()).toString()),
ac);
}
expression.next();
if (expression.getOperator() != SPACE) {
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
(new Character(expression.getOperator()).toString()),
ac);
}
val = expression.getValue();
if (!val.equals(MIX) && !val.equals(REPEAT)) {
- throw new InvalidParamException("few-value",
+ throw new InvalidParamException("few-value",
getPropertyName(), ac);
}
else if(!val.equals(MIX)) {
@@ -148,7 +148,7 @@
}
} else if (valuesNb == 2) {
if (expression.getOperator() != SPACE) {
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
(new Character(expression.getOperator()).toString()),
ac);
}
@@ -166,42 +166,42 @@
return;
} else if (val.equals(inherit)) {
if(check && valuesNb > 1) {
- throw new InvalidParamException("unrecognize", ac);
+ throw new InvalidParamException("unrecognize", ac);
}
this.value = inherit;
expression.next();
return;
} else if (val.equals(NONE)) {
if(check && valuesNb > 1) {
- throw new InvalidParamException("unrecognize", ac);
+ throw new InvalidParamException("unrecognize", ac);
}
this.value = NONE;
expression.next();
return;
} else if (val.equals(AUTO)) {
if(check && valuesNb > 1) {
- throw new InvalidParamException("unrecognize", ac);
+ throw new InvalidParamException("unrecognize", ac);
}
this.value = AUTO;
expression.next();
return;
}
-
+
throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
}
-
+
public ACssPlayDuring(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns some usable value of this property...
*/
@@ -215,46 +215,46 @@
return url;
}
}
-
+
/**
* The optional 'mix' keyword means the sound inherited from the parent
* element's play-during property continues to play and the current
* element sound (pointed to by the URL) is mixed with it. If mix is not
- * specified, the sound replaces the sound of the parent element.
- */
+ * specified, the sound replaces the sound of the parent element.
+ */
public boolean isMix() {
return mix;
}
-
+
/**
* The optional 'repeat' keyword means the sound will repeat if it is
* too short to fill the entire duration of the element. Without this
* keyword, the sound plays once and then stops. Thuis is similar to the
* background repeat properties in CSS1. If the sound is too long for the
* element, it is clipped once the element is spoken.
- */
+ */
public boolean isRepeat() {
return repeat;
}
-
+
/**
- * 'auto' means that the sound of the parent element continues to play
+ * 'auto' means that the sound of the parent element continues to play
* (it is not restarted, which would have been the case if
* this property inherited).
- */
+ */
public boolean isAuto() {
return value == AUTO;
}
-
+
/**
* 'none' means that there is silence.
* the sound of the parent element (if any) is silent for the current
* element and continues after the current element.
- */
+ */
public boolean isNone() {
return value == NONE;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value is equals to inherit
@@ -262,7 +262,7 @@
public boolean isSoftlyInherited() {
return value.equals(inherit);
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -278,15 +278,15 @@
return ret;
}
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "play-during";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -297,28 +297,28 @@
style.addRedefinitionWarning(ac, this);
((ACssStyle) style).acssPlayDuring = this;
}
-
+
/**
* Compares two properties for equality.
*
* @param property The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof ACssPlayDuring &&
+ return (property instanceof ACssPlayDuring &&
value.equals(((ACssPlayDuring) property).value));
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((ACssStyle) style).getPlayDuring();
} else {
return ((ACssStyle) style).acssPlayDuring;
}
- }
+ }
}
Index: ACssCueAfter.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssCueAfter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssCueAfter.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssCueAfter.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -50,40 +50,40 @@
* @version $Revision$
*/
public class ACssCueAfter extends ACssProperty {
-
+
CssValue value;
-
+
private URL url;
private static CssIdent none = new CssIdent("none");
/**
* Create a new ACssCueAfter
- */
+ */
public ACssCueAfter() {
value = none;
}
-
+
/**
* Create a new ACssCueAfter
- */
+ */
public ACssCueAfter(ACssCueBefore cueBefore) {
value = cueBefore.value;
}
-
+
/**
* Creates a new ACssCueAfter
* @param value the value of the size
* @exception InvalidParamException The value is incorrect
- */
+ */
public ACssCueAfter(ApplContext ac, CssExpression value, boolean check)
throws InvalidParamException {
-
+
if(check && value.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = value.getValue();
-
+
if (val instanceof CssURL) {
this.value = val;
value.next();
@@ -97,27 +97,27 @@
value.next();
return;
}
-
- throw new InvalidParamException("value", val.toString(),
+
+ throw new InvalidParamException("value", val.toString(),
getPropertyName(), ac);
}
-
+
public ACssCueAfter(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
if (value == none)
return null;
else
return value;
}
-
-
+
+
/**
* Returns some usable value of this property...
*/
@@ -131,7 +131,7 @@
return url;
}
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value is equals to inherit
@@ -139,33 +139,33 @@
public boolean isSoftlyInherited() {
return value.equals(inherit);
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "cue-after";
}
-
+
public void addToStyle(ApplContext ac, CssStyle style) {
ACssCue acssCue = ((ACssStyle) style).acssCue;
if (acssCue.cueAfter != null)
style.addRedefinitionWarning(ac, this);
acssCue.cueAfter = this;
}
-
+
public boolean equals(CssProperty property) {
return (property instanceof ACssCueAfter && value.equals(((ACssCueAfter) property).value));
}
-
+
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((ACssStyle) style).getCueAfter();
@@ -173,5 +173,5 @@
return ((ACssStyle) style).acssCue.cueAfter;
}
}
-
+
}
Index: ACssCue.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssCue.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssCue.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssCue.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -46,23 +46,23 @@
* @version $Revision$
*/
public class ACssCue extends ACssProperty implements CssOperator {
-
+
ACssCueBefore cueBefore;
ACssCueAfter cueAfter;
-
+
boolean same;
-
+
/**
* Create a new ACssCue
*/
public ACssCue() {
- }
-
+ }
+
/**
* Create a new ACssCue
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public ACssCue(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
switch (expression.getCount()) {
@@ -73,7 +73,7 @@
break;
case 2:
if (expression.getOperator() != SPACE) {
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
(new Character(expression.getOperator()).toString()),
ac);
}
@@ -92,26 +92,26 @@
}
}
}
-
+
public ACssCue(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return cueBefore;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "cue";
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -123,17 +123,17 @@
return cueBefore + " " + cueAfter;
}
}
-
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
super.setImportant();
cueBefore.setImportant();
cueAfter.setImportant();
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -142,14 +142,14 @@
return ((cueAfter == null || cueAfter.getImportant()) &&
(cueBefore == null || cueBefore.getImportant()));
}
-
+
/**
* Print this property.
*
* @param printer The printer.
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if ((cueBefore != null && cueAfter != null) &&
(getImportant() ||
@@ -163,7 +163,7 @@
cueAfter.print(printer);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -175,21 +175,21 @@
cueBefore.addToStyle(ac, style);
cueAfter.addToStyle(ac, style);
}
-
+
/**
* Update the source file and the line.
* Overrides this method for a macro
*
* @param line The line number where this property is defined
* @param source The source file where this property is defined
- */
+ */
public void setInfo(int line, String source) {
super.setInfo(line, source);
// cueBefore and cueAfter can't be null ...
cueBefore.setInfo(line, source);
cueAfter.setInfo(line, source);
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -206,23 +206,23 @@
cueAfter.setSelectors(selector);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return false; // ????
}
-
-
+
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((ACssStyle) style).getCue();
@@ -230,5 +230,5 @@
return ((ACssStyle) style).acssCue;
}
}
-
+
}
Index: ACssVoicePitchRange.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssVoicePitchRange.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssVoicePitchRange.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssVoicePitchRange.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -57,11 +57,11 @@
public ACssVoicePitchRange(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
this();
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -85,7 +85,7 @@
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
Index: ACssPitchRange.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssPitchRange.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssPitchRange.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssPitchRange.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -34,34 +34,34 @@
* @version $Revision$
*/
public class ACssPitchRange extends ACssProperty {
-
+
CssValue value;
-
+
static CssValue DefaultValue = new CssNumber(null, 50);
-
+
/**
* Create a new ACssPitchRange
*/
public ACssPitchRange() {
value = DefaultValue;
- }
-
+ }
+
/**
* Creates a new ACssPitchRange
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public ACssPitchRange(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
this();
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
int index;
-
+
setByUser();
if (val.equals(inherit)) {
value = inherit;
@@ -69,39 +69,39 @@
return;
} else if (val instanceof CssNumber) {
float f = ((CssNumber) val).getValue();
- if ((f < 0) || (f > 100)) {
+ if ((f < 0) || (f > 100)) {
throw new InvalidParamException("range", null, ac);
}
value = val;
expression.next();
return;
}
-
- throw new InvalidParamException("value",
- expression.getValue().toString(),
+
+ throw new InvalidParamException("value",
+ expression.getValue().toString(),
getPropertyName(), ac);
}
-
+
public ACssPitchRange(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "pitch-range";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value is equals to inherit
@@ -109,14 +109,14 @@
public boolean isSoftlyInherited() {
return value.equals(inherit);
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -127,23 +127,23 @@
style.addRedefinitionWarning(ac, this);
((ACssStyle) style).acssPitchRange = this;
}
-
+
/**
* Compares two properties for equality.
*
* @param property The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof ACssPitchRange &&
+ return (property instanceof ACssPitchRange &&
value.equals(((ACssPitchRange) property).value));
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((ACssStyle) style).getPitchRange();
@@ -151,6 +151,6 @@
return ((ACssStyle) style).acssPitchRange;
}
}
-
+
}
Index: ACssSpeakTime.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssSpeakTime.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssSpeakTime.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssSpeakTime.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -28,31 +28,31 @@
* @version $Revision$
*/
public class ACssSpeakTime extends ACssProperty {
-
+
CssValue value;
-
+
/**
* Create a new ACssSpeakTime
- */
+ */
public ACssSpeakTime() {
value = none;
}
-
+
/**
* Creates a new ACssSpeakTime
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
- public ACssSpeakTime(ApplContext ac, CssExpression expression, boolean check)
+ */
+ public ACssSpeakTime(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
- }
-
+ }
+
CssValue val = expression.getValue();
-
+
if (val.equals(none)) {
value = none;
expression.next();
@@ -65,37 +65,37 @@
return;
}
}
-
+
throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
}
-
+
public ACssSpeakTime(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "speak-time";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -106,24 +106,24 @@
((ACssStyle) style).addRedefinitionWarning(ac, this);
((ACssStyle) style).acssSpeakTime = this;
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof ACssSpeakTime &&
+ return (property instanceof ACssSpeakTime &&
value.equals(((ACssSpeakTime) property).value));
}
-
-
+
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((ACssStyle) style).getSpeakTime();
@@ -131,6 +131,6 @@
return ((ACssStyle) style).acssSpeakTime;
}
}
-
+
private static CssIdent none = new CssIdent("none");
}
Index: ACssVolume.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssVolume.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssVolume.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssVolume.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -89,7 +89,7 @@
*
* <p>To inhibit the speaking of an element and all it's children so that
* it takes no time at all (for example, to get the effect of collapsing
- * and expanding lists) use the CSS1 property 'display'
+ * and expanding lists) use the CSS1 property 'display'
*
* <pre>display: none</pre>
*
@@ -100,36 +100,36 @@
* @version $Revision$
*/
public class ACssVolume extends ACssProperty {
-
+
CssValue value;
-
+
private static int[] hash_values;
-
- private static String[] VOLUME = { "silent", "x-soft", "soft",
+
+ private static String[] VOLUME = { "silent", "x-soft", "soft",
"medium", "loud", "x-loud" };
private static CssIdent defaultValue = new CssIdent(VOLUME[3]);
-
+
/**
* Create a new ACssVolume
*/
public ACssVolume() {
value = defaultValue;
- }
-
+ }
+
/**
* Creates a new ACssVolume
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public ACssVolume(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
this();
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
//int index;
@@ -144,7 +144,7 @@
/*
can't do the clipping here. see specs
-
+
float v = ((Float) ((CssPercentage) val).get()).floatValue();
if (v < 0 || v > 100) {
// clipped
@@ -165,27 +165,27 @@
}
expression.next();
} else {
- throw new InvalidParamException("value",
- expression.getValue().toString(),
+ throw new InvalidParamException("value",
+ expression.getValue().toString(),
getPropertyName(), ac);
}
expression.next();
}
-
+
public ACssVolume(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
-
+
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value is equals to inherit
@@ -193,7 +193,7 @@
public boolean isSoftlyInherited() {
return value.equals(inherit);
}
-
+
/**
* Returns some usable value of this property...
*
@@ -202,21 +202,21 @@
public float getValue() { // vm
return ((CssNumber) value).getValue();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "volume";
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -227,52 +227,52 @@
style.addRedefinitionWarning(ac, this);
((ACssStyle) style).acssVolume = this;
}
-
+
/**
* Compares two properties for equality.
*
* @param property The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof ACssVolume &&
+ return (property instanceof ACssVolume &&
value.equals(((ACssVolume) property).value));
}
-
- private CssIdent checkIdent(ApplContext ac, CssIdent ident)
+
+ private CssIdent checkIdent(ApplContext ac, CssIdent ident)
throws InvalidParamException {
-
+
int hash = ident.hashCode();
for (int i = 0; i < VOLUME.length; i++) {
if (hash_values[i] == hash) {
return ident;
}
}
-
- throw new InvalidParamException("value", ident.toString(),
+
+ throw new InvalidParamException("value", ident.toString(),
getPropertyName(), ac);
}
-
+
/** @deprecated */
- private CssPercentage ValueOfIdent(ApplContext ac, CssIdent ident)
+ private CssPercentage ValueOfIdent(ApplContext ac, CssIdent ident)
throws InvalidParamException {
-
+
int hash = ident.hashCode();
for (int i = 0; i < VOLUME.length; i++) {
if (hash_values[i] == hash) {
return new CssPercentage(ACssProperties.getValue(this, VOLUME[i]));
}
}
-
- throw new InvalidParamException("value", ident.toString(),
+
+ throw new InvalidParamException("value", ident.toString(),
getPropertyName(), ac);
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((ACssStyle) style).getVolume();
@@ -280,7 +280,7 @@
return ((ACssStyle) style).acssVolume;
}
}
-
+
static {
hash_values = new int[VOLUME.length];
for (int i = 0; i < VOLUME.length; i++)
Index: ACssStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssStyle.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssStyle.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssStyle.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -428,15 +428,14 @@
*/
public void findConflicts(ApplContext ac, Warnings warnings, Enumeration allSelectors) {
super.findConflicts(ac, warnings, allSelectors);
-
if (acssVoiceFamily != null) {
if (!acssVoiceFamily.containsGenericFamily()) {
- warnings.addWarning(new Warning(acssVoiceFamily,
- "no-generic-family", 2, ac));
+ warnings.addWarning(new Warning(acssVoiceFamily,
+ "no-generic-family", 2, ac));
}
if (acssVoiceFamily.withSpace) {
warnings.addWarning(new Warning(acssVoiceFamily,
- "with-space", 1, ac));
+ "with-space", 1, ac));
}
}
@@ -444,15 +443,15 @@
!acssPause.getBefore().isSoftlyInherited() &&
!(acssPause.getBefore().get() instanceof CssPercentage)) {
// Using relative units gives more robust stylesheets
- warnings.addWarning(new Warning(acssPause.getBefore(),
- "relative", 2, ac));
+ warnings.addWarning(new Warning(acssPause.getBefore(),
+ "relative", 2, ac));
}
if ((acssPause.getAfter() != null) &&
!acssPause.getAfter().isSoftlyInherited() &&
!(acssPause.getAfter().get() instanceof CssPercentage)) {
- // Using relative units gives more robust stylesheets
- warnings.addWarning(new Warning(acssPause.getAfter(),
- "relative", 2, ac));
+ // Using relative units gives more robust stylesheets
+ warnings.addWarning(new Warning(acssPause.getAfter(),
+ "relative", 2, ac));
}
Index: ACssCueBefore.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssCueBefore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssCueBefore.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssCueBefore.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -50,41 +50,41 @@
* @version $Revision$
*/
public class ACssCueBefore extends ACssProperty {
-
+
CssValue value;
-
+
private URL url;
private static CssIdent none = new CssIdent("none");
/**
* Create a new ACssCueBefore
- */
+ */
public ACssCueBefore() {
// Initial is User Agent Specific
value = none;
}
-
+
/**
* Create a new ACssCueBefore
- */
+ */
public ACssCueBefore(ACssCueAfter cueBefore) {
value = cueBefore.value;
}
-
+
/**
* Creates a new ACssCueBefore
* @param value the value of the size
* @exception InvalidParamException The value is incorrect
- */
+ */
public ACssCueBefore(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
-
+
if (val instanceof CssURL) {
value = val;
expression.next();
@@ -98,25 +98,25 @@
expression.next();
return;
}
-
+
throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
}
-
+
public ACssCueBefore(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
if (value == none)
return null;
else
return value;
}
-
+
/**
* Returns some usable value of this property...
*/
@@ -130,7 +130,7 @@
return url;
}
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value is equals to inherit
@@ -138,33 +138,33 @@
public boolean isSoftlyInherited() {
return value.equals(inherit);
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "cue-before";
}
-
+
public void addToStyle(ApplContext ac, CssStyle style) {
ACssCue acssCue = ((ACssStyle) style).acssCue;
if (acssCue.cueBefore != null)
style.addRedefinitionWarning(ac, this);
acssCue.cueBefore = this;
}
-
+
public boolean equals(CssProperty property) {
return (property instanceof ACssCueBefore && value.equals(((ACssCueBefore) property).value));
}
-
+
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((ACssStyle) style).getCueBefore();
@@ -172,5 +172,5 @@
return ((ACssStyle) style).acssCue.cueBefore;
}
}
-
+
}
Index: ACssSpeak.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssSpeak.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssSpeak.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssSpeak.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -21,35 +21,35 @@
* @version $Revision$
*/
public class ACssSpeak extends ACssProperty {
-
+
CssValue value;
-
+
private static int[] hash_values;
-
+
private static String[] SPEAK = { "normal", "none", "spell-out" };
private static CssIdent defaultValue = new CssIdent(SPEAK[1]);
-
+
/**
* Create a new ACssSpeak
*/
public ACssSpeak() {
value = defaultValue;
- }
-
+ }
+
/**
* Creates a new ACssSpeak
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public ACssSpeak(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
this();
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
int index;
@@ -60,34 +60,34 @@
} else if (val instanceof CssIdent) {
value = checkIdent(ac, (CssIdent) val);
} else {
- throw new InvalidParamException("value",
- expression.getValue().toString(),
+ throw new InvalidParamException("value",
+ expression.getValue().toString(),
getPropertyName(), ac);
}
expression.next();
}
-
+
public ACssSpeak(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "speak";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value is equals to inherit
@@ -95,14 +95,14 @@
public boolean isSoftlyInherited() {
return value.equals(inherit);
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -113,37 +113,37 @@
style.addRedefinitionWarning(ac, this);
((ACssStyle) style).acssSpeak = this;
}
-
+
/**
* Compares two properties for equality.
*
* @param property The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof ACssSpeak &&
+ return (property instanceof ACssSpeak &&
value.equals(((ACssSpeak) property).value));
}
-
- private CssIdent checkIdent(ApplContext ac, CssIdent ident)
+
+ private CssIdent checkIdent(ApplContext ac, CssIdent ident)
throws InvalidParamException {
-
+
int hash = ident.hashCode();
for (int i = 0; i < SPEAK.length; i++) {
if (hash_values[i] == hash) {
return ident;
}
}
-
- throw new InvalidParamException("value", ident.toString(),
+
+ throw new InvalidParamException("value", ident.toString(),
getPropertyName(), ac);
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((ACssStyle) style).getSpeak();
@@ -151,7 +151,7 @@
return ((ACssStyle) style).acssSpeak;
}
}
-
+
static {
hash_values = new int[SPEAK.length];
for (int i = 0; i < SPEAK.length; i++)
Index: ACssElevation.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssElevation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ACssElevation.java 8 Sep 2005 12:23:33 -0000 1.3
+++ ACssElevation.java 14 Sep 2005 15:14:18 -0000 1.4
@@ -21,14 +21,14 @@
* @version $Revision$
*/
public class ACssElevation extends ACssProperty {
-
+
CssValue value;
-
+
private static int[] hash_values;
-
+
private static String[] ELEVATION = { "below", "level", "above",
"highter", "lower" };
-
+
private static CssValue defaultValue = new CssIdent(ELEVATION[1]);
/**
@@ -36,27 +36,27 @@
*/
public ACssElevation() {
value = defaultValue;
- }
-
+ }
+
/**
* Creates a new ACssElevation
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public ACssElevation(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
this();
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
//int index;
setByUser();
-
- if (val.equals(inherit)) {
+
+ if (val.equals(inherit)) {
value = inherit;
expression.next();
return;
@@ -66,7 +66,7 @@
return;
} else if (val instanceof CssAngle) {
float v = ((CssAngle) val).getDegree();
- if (v > 90 && v < 270) {
+ if (v > 90 && v < 270) {
throw new InvalidParamException("elevation.range", null, ac);
}
value = val;
@@ -74,31 +74,31 @@
return;
}
- throw new InvalidParamException("value",
- expression.getValue().toString(),
+ throw new InvalidParamException("value",
+ expression.getValue().toString(),
getPropertyName(), ac);
}
-
+
public ACssElevation(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "elevation";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value is equals to inherit
@@ -106,14 +106,14 @@
public boolean isSoftlyInherited() {
return value.equals(inherit);
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -124,17 +124,17 @@
style.addRedefinitionWarning(ac, this);
((ACssStyle) style).acssElevation = this;
}
-
+
/**
* Compares two properties for equality.
*
* @param property The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof ACssElevation &&
+ return (property instanceof ACssElevation &&
value.equals(((ACssElevation) property).value));
}
-
+
private CssIdent checkIdent(ApplContext ac, CssIdent ident)
throws InvalidParamException {
int hash = ident.hashCode();
@@ -143,17 +143,17 @@
return ident;
}
}
-
- throw new InvalidParamException("value", ident.toString(),
+
+ throw new InvalidParamException("value", ident.toString(),
getPropertyName(), ac);
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((ACssStyle) style).getElevation();
@@ -161,7 +161,7 @@
return ((ACssStyle) style).acssElevation;
}
}
-
+
static {
hash_values = new int[ELEVATION.length];
for (int i = 0; i < ELEVATION.length; i++)
Index: ACssSpeakPunctuation.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/aural/ACssSpeakPunctuation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACssSpeakPunctuation.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ACssSpeakPunctuation.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -33,34 +33,34 @@
* @version $Revision$
*/
public class ACssSpeakPunctuation extends ACssProperty {
-
+
CssValue value;
-
+
private static CssIdent none = new CssIdent("none");
private static CssIdent code = new CssIdent("code");
/**
* Create a new ACssSpeakPunctuation
- */
+ */
public ACssSpeakPunctuation() {
value = none;
}
-
+
/**
* Creates a new ACssSpeakPunctuation
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
+ */
public ACssSpeakPunctuation(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
-
+
if (val.equals(inherit)) {
value = inherit;
expression.next();
@@ -74,24 +74,24 @@
expression.next();
return;
}
-
+
throw new InvalidParamException("value",
- val.toString(),
+ val.toString(),
getPropertyName(), ac);
}
-
+
public ACssSpeakPunctuation(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value is equals to inherit
@@ -99,22 +99,22 @@
public boolean isSoftlyInherited() {
return value.equals(inherit);
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "speak-punctuation";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -125,24 +125,24 @@
((ACssStyle) style).addRedefinitionWarning(ac, this);
((ACssStyle) style).acssSpeakPunctuation = this;
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof ACssSpeakPunctuation &&
+ return (property instanceof ACssSpeakPunctuation &&
value.equals(((ACssSpeakPunctuation) property).value));
}
-
-
+
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((ACssStyle) style).getSpeakPunctuation();
@@ -150,5 +150,5 @@
return ((ACssStyle) style).acssSpeakPunctuation;
}
}
-
+
}
Received on Wednesday, 14 September 2005 15:16:31 UTC