You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2009/09/06 06:58:08 UTC

svn commit: r811760 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/PropertiesFactory.java

Author: ivaynberg
Date: Sun Sep  6 04:58:08 2009
New Revision: 811760

URL: http://svn.apache.org/viewvc?rev=811760&view=rev
Log:
WICKET-2451 Add ability to load UTF-8 encoded properties not in XML format.
Issue: WICKET-2451

Modified:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/PropertiesFactory.java

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/PropertiesFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/PropertiesFactory.java?rev=811760&r1=811759&r2=811760&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/PropertiesFactory.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/PropertiesFactory.java Sun Sep  6 04:58:08 2009
@@ -17,7 +17,11 @@
 package org.apache.wicket.resource;
 
 import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.Iterator;
@@ -313,11 +317,26 @@
 	 */
 	public class PropertiesFilePropertiesLoader extends AbstractPropertiesLoader
 	{
+	    /** Can the JDK read properties from Reader ? */
+	    private boolean loadFromReaderAvailable = false;
+
+	    /**
+	     * Buffer size used when reading a properties file.
+	     */
+	    private static final int BUFFER_SIZE = 2000;
+
 		/**
 		 * Construct.
 		 */
 		public PropertiesFilePropertiesLoader()
 		{
+	        try {
+	              Properties.class.getMethod("load", new Class[] {Reader.class});
+	              loadFromReaderAvailable = true;
+	            }
+	            catch (NoSuchMethodException ex) {
+	                loadFromReaderAvailable = false;
+	            }
 		}
 
 		/**
@@ -340,9 +359,53 @@
 		protected java.util.Properties loadProperties(BufferedInputStream in) throws IOException
 		{
 			java.util.Properties properties = new java.util.Properties();
+		    // If we are on JDK 6 we load from Reader
+		    if (loadFromReaderAvailable) {
 			properties.load(in);
+	        // If we are on JDK <=5 then we convert to ASCII
+		    } else {
+	            properties.load(readUTFStreamToEscapedASCII(in));
+		    }
 			return properties;
 		}
+
+	    /**
+	     * Reads a UTF-8 stream, performing a conversion to ASCII (i.e., ISO8859-1 encoding). Characters outside the normal
+	     * range for ISO8859-1 are converted to unicode escapes. In effect, Tapestry is performing native2ascii on the
+	     * files, on the fly.
+	     */
+	    private InputStream readUTFStreamToEscapedASCII(InputStream is) throws IOException
+	    {
+	        Reader reader = new InputStreamReader(is, "UTF-8");
+
+	        StringBuilder builder = new StringBuilder(BUFFER_SIZE);
+	        char[] buffer = new char[BUFFER_SIZE];
+
+	        while (true)
+	        {
+	            int length = reader.read(buffer);
+
+	            if (length < 0) break;
+
+	            for (int i = 0; i < length; i++)
+	            {
+	                char ch = buffer[i];
+
+	                if (ch <= '\u007f')
+	                {
+	                    builder.append(ch);
+	                    continue;
+	                }
+	                builder.append(String.format("\\u%04x", (int) ch));
+	            }
+	        }
+
+	        reader.close();
+
+	        byte[] resourceContent = builder.toString().getBytes();
+	        return new ByteArrayInputStream(resourceContent);
+	    }
+
 	}
 
 	/**