- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 09 Sep 2011 12:16:47 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2
In directory hutz:/tmp/cvs-serv18813/properties/css2
Modified Files:
Css2Style.java CssBackgroundCSS2.java
Added Files:
CssAzimuth.java
Log Message:
code cleanup, removed dead code, starting reorg of azimuth (others to follow)
--- NEW FILE: CssAzimuth.java ---
//
// $Id: CssAzimuth.java,v 1.1 2011/09/09 12:16:45 ylafon Exp $
// From Philippe Le Hegaret (Philippe.Le_Hegaret@sophia.inria.fr)
//
// (c) COPYRIGHT MIT and INRIA, 1997.
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css2;
import org.w3c.css.properties.aural.ACssProperties;
import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssAngle;
import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssNumber;
import org.w3c.css.values.CssValue;
/**
*
* @version $Revision: 1.1 $
*/
public class CssAzimuth extends org.w3c.css.properties.css.CssAzimuth {
CssValue value;
boolean isBehind;
private static int[] hash_values;
private static String[] AZIMUTH = { "left-side", "far-left", "left",
"center-left", "center", "center-right",
"right", "far-right", "right-side" };
private static CssIdent defaultIdentValue = new CssIdent(AZIMUTH[4]);
private static CssIdent behind = new CssIdent("behind");
private static CssIdent leftwards = new CssIdent("leftwards");
private static CssIdent rightwards = new CssIdent("rightwards");
/**
* Create a new CssAzimuth
*/
public CssAzimuth() {
value = defaultIdentValue;
}
/**
* Creates a new CssAzimuth
*
* @param expression The expression for this property
* @exception org.w3c.css.util.InvalidParamException Expressions are incorrect
*/
public CssAzimuth(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
this();
if(check && expression.getCount() > 2) {
throw new InvalidParamException("unrecognize", ac);
}
CssValue val = expression.getValue();
int index;
setByUser();
if (val.equals(leftwards)) {
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
value = leftwards;
expression.next();
return;
} if (val.equals(inherit)) {
if(expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
value = inherit;
expression.next();
return;
} else if (val.equals(rightwards)) {
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
value = rightwards;
expression.next();
return;
} else if (val.equals(behind)) {
isBehind = true;
expression.next();
CssValue valnext = expression.getValue();
if (valnext == null) {
// behind == behind center
value = null;
return;
} else if (valnext instanceof CssIdent) {
value = checkIdent(ac, (CssIdent) valnext);
expression.next();
return;
}
} else if (val instanceof CssIdent) {
expression.next();
CssValue valnext = expression.getValue();
if (valnext == null) {
// left
value = checkIdent(ac, (CssIdent) val);
return;
} else if (valnext.equals(behind)) {
// left behind
value = checkIdent(ac, (CssIdent) val);
isBehind = true;
expression.next();
return;
}
} else if (val instanceof CssAngle) {
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
CssAngle angle = (CssAngle) val;
if (!angle.isDegree()) {
throw new InvalidParamException("degree", null, ac);
}
value = val;
expression.next();
return;
} else if (val instanceof CssNumber) {
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
value = ((CssNumber) val).getAngle();
expression.next();
return;
}
throw new InvalidParamException("value",
expression.getValue().toString(),
getPropertyName(), ac);
}
public CssAzimuth(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
/**
* Returns true if this property is "softly" inherited
* e.g. his value is equals to inherit
*/
public boolean isSoftlyInherited() {
return value.equals(inherit);
}
/**
* Returns a string representation of the object.
*/
public String toString() {
if (isBehind) {
if (value != null) {
return behind.toString() + " " + value.toString();
} else {
return behind.toString();
}
} else {
return value.toString();
}
}
/**
* Compares two properties for equality.
*
* @param property The other property.
*/
public boolean equals(CssProperty property) {
return (property instanceof CssAzimuth &&
value.equals(((CssAzimuth) property).value));
}
private CssIdent checkIdent(ApplContext ac, CssIdent ident)
throws InvalidParamException {
int hash = ident.hashCode();
for (int i = 0; i < AZIMUTH.length; i++) {
if (hash_values[i] == hash) {
return ident;
}
}
throw new InvalidParamException("value",
ident.toString(),
getPropertyName(), ac);
}
/** @deprecated */
private Float ValueOfIdent(ApplContext ac, CssIdent ident, boolean b)
throws InvalidParamException {
int hash = ident.hashCode();
for (int i = 0; i < AZIMUTH.length; i++) {
if (hash_values[i] == hash) {
if (b) {
return ACssProperties.getValue(this,
behind.toString() + "." + AZIMUTH[i]);
} else {
return ACssProperties.getValue(this, AZIMUTH[i]);
}
}
}
throw new InvalidParamException("value",
ident.toString(),
getPropertyName(), ac);
}
static {
hash_values = new int[AZIMUTH.length];
for (int i = 0; i < AZIMUTH.length; i++)
hash_values[i] = AZIMUTH[i].hashCode();
}
}
Index: Css2Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Css2Style.java 5 Jan 2010 13:49:46 -0000 1.3
+++ Css2Style.java 9 Sep 2011 12:16:45 -0000 1.4
@@ -7,16 +7,11 @@
package org.w3c.css.properties.css2;
import org.w3c.css.properties.aural.ACssStyle;
-import org.w3c.css.parser.CssPrinterStyle;
/**
* @version $Revision$
*/
public class Css2Style extends ACssStyle {
- public void print(CssPrinterStyle printer) {
- super.print(printer);
- }
-
}
Index: CssBackgroundCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssBackgroundCSS2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBackgroundCSS2.java 5 Jan 2010 13:49:46 -0000 1.1
+++ CssBackgroundCSS2.java 9 Sep 2011 12:16:45 -0000 1.2
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css2;
-import org.w3c.css.parser.CssPrinterStyle;
import org.w3c.css.parser.CssSelectors;
import org.w3c.css.parser.CssStyle;
import org.w3c.css.properties.css.CssBackgroundConstants;
@@ -414,41 +413,6 @@
}
/**
- * Print this property.
- *
- * @param printer The printer.
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if ((color != null && image != null &&
- repeat != null && attachment !=null &&
- position != null) &&
- (getImportant() ||
- (!image.important &&
- !color.important &&
- !repeat.important &&
- !attachment.important &&
- !position.important))) {
- if (color.byUser || image.byUser || repeat.byUser
- || attachment.byUser || position.byUser) {
- printer.print(this);
- }
- } else {
- if (color != null)
- color.print(printer);
- if (image != null)
- image.print(printer);
- if (repeat != null)
- repeat.print(printer);
- if (attachment != null)
- attachment.print(printer);
- if (position != null)
- position.print(printer);
- }
- }
-
- /**
* Set the context.
* Overrides this method for a macro
*
Received on Friday, 9 September 2011 12:16:53 UTC