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

2002/css-validator/org/w3c/css/util ApplContext.java,1.3,1.4

From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
Date: Tue, 12 Jul 2005 13:14:51 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1DsKb5-0000H6-W1@lionel-hutz.w3.org>

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

Modified Files:
	ApplContext.java 
Log Message:
Added support for encoding negotiation and solve some encoding issues (Jean-Guilhem Rouel)

Index: ApplContext.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/util/ApplContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ApplContext.java	24 Oct 2003 16:47:45 -0000	1.3
+++ ApplContext.java	12 Jul 2005 13:14:49 -0000	1.4
@@ -8,7 +8,15 @@
  */
 package org.w3c.css.util;
 
+import java.nio.charset.Charset;
+import java.nio.charset.IllegalCharsetNameException;
+import java.util.StringTokenizer;
+
 import org.w3c.css.parser.Frame;
+import org.w3c.www.http.HttpAccept;
+import org.w3c.www.http.HttpAcceptCharset;
+import org.w3c.www.http.HttpAcceptCharsetList;
+import org.w3c.www.http.HttpFactory;
 
 /**
  * @version $Revision$
@@ -19,21 +27,28 @@
     String credential = null;
 
     String lang;
+    
     Messages msgs;
+    
     Frame  frame;
+    
     String cssversion;
+    
     String profile;
+    
     String input;
+    
     Class cssselectorstyle;
 
     int origin = -1;
+    
     String medium;
 
     /**
      * Creates a new ApplContext
      */
     public ApplContext(String lang) {
-	this.lang =lang;
+	this.lang = lang;
         msgs = new Messages(lang);
     }
 
@@ -68,21 +83,34 @@
     }
 
     public String getContentType() {
-	return (msgs != null)? 
-	    msgs.getString("content-type")
-	    : null;
+	return (msgs != null) ? msgs.getString("content-type") : null;
     }
 
     public String getContentLanguage() {
-	return (msgs != null)? 
-	    msgs.getString("content-language")
-	    : null;
+	return (msgs != null) ? msgs.getString("content-language") : null;
     }
 
+    /**
+     * Searches the properties list for a content-encoding one.
+     * If it does not exist, searches for output-encoding-name.
+     * If it still does not exists, the method returns the default utf-8 value
+     * @return the output encoding of this ApplContext
+     */
     public String getContentEncoding() {
-	return (msgs != null)? 
-	    msgs.getString("content-encoding")
-	    : null;
+	//return (msgs != null) ? msgs.getString("content-encoding") : null;
+	String res = null;
+	if(msgs != null) {
+	    res = msgs.getString("content-encoding");
+	    if(res == null) {
+		res = msgs.getString("output-encoding-name");
+	    }		
+	    if(res != null) {
+		// if an encoding has been found, return it
+		return res;
+	    }
+	}
+	// default encoding
+	return Utf8Properties.ENCODING;
     }
 
     public String getLang() {
@@ -134,4 +162,122 @@
     public void setInput(String input) {
 	this.input = input;
     }
+    
+    /**
+     * Sets the content encoding to the first charset that appears in
+     * <i>acceptCharset</i>.
+     * If the charset is not supported, the content encoding will be utf-8
+     * @param acceptCharset a String representing the Accept-Charset request parameter
+     */
+    public void setContentEncoding(String acceptCharset) {	
+	if(acceptCharset != null) {		    
+	    // uses some Jigsaw classes to parse the Accept-Charset
+	    // these classes need to load a lot of stuff, so it may be quite long
+	    // the first time 
+	    HttpAcceptCharsetList charsetList = 
+		HttpFactory.parseAcceptCharsetList(acceptCharset);
+	    HttpAcceptCharset[] charsets = (HttpAcceptCharset[])charsetList.getValue();
+	    
+	    String encoding = null;
+	    double quality = 0.0;
+	    
+	    for(int i = 0; i < charsets.length && quality < 1.0 ; i++) {
+		HttpAcceptCharset charset = charsets[i];
+		
+		String currentCharset = charset.getCharset();
+		
+		// checks that the charset is supported by Java
+		
+		
+		if(isCharsetSupported(currentCharset)) {
+		    double currentQuality = charset.getQuality();
+		    
+		    if(currentQuality > quality) {
+			quality = currentQuality;
+			encoding = charset.getCharset();
+		    }
+		}
+	    }		
+	    if(encoding != null) {
+		getMsg().properties.setProperty("content-encoding", encoding);
+	    }
+	    else {
+		// no valid charset
+		getMsg().properties.remove("content-encoding");
+	    }
+	}
+	else {
+	    // no Accept-Charset given 
+	    getMsg().properties.remove("content-encoding");
+	}
+    }
+    
+    private boolean isCharsetSupported(String charset) {	
+	try {
+	    return Charset.isSupported(charset);		
+	}
+	catch(Exception e) {
+	    return false;
+	}	
+    }
+    
+    /*
+    // First version of the Accept-Charset parser
+    public void setContentEncoding(String acceptCharset) {
+	String encoding = Utf8Properties.ENCODING;
+	double quality = 0.;
+	System.out.println(acceptCharset);
+	if(acceptCharset != null) {	    
+	    StringTokenizer csTok = new StringTokenizer(acceptCharset, ",");
+	    // 1.0 is the highest possible quality, so if we reach it, we 
+	    // don't need to continue
+	    while(csTok.hasMoreTokens() && quality < 1.0) {
+		String[] currentCharset = csTok.nextToken().split(";");		
+		if(currentCharset.length > 0) {
+		    String enc = currentCharset[0].trim().toLowerCase();		    
+		    // we need to know if the current charset has a valid name
+		    // and is supported
+		    boolean supported = false;
+		    try {
+			supported = Charset.isSupported(enc);		
+		    }
+		    catch(IllegalCharsetNameException e) {
+			supported = false;
+		    }
+		    catch(IllegalArgumentException e) {
+			supported = false;
+		    }
+		    // if the current encoding is supported, we try to get its quality		    
+		    if(supported) {
+			if(currentCharset.length == 2) {
+			    String sQual = Util.strip(currentCharset[1]);
+			    // now, sQual should be "q=x.y"
+			    try {
+				sQual = sQual.substring(2, sQual.length());
+				double qual = Double.parseDouble(sQual);
+				if(qual > quality) {
+				    quality = qual;
+				}
+			    }
+			    catch(Exception e) {
+				// if the quality field is not correct, we ignore
+				// this encoding
+				continue;
+			    }			    
+			}			
+			else {
+			    // if no quality is given for this encoding,
+			    // we consider that quality=1, according to RFC2616 14.2
+			    quality = 1.0;
+			}
+			encoding = enc;
+		    }		    
+		}
+	    }
+	    if(encoding != null) {
+		getMsg().properties.setProperty("content-encoding", encoding);
+	    }
+	}
+    }
+    */
 }
Received on Tuesday, 12 July 2005 13:14:58 GMT

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