Re: [patch] Proposed fix for API discrepancies
Chris Burdess <[email protected]>
| Newsgroups | gmane.comp.java.classpath.extensions.javamail |
|---|---|
| Message-ID | <[email protected]> |
Fernando Nasser wrote:
> For review/approval/commit
>
> Cheers,
> Fernando
> --- source/javax/mail/FetchProfile.java.orig 2005-05-13
> 15:01:54.000000000 -0400
> +++ source/javax/mail/FetchProfile.java 2005-05-13 15:02:29.000000000
> -0400
> @@ -113,11 +113,6 @@
> {
> this.name = name;
> }
> -
> - public String toString()
> - {
> - return name;
> - }
>
> }
>
> --- source/javax/mail/Header.java.orig 2005-05-13 15:02:51.000000000
> -0400
> +++ source/javax/mail/Header.java 2005-05-13 15:03:28.000000000 -0400
> @@ -39,12 +39,12 @@
> /**
> * The name.
> */
> - protected String name;
> + String name;
>
> /**
> * The value.
> */
> - protected String value;
> + String value;
>
> /**
> * Construct a Header object.
> --- source/javax/mail/Message.java.orig 2005-05-13 15:05:00.000000000
> -0400
> +++ source/javax/mail/Message.java 2005-05-13 15:07:26.000000000 -0400
> @@ -109,6 +109,12 @@
> {
> this.type = type;
> }
> +
> + public String toString()
> + {
> + return type;
> + }
> +
>
> /**
> * When deserializing a RecipientType, we need to make sure to
> return
> --- source/javax/mail/internet/MimeUtility.java.orig 2005-05-13
> 15:08:06.000000000 -0400
> +++ source/javax/mail/internet/MimeUtility.java 2005-05-13
> 15:21:12.000000000 -0400
> @@ -1105,7 +1105,7 @@
> // all-ASCII, majority-ASCII, or minority-ASCII bytes.
>
> // Constants
> - static final int ALL = -1;
> + public static final int ALL = -1;
> static final int ALL_ASCII = 1;
> static final int MAJORITY_ASCII = 2;
> static final int MINORITY_ASCII = 3;
> --- source/javax/mail/search/RecipientStringTerm.java.orig 2005-05-13
> 15:21:44.000000000 -0400
> +++ source/javax/mail/search/RecipientStringTerm.java 2005-05-13
> 15:59:05.000000000 -0400
> @@ -47,7 +47,7 @@
> /**
> * The recipient type.
> */
> - protected Message.RecipientType type;
> + private Message.RecipientType type;
>
> /**
> * Constructor.
> --- source/javax/mail/internet/InternetHeaders.java.orig 2005-03-04
> 12:43:29.000000000 -0500
> +++ source/javax/mail/internet/InternetHeaders.java 2005-05-13
> 17:15:28.000000000 -0400
> @@ -74,14 +74,20 @@
> * The header class that stores raw header lines.
> */
> static class InternetHeader
> - extends Header
> {
> -
> +
> + /**
> + * The name.
> + */
> + String name;
> +
> + /**
> + * The value.
> + */
> String line;
>
> InternetHeader(String line)
> {
> - super(null, null);
> int i = line.indexOf(':');
> name = (i < 0) ? line.trim() : line.substring(0, i).trim();
> this.line = line;
> @@ -89,7 +95,7 @@
>
> InternetHeader(String name, String value)
> {
> - super(name, null);
> + this.name = name;
> if (value != null)
> {
> StringBuffer buffer = new StringBuffer();
> @@ -101,6 +107,11 @@
> }
> }
>
> + public String getName()
> + {
> + return name;
> + }
> +
> public String getValue()
> {
> int i = line.indexOf(':');
>
Thanks. I committed this as is except invoking a valid Header
constructor in InternetHeaders.InternetHeader.
--
Chris Burdess