- From: CVS User ylafon <cvsmail@w3.org>
- Date: Wed, 29 Jan 2014 21:03:02 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css
In directory roscoe:/tmp/cvs-serv9756/css
Modified Files:
CssBreakAfter.java
Added Files:
CssPageBreakAfter.java CssPageBreakBefore.java
CssPageBreakInside.java
Log Message:
page-break-[after|before|inside] per CSS2 CSS21 CSS3
--- /sources/public/2002/css-validator/org/w3c/css/properties/css/CssBreakAfter.java 2012/08/24 07:33:40 1.5
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css/CssBreakAfter.java 2014/01/29 21:03:02 1.6
@@ -1,4 +1,4 @@
-// $Id: CssBreakAfter.java,v 1.5 2012/08/24 07:33:40 ylafon Exp $
+// $Id: CssBreakAfter.java,v 1.6 2014/01/29 21:03:02 ylafon Exp $
// From Sijtsche de Jong (sy.de.jong@let.rug.nl)
// Rewritten 2010 by Yves Lafon <ylafon@w3.org>
//
@@ -24,13 +24,13 @@
public CssValue value;
/**
- * Create a new CssBreakAfter
+ * Create a new CssPageBreakAfter
*/
public CssBreakAfter() {
}
/**
- * Create a new CssBreakAfter
+ * Create a new CssPageBreakAfter
*
* @param expression The expression for this property
* @throws InvalidParamException Incorrect value
--- /sources/public/2002/css-validator/org/w3c/css/properties/css/CssPageBreakAfter.java 2014/01/29 21:03:02 NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css/CssPageBreakAfter.java 2014/01/29 21:03:02 1.1
// $Id: CssPageBreakAfter.java,v 1.1 2014/01/29 21:03:02 ylafon Exp $
// Author: Yves Lafon <ylafon@w3.org>
//
// (c) COPYRIGHT MIT, ERCIM, Keio University, Beihang University 2013.
// 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.css2.Css2Style;
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 CSS2
*/
public class CssPageBreakAfter extends CssProperty {
public static final String propertyName = "page-break-after";
public CssValue value;
/**
* Create a new CssPageBreakAfter
*/
public CssPageBreakAfter() {
}
/**
* Create a new CssPageBreakAfter
*
* @param ac The context
* @param expression The expression for this property
* @param check true will test the number of parameters
* @throws org.w3c.css.util.InvalidParamException The expression is incorrect
*/
public CssPageBreakAfter(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
/**
* Create a new CssPageBreakAfter
*
* @param ac, the Context
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException The expression is incorrect
*/
public CssPageBreakAfter(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 final String getPropertyName() {
return propertyName;
}
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
*/
public boolean isSoftlyInherited() {
return (value == 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) {
Css2Style style0 = (Css2Style) style;
if (style0.cssPageBreakAfter != null) {
style0.addRedefinitionWarning(ac, this);
}
style0.cssPageBreakAfter = 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 ((Css2Style) style).getPageBreakAfter();
} else {
return ((Css2Style) style).cssPageBreakAfter;
}
}
/**
* Compares two properties for equality.
*
* @param property The other property.
* @return boolean
*/
public boolean equals(CssProperty property) {
return (property instanceof CssPageBreakAfter &&
value.equals(((CssPageBreakAfter) property).value));
}
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
*/
public boolean isDefault() {
return false;
}
}
--- /sources/public/2002/css-validator/org/w3c/css/properties/css/CssPageBreakBefore.java 2014/01/29 21:03:02 NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css/CssPageBreakBefore.java 2014/01/29 21:03:02 1.1
// $Id: CssPageBreakBefore.java,v 1.1 2014/01/29 21:03:02 ylafon Exp $
// Author: Yves Lafon <ylafon@w3.org>
//
// (c) COPYRIGHT MIT, ERCIM, Keio University, Beihang University 2013.
// 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.css2.Css2Style;
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 CSS2
*/
public class CssPageBreakBefore extends CssProperty {
public static final String propertyName = "page-break-before";
public CssValue value;
/**
* Create a new CssPageBreakBefore
*/
public CssPageBreakBefore() {
}
/**
* Create a new CssPageBreakBefore
*
* @param ac The context
* @param expression The expression for this property
* @param check true will test the number of parameters
* @throws org.w3c.css.util.InvalidParamException The expression is incorrect
*/
public CssPageBreakBefore(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
/**
* Create a new CssPageBreakBefore
*
* @param ac, the Context
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException The expression is incorrect
*/
public CssPageBreakBefore(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 final String getPropertyName() {
return propertyName;
}
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
*/
public boolean isSoftlyInherited() {
return (value == 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) {
Css2Style style0 = (Css2Style) style;
if (style0.cssPageBreakBefore != null) {
style0.addRedefinitionWarning(ac, this);
}
style0.cssPageBreakBefore = 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 ((Css2Style) style).getPageBreakBefore();
} else {
return ((Css2Style) style).cssPageBreakBefore;
}
}
/**
* Compares two properties for equality.
*
* @param property The other property.
* @return boolean
*/
public boolean equals(CssProperty property) {
return (property instanceof CssPageBreakBefore &&
value.equals(((CssPageBreakBefore) property).value));
}
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
*/
public boolean isDefault() {
return false;
}
}
--- /sources/public/2002/css-validator/org/w3c/css/properties/css/CssPageBreakInside.java 2014/01/29 21:03:02 NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css/CssPageBreakInside.java 2014/01/29 21:03:02 1.1
// $Id: CssPageBreakInside.java,v 1.1 2014/01/29 21:03:02 ylafon Exp $
// Author: Yves Lafon <ylafon@w3.org>
//
// (c) COPYRIGHT MIT, ERCIM, Keio University, Beihang University 2013.
// 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.css2.Css2Style;
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 CSS2
*/
public class CssPageBreakInside extends CssProperty {
public static final String propertyName = "page-break-inside";
public CssValue value;
/**
* Create a new CssPageBreakInside
*/
public CssPageBreakInside() {
}
/**
* Create a new CssPageBreakInside
*
* @param ac The context
* @param expression The expression for this property
* @param check true will test the number of parameters
* @throws org.w3c.css.util.InvalidParamException The expression is incorrect
*/
public CssPageBreakInside(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
/**
* Create a new CssPageBreakInside
*
* @param ac, the Context
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException The expression is incorrect
*/
public CssPageBreakInside(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 final String getPropertyName() {
return propertyName;
}
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
*/
public boolean isSoftlyInherited() {
return (value == 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) {
Css2Style style0 = (Css2Style) style;
if (style0.cssPageBreakInside != null) {
style0.addRedefinitionWarning(ac, this);
}
style0.cssPageBreakInside = 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 ((Css2Style) style).getPageBreakInside();
} else {
return ((Css2Style) style).cssPageBreakInside;
[23 lines skipped]
Received on Wednesday, 29 January 2014 21:03:03 UTC