W3C home > Mailing lists > Public > www-validator-cvs@w3.org > July 2007

2002/css-validator/org/w3c/css/parser CssFouffa.java,1.37,1.38 CssPropertyFactory.java,1.15,1.16

From: Julien Grand-Mourcel via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 13 Jul 2007 13:32:23 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1I9LFv-0003Xu-MR@lionel-hutz.w3.org>

Update of /sources/public/2002/css-validator/org/w3c/css/parser
In directory hutz:/tmp/cvs-serv13393/org/w3c/css/parser

Modified Files:
	CssFouffa.java CssPropertyFactory.java 
Log Message:
Adding patch to use Velocity template engine.
And some other changes...

Index: CssPropertyFactory.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssPropertyFactory.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- CssPropertyFactory.java	19 Apr 2006 11:28:05 -0000	1.15
+++ CssPropertyFactory.java	13 Jul 2007 13:32:21 -0000	1.16
@@ -20,257 +20,219 @@
 import org.w3c.css.values.CssExpression;
 import org.w3c.css.values.CssIdent;
 
-
 /**
  * @version $Revision$
  * @author Philippe Le H�garet
  */
 public class CssPropertyFactory implements Cloneable {
 
-    // all recognized properties are here.
-    private Utf8Properties properties;
+	// all recognized properties are here.
+	private Utf8Properties properties;
 
-    //private Utf8Properties allprops;
+	// private Utf8Properties allprops;
 
-    // does not seem to be used
-//    private String usermedium;
+	// does not seem to be used
+	// private String usermedium;
 
-    public CssPropertyFactory getClone() {
-	try {
-	    return (CssPropertyFactory) clone();
-	} catch (CloneNotSupportedException ex) {
-	    ex.printStackTrace();
-	    return null;
+	public CssPropertyFactory getClone() {
+		try {
+			return (CssPropertyFactory) clone();
+		} catch (CloneNotSupportedException ex) {
+			ex.printStackTrace();
+			return null;
+		}
 	}
-    }
 
-    /**
-     * Create a new CssPropertyFactory
-     */
-    /*public CssPropertyFactory(URL url, URL allprop_url) {
-	properties = new Utf8Properties();
-	InputStream f = null;
-	try {
-	    f = url.openStream();
-	    properties.load(f);
-	} catch (IOException e) {
-	    e.printStackTrace();
-	} finally {
-	    try {
-		if (f != null)
-		    f.close();
-	    } catch (Exception e) {
-		e.printStackTrace();
-	    } // ignore
-	}
+	/**
+	 * Create a new CssPropertyFactory
+	 */
+	/*
+	 * public CssPropertyFactory(URL url, URL allprop_url) { properties = new
+	 * Utf8Properties(); InputStream f = null; try { f = url.openStream();
+	 * properties.load(f); } catch (IOException e) { e.printStackTrace(); }
+	 * finally { try { if (f != null) f.close(); } catch (Exception e) {
+	 * e.printStackTrace(); } // ignore }
+	 *  // list of all properties allprops = new Utf8Properties(); InputStream
+	 * f_all = null; try { f_all = allprop_url.openStream();
+	 * allprops.load(f_all); } catch (IOException e) { e.printStackTrace(); }
+	 * finally { try { if (f_all != null) f_all.close(); } catch (Exception e) {
+	 * e.printStackTrace(); } // ignore } }
+	 */
 
-	// list of all properties
-	allprops = new Utf8Properties();
-	InputStream f_all = null;
-	try {
-	    f_all = allprop_url.openStream();
-	    allprops.load(f_all);
-	} catch (IOException e) {
-	    e.printStackTrace();
-	} finally {
-	    try {
-		if (f_all != null)
-		    f_all.close();
-	    } catch (Exception e) {
-		e.printStackTrace();
-	    } // ignore
+	public CssPropertyFactory(String profile) {
+		properties = PropertiesLoader.getProfile(profile);
+		// It's not good to have null properties :-/
+		if (properties == null) {
+			throw new NullPointerException();
+		}
 	}
-    }*/
 
-    public CssPropertyFactory(String profile) {
-	properties = PropertiesLoader.getProfile(profile);
-	// It's not good to have null properties :-/
-	if(properties == null) {
-	    throw new NullPointerException();
+	public String getProperty(String name) {
+		return properties.getProperty(name);
 	}
-    }
 
-    public String getProperty(String name) {
-	return properties.getProperty(name);
-    }
+	private Vector getVector(String media) {
+		Vector list = new Vector(4);
+		String medium = new String();
+		StringTokenizer tok = new StringTokenizer(media, ",");
 
-    private Vector getVector(String media) {
-	Vector list = new Vector(4);
-	String medium = new String();
-	StringTokenizer tok = new StringTokenizer(media, ",");
+		while (tok.hasMoreTokens()) {
+			medium = tok.nextToken();
+			medium = medium.trim();
+			list.addElement(medium);
+		}
 
-	while (tok.hasMoreTokens()) {
-	    medium = tok.nextToken();
-	    medium = medium.trim();
-	    list.addElement(medium);
+		return list;
 	}
 
-	return list;
-    }
+	// public void setUserMedium(String usermedium) {
+	// this.usermedium = usermedium;
+	// }
 
-//    public void setUserMedium(String usermedium) {
-//	this.usermedium = usermedium;
-//    }
+	// bug: FIXME
+	// @media screen and (min-width: 400px) and (max-width: 700px), print {
+	// a {
+	// border: 0;
+	// }
+	// }
+	public synchronized CssProperty createMediaFeature(ApplContext ac, AtRule atRule, String property,
+			CssExpression expression) throws Exception {
+		// String result = "ok";
+		String media = atRule.toString();
+		int pos = -1;
+		int pos2 = media.toUpperCase().indexOf("AND");
 
-//    bug: FIXME
-//	@media screen and (min-width: 400px) and (max-width: 700px), print {
-//	  a {
-//	    border: 0;
-//	  }
-//	}
-    public synchronized CssProperty createMediaFeature(ApplContext ac,
-	    AtRule atRule, String property, CssExpression expression)
-    throws Exception {
-	//String result = "ok";
-	String media = atRule.toString();
-	int pos = -1;
-	int pos2 = media.toUpperCase().indexOf("AND");
+		if (pos2 == -1) {
+			pos2 = media.length();
+		}
 
-	if (pos2 == -1) {
-	    pos2 = media.length();
-	}
+		if (media.toUpperCase().indexOf("NOT") != -1) {
+			pos = media.toUpperCase().indexOf("NOT");
+			media = media.substring(pos + 4, pos2);
+		} else if (media.toUpperCase().indexOf("ONLY") != -1) {
+			pos = media.toUpperCase().indexOf("ONLY");
+			media = media.substring(pos + 4, pos2);
+		} else {
+			pos = media.indexOf(" ");
+			media = media.substring(pos + 1, pos2);
+		}
 
-	if (media.toUpperCase().indexOf("NOT") != -1) {
-	    pos = media.toUpperCase().indexOf("NOT");
-	    media = media.substring(pos + 4, pos2);
-	} else if (media.toUpperCase().indexOf("ONLY") != -1) {
-	    pos = media.toUpperCase().indexOf("ONLY");
-	    media = media.substring(pos + 4, pos2);
-	} else {
-	    pos = media.indexOf(" ");
-	    media = media.substring(pos + 1, pos2);
-	}
+		media = media.trim();
 
-	media = media.trim();
+		String classname = properties.getProperty("mediafeature" + "." + property);
 
-	String classname = properties.getProperty("mediafeature" + "."
-		+ property);
+		if (classname == null) {
+			if (atRule instanceof AtRuleMedia && (!media.equals("all"))) {
+				// I don't know this property
+				throw new InvalidParamException("noexistence-media", property, media, ac);
+				// ac.getFrame().addWarning("noexistence-media", property);
+				// classname = allprops.getProperty(property);
+			} else {
+				// I don't know this property
+				throw new InvalidParamException("noexistence", property, media, ac);
+			}
+		}
 
-	if (classname == null) {
-	    if (atRule instanceof AtRuleMedia && (!media.equals("all"))) {
-		// I don't know this property
-		 throw new InvalidParamException("noexistence-media",
-		              property,
-		              media, ac);
-//		ac.getFrame().addWarning("noexistence-media", property);
-//		classname = allprops.getProperty(property);
-	    } else {
-		// I don't know this property
-		throw new InvalidParamException("noexistence", property, media,
-			ac);
-	    }
-	}
+		try {
+			// create an instance of your property class
+			Class expressionclass = new CssExpression().getClass();
+			if (expression != null) {
+				expressionclass = expression.getClass();
+			}
+			// Maybe it will be necessary to add the check parameter as for
+			// create property, so... FIXME
+			Class[] parametersType = { ac.getClass(), expressionclass };
+			Constructor constructor = Class.forName(classname).getConstructor(parametersType);
+			Object[] parameters = { ac, expression };
+			// invoke the constructor
+			return (CssProperty) constructor.newInstance(parameters);
+		} catch (InvocationTargetException e) {
+			// catch InvalidParamException
+			InvocationTargetException iv = e;
+			Exception ex = (Exception) iv.getTargetException();
+			throw ex;
+		}
 
-	try {
-	    // create an instance of your property class
-	    Class expressionclass = new CssExpression().getClass();
-	    if (expression != null) {
-		expressionclass = expression.getClass();
-	    }
-	    // Maybe it will be necessary to add the check parameter as for
-	    // create property, so... FIXME
-	    Class[] parametersType = { ac.getClass(), expressionclass };
-	    Constructor constructor = Class.forName(classname).getConstructor(
-		    parametersType);
-	    Object[] parameters = { ac, expression };
-	    // invoke the constructor
-	    return (CssProperty) constructor.newInstance(parameters);
-	} catch (InvocationTargetException e) {
-	    // catch InvalidParamException
-	    InvocationTargetException iv = e;
-	    Exception ex = (Exception) iv.getTargetException();
-	    throw ex;
 	}
 
-    }
-
-    public synchronized CssProperty createProperty(ApplContext ac,
-	    AtRule atRule, String property, CssExpression expression)
-    throws Exception {
-	String classname = null;        
-	String media = atRule.toString();
-	int pos = -1;
-	String upperMedia = media.toUpperCase();
-	int pos2 = upperMedia.indexOf("AND ");
+	public synchronized CssProperty createProperty(ApplContext ac, AtRule atRule, String property,
+			CssExpression expression) throws Exception {
+		String classname = null;
+		String media = atRule.toString();
+		int pos = -1;
+		String upperMedia = media.toUpperCase();
+		int pos2 = upperMedia.indexOf("AND ");
 
-	if (pos2 == -1) {
-	    pos2 = media.length();
-	}
+		if (pos2 == -1) {
+			pos2 = media.length();
+		}
 
-	if ((pos = upperMedia.indexOf("NOT")) != -1) {
-	    media = media.substring(pos + 4, pos2);
-	} else if ((pos = upperMedia.indexOf("ONLY")) != -1) {
-	    media = media.substring(pos + 4, pos2);
-	} else {
-	    pos = media.indexOf(' ');
-	    media = media.substring(pos + 1, pos2);
-	}
+		if ((pos = upperMedia.indexOf("NOT")) != -1) {
+			media = media.substring(pos + 4, pos2);
+		} else if ((pos = upperMedia.indexOf("ONLY")) != -1) {
+			media = media.substring(pos + 4, pos2);
+		} else {
+			pos = media.indexOf(' ');
+			media = media.substring(pos + 1, pos2);
+		}
 
-	media = media.trim();
+		media = media.trim();
 
-	Vector list = new Vector(getVector(media));
+		Vector list = new Vector(getVector(media));
 
-	if(atRule instanceof AtRuleMedia) {
-	    classname = properties.getProperty(property);
-	    // a list of media has been specified
-	    if(classname != null && !media.equals("all")) {
-		String propMedia = PropertiesLoader.mediaProperties.getProperty(property);
-		for(int i = 0; i < list.size(); i++) {
-		    String medium = (String) list.elementAt(i);
-		    if(propMedia.indexOf(medium.toLowerCase()) == -1 &&
-			    !propMedia.equals("all")) {
-			ac.getFrame().addWarning("noexistence-media",
-				property, medium + " (" + propMedia + ")");
-		    }
+		if (atRule instanceof AtRuleMedia) {
+			classname = properties.getProperty(property);
+			// a list of media has been specified
+			if (classname != null && !media.equals("all")) {
+				String propMedia = PropertiesLoader.mediaProperties.getProperty(property);
+				for (int i = 0; i < list.size(); i++) {
+					String medium = (String) list.elementAt(i);
+					if (propMedia.indexOf(medium.toLowerCase()) == -1 && !propMedia.equals("all")) {
+						ac.getFrame().addWarning("noexistence-media", property, medium + " (" + propMedia + ")");
+					}
+				}
+			}
+		} else {
+			classname = properties.getProperty("@" + atRule.keyword() + "." + property);
 		}
-	    }
-	}
-	else {
-	    classname = properties.getProperty("@" + atRule.keyword() + "."
-		    + property);
-	}
 
-	// the property does not exist in this profile
-	// this is an error... or a warning if it exists in another
-	// profile... FIXME
-	if(classname == null) {
-	    throw new InvalidParamException("noexistence",
-		    property, ac);
-	}
+		// the property does not exist in this profile
+		// this is an error... or a warning if it exists in another
+		// profile... FIXME
+		if (classname == null) {
+			throw new InvalidParamException("noexistence", property, ac);
+		}
 
-	CssIdent initial = new CssIdent("initial");
+		CssIdent initial = new CssIdent("initial");
 
-	if (expression.getValue().equals(initial)
-		&& ac.getCssVersion().equals("css3")) {
-	    try {
-		// create an instance of your property class
-		Class[] parametersType = {};
-		Constructor constructor = Class.forName(classname)
-		.getConstructor(parametersType);
-		Object[] parameters = {};
-		// invoke the constructor
-		return (CssProperty) constructor.newInstance(parameters);
-	    } catch (InvocationTargetException e) {
-		// catch InvalidParamException
-		InvocationTargetException iv = e;
-		Exception ex = (Exception) iv.getTargetException();
-		throw ex;
-	    }
-	} else {
-	    try {
-		// create an instance of your property class
-		Class[] parametersType = { ac.getClass(), expression.getClass(), boolean.class };
-		Constructor constructor = Class.forName(classname)
-		.getConstructor(parametersType);
-		Object[] parameters = { ac, expression, new Boolean(true)};
-		// invoke the constructor
-		return (CssProperty) constructor.newInstance(parameters);
-	    } catch (InvocationTargetException e) {
-		// catch InvalidParamException
-		InvocationTargetException iv = e;
-		Exception ex = (Exception) iv.getTargetException();
-		throw ex;
-	    }
+		if (expression.getValue().equals(initial) && ac.getCssVersion().equals("css3")) {
+			try {
+				// create an instance of your property class
+				Class[] parametersType = {};
+				Constructor constructor = Class.forName(classname).getConstructor(parametersType);
+				Object[] parameters = {};
+				// invoke the constructor
+				return (CssProperty) constructor.newInstance(parameters);
+			} catch (InvocationTargetException e) {
+				// catch InvalidParamException
+				InvocationTargetException iv = e;
+				Exception ex = (Exception) iv.getTargetException();
+				throw ex;
+			}
+		} else {
+			try {
+				// create an instance of your property class
+				Class[] parametersType = { ac.getClass(), expression.getClass(), boolean.class };
+				Constructor constructor = Class.forName(classname).getConstructor(parametersType);
+				Object[] parameters = { ac, expression, new Boolean(true) };
+				// invoke the constructor
+				return (CssProperty) constructor.newInstance(parameters);
+			} catch (InvocationTargetException e) {
+				// catch InvalidParamException
+				InvocationTargetException iv = e;
+				Exception ex = (Exception) iv.getTargetException();
+				throw ex;
+			}
+		}
 	}
-    }
 }

Index: CssFouffa.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssFouffa.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- CssFouffa.java	16 Dec 2006 20:22:27 -0000	1.37
+++ CssFouffa.java	13 Jul 2007 13:32:21 -0000	1.38
@@ -29,13 +29,13 @@
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.HTTPURL;
 import org.w3c.css.util.InvalidParamException;
-//import org.w3c.css.util.Utf8Properties;
+// import org.w3c.css.util.Utf8Properties;
 import org.w3c.css.util.Util;
 import org.w3c.css.values.CssExpression;
 
 /**
  * This class is a front end of the CSS1 parser.
- *
[...1648 lines suppressed...]
-	//loadConfig("css2", null);
-    }
+	public CssFouffa(java.io.Reader stream) {
+		super(stream);
+		properties = new CssPropertyFactory("css2");
+		// loadConfig("css2", null);
+	}
 
-    public CssFouffa(CssParserTokenManager tm) {
-	super(tm);
-	properties = new CssPropertyFactory("css2");
-	//loadConfig("css2", null);
-    }
+	public CssFouffa(CssParserTokenManager tm) {
+		super(tm);
+		properties = new CssPropertyFactory("css2");
+		// loadConfig("css2", null);
+	}
 
 }
Received on Friday, 13 July 2007 13:32:26 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 26 April 2012 12:54:58 GMT