svn commit: r776300 - in /maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia: parser/AbstractXmlParser.java util/HtmlTools.java

[ltheussl]

Author: ltheussl
Date: Tue May 19 13:00:55 2009
New Revision: 776300

URL: http://svn.apache.org/viewvc?rev=776300&view=rev
Log:
Remove TODO, formatting.

Modified:
    
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
    
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java?rev=776300&r1=776299&r2=776300&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
 Tue May 19 13:00:55 2009
@@ -393,12 +393,10 @@
         else
         {
             // TODO: the MXParser doesn't actually handle correctly surrogate 
char, ie
-            // if orignalText = "𝟯", text = "\ud7ef"
+            // if originalText = "𝟯", text = "\ud7ef"
 
             String unescaped = HtmlTools.unescapeHTML( text );
 
-            // TODO: StringEscapeUtils.unescapeHtml returns unknown entities 
as is,
-            // they should be handled as one character as well
             if ( text.equals( unescaped ) && text.length() > 1 )
             {
                 // this means the entity is unrecognized: emit as unknown

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java?rev=776300&r1=776299&r2=776300&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
 Tue May 19 13:00:55 2009
@@ -140,7 +140,7 @@
 
         for ( int i = 0; i < length; ++i )
         {
-            char c = text.charAt(i);
+            char c = text.charAt( i );
             switch ( c )
             {
                 case '<':
@@ -214,9 +214,10 @@
             return null;
         }
 
+        // StringEscapeUtils.unescapeHtml returns entities it doesn't 
recognize unchanged
         String unescaped = StringEscapeUtils.unescapeHtml( text );
 
-        if ( !text.equals( unescaped ))
+        if ( !text.equals( unescaped ) )
         {
             return unescaped;
         }
@@ -381,10 +382,10 @@
         // utility class
     }
 
-    //
-    // Imported code from ASF Harmony project
-    // 
http://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Character.java
-    //
+//
+// Imported code from ASF Harmony project
+// 
http://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Character.java
+//
 
     private static int toCodePoint( char high, char low )
     {