Menu
▾
▴
[Mailsomething-cvs] mailsomething/src/net/sf/mailsomething/mail/parsers MailEncoder.java,1.5,1.6 MailDecoder.java,1.6,1.7 NntpController.java,1.2,1.3 ImapController.java,1.5,1.6
|
From: Stig T. <jw...@us...> - 2005-03-21 17:18:38
|
Update of /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/mail/parsers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1103/net/sf/mailsomething/mail/parsers Modified Files: MailEncoder.java MailDecoder.java NntpController.java ImapController.java Log Message: Index: ImapController.java =================================================================== RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/mail/parsers/ImapController.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ImapController.java 20 Mar 2005 20:41:13 -0000 1.5 --- ImapController.java 21 Mar 2005 17:18:22 -0000 1.6 *************** *** 1853,1857 **** ! String command = "HEADER " + MessageConstants.MESSAGE_ID + " " + id; String[] serverreply = session.search(command); --- 1853,1857 ---- ! String command = "HEADER " + RFC822.MESSAGE_ID + " " + id; String[] serverreply = session.search(command); Index: MailEncoder.java =================================================================== RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/mail/parsers/MailEncoder.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MailEncoder.java 20 Mar 2005 20:41:13 -0000 1.5 --- MailEncoder.java 21 Mar 2005 17:18:20 -0000 1.6 *************** *** 43,47 **** throws IOException { ! message.setField(MessageConstants.X.MAILER, "Mailsomething"); encodeBody(message, stream, true); --- 43,47 ---- throws IOException { ! message.setField(RFC822.X.MAILER, "Mailsomething"); encodeBody(message, stream, true); *************** *** 252,257 **** if (!top ! && fieldNames[i].equals(MessageConstants.MESSAGE_ID) ! || fieldNames[i].equals(MessageConstants.CONTENT_TYPE)) continue; --- 252,257 ---- if (!top ! && fieldNames[i].equals(RFC822.MESSAGE_ID) ! || fieldNames[i].equals(RFC822.CONTENT_TYPE)) continue; *************** *** 336,340 **** } else { ! if (message.getField(MessageConstants.CONTENT_TYPE) != null) { headerField = null; --- 336,340 ---- } else { ! if (message.getField(RFC822.CONTENT_TYPE) != null) { headerField = null; *************** *** 342,348 **** try { headerField = ! MessageConstants.CONTENT_TYPE + ": " ! + message.getField(MessageConstants.CONTENT_TYPE); } catch (ClassCastException f) { --- 342,348 ---- try { headerField = ! RFC822.CONTENT_TYPE + ": " ! + message.getField(RFC822.CONTENT_TYPE); } catch (ClassCastException f) { *************** *** 372,376 **** //out.write(CRLF, 0, CRLF.length); ! String contentType = message.getField(MessageConstants.CONTENT_TYPE); if (contentType == null) { --- 372,376 ---- //out.write(CRLF, 0, CRLF.length); ! String contentType = message.getField(RFC822.CONTENT_TYPE); if (contentType == null) { *************** *** 573,577 **** throws IOException { ! String contentType = message.getField(MessageConstants.CONTENT_TYPE); boolean isHtml = false; --- 573,577 ---- throws IOException { ! String contentType = message.getField(RFC822.CONTENT_TYPE); boolean isHtml = false; *************** *** 595,603 **** stream.read(body, 0, streamLength); ! if (message.getField(MessageConstants.CONTENT_TRANSFER_ENCODING) != null) { if (message ! .getField(MessageConstants.CONTENT_TRANSFER_ENCODING) .equalsIgnoreCase(MailDecoder.QP)) { --- 595,603 ---- stream.read(body, 0, streamLength); ! if (message.getField(RFC822.CONTENT_TRANSFER_ENCODING) != null) { if (message ! .getField(RFC822.CONTENT_TRANSFER_ENCODING) .equalsIgnoreCase(MailDecoder.QP)) { *************** *** 608,612 **** } else if ( message.getField( ! MessageConstants .CONTENT_TRANSFER_ENCODING) .equalsIgnoreCase( --- 608,612 ---- } else if ( message.getField( ! RFC822 .CONTENT_TRANSFER_ENCODING) .equalsIgnoreCase( *************** *** 738,746 **** stream.read(body, 0, streamLength); ! if (message.getField(MessageConstants.CONTENT_TRANSFER_ENCODING) != null) { if (message ! .getField(MessageConstants.CONTENT_TRANSFER_ENCODING) .equalsIgnoreCase(MailDecoder.QP)) { --- 738,746 ---- stream.read(body, 0, streamLength); ! if (message.getField(RFC822.CONTENT_TRANSFER_ENCODING) != null) { if (message ! .getField(RFC822.CONTENT_TRANSFER_ENCODING) .equalsIgnoreCase(MailDecoder.QP)) { *************** *** 751,755 **** } else if ( message.getField( ! MessageConstants .CONTENT_TRANSFER_ENCODING) .equalsIgnoreCase( --- 751,755 ---- } else if ( message.getField( ! RFC822 .CONTENT_TRANSFER_ENCODING) .equalsIgnoreCase( *************** *** 1324,1328 **** int lineswritten = 0; ! String contentType = message.getField(MessageConstants.CONTENT_TYPE); if (contentType == null) { --- 1324,1328 ---- int lineswritten = 0; ! String contentType = message.getField(RFC822.CONTENT_TYPE); if (contentType == null) { *************** *** 1391,1395 **** throws IOException { ! String contentType = message.getField(MessageConstants.CONTENT_TYPE); boolean isHtml = false; --- 1391,1395 ---- throws IOException { ! String contentType = message.getField(RFC822.CONTENT_TYPE); boolean isHtml = false; *************** *** 1415,1423 **** int lineswritten = 0; ! if (message.getField(MessageConstants.CONTENT_TRANSFER_ENCODING) != null) { if (message ! .getField(MessageConstants.CONTENT_TRANSFER_ENCODING) .equalsIgnoreCase(MailDecoder.QP)) { --- 1415,1423 ---- int lineswritten = 0; ! if (message.getField(RFC822.CONTENT_TRANSFER_ENCODING) != null) { if (message ! .getField(RFC822.CONTENT_TRANSFER_ENCODING) .equalsIgnoreCase(MailDecoder.QP)) { *************** *** 1429,1433 **** } else if ( message.getField( ! MessageConstants .CONTENT_TRANSFER_ENCODING) .equalsIgnoreCase( --- 1429,1433 ---- } else if ( message.getField( ! RFC822 .CONTENT_TRANSFER_ENCODING) .equalsIgnoreCase( *************** *** 1605,1613 **** int lineswritten = 0; ! if (message.getField(MessageConstants.CONTENT_TRANSFER_ENCODING) != null) { if (message ! .getField(MessageConstants.CONTENT_TRANSFER_ENCODING) .equalsIgnoreCase(MailDecoder.QP)) { --- 1605,1613 ---- int lineswritten = 0; ! if (message.getField(RFC822.CONTENT_TRANSFER_ENCODING) != null) { if (message ! .getField(RFC822.CONTENT_TRANSFER_ENCODING) .equalsIgnoreCase(MailDecoder.QP)) { *************** *** 1618,1622 **** } else if ( message.getField( ! MessageConstants .CONTENT_TRANSFER_ENCODING) .equalsIgnoreCase( --- 1618,1622 ---- } else if ( message.getField( ! RFC822 .CONTENT_TRANSFER_ENCODING) .equalsIgnoreCase( Index: NntpController.java =================================================================== RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/mail/parsers/NntpController.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NntpController.java 20 Mar 2005 20:41:13 -0000 1.2 --- NntpController.java 21 Mar 2005 17:18:21 -0000 1.3 *************** *** 11,15 **** import net.sf.mailsomething.mail.MailService; import net.sf.mailsomething.mail.Message; ! import net.sf.mailsomething.mail.MessageConstants; import net.sf.mailsomething.mail.MessageHolder; import net.sf.mailsomething.mail.NntpAccount; --- 11,15 ---- import net.sf.mailsomething.mail.MailService; import net.sf.mailsomething.mail.Message; ! import net.sf.mailsomething.mail.RFC822; import net.sf.mailsomething.mail.MessageHolder; import net.sf.mailsomething.mail.NntpAccount; *************** *** 388,396 **** for (int i = 0; i < messages.length; i++) if (messages[i] ! .getField(MessageConstants.SUBJECT) .toLowerCase() .startsWith("re: ")) { ! if (messages[i].getField(MessageConstants.REFERENCES) != null) { --- 388,396 ---- for (int i = 0; i < messages.length; i++) if (messages[i] ! .getField(RFC822.SUBJECT) .toLowerCase() .startsWith("re: ")) { ! if (messages[i].getField(RFC822.REFERENCES) != null) { *************** *** 398,402 **** MailDecoder.getReferences( messages[i].getField( ! MessageConstants.REFERENCES)); for (int j = 0; j < refs.length; j++) { --- 398,402 ---- MailDecoder.getReferences( messages[i].getField( ! RFC822.REFERENCES)); for (int j = 0; j < refs.length; j++) { Index: MailDecoder.java =================================================================== RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/mail/parsers/MailDecoder.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MailDecoder.java 20 Mar 2005 20:41:13 -0000 1.6 --- MailDecoder.java 21 Mar 2005 17:18:20 -0000 1.7 *************** *** 50,54 **** *@created October 7, 2001 */ ! public class MailDecoder extends Object implements MessageConstants { //a logger instance --- 50,54 ---- *@created October 7, 2001 */ ! public class MailDecoder extends Object implements RFC822 { //a logger instance *************** *** 514,518 **** case 0 : decodeFrom(value, header); ! header.setField(MessageConstants.FROM, value); break; case 1 : --- 514,518 ---- case 0 : decodeFrom(value, header); ! header.setField(RFC822.FROM, value); break; case 1 : *************** *** 521,525 **** case 2 : decodeTo(value, header); ! header.setField(MessageConstants.TO, value); break; case 3 : --- 521,525 ---- case 2 : decodeTo(value, header); ! header.setField(RFC822.TO, value); break; case 3 : *************** *** 856,860 **** } ! object.setField(MessageConstants.CONTENT_TYPE, contentType); try { --- 856,860 ---- } ! object.setField(RFC822.CONTENT_TYPE, contentType); try { *************** *** 977,981 **** if (object.getMimeType() != null ! && object.getField(MessageConstants.MESSAGE_ID) != null) { if (object.getMimeType().getSubType().equals("html")) { --- 977,981 ---- if (object.getMimeType() != null ! && object.getField(RFC822.MESSAGE_ID) != null) { if (object.getMimeType().getSubType().equals("html")) { *************** *** 1061,1065 **** string = removeMetaInfo(string); ! if (o.getField(MessageConstants.MESSAGE_ID).indexOf("hotmail") != -1) string = validateHotmail(string); --- 1061,1065 ---- string = removeMetaInfo(string); ! if (o.getField(RFC822.MESSAGE_ID).indexOf("hotmail") != -1) string = validateHotmail(string); *************** *** 1219,1223 **** */ private static void validateHeader(MimeTypeObject m) { ! if (m.getField(MessageConstants.MESSAGE_ID) == null) { String id = "mailsomething_"; --- 1219,1223 ---- */ private static void validateHeader(MimeTypeObject m) { ! if (m.getField(RFC822.MESSAGE_ID) == null) { String id = "mailsomething_"; *************** *** 1227,1231 **** id += d.getTime(); ! m.setField(MessageConstants.MESSAGE_ID, id); } --- 1227,1231 ---- id += d.getTime(); ! m.setField(RFC822.MESSAGE_ID, id); } *************** *** 1237,1259 **** * */ ! if (m.getField(MessageConstants.REPLY_TO) == null) { ! if (m.getField(MessageConstants.LIST_POST) != null ! || m.getField(MessageConstants.LIST_POST.toLowerCase()) != null) { ! if (m.getField(MessageConstants.LIST_POST) != null) { m.setField( ! MessageConstants.REPLY_TO, MailDecoder.decodeListPost( ! m.getField(MessageConstants.LIST_POST))); } else { m.setField( ! MessageConstants.REPLY_TO, MailDecoder.decodeListPost( m.getField( ! MessageConstants.LIST_POST.toLowerCase()))); } --- 1237,1259 ---- * */ ! if (m.getField(RFC822.REPLY_TO) == null) { ! if (m.getField(RFC822.LIST_POST) != null ! || m.getField(RFC822.LIST_POST.toLowerCase()) != null) { ! if (m.getField(RFC822.LIST_POST) != null) { m.setField( ! RFC822.REPLY_TO, MailDecoder.decodeListPost( ! m.getField(RFC822.LIST_POST))); } else { m.setField( ! RFC822.REPLY_TO, MailDecoder.decodeListPost( m.getField( ! RFC822.LIST_POST.toLowerCase()))); } *************** *** 1829,1837 **** //logger.finest("body filename=" + parent.getBody(i).getFile().getName()); ! if (parent.getBody(i).getField(MessageConstants.CONTENT_ID) != null) { if (parent .getBody(i) ! .getField(MessageConstants.CONTENT_ID) .equalsIgnoreCase(cid)) return parent.getBody(i).getFile().getName(); --- 1829,1837 ---- //logger.finest("body filename=" + parent.getBody(i).getFile().getName()); ! if (parent.getBody(i).getField(RFC822.CONTENT_ID) != null) { if (parent .getBody(i) ! .getField(RFC822.CONTENT_ID) .equalsIgnoreCase(cid)) return parent.getBody(i).getFile().getName(); *************** *** 2047,2051 **** String temp = header[i].toLowerCase(); ! if (header[i].indexOf(MessageConstants.CONTENT_TYPE) != -1) { String type = header[i].substring(header[i].indexOf(" ")); --- 2047,2051 ---- String temp = header[i].toLowerCase(); ! if (header[i].indexOf(RFC822.CONTENT_TYPE) != -1) { String type = header[i].substring(header[i].indexOf(" ")); *************** *** 2058,2062 **** } else if ( ! temp.indexOf(MessageConstants.CONTENT_CLASS.toLowerCase()) != -1) { --- 2058,2062 ---- } else if ( ! temp.indexOf(RFC822.CONTENT_CLASS.toLowerCase()) != -1) { |
