- From: Julien Grand-Mourcel via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 13 Jul 2007 13:32:23 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3
In directory hutz:/tmp/cvs-serv13393/org/w3c/css/properties/css3
Modified Files:
CssOpacity.java
Log Message:
Adding patch to use Velocity template engine.
And some other changes...
Index: CssOpacity.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssOpacity.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssOpacity.java 14 Sep 2005 15:15:04 -0000 1.2
+++ CssOpacity.java 13 Jul 2007 13:32:21 -0000 1.3
@@ -20,154 +20,164 @@
import org.w3c.css.values.CssValue;
/**
- * <P>
- * <EM>Value:</EM> < alphavalue> || inherit<BR>
- * <EM>Initial:</EM>1<BR>
- * <EM>Applies to:</EM>all elements<BR>
- * <EM>Inherited:</EM>no<BR>
- * <EM>Percentages:</EM>no<BR>
- * <EM>Media:</EM>:visual
- * <P>
- * This property sets the opacity of an element.
- * <PRE>
- * H1 { opacity: 0}
- * </PRE>
+ * <P>
+ * <EM>Value:</EM> < alphavalue> || inherit<BR>
+ * <EM>Initial:</EM>1<BR>
+ * <EM>Applies to:</EM>all elements<BR>
+ * <EM>Inherited:</EM>no<BR>
+ * <EM>Percentages:</EM>no<BR>
+ * <EM>Media:</EM>:visual
+ * <P>
+ * This property sets the opacity of an element.
+ *
+ * <PRE>
+ *
+ * H1 { opacity: 0}
+ *
+ * </PRE>
*/
public class CssOpacity extends CssProperty implements CssOperator {
- String opaclevel;
- ApplContext ac;
+ String opaclevel;
+ ApplContext ac;
- /**
- * Create a new CssOpacity
- */
- public CssOpacity() {
- CssNumber cssnum = new CssNumber((float) 1.0);
- opaclevel = cssnum.toString();
- }
+ /**
+ * Create a new CssOpacity
+ */
+ public CssOpacity() {
+ CssNumber cssnum = new CssNumber((float) 1.0);
+ opaclevel = cssnum.toString();
+ }
- /**
- * Create a new CssOpacity
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public CssOpacity(ApplContext ac, CssExpression expression,
- boolean check) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
+ /**
+ * Create a new CssOpacity
+ *
+ * @param expression
+ * The expression for this property
+ * @exception InvalidParamException
+ * Values are incorrect
+ */
+ public CssOpacity(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
- if (val instanceof CssNumber) {
+ if (val instanceof CssNumber) {
- CssNumber cssnum = new CssNumber(clampedValue(ac, ((CssNumber) val).getValue()));
- opaclevel = cssnum.toString();
- expression.next();
- }
- else if (val instanceof CssIdent) {
- if (val.equals(inherit)) {
- opaclevel = "inherit";
- expression.next();
- } else {
- throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
- }
- }
- else {
- throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
+ CssNumber cssnum = new CssNumber(clampedValue(ac, ((CssNumber) val)
+ .getValue()));
+ opaclevel = cssnum.toString();
+ expression.next();
+ } else if (val instanceof CssIdent) {
+ if (val.equals(inherit)) {
+ opaclevel = "inherit";
+ expression.next();
+ } else {
+ throw new InvalidParamException("value", val.toString(),
+ getPropertyName(), ac);
+ }
+ } else {
+ throw new InvalidParamException("value", val.toString(),
+ getPropertyName(), ac);
+ }
}
- }
- public CssOpacity(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
- this(ac, expression, false);
- }
+ public CssOpacity(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
- /**
- * Brings all values back between 0 and 1
- *
- * @param opac The value to be modified if necessary
- */
- private float clampedValue(ApplContext ac, float opac) {
- if (opac < 0 || opac > 1) {
- ac.getFrame().addWarning("out-of-range", Util.displayFloat(opac));
- return ((opac<0)?0:1);
+ /**
+ * Brings all values back between 0 and 1
+ *
+ * @param opac
+ * The value to be modified if necessary
+ */
+ private float clampedValue(ApplContext ac, float opac) {
+ if (opac < 0 || opac > 1) {
+ ac.getFrame().addWarning("out-of-range", Util.displayFloat(opac));
+ return ((opac < 0) ? 0 : 1);
+ } else
+ return (opac);
}
- else return(opac);
- }
- /**
- * Add this property to the CssStyle.
- *
- * @param style The CssStyle
- */
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((Css3Style) style).cssOpacity != null)
- style.addRedefinitionWarning(ac, this);
- ((Css3Style) style).cssOpacity = this;
- }
+ /**
+ * Add this property to the CssStyle.
+ *
+ * @param style
+ * The CssStyle
+ */
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((Css3Style) style).cssOpacity != null)
+ style.addRedefinitionWarning(ac, this);
+ ((Css3Style) style).cssOpacity = this;
+ }
- /**
- * 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 ((Css3Style) style).getOpacity();
- } else {
- return ((Css3Style) style).cssOpacity;
+ /**
+ * 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 ((Css3Style) style).getOpacity();
+ } else {
+ return ((Css3Style) style).cssOpacity;
+ }
}
- }
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof CssOpacity &&
- opaclevel.equals( ((CssOpacity) property).opaclevel));
- }
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value
+ * The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof CssOpacity && opaclevel
+ .equals(((CssOpacity) property).opaclevel));
+ }
- /**
- * Returns the name of this property
- */
- public String getPropertyName() {
- return "opacity";
- }
+ /**
+ * Returns the name of this property
+ */
+ public String getPropertyName() {
+ return "opacity";
+ }
- /**
- * Returns the value of this property
- */
- public Object get() {
- return opaclevel;
- }
+ /**
+ * Returns the value of this property
+ */
+ public Object get() {
+ return opaclevel;
+ }
- /**
- * Returns true if this property is "softly" inherited
- */
- public boolean isSoftlyInherited() {
- return opaclevel.equals("inherit");
- }
+ /**
+ * Returns true if this property is "softly" inherited
+ */
+ public boolean isSoftlyInherited() {
+ return opaclevel.equals("inherit");
+ }
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- return opaclevel;
- }
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ return opaclevel;
+ }
- /**
- * Is the value of this property a default value
- * It is used by all macro for the function <code>print</code>
- */
- public boolean isDefault() {
- CssNumber cssnum = new CssNumber(ac, (float) 1.0);
- return opaclevel == cssnum.toString();
- }
+ /**
+ * Is the value of this property a default value It is used by all macro for
+ * the function <code>print</code>
+ */
+ public boolean isDefault() {
+ CssNumber cssnum = new CssNumber(ac, (float) 1.0);
+ return opaclevel == cssnum.toString();
+ }
}
-
Received on Friday, 13 July 2007 13:32:25 UTC