- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 07 Nov 2012 11:34:56 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css
In directory hutz:/tmp/cvs-serv17598/css
Added Files:
CssListStyle.java CssListStyleImage.java
CssListStylePosition.java CssListStyleType.java
Log Message:
list-style-* per css1/2/21/3/tv plus cleanup of multiple property depending on the level in css1style
--- NEW FILE: CssListStyleType.java ---
// $Id: CssListStyleType.java,v 1.1 2012/11/07 11:34:54 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.css;
import org.w3c.css.parser.CssStyle;
import org.w3c.css.properties.css1.Css1Style;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssValue;
/**
* @since CSS1
*/
public class CssListStyleType extends CssProperty {
public CssValue value;
/**
* Create a new CssListStyleType
*/
public CssListStyleType() {
}
/**
* Set the value of the property<br/>
* Does not check the number of values
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* The expression is incorrect
*/
public CssListStyleType(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
/**
* Set the value of the property
*
* @param expression The expression for this property
* @param check set it to true to check the number of values
* @throws org.w3c.css.util.InvalidParamException
* The expression is incorrect
*/
public CssListStyleType(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
throw new InvalidParamException("unrecognize", ac);
}
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
/**
* Returns the name of this property
*/
public final String getPropertyName() {
return "list-style-type";
}
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
/**
* Returns true if this property is "softly" inherited
* e.g. his value is equals to inherit
*/
public boolean isSoftlyInherited() {
return inherit == value;
}
/**
* Add this property to the CssStyle
*
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
if (((Css1Style)style).cssListStyleType != null) {
style.addRedefinitionWarning(ac, this);
}
((Css1Style)style).cssListStyleType = 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 ((Css1Style) style).getListStyleType();
} else {
return ((Css1Style) style).cssListStyleType;
}
}
/**
* Compares two properties for equality.
*
* @param property The other property.
*/
public boolean equals(CssProperty property) {
try {
CssListStyleType other = (CssListStyleType) property;
return (value != null && value.equals(other.value)) || (value == null && other.value == null);
} catch (ClassCastException cce) {
return false; // FIXME
}
}
}
--- NEW FILE: CssListStylePosition.java ---
// $Id: CssListStylePosition.java,v 1.1 2012/11/07 11:34:53 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.css;
import org.w3c.css.parser.CssStyle;
import org.w3c.css.properties.css1.Css1Style;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssValue;
/**
* @since CSS1
*/
public class CssListStylePosition extends CssProperty {
public CssValue value;
/**
* Create a new CssListStylePosition
*/
public CssListStylePosition() {
}
/**
* Set the value of the property<br/>
* Does not check the number of values
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* The expression is incorrect
*/
public CssListStylePosition(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
/**
* Set the value of the property
*
* @param expression The expression for this property
* @param check set it to true to check the number of values
* @throws org.w3c.css.util.InvalidParamException
* The expression is incorrect
*/
public CssListStylePosition(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
throw new InvalidParamException("unrecognize", ac);
}
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
/**
* Returns the name of this property
*/
public final String getPropertyName() {
return "list-style-position";
}
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
/**
* Returns true if this property is "softly" inherited
* e.g. his value is equals to inherit
*/
public boolean isSoftlyInherited() {
return inherit == value;
}
/**
* Add this property to the CssStyle
*
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
if (((Css1Style)style).cssListStylePosition != null) {
style.addRedefinitionWarning(ac, this);
}
((Css1Style)style).cssListStylePosition = 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 ((Css1Style) style).getListStylePosition();
} else {
return ((Css1Style) style).cssListStylePosition;
}
}
/**
* Compares two properties for equality.
*
* @param property The other property.
*/
public boolean equals(CssProperty property) {
try {
CssListStylePosition other = (CssListStylePosition) property;
return (value != null && value.equals(other.value)) || (value == null && other.value == null);
} catch (ClassCastException cce) {
return false; // FIXME
}
}
}
--- NEW FILE: CssListStyleImage.java ---
// $Id: CssListStyleImage.java,v 1.1 2012/11/07 11:34:53 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.css;
import org.w3c.css.parser.CssStyle;
import org.w3c.css.properties.css1.Css1Style;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssValue;
/**
* @since CSS1
*/
public class CssListStyleImage extends CssProperty {
public CssValue value;
/**
* Create a new CssListStyleImage
*/
public CssListStyleImage() {
}
/**
* Set the value of the property<br/>
* Does not check the number of values
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* The expression is incorrect
*/
public CssListStyleImage(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
/**
* Set the value of the property
*
* @param expression The expression for this property
* @param check set it to true to check the number of values
* @throws org.w3c.css.util.InvalidParamException
* The expression is incorrect
*/
public CssListStyleImage(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
throw new InvalidParamException("unrecognize", ac);
}
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
/**
* Returns the name of this property
*/
public final String getPropertyName() {
return "list-style-image";
}
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
/**
* Returns true if this property is "softly" inherited
* e.g. his value is equals to inherit
*/
public boolean isSoftlyInherited() {
return inherit == value;
}
/**
* Add this property to the CssStyle
*
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
if (((Css1Style)style).cssListStyleImage != null) {
style.addRedefinitionWarning(ac, this);
}
((Css1Style)style).cssListStyleImage = 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 ((Css1Style) style).getListStyleImage();
} else {
return ((Css1Style) style).cssListStyleImage;
}
}
/**
* Compares two properties for equality.
*
* @param property The other property.
*/
public boolean equals(CssProperty property) {
try {
CssListStyleImage other = (CssListStyleImage) property;
return (value != null && value.equals(other.value)) || (value == null && other.value == null);
} catch (ClassCastException cce) {
return false; // FIXME
}
}
}
--- NEW FILE: CssListStyle.java ---
// $Id: CssListStyle.java,v 1.1 2012/11/07 11:34:53 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.css;
import org.w3c.css.parser.CssSelectors;
import org.w3c.css.parser.CssStyle;
import org.w3c.css.properties.css1.Css1Style;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssValue;
/**
* @since CSS1
*/
public class CssListStyle extends CssProperty {
public CssValue value;
public CssListStyleType cssListStyleType;
public CssListStyleImage cssListStyleImage;
public CssListStylePosition cssListStylePosition;
/**
* Create a new CssListStyle
*/
public CssListStyle() {
}
/**
* Set the value of the property<br/>
* Does not check the number of values
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* The expression is incorrect
*/
public CssListStyle(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
/**
* Set the value of the property
*
* @param expression The expression for this property
* @param check set it to true to check the number of values
* @throws org.w3c.css.util.InvalidParamException
* The expression is incorrect
*/
public CssListStyle(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
throw new InvalidParamException("unrecognize", ac);
}
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
/**
* Returns the name of this property
*/
public final String getPropertyName() {
return "list-style-position";
}
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
/**
* Returns true if this property is "softly" inherited
* e.g. his value is equals to inherit
*/
public boolean isSoftlyInherited() {
return inherit == value;
}
/**
* Add this property to the CssStyle
*
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
if (((Css1Style)style).cssListStyle != null) {
style.addRedefinitionWarning(ac, this);
}
((Css1Style)style).cssListStyle = this;
cssListStyleImage.addToStyle(ac, style);
cssListStylePosition.addToStyle(ac, style);
cssListStyleType.addToStyle(ac, style);
}
/**
* 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 ((Css1Style) style).getListStyle();
} else {
return ((Css1Style) style).cssListStyle;
}
}
/**
* Compares two properties for equality.
*
* @param property The other property.
*/
public boolean equals(CssProperty property) {
try {
CssListStyle other = (CssListStyle) property;
return (value != null && value.equals(other.value)) || (value == null && other.value == null);
} catch (ClassCastException cce) {
return false; // FIXME
}
}
/**
* 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);
cssListStyleImage.setInfo(line, source);
cssListStylePosition.setInfo(line, source);
cssListStyleType.setInfo(line, source);
}
/**
* Set this property to be important.
* Overrides this method for a macro
*/
public void setImportant() {
super.setImportant();
cssListStyleImage.setImportant();
cssListStylePosition.setImportant();
cssListStyleType.setImportant();
}
/**
* Set the context.
* Overrides this method for a macro
*
* @see org.w3c.css.css.CssCascadingOrder#order
* @see org.w3c.css.css.StyleSheetParser#handleRule
*/
public void setSelectors(CssSelectors selector) {
super.setSelectors(selector);
cssListStylePosition.setSelectors(selector);
cssListStyleImage.setSelectors(selector);
cssListStyleType.setSelectors(selector);
}
}
Received on Wednesday, 7 November 2012 11:35:02 UTC