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

2002/css-validator/org/w3c/css/parser CssPropertyFactory.java,1.20,1.21

From: Julien Grand-Mourcel via cvs-syncmail <cvsmail@w3.org>
Date: Thu, 13 Sep 2007 10:04:18 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1IVlYY-00058i-Pk@lionel-hutz.w3.org>

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

Modified Files:
	CssPropertyFactory.java 
Log Message:
FIXING bug when a property doesn't exist in the current profile but exits in another one.

Index: CssPropertyFactory.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/CssPropertyFactory.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- CssPropertyFactory.java	13 Aug 2007 08:30:36 -0000	1.20
+++ CssPropertyFactory.java	13 Sep 2007 10:04:16 -0000	1.21
@@ -9,6 +9,7 @@
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
 import java.util.StringTokenizer;
 import java.util.Vector;
 
@@ -28,6 +29,9 @@
 
 	// all recognized properties are here.
 	private Utf8Properties properties;
+	
+	//all used profiles are here (in the priority order)
+	private static String[] SORTEDPROFILES = PropertiesLoader.getProfiles();
 
 	// private Utf8Properties allprops;
 
@@ -178,61 +182,82 @@
 
 		media = media.trim();
 
-		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 + ")");
-					}
-				}
-			}
-		} else {
-			classname = properties.getProperty("@" + atRule.keyword() + "." + property);
-		}
-
+		classname = setClassName(atRule, media, ac, property);
+		
 		// the property does not exist in this profile
-		// this is an error... or a warning if it exists in another
-		// profile... FIXME
+		// this is an error... or a warning if it exists in another profile
 		if (classname == null) {
-			throw new InvalidParamException("noexistence", property, ac.getMsg().getString(ac.getCssVersion()), ac);
+			ArrayList pfsOk = new ArrayList();
+			
+			for (int i=0; i<SORTEDPROFILES.length; ++i) {
+				String p = String.valueOf(SORTEDPROFILES[i]);
+				if (!p.equals(ac.getCssVersion()) && PropertiesLoader.getProfile(p).containsKey(property)) {
+					pfsOk.add(p);
+				}
+			}
+			
+			if (pfsOk.size() > 0) {
+				if (ac.getProfile().equals("none")) {
+					// the last one should be the best one to use
+					String	pf = (String) pfsOk.get(pfsOk.size()-1),
+							old_pf = ac.getCssVersion();
+					ac.setCssVersion(pf);
+					ac.getFrame().addWarning("noexistence", new String[] { property, ac.getMsg().getString(old_pf), pfsOk.toString() });
+					classname = setClassName(atRule, media, ac, property);
+					ac.setCssVersion(old_pf);
+				}
+				else
+					throw new InvalidParamException("noexistence", new String[] { property, ac.getMsg().getString(ac.getCssVersion()), pfsOk.toString() }, ac);
+			} else {
+					throw new InvalidParamException("noexistence-at-all", property, ac);
+			}
 		}
 
 		CssIdent initial = new CssIdent("initial");
 
-		if (expression.getValue().equals(initial) && ac.getCssVersion().equals("css3")) {
-			try {
+		try {
+			if (expression.getValue().equals(initial) && ac.getCssVersion().equals("css3")) {
 				// 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 {
+			} else {
 				// 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;
+			
+			}
+		} catch (InvocationTargetException e) {
+			// catch InvalidParamException
+			InvocationTargetException iv = e;
+			Exception ex = (Exception) iv.getTargetException();
+			throw ex;
+		}
+	}
+
+	private String setClassName(AtRule atRule, String media, ApplContext ac, String property) {
+		String className;
+		Vector list = new Vector(getVector(media));
+		if (atRule instanceof AtRuleMedia) {
+			className = PropertiesLoader.getProfile(ac.getCssVersion()).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", new String[] { property, medium + " (" + propMedia + ")" });
+					}
+				}
 			}
+		} else {
+			className = PropertiesLoader.getProfile(ac.getCssVersion()).getProperty("@" + atRule.keyword() + "." + property);
 		}
+		return className;
 	}
 }
Received on Thursday, 13 September 2007 10:04:25 GMT

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