click-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sa...@apache.org
Subject svn commit: r729723 - in /incubator/click/trunk/click/framework: src/net/sf/click/util/ClickUtils.java test/net/sf/click/util/ClickUtilsTest.java
Date Sun, 28 Dec 2008 12:27:45 GMT
Author: sabob
Date: Sun Dec 28 04:27:45 2008
New Revision: 729723

URL: http://svn.apache.org/viewvc?rev=729723&view=rev
Log:
converted character to unicode

Modified:
    incubator/click/trunk/click/framework/src/net/sf/click/util/ClickUtils.java
    incubator/click/trunk/click/framework/test/net/sf/click/util/ClickUtilsTest.java

Modified: incubator/click/trunk/click/framework/src/net/sf/click/util/ClickUtils.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/framework/src/net/sf/click/util/ClickUtils.java?rev=729723&r1=729722&r2=729723&view=diff
==============================================================================
--- incubator/click/trunk/click/framework/src/net/sf/click/util/ClickUtils.java (original)
+++ incubator/click/trunk/click/framework/src/net/sf/click/util/ClickUtils.java Sun Dec 28
04:27:45 2008
@@ -156,12 +156,12 @@
         HTML_ENTITIES[166] = "¦"; // broken bar = broken vertical bar
         HTML_ENTITIES[167] = "§"; // section sign
         HTML_ENTITIES[168] = "¨"; // diaeresis = spacing diaeresis
-        HTML_ENTITIES[169] = "©"; // � - copyright sign
+        HTML_ENTITIES[169] = "©"; // © - copyright sign
         HTML_ENTITIES[170] = "ª"; // feminine ordinal indicator
         HTML_ENTITIES[171] = "«"; // left-pointing double angle quotation mark
= left pointing guillemet
         HTML_ENTITIES[172] = "¬";   //not sign
         HTML_ENTITIES[173] = "­";   //soft hyphen = discretionary hyphen
-        HTML_ENTITIES[174] = "®";   // � - registered trademark sign
+        HTML_ENTITIES[174] = "®";   // ® - registered trademark sign
         HTML_ENTITIES[175] = "¯";   //macron = spacing macron = overline = APL overbar
         HTML_ENTITIES[176] = "°";   //degree sign
         HTML_ENTITIES[177] = "±";   //plus-minus sign = plus-or-minus sign
@@ -179,70 +179,70 @@
         HTML_ENTITIES[189] = "½";   //vulgar fraction one half = fraction one
half
         HTML_ENTITIES[190] = "¾";   //vulgar fraction three quarters = fraction
three quarters
         HTML_ENTITIES[191] = "¿";   //inverted question mark = turned question
mark
-        HTML_ENTITIES[192] = "À";   // � - uppercase A, grave accent
-        HTML_ENTITIES[193] = "Á";   // � - uppercase A, acute accent
-        HTML_ENTITIES[194] = "Â";   // � - uppercase A, circumflex accent
-        HTML_ENTITIES[195] = "Ã";   // � - uppercase A, tilde
-        HTML_ENTITIES[196] = "Ä";   // � - uppercase A, umlaut
-        HTML_ENTITIES[197] = "Å";   // � - uppercase A, ring
-        HTML_ENTITIES[198] = "Æ";   // � - uppercase AE
-        HTML_ENTITIES[199] = "Ç";   // � - uppercase C, cedilla
-        HTML_ENTITIES[200] = "È";   // � - uppercase E, grave accent
-        HTML_ENTITIES[201] = "É";   // � - uppercase E, acute accent
-        HTML_ENTITIES[202] = "Ê";   // � - uppercase E, circumflex accent
-        HTML_ENTITIES[203] = "Ë";   // � - uppercase E, umlaut
-        HTML_ENTITIES[204] = "Ì";   // � - uppercase I, grave accent
-        HTML_ENTITIES[205] = "Í";   // � - uppercase I, acute accent
-        HTML_ENTITIES[206] = "Î";   // � - uppercase I, circumflex accent
-        HTML_ENTITIES[207] = "Ï";   // � - uppercase I, umlaut
-        HTML_ENTITIES[208] = "Ð";   // � - uppercase Eth, Icelandic
-        HTML_ENTITIES[209] = "Ñ";   // � - uppercase N, tilde
-        HTML_ENTITIES[210] = "Ò";   // � - uppercase O, grave accent
-        HTML_ENTITIES[211] = "Ó";   // � - uppercase O, acute accent
-        HTML_ENTITIES[212] = "Ô";   // � - uppercase O, circumflex accent
-        HTML_ENTITIES[213] = "Õ";   // � - uppercase O, tilde
-        HTML_ENTITIES[214] = "Ö";   // � - uppercase O, umlaut
+        HTML_ENTITIES[192] = "À";   // À - uppercase A, grave accent
+        HTML_ENTITIES[193] = "Á";   // Á - uppercase A, acute accent
+        HTML_ENTITIES[194] = "Â";   // Â - uppercase A, circumflex accent
+        HTML_ENTITIES[195] = "Ã";   // Ã - uppercase A, tilde
+        HTML_ENTITIES[196] = "Ä";   // Ä - uppercase A, umlaut
+        HTML_ENTITIES[197] = "Å";   // Å - uppercase A, ring
+        HTML_ENTITIES[198] = "Æ";   // Æ - uppercase AE
+        HTML_ENTITIES[199] = "Ç";   // Ç - uppercase C, cedilla
+        HTML_ENTITIES[200] = "È";   // È - uppercase E, grave accent
+        HTML_ENTITIES[201] = "É";   // É - uppercase E, acute accent
+        HTML_ENTITIES[202] = "Ê";   // Ê - uppercase E, circumflex accent
+        HTML_ENTITIES[203] = "Ë";   // Ë - uppercase E, umlaut
+        HTML_ENTITIES[204] = "Ì";   // Ì - uppercase I, grave accent
+        HTML_ENTITIES[205] = "Í";   // Í - uppercase I, acute accent
+        HTML_ENTITIES[206] = "Î";   // Î - uppercase I, circumflex accent
+        HTML_ENTITIES[207] = "Ï";   // Ï - uppercase I, umlaut
+        HTML_ENTITIES[208] = "Ð";   // Ð - uppercase Eth, Icelandic
+        HTML_ENTITIES[209] = "Ñ";   // Ñ - uppercase N, tilde
+        HTML_ENTITIES[210] = "Ò";   // Ò - uppercase O, grave accent
+        HTML_ENTITIES[211] = "Ó";   // Ó - uppercase O, acute accent
+        HTML_ENTITIES[212] = "Ô";   // Ô - uppercase O, circumflex accent
+        HTML_ENTITIES[213] = "Õ";   // Õ - uppercase O, tilde
+        HTML_ENTITIES[214] = "Ö";   // Ö - uppercase O, umlaut
         HTML_ENTITIES[215] = "×";   //multiplication sign
-        HTML_ENTITIES[216] = "Ø";   // � - uppercase O, slash
-        HTML_ENTITIES[217] = "Ù";   // � - uppercase U, grave accent
-        HTML_ENTITIES[218] = "Ú";   // � - uppercase U, acute accent
-        HTML_ENTITIES[219] = "Û";   // � - uppercase U, circumflex accent
-        HTML_ENTITIES[220] = "Ü";   // � - uppercase U, umlaut
-        HTML_ENTITIES[221] = "Ý";   // � - uppercase Y, acute accent
-        HTML_ENTITIES[222] = "Þ";   // � - uppercase THORN, Icelandic
-        HTML_ENTITIES[223] = "ß";   // � - lowercase sharps, German
-        HTML_ENTITIES[224] = "à";   // � - lowercase a, grave accent
-        HTML_ENTITIES[225] = "á";   // � - lowercase a, acute accent
-        HTML_ENTITIES[226] = "â";   // � - lowercase a, circumflex accent
-        HTML_ENTITIES[227] = "ã";   // � - lowercase a, tilde
-        HTML_ENTITIES[228] = "ä";   // � - lowercase a, umlaut
-        HTML_ENTITIES[229] = "å";   // � - lowercase a, ring
-        HTML_ENTITIES[230] = "æ";   // � - lowercase ae
-        HTML_ENTITIES[231] = "ç";   // � - lowercase c, cedilla
-        HTML_ENTITIES[232] = "è";   // � - lowercase e, grave accent
-        HTML_ENTITIES[233] = "é";   // � - lowercase e, acute accent
-        HTML_ENTITIES[234] = "ê";   // � - lowercase e, circumflex accent
-        HTML_ENTITIES[235] = "ë";   // � - lowercase e, umlaut
-        HTML_ENTITIES[236] = "ì";   // � - lowercase i, grave accent
-        HTML_ENTITIES[237] = "í";   // � - lowercase i, acute accent
-        HTML_ENTITIES[238] = "î";   // � - lowercase i, circumflex accent
-        HTML_ENTITIES[239] = "ï";   // � - lowercase i, umlaut
-        HTML_ENTITIES[240] = "ð";   // � - lowercase eth, Icelandic
-        HTML_ENTITIES[241] = "ñ";   // � - lowercase n, tilde
-        HTML_ENTITIES[242] = "ò";   // � - lowercase o, grave accent
-        HTML_ENTITIES[243] = "ó";   // � - lowercase o, acute accent
-        HTML_ENTITIES[244] = "ô";   // � - lowercase o, circumflex accent
-        HTML_ENTITIES[245] = "õ";   // � - lowercase o, tilde
-        HTML_ENTITIES[246] = "ö";   // � - lowercase o, umlaut
+        HTML_ENTITIES[216] = "Ø";   // Ø - uppercase O, slash
+        HTML_ENTITIES[217] = "Ù";   // Ù - uppercase U, grave accent
+        HTML_ENTITIES[218] = "Ú";   // Ú - uppercase U, acute accent
+        HTML_ENTITIES[219] = "Û";   // Û - uppercase U, circumflex accent
+        HTML_ENTITIES[220] = "Ü";   // Ü - uppercase U, umlaut
+        HTML_ENTITIES[221] = "Ý";   // Ý - uppercase Y, acute accent
+        HTML_ENTITIES[222] = "Þ";   // Þ - uppercase THORN, Icelandic
+        HTML_ENTITIES[223] = "ß";   // ß - lowercase sharps, German
+        HTML_ENTITIES[224] = "à";   // à - lowercase a, grave accent
+        HTML_ENTITIES[225] = "á";   // á - lowercase a, acute accent
+        HTML_ENTITIES[226] = "â";   // â - lowercase a, circumflex accent
+        HTML_ENTITIES[227] = "ã";   // ã - lowercase a, tilde
+        HTML_ENTITIES[228] = "ä";   // ä - lowercase a, umlaut
+        HTML_ENTITIES[229] = "å";   // Ã¥ - lowercase a, ring
+        HTML_ENTITIES[230] = "æ";   // æ - lowercase ae
+        HTML_ENTITIES[231] = "ç";   // ç - lowercase c, cedilla
+        HTML_ENTITIES[232] = "è";   // è - lowercase e, grave accent
+        HTML_ENTITIES[233] = "é";   // é - lowercase e, acute accent
+        HTML_ENTITIES[234] = "ê";   // ê - lowercase e, circumflex accent
+        HTML_ENTITIES[235] = "ë";   // ë - lowercase e, umlaut
+        HTML_ENTITIES[236] = "ì";   // ì - lowercase i, grave accent
+        HTML_ENTITIES[237] = "í";   // í - lowercase i, acute accent
+        HTML_ENTITIES[238] = "î";   // î - lowercase i, circumflex accent
+        HTML_ENTITIES[239] = "ï";   // ï - lowercase i, umlaut
+        HTML_ENTITIES[240] = "ð";   // ð - lowercase eth, Icelandic
+        HTML_ENTITIES[241] = "ñ";   // ñ - lowercase n, tilde
+        HTML_ENTITIES[242] = "ò";   // ò - lowercase o, grave accent
+        HTML_ENTITIES[243] = "ó";   // ó - lowercase o, acute accent
+        HTML_ENTITIES[244] = "ô";   // ô - lowercase o, circumflex accent
+        HTML_ENTITIES[245] = "õ";   // õ - lowercase o, tilde
+        HTML_ENTITIES[246] = "ö";   // ö - lowercase o, umlaut
         HTML_ENTITIES[247] = "÷";   // division sign
-        HTML_ENTITIES[248] = "ø";   // � - lowercase o, slash
-        HTML_ENTITIES[249] = "ù";   // � - lowercase u, grave accent
-        HTML_ENTITIES[250] = "ú";   // � - lowercase u, acute accent
-        HTML_ENTITIES[251] = "û";   // � - lowercase u, circumflex accent
-        HTML_ENTITIES[252] = "ü";   // � - lowercase u, umlaut
-        HTML_ENTITIES[253] = "ý";   // � - lowercase y, acute accent
-        HTML_ENTITIES[254] = "þ";   // � - lowercase thorn, Icelandic
-        HTML_ENTITIES[255] = "ÿ";   // � - lowercase y, umlaut
+        HTML_ENTITIES[248] = "ø";   // ø - lowercase o, slash
+        HTML_ENTITIES[249] = "ù";   // ù - lowercase u, grave accent
+        HTML_ENTITIES[250] = "ú";   // ú - lowercase u, acute accent
+        HTML_ENTITIES[251] = "û";   // û - lowercase u, circumflex accent
+        HTML_ENTITIES[252] = "ü";   // ü - lowercase u, umlaut
+        HTML_ENTITIES[253] = "ý";   // ý - lowercase y, acute accent
+        HTML_ENTITIES[254] = "þ";   // þ - lowercase thorn, Icelandic
+        HTML_ENTITIES[255] = "ÿ";   // ÿ - lowercase y, umlaut
         // http://www.w3.org/TR/REC-html40/sgml/entities.html
         // <!-- Latin Extended-B -->
         HTML_ENTITIES[402] = "&fnof;";   //latin small f with hook = function= florin,
U+0192 ISOtech -->

Modified: incubator/click/trunk/click/framework/test/net/sf/click/util/ClickUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/framework/test/net/sf/click/util/ClickUtilsTest.java?rev=729723&r1=729722&r2=729723&view=diff
==============================================================================
--- incubator/click/trunk/click/framework/test/net/sf/click/util/ClickUtilsTest.java (original)
+++ incubator/click/trunk/click/framework/test/net/sf/click/util/ClickUtilsTest.java Sun Dec
28 04:27:45 2008
@@ -432,7 +432,7 @@
         assertEquals("&gt;", ClickUtils.escapeHtml(">"));
         assertEquals("&gt;", ClickUtils.escapeHtml(">"));
         assertEquals(" ", ClickUtils.escapeHtml(" "));
-        assertEquals("&agrave;", ClickUtils.escapeHtml("�"));
+        assertEquals("&agrave;", ClickUtils.escapeHtml("\u00e0"));
         
         assertFalse(ClickUtils.requiresEscape((char) 0));
         assertTrue(ClickUtils.requiresEscape((char) 34));



Mime
View raw message