svn commit: r669901 - in /geronimo/specs/trunk/geronimo-javamail_1.4_spec/src: main/java/org/apache/geronimo/mail/handlers/TextHandler.java test/java/javax/mail/internet/InternetAddressTest.java

[ri...@apache.org]

Author: rickmcguire
Date: Fri Jun 20 07:01:53 2008
New Revision: 669901

URL: http://svn.apache.org/viewvc?rev=669901&view=rev
Log:
GERONIMO-4136 Encoding coversion issues with geronimo javamail


Modified:
    geronimo/specs/trunk/geronimo-javamail_1.4_spec/src/main/java/org/apache/geronimo/mail/handlers/TextHandler.java
    geronimo/specs/trunk/geronimo-javamail_1.4_spec/src/test/java/javax/mail/internet/InternetAddressTest.java

Modified: geronimo/specs/trunk/geronimo-javamail_1.4_spec/src/main/java/org/apache/geronimo/mail/handlers/TextHandler.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-javamail_1.4_spec/src/main/java/org/apache/geronimo/mail/handlers/TextHandler.java?rev=669901&r1=669900&r2=669901&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-javamail_1.4_spec/src/main/java/org/apache/geronimo/mail/handlers/TextHandler.java (original)
+++ geronimo/specs/trunk/geronimo-javamail_1.4_spec/src/main/java/org/apache/geronimo/mail/handlers/TextHandler.java Fri Jun 20 07:01:53 2008
@@ -117,19 +117,25 @@
         }
     }
 
+    
     /**
-     * Method writeTo
-     *
-     * @param object
-     * @param s
+     * Write an object of "our" type out to the provided 
+     * output stream.  The content type might modify the 
+     * result based on the content type parameters. 
+     * 
+     * @param object The object to write.
+     * @param contentType
+     *               The content mime type, including parameters.
      * @param outputstream
+     *               The target output stream.
+     * 
      * @throws IOException
      */
-    public void writeTo(Object object, String s, OutputStream outputstream)
+    public void writeTo(Object object, String contentType, OutputStream outputstream)
             throws IOException {
         OutputStreamWriter os;
         try {
-            String charset = getCharSet(s);
+            String charset = getCharSet(contentType);
             os = new OutputStreamWriter(outputstream, charset);
         } catch (Exception ex) {
             throw new UnsupportedEncodingException(ex.toString());

Modified: geronimo/specs/trunk/geronimo-javamail_1.4_spec/src/test/java/javax/mail/internet/InternetAddressTest.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-javamail_1.4_spec/src/test/java/javax/mail/internet/InternetAddressTest.java?rev=669901&r1=669900&r2=669901&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-javamail_1.4_spec/src/test/java/javax/mail/internet/InternetAddressTest.java (original)
+++ geronimo/specs/trunk/geronimo-javamail_1.4_spec/src/test/java/javax/mail/internet/InternetAddressTest.java Fri Jun 20 07:01:53 2008
@@ -539,7 +539,6 @@
 
     private void validateAddress(InternetAddress a, String address, String personal, String toString, boolean group)
     {
-//      System.out.println("Testing address \"" + a + "\" against \"" + toString + "\"");
         assertEquals("Invalid address:", a.getAddress(), address);
         if (personal == null) {
             assertNull("Personal must be null", a.getPersonal());