W3C home > Mailing lists > Public > www-validator-cvs@w3.org > February 2009

2002/css-validator/org/w3c/css/servlet CssValidator.java,1.39,1.40

From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
Date: Sun, 15 Feb 2009 18:23:39 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1LYleV-0004Xf-RM@lionel-hutz.w3.org>
Update of /sources/public/2002/css-validator/org/w3c/css/servlet
In directory hutz:/tmp/cvs-serv17445/org/w3c/css/servlet

Modified Files:
	CssValidator.java 
Log Message:
fix for charset support of fake URIs (upload and text input)

Index: CssValidator.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/servlet/CssValidator.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- CssValidator.java	13 Feb 2009 21:50:16 -0000	1.39
+++ CssValidator.java	15 Feb 2009 18:23:37 -0000	1.40
@@ -586,11 +586,13 @@
 	if (output == null) {
 	    output = texthtml;
 	}
-	if ((file == null || file.getSize() == 0) && (text == null || text.length() == 0)) {
+	if ((file == null || file.getSize() == 0) && 
+	    (text == null || text.length() == 0)) {
 	    // res.sendError(res.SC_BAD_REQUEST,
 	    // "You have send an invalid request");
 	    handleError(res, ac, output, "No file",
-		    	new IOException(ac.getMsg().getServletString("invalid-request")),
+		    	new IOException(ac.getMsg().getServletString(
+							   "invalid-request")),
 		    	false);
 	    return;
 	}
@@ -615,7 +617,7 @@
 	}
 
 	// CSS version
-	if (profile != null && (!"none".equals(profile) || "".equals(profile))) {
+	if (profile != null && (!"none".equals(profile) ||"".equals(profile))) {
 	    if ("css1".equals(profile) || "css2".equals(profile)
 		|| "css21".equals(profile)
 		|| "css3".equals(profile) || "svg".equals(profile)
@@ -623,34 +625,39 @@
 	    	ac.setCssVersion(profile);
 	    } else {
 		ac.setProfile(profile);
-		ac.setCssVersion(PropertiesLoader.config.getProperty("defaultProfile"));
+		ac.setCssVersion(PropertiesLoader.config.getProperty(
+							     "defaultProfile"));
 	    }
 	} else {
 	    ac.setProfile("none");
-	    ac.setCssVersion(PropertiesLoader.config.getProperty("defaultProfile"));
+	    ac.setCssVersion(PropertiesLoader.config.getProperty(
+							     "defaultProfile"));
 	}
 	String fileName = "";
 	InputStream is = null;
 	boolean isCSS = false;
 	
 	if (file != null && file.getSize() != 0) {
+	    ac.setFakeFile(file);
 	    fileName = file.getName();
 	    Util.verbose("File : " + fileName);
 	    is = file.getInputStream();
 	    // another way to get file type...
 	    isCSS = file.getContentType().equals(textcss);
 	} else if (text != null ) {
+	    ac.setFakeText(text);
 	    fileName = "TextArea";
 	    Util.verbose("- " + fileName + " Data -");
 	    Util.verbose(text);
 	    Util.verbose("- End of " + fileName + " Data");
 	    is = new ByteArrayInputStream(text.getBytes());
-	    //quick test that works in most cases to determine wether it's HTML or CSS
+	    //quick test that works in most cases to determine wether it's 
+	    //HTML or CSS
 	    isCSS = isCSS(text);
 	}
 	fileName = "file://localhost/" + fileName;
   	try {
-		
+	    ac.setFakeURL(fileName);
 	    if (isCSS) {
 		//if CSS:
 		parser = new StyleSheetParser();
@@ -801,7 +808,8 @@
     }
 
     private void handleError(HttpServletResponse res, ApplContext ac,
-			     String output, String title, Exception e, boolean validURI)
+			     String output, String title, Exception e,
+			     boolean validURI)
     	throws IOException {
 
 	System.err.println("[ERROR VALIDATOR] " + title);
Received on Sunday, 15 February 2009 18:32:00 GMT

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