CVS 2002/css-validator/org/w3c/css/properties/css3

Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3
In directory roscoe:/tmp/cvs-serv20337/css3

Modified Files:
	Css3Style.java 
Added Files:
	CssObjectPosition.java 
Log Message:
object-position per http://www.w3.org/TR/2012/CR-css3-images-20120417/#object-position

--- /sources/public/2002/css-validator/org/w3c/css/properties/css3/Css3Style.java	2012/11/28 09:18:17	1.140
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css3/Css3Style.java	2012/11/28 09:28:11	1.141
@@ -1,6 +1,6 @@
 //
 
-// $Id: Css3Style.java,v 1.140 2012/11/28 09:18:17 ylafon Exp $
+// $Id: Css3Style.java,v 1.141 2012/11/28 09:28:11 ylafon Exp $
 // From Sijtsche de Jong (sy.de.jong@let.rug.nl)
 //
 // COPYRIGHT (c) 1995-2000 World Wide Web Consortium, (MIT, INRIA, Keio University)
@@ -70,18 +70,19 @@
 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.CssNavIndex;
-import org.w3c.css.properties.css.CssNavUp;
 import org.w3c.css.properties.css.CssNavDown;
+import org.w3c.css.properties.css.CssNavIndex;
 import org.w3c.css.properties.css.CssNavLeft;
 import org.w3c.css.properties.css.CssNavRight;
+import org.w3c.css.properties.css.CssNavUp;
 import org.w3c.css.properties.css.CssObjectFit;
+import org.w3c.css.properties.css.CssObjectPosition;
 import org.w3c.css.properties.css.CssOpacity;
 import org.w3c.css.properties.css.CssOrder;
 import org.w3c.css.properties.css.CssOutlineOffset;
 import org.w3c.css.properties.css.CssOverflowStyle;
-import org.w3c.css.properties.css.CssOverflowX;
 import org.w3c.css.properties.css.CssOverflowWrap;
+import org.w3c.css.properties.css.CssOverflowX;
 import org.w3c.css.properties.css.CssOverflowY;
 import org.w3c.css.properties.css.CssPerspective;
 import org.w3c.css.properties.css.CssPerspectiveOrigin;
@@ -233,6 +234,7 @@
 	public CssOverflowY	cssOverflowY;
 	
 	public CssObjectFit cssObjectFit;
+	public CssObjectPosition cssObjectPosition;
 
 	CssDropInitialAfterAdjust cssDropInitialAfterAdjust;
 	CssDropInitialAfterAlign cssDropInitialAfterAlign;
@@ -1411,6 +1413,15 @@
 		}
 		return cssObjectFit;
 	}
+
+	public CssObjectPosition getObjectPosition() {
+		if (cssObjectPosition == null) {
+			cssObjectPosition =
+					(CssObjectPosition) style.CascadingOrder(
+							new CssObjectPosition(), style, selector);
+		}
+		return cssObjectPosition;
+	}
 	
 	///
 

--- /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssObjectPosition.java	2012/11/28 09:28:11	NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssObjectPosition.java	2012/11/28 09:28:11	1.1
// $Id: CssObjectPosition.java,v 1.1 2012/11/28 09:28:11 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;

/**
 * @spec http://www.w3.org/TR/2012/CR-css3-images-20120417/#object-position
 */
public class CssObjectPosition extends org.w3c.css.properties.css.CssObjectPosition {

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

	/**
	 * Creates a new CssObjectPosition
	 *
	 * @param expression The expression for this property
	 * @throws org.w3c.css.util.InvalidParamException
	 *          Expressions are incorrect
	 */
	public CssObjectPosition(ApplContext ac, CssExpression expression, boolean check)
			throws InvalidParamException {
		if (check && expression.getCount() > 4) {
			throw new InvalidParamException("unrecognize", ac);
		}
		setByUser();
		value = CssBackgroundPosition.checkSyntax(expression, ac, getPropertyName());
	}

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

Received on Wednesday, 28 November 2012 09:28:16 UTC