W3C home > Mailing lists > Public > www-validator-cvs@w3.org > September 2012

2002/css-validator/org/w3c/css/properties/css3 CssMarqueePlayCount.java,NONE,1.1 Css3Style.java,1.92,1.93 CssMarquee.java,1.3,NONE CssMarqueeRepetition.java,1.3,NONE

From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
Date: Wed, 05 Sep 2012 12:00:07 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1T9EH9-0005UF-O2@lionel-hutz.w3.org>
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3
In directory hutz:/tmp/cvs-serv20976/css3

Modified Files:
	Css3Style.java 
Added Files:
	CssMarqueePlayCount.java 
Removed Files:
	CssMarquee.java CssMarqueeRepetition.java 
Log Message:
removed marquee and marquee-repetition, added marquee-play-count per http://www.w3.org/TR/2008/CR-css3-marquee-20081205/#marquee-play-count

--- CssMarquee.java DELETED ---

--- NEW FILE: CssMarqueePlayCount.java ---
// $Id: CssMarqueePlayCount.java,v 1.1 2012/09/05 12:00:05 ylafon Exp $
// Author: Yves Lafon <ylafon@w3.org>
//
// (c) COPYRIGHT MIT, ERCIM and Keio University, 2012.
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css3;

import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssNumber;
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;

/**
 * @spec http://www.w3.org/TR/2008/CR-css3-marquee-20081205/#marquee-play-count
 */
public class CssMarqueePlayCount extends org.w3c.css.properties.css.CssMarqueeDirection {

	private static CssIdent infinite;

	static {
		infinite = CssIdent.getIdent("infinite");
	}

	/**
	 * Create a new CssMarqueeDirection
	 */
	public CssMarqueePlayCount() {
		value = initial;
	}

	/**
	 * Creates a new CssMarqueeDirection
	 *
	 * @param expression The expression for this property
	 * @throws org.w3c.css.util.InvalidParamException
	 *          Expressions are incorrect
	 */
	public CssMarqueePlayCount(ApplContext ac, CssExpression expression, boolean check)
			throws InvalidParamException {
		setByUser();
		CssValue val = expression.getValue();

		if (check && expression.getCount() > 1) {
			throw new InvalidParamException("unrecognize", ac);
		}

		switch (val.getType()) {
			case CssTypes.CSS_NUMBER:
				CssNumber num = (CssNumber) val;
				if (!num.isPositive()) {
					throw new InvalidParamException("negative-value",
							num, getPropertyName(), ac);
				}
				break;
			case CssTypes.CSS_IDENT:
				CssIdent ident = (CssIdent) val;
				if (inherit.equals(ident)) {
					value = inherit;
					break;
				}
				if (infinite.equals(ident)) {
					value = infinite;
					break;
				}
				// unrecognized, let it flow.
			default:
				throw new InvalidParamException("value",
						val, getPropertyName(), ac);
		}
		expression.next();
	}

	public CssMarqueePlayCount(ApplContext ac, CssExpression expression)
			throws InvalidParamException {
		this(ac, expression, false);
	}
}


--- CssMarqueeRepetition.java DELETED ---

Index: Css3Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/Css3Style.java,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- Css3Style.java	5 Sep 2012 11:50:03 -0000	1.92
+++ Css3Style.java	5 Sep 2012 12:00:05 -0000	1.93
@@ -43,6 +43,7 @@
 import org.w3c.css.properties.css.CssHyphens;
 import org.w3c.css.properties.css.CssLineBreak;
 import org.w3c.css.properties.css.CssMarqueeDirection;
+import org.w3c.css.properties.css.CssMarqueePlayCount;
 import org.w3c.css.properties.css.CssMarqueeSpeed;
 import org.w3c.css.properties.css.CssMarqueeStyle;
 import org.w3c.css.properties.css.CssOpacity;
@@ -134,7 +135,8 @@
 	public CssMarqueeDirection cssMarqueeDirection;
 	public CssMarqueeSpeed cssMarqueeSpeed;
 	public CssMarqueeStyle cssMarqueeStyle;
-
+	public CssMarqueePlayCount cssMarqueePlayCount;
+	
 	CssDropInitialAfterAdjust cssDropInitialAfterAdjust;
 	CssDropInitialAfterAlign cssDropInitialAfterAlign;
 	CssDropInitialBeforeAdjust cssDropInitialBeforeAdjust;
@@ -171,8 +173,6 @@
 	CssPaddingTopCSS3 cssPaddingTopCSS3;
 	CssPaddingLeftCSS3 cssPaddingLeftCSS3;
 	CssPaddingRightCSS3 cssPaddingRightCSS3;
-	CssMarquee cssMarquee;
-	CssMarqueeRepetition cssMarqueeRepetition;
 
 	public org.w3c.css.properties.css.CssBorderImageSource getBorderImageSource() {
 		if (cssBorder.borderImage.source == null) {
@@ -830,15 +830,6 @@
 		return cssPaddingRightCSS3;
 	}
 
-	public CssMarquee getMarquee() {
-		if (cssMarquee == null) {
-			cssMarquee =
-					(CssMarquee) style.CascadingOrder(
-							new CssMarquee(), style, selector);
-		}
-		return cssMarquee;
-	}
-
 	public CssMarqueeDirection getMarqueeDirection() {
 		if (cssMarqueeDirection == null) {
 			cssMarqueeDirection =
@@ -848,13 +839,13 @@
 		return cssMarqueeDirection;
 	}
 
-	public CssMarqueeRepetition getMarqueeRepetition() {
-		if (cssMarqueeRepetition == null) {
-			cssMarqueeRepetition =
-					(CssMarqueeRepetition) style.CascadingOrder(
-							new CssMarqueeRepetition(), style, selector);
+	public CssMarqueePlayCount getMarqueePlayCount() {
+		if (cssMarqueePlayCount == null) {
+			cssMarqueePlayCount =
+					(CssMarqueePlayCount) style.CascadingOrder(
+							new CssMarqueePlayCount(), style, selector);
 		}
-		return cssMarqueeRepetition;
+		return cssMarqueePlayCount;
 	}
 
 	public CssMarqueeSpeed getMarqueeSpeed() {
Received on Wednesday, 5 September 2012 12:00:11 UTC

This archive was generated by hypermail 2.3.1 : Wednesday, 7 January 2015 15:17:51 UTC