[Mailsomething-cvs] mailsomething/src/net/sf/mailsomething/mail RFC822.java,NONE,1.1 SmtpAccount.java,1.2,1.3 MessageBody.java,1.3,1.4 ImapAccount.java,1.4,1.5 TransparentMailbox.java,1.4,1.5 FilterCriteria.java,1.1,1.2 Mailbox.java,1.5,1.6 MailboxListMessage.java,1.1,1.2 MailUtils.java,1.3,1.4 Message.java,1.5,1.6 Draft.java,1.3,1.4 MessageConstants.java,1.1,NONE MailFilterRule.java,1.1,NONE MailFilter.java,1.1,NONE MailFilterAction.java,1.1,NONE

[Stig T. <jw...@us...>]

Update of /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/mail
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv564/net/sf/mailsomething/mail

Modified Files:
	SmtpAccount.java MessageBody.java ImapAccount.java 
	TransparentMailbox.java FilterCriteria.java Mailbox.java 
	MailboxListMessage.java MailUtils.java Message.java Draft.java 
Added Files:
	RFC822.java 
Removed Files:
	MessageConstants.java MailFilterRule.java MailFilter.java 
	MailFilterAction.java 
Log Message:


Index: ImapAccount.java
===================================================================
RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/mail/ImapAccount.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ImapAccount.java	20 Mar 2005 15:07:40 -0000	1.4
--- ImapAccount.java	21 Mar 2005 17:17:11 -0000	1.5
***************
*** 74,78 ****
  	
  	//if account is inited, after deserializing
! 	transient boolean isInited = false;
  
  	//only headers is fetched, its up to the calling class to make sure
--- 74,78 ----
  	
  	//if account is inited, after deserializing
! 	//transient boolean isInited = false;
  
  	//only headers is fetched, its up to the calling class to make sure
***************
*** 278,286 ****
  	 */
  	public void init() {
! 
! 		super.init();
! 
  		if (isInited)
  			return;
  
  		//temporarely
--- 278,286 ----
  	 */
  	public void init() {
! 		
  		if (isInited)
  			return;
+ 		
+ 		super.init();
  
  		//temporarely

Index: SmtpAccount.java
===================================================================
RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/mail/SmtpAccount.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SmtpAccount.java	20 Mar 2005 20:38:46 -0000	1.2
--- SmtpAccount.java	21 Mar 2005 17:17:11 -0000	1.3
***************
*** 164,168 ****
  		}
  
! 		message.setField(MessageConstants.FROM, address.toString());
  
  		//if(jprops == null) createProperties();
--- 164,168 ----
  		}
  
! 		message.setField(RFC822.FROM, address.toString());
  
  		//if(jprops == null) createProperties();

--- MailFilterRule.java DELETED ---

--- NEW FILE: RFC822.java ---
package net.sf.mailsomething.mail;


/**
 *
 * The fields arent meant to be exactly the same as an rfc822 header-fields.
 * They are meant for use for the mail-api. In most cases they are the same
 * though. Since I havent found any exact standard in the fieldnames for
 * rfc822 it would anyways be wrong to give the impression theese fields
 * despicts a non-standard.
 *
 * Theese fields are the fieldnames ones any client-class would expect to
 * find in a message, through getField(). eg. not getField(myownsubjectname)
 * but getField(MessageConstants.SUBJECT);
 *
 * To be absolute clear: this class isnt sufficient for maildecoding (locating)
 * rfc822 fields.
 */


public interface RFC822 {

	static final String FROM = "From";			//same as rfc822, a mailaddress
		
	static final String SUBJECT = "Subject";		//same as rfc822
	static final String DATE = "Date";			// .................
	static final String DELIVERY_DATE = "Delivery-date";
	
	static final String TO = "To";			// ................
		
	//a convinience field, with only the mailaddres eg rec...@ho...
	static final String TO_ADDRESS = "To-Address";	
	
	static final String ENVELOPE_TO = "Envelope-to";
		
	
		
	static final String CONTENT_ID = "Content-Id";		//same as rfc822
	static final String MIME_VERSION = "Mime-Version";	//same as rfc822
	static final String MESSAGE_ID = "Message-Id";		//same as rfc822
	static final String RECIEVED = "Recieved";		//same as rfc822
	
	static final String CONTENT_TYPE = "Content-Type";	//same as rfc822
	static final String CONTENT_DISPOSITION = "Content-Disposition";	//same as rfc822
	static final String CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding";
	static final String CONTENT_CLASS = "Content-class";
	
	static final String SENDER = "Sender";			//same as rfc822
	
	static final String RETURN_PATH = "Return-Path";	//same as rfc822
	static final String REPLY_TO = "Reply-To";		//same as rfc822
	static final String IN_REPLY_TO = "In-Reply-To";		//same as rfc822
	
	static final String CC = "Cc";				//same as rfc822
	static final String BCC = "Bcc";				//same as rfc822
	
	
	static final String DISPOSITION_NOTIFICATION_TO = "Disposition-Notification-To";
	
	static final String THREAD_TOPIC = "Thread-Topic";
	static final String THREAD_INDEX = "Thread-Index";

	//being used to reference other messages (by messageid) for example in
	//nntp.
	static final String REFERENCES = "References";
	
	
	
	static final String LIST_ID = "List-Id";
	static final String LIST_POST = "List-Post";
		
			
	public interface X {
		
		static final String MAILER = "X-Mailer";
		static final String TEXT_CLASSIFICATION = "X-Text-Classification";
		
		
	}
			
			
}


Index: TransparentMailbox.java
===================================================================
RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/mail/TransparentMailbox.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TransparentMailbox.java	20 Mar 2005 20:38:47 -0000	1.4
--- TransparentMailbox.java	21 Mar 2005 17:17:12 -0000	1.5
***************
*** 160,164 ****
  		for (int i = 0; i < messages.size(); i++) {
  			Message m = (Message) messages.elementAt(i);
! 			if (messageid.equals(m.getField(MessageConstants.MESSAGE_ID))) {
  				return m;
  			}
--- 160,164 ----
  		for (int i = 0; i < messages.size(); i++) {
  			Message m = (Message) messages.elementAt(i);
! 			if (messageid.equals(m.getField(RFC822.MESSAGE_ID))) {
  				return m;
  			}
***************
*** 309,313 ****
  	public synchronized void addMessage(Message message) {
  
! 		String messageid = message.getField(MessageConstants.MESSAGE_ID);
  
  		if (messageid == null) {
--- 309,313 ----
  	public synchronized void addMessage(Message message) {
  
! 		String messageid = message.getField(RFC822.MESSAGE_ID);
  
  		if (messageid == null) {
***************
*** 315,319 ****
  			messageid = MailUtils.getUniqeID();
  
! 			message.setField(MessageConstants.MESSAGE_ID, messageid);
  
  		} else {
--- 315,319 ----
  			messageid = MailUtils.getUniqeID();
  
! 			message.setField(RFC822.MESSAGE_ID, messageid);
  
  		} else {
***************
*** 374,379 ****
  		for (int i = 0; i < messages.size(); i++) {
  			Message m = (Message) messages.elementAt(i);
! 			if (m.getField(MessageConstants.MESSAGE_ID) != null
! 				&& messageid.equals(m.getField(MessageConstants.MESSAGE_ID))) {
  				return true;
  			}
--- 374,379 ----
  		for (int i = 0; i < messages.size(); i++) {
  			Message m = (Message) messages.elementAt(i);
! 			if (m.getField(RFC822.MESSAGE_ID) != null
! 				&& messageid.equals(m.getField(RFC822.MESSAGE_ID))) {
  				return true;
  			}
***************
*** 427,431 ****
  	public void removeMessage(Message message) {
  
! 		if (!exists(message.getField(MessageConstants.MESSAGE_ID)))
  			return;
  
--- 427,431 ----
  	public void removeMessage(Message message) {
  
! 		if (!exists(message.getField(RFC822.MESSAGE_ID)))
  			return;
  
***************
*** 466,470 ****
  			new MessageEvent(
  				this,
! 				message.getField(MessageConstants.MESSAGE_ID),
  				getMessageCount());
  
--- 466,470 ----
  			new MessageEvent(
  				this,
! 				message.getField(RFC822.MESSAGE_ID),
  				getMessageCount());
  
***************
*** 695,699 ****
  					this,
  					getMessage(getMessageCount() - 1).getField(
! 						MessageConstants.MESSAGE_ID),
  					getMessageCount() - 1);
  
--- 695,699 ----
  					this,
  					getMessage(getMessageCount() - 1).getField(
! 						RFC822.MESSAGE_ID),
  					getMessageCount() - 1);
  

--- MailFilterAction.java DELETED ---

Index: FilterCriteria.java
===================================================================
RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/mail/FilterCriteria.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FilterCriteria.java	3 Apr 2004 07:56:48 -0000	1.1
--- FilterCriteria.java	21 Mar 2005 17:17:12 -0000	1.2
***************
*** 26,30 ****
  		boolean conditionFound = false;
  		
! 		if (field.equals(MessageConstants.FROM)) {
  			MailAddress address = message.getFrom();
  			String fromEmail = address.getEmail();
--- 26,30 ----
  		boolean conditionFound = false;
  		
! 		if (field.equals(RFC822.FROM)) {
  			MailAddress address = message.getFrom();
  			String fromEmail = address.getEmail();
***************
*** 34,38 ****
  			
  			
! 		} else if(field.equals(MessageConstants.TO)) {
  			AddressList addressList = message.getTo();
  			MailAddress[] addresses = addressList.getAddresses();
--- 34,38 ----
  			
  			
! 		} else if(field.equals(RFC822.TO)) {
  			AddressList addressList = message.getTo();
  			MailAddress[] addresses = addressList.getAddresses();
***************
*** 45,49 ****
  				}
  			}	
! 		} else if (field.equals(MessageConstants.CC)) {
  			/*
  			AddressList addressList = message.getCC();
--- 45,49 ----
  				}
  			}	
! 		} else if (field.equals(RFC822.CC)) {
  			/*
  			AddressList addressList = message.getCC();
***************
*** 59,63 ****
  			*/
  
! 		} else if (field.equals(MessageConstants.SUBJECT)) {
  			String subject = message.getSubject();
  
--- 59,63 ----
  			*/
  
! 		} else if (field.equals(RFC822.SUBJECT)) {
  			String subject = message.getSubject();
  

Index: MailUtils.java
===================================================================
RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/mail/MailUtils.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MailUtils.java	20 Mar 2005 20:38:47 -0000	1.3
--- MailUtils.java	21 Mar 2005 17:17:13 -0000	1.4
***************
*** 298,307 ****
  					} else if (
  						message.getBody(i).getField(
! 							MessageConstants.CONTENT_TYPE)
  							!= null) {
  	
  						String contentType =
  							message.getBody(i).getField(
! 								MessageConstants.CONTENT_TYPE);
  	
  						if (contentType.equals(ContentTypes.TEXT_PLAIN)) {
--- 298,307 ----
  					} else if (
  						message.getBody(i).getField(
! 							RFC822.CONTENT_TYPE)
  							!= null) {
  	
  						String contentType =
  							message.getBody(i).getField(
! 								RFC822.CONTENT_TYPE);
  	
  						if (contentType.equals(ContentTypes.TEXT_PLAIN)) {

--- MailFilter.java DELETED ---

Index: MailboxListMessage.java
===================================================================
RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/mail/MailboxListMessage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MailboxListMessage.java	3 Apr 2004 07:56:48 -0000	1.1
--- MailboxListMessage.java	21 Mar 2005 17:17:13 -0000	1.2
***************
*** 33,43 ****
  		//theres no direct need to set this, but I plan to use it to
  		//check if a remote message is equevalent to the local copy
! 		setField(MessageConstants.MESSAGE_ID, MailUtils.getUniqeID());
  
  		//set the contenttype to plain text.
! 		setField(MessageConstants.CONTENT_TYPE, "text/plain");
  
  		//set the subject
! 		setField(MessageConstants.SUBJECT, ".mailboxlist");
  		
  		
--- 33,43 ----
  		//theres no direct need to set this, but I plan to use it to
  		//check if a remote message is equevalent to the local copy
! 		setField(RFC822.MESSAGE_ID, MailUtils.getUniqeID());
  
  		//set the contenttype to plain text.
! 		setField(RFC822.CONTENT_TYPE, "text/plain");
  
  		//set the subject
! 		setField(RFC822.SUBJECT, ".mailboxlist");
  		
  		

Index: Draft.java
===================================================================
RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/mail/Draft.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Draft.java	20 Mar 2005 20:38:47 -0000	1.3
--- Draft.java	21 Mar 2005 17:17:13 -0000	1.4
***************
*** 25,29 ****
  		super();
  
! 		setField(MessageConstants.MESSAGE_ID, MailUtils.getUniqeID());
  
  	}
--- 25,29 ----
  		super();
  
! 		setField(RFC822.MESSAGE_ID, MailUtils.getUniqeID());
  
  	}
***************
*** 46,50 ****
  
  			if (getBody(0)
! 				.getField(MessageConstants.CONTENT_TYPE)
  				.indexOf(contentType)
  				!= -1) {
--- 46,50 ----
  
  			if (getBody(0)
! 				.getField(RFC822.CONTENT_TYPE)
  				.indexOf(contentType)
  				!= -1) {
***************
*** 59,64 ****
  		} else if (
  			getBodyCount() == 0
! 				&& getField(MessageConstants.CONTENT_TYPE) != null
! 				&& getField(MessageConstants.CONTENT_TYPE).indexOf(contentType)
  					!= -1) {
  
--- 59,64 ----
  		} else if (
  			getBodyCount() == 0
! 				&& getField(RFC822.CONTENT_TYPE) != null
! 				&& getField(RFC822.CONTENT_TYPE).indexOf(contentType)
  					!= -1) {
  
***************
*** 70,74 ****
  
  				if (getBody(i)
! 					.getField(MessageConstants.CONTENT_TYPE)
  					.indexOf(contentType)
  					!= -1) {
--- 70,74 ----
  
  				if (getBody(i)
! 					.getField(RFC822.CONTENT_TYPE)
  					.indexOf(contentType)
  					!= -1) {
***************
*** 104,111 ****
  			MessageBody body = (MessageBody) getBody(0);
  
! 			body.setField(MessageConstants.CONTENT_TYPE, "text/plain");
  
  			super.setField(
! 				MessageConstants.CONTENT_TYPE,
  				"text/plain; charset=\"iso-8859-1\"");
  
--- 104,111 ----
  			MessageBody body = (MessageBody) getBody(0);
  
! 			body.setField(RFC822.CONTENT_TYPE, "text/plain");
  
  			super.setField(
! 				RFC822.CONTENT_TYPE,
  				"text/plain; charset=\"iso-8859-1\"");
  
***************
*** 128,132 ****
  			body.setObject(text);
  
! 			body.setField(MessageConstants.CONTENT_TYPE, "text/plain");
  
  			addBody(body);
--- 128,132 ----
  			body.setObject(text);
  
! 			body.setField(RFC822.CONTENT_TYPE, "text/plain");
  
  			addBody(body);
***************
*** 135,139 ****
  			//of creating this draft can change it if necessary.
  			super.setField(
! 				MessageConstants.CONTENT_TYPE,
  				"multipart/alternative");
  
--- 135,139 ----
  			//of creating this draft can change it if necessary.
  			super.setField(
! 				RFC822.CONTENT_TYPE,
  				"multipart/alternative");
  
***************
*** 161,170 ****
  		body.setObject(bytes);
  
! 		if (getField(MessageConstants.CONTENT_TYPE) != null) {
  
  			//set the contenttype as the same as the draft. 
  			body.setField(
! 				MessageConstants.CONTENT_TYPE,
! 				getField(MessageConstants.CONTENT_TYPE));
  		}
  
--- 161,170 ----
  		body.setObject(bytes);
  
! 		if (getField(RFC822.CONTENT_TYPE) != null) {
  
  			//set the contenttype as the same as the draft. 
  			body.setField(
! 				RFC822.CONTENT_TYPE,
! 				getField(RFC822.CONTENT_TYPE));
  		}
  
***************
*** 229,237 ****
  
  			body.setField(
! 				MessageConstants.CONTENT_TYPE,
  				ContentTypes.TEXT_HTML);
  
  			super.setField(
! 				MessageConstants.CONTENT_TYPE,
  				ContentTypes.TEXT_HTML);
  
--- 229,237 ----
  
  			body.setField(
! 				RFC822.CONTENT_TYPE,
  				ContentTypes.TEXT_HTML);
  
  			super.setField(
! 				RFC822.CONTENT_TYPE,
  				ContentTypes.TEXT_HTML);
  
***************
*** 260,264 ****
  
  			body.setField(
! 				MessageConstants.CONTENT_TYPE,
  				ContentTypes.TEXT_HTML);
  
--- 260,264 ----
  
  			body.setField(
! 				RFC822.CONTENT_TYPE,
  				ContentTypes.TEXT_HTML);
  
***************
*** 268,272 ****
  			//of creating this draft can change it if necessary.
  			super.setField(
! 				MessageConstants.CONTENT_TYPE,
  				"multipart/alternative");
  
--- 268,272 ----
  			//of creating this draft can change it if necessary.
  			super.setField(
! 				RFC822.CONTENT_TYPE,
  				"multipart/alternative");
  
***************
*** 320,324 ****
  			//we allready have 1 body, set the mimetype to mixed
  
! 			super.setField(MessageConstants.CONTENT_TYPE, "multipart/mixed");
  
  			try {
--- 320,324 ----
  			//we allready have 1 body, set the mimetype to mixed
  
! 			super.setField(RFC822.CONTENT_TYPE, "multipart/mixed");
  
  			try {
***************
*** 338,342 ****
  			//contenttype
  
! 			if (getField(MessageConstants.CONTENT_TYPE)
  				.equals("multipart/alternative")) {
  
--- 338,342 ----
  			//contenttype
  
! 			if (getField(RFC822.CONTENT_TYPE)
  				.equals("multipart/alternative")) {
  
***************
*** 367,392 ****
  		} else if (getBodyCount() == 0) {
  
! 			if (o.getField(MessageConstants.CONTENT_TYPE) != null) {
  
  				setField(
! 					MessageConstants.CONTENT_TYPE,
! 					o.getField(MessageConstants.CONTENT_TYPE));
  
  			}
  
! 			if (o.getField(MessageConstants.CONTENT_TRANSFER_ENCODING)
  				!= null) {
  
  				setField(
! 					MessageConstants.CONTENT_TRANSFER_ENCODING,
! 					o.getField(MessageConstants.CONTENT_TRANSFER_ENCODING));
  
  			}
  
! 			if (o.getField(MessageConstants.CONTENT_DISPOSITION) != null) {
  
  				setField(
! 					MessageConstants.CONTENT_DISPOSITION,
! 					o.getField(MessageConstants.CONTENT_DISPOSITION));
  
  			}
--- 367,392 ----
  		} else if (getBodyCount() == 0) {
  
! 			if (o.getField(RFC822.CONTENT_TYPE) != null) {
  
  				setField(
! 					RFC822.CONTENT_TYPE,
! 					o.getField(RFC822.CONTENT_TYPE));
  
  			}
  
! 			if (o.getField(RFC822.CONTENT_TRANSFER_ENCODING)
  				!= null) {
  
  				setField(
! 					RFC822.CONTENT_TRANSFER_ENCODING,
! 					o.getField(RFC822.CONTENT_TRANSFER_ENCODING));
  
  			}
  
! 			if (o.getField(RFC822.CONTENT_DISPOSITION) != null) {
  
  				setField(
! 					RFC822.CONTENT_DISPOSITION,
! 					o.getField(RFC822.CONTENT_DISPOSITION));
  
  			}
***************
*** 411,423 ****
  
  		b.setField(
! 			MessageConstants.CONTENT_TYPE,
  			"application/octet-stream; name=\"" + file.getName() + "\"");
  
  		//could use contentid here
  		b.setField(
! 			MessageConstants.CONTENT_DISPOSITION,
  			"attachment; filename=\"" + file.getName() + "\"");
  
! 		b.setField(MessageConstants.CONTENT_TRANSFER_ENCODING, "base64");
  
  		addAttachment(b);
--- 411,423 ----
  
  		b.setField(
! 			RFC822.CONTENT_TYPE,
  			"application/octet-stream; name=\"" + file.getName() + "\"");
  
  		//could use contentid here
  		b.setField(
! 			RFC822.CONTENT_DISPOSITION,
  			"attachment; filename=\"" + file.getName() + "\"");
  
! 		b.setField(RFC822.CONTENT_TRANSFER_ENCODING, "base64");
  
  		addAttachment(b);
***************
*** 441,445 ****
  		}
  
! 		super.setField(MessageConstants.TO, address.toString());
  
  	}
--- 441,445 ----
  		}
  
! 		super.setField(RFC822.TO, address.toString());
  
  	}
***************
*** 449,453 ****
  		//super.setField(name, value);
  
! 		if (name.equals(MessageConstants.TO)) {
  
  			//System.out.println("setto" + value);
--- 449,453 ----
  		//super.setField(name, value);
  
! 		if (name.equals(RFC822.TO)) {
  
  			//System.out.println("setto" + value);
***************
*** 477,483 ****
  			setTo(tolist);
  
! 			super.setField(MessageConstants.TO, tolist.toString());
  
! 		} else if (name.equals(MessageConstants.CONTENT_TYPE)) {
  
  			if (getBodyCount() == 1) {
--- 477,483 ----
  			setTo(tolist);
  
! 			super.setField(RFC822.TO, tolist.toString());
  
! 		} else if (name.equals(RFC822.CONTENT_TYPE)) {
  
  			if (getBodyCount() == 1) {
***************
*** 503,507 ****
  	public void setSubject(String subject) {
  		
! 		setField(MessageConstants.SUBJECT, subject);
  		
  		
--- 503,507 ----
  	public void setSubject(String subject) {
  		
! 		setField(RFC822.SUBJECT, subject);
  		
  		

Index: MessageBody.java
===================================================================
RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/mail/MessageBody.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MessageBody.java	20 Mar 2005 20:38:46 -0000	1.3
--- MessageBody.java	21 Mar 2005 17:17:11 -0000	1.4
***************
*** 205,213 ****
  		if(mimetype != null) return mimetype;
  		
! 		else if(getField(MessageConstants.CONTENT_TYPE) != null) {
  			
  			try {
  			
! 				mimetype =  new MimeType(getField(MessageConstants.CONTENT_TYPE));	
  			
  			} catch (MimeTypeParseException f) {
--- 205,213 ----
  		if(mimetype != null) return mimetype;
  		
! 		else if(getField(RFC822.CONTENT_TYPE) != null) {
  			
  			try {
  			
! 				mimetype =  new MimeType(getField(RFC822.CONTENT_TYPE));	
  			
  			} catch (MimeTypeParseException f) {

Index: Mailbox.java
===================================================================
RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/mail/Mailbox.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Mailbox.java	20 Mar 2005 20:38:47 -0000	1.5
--- Mailbox.java	21 Mar 2005 17:17:12 -0000	1.6
***************
*** 269,273 ****
  		for (int i = 0; i < messages.size(); i++) {
  			Message m = (Message) messages.elementAt(i);
! 			if (messageid.equals(m.getField(MessageConstants.MESSAGE_ID))) {
  				return m;
  			}
--- 269,273 ----
  		for (int i = 0; i < messages.size(); i++) {
  			Message m = (Message) messages.elementAt(i);
! 			if (messageid.equals(m.getField(RFC822.MESSAGE_ID))) {
  				return m;
  			}
***************
*** 512,516 ****
  	public synchronized void addMessage(Message message) {
  
! 		String messageid = message.getField(MessageConstants.MESSAGE_ID);
  
  		if (messageid == null) {
--- 512,516 ----
  	public synchronized void addMessage(Message message) {
  
! 		String messageid = message.getField(RFC822.MESSAGE_ID);
  
  		if (messageid == null) {
***************
*** 518,522 ****
  			messageid = MailUtils.getUniqeID();
  
! 			message.setField(MessageConstants.MESSAGE_ID, messageid);
  
  		} else {
--- 518,522 ----
  			messageid = MailUtils.getUniqeID();
  
! 			message.setField(RFC822.MESSAGE_ID, messageid);
  
  		} else {
***************
*** 685,690 ****
  		for (int i = 0; i < messages.size(); i++) {
  			Message m = (Message) messages.elementAt(i);
! 			if (m.getField(MessageConstants.MESSAGE_ID) != null
! 				&& messageid.equals(m.getField(MessageConstants.MESSAGE_ID))) {
  				return true;
  			}
--- 685,690 ----
  		for (int i = 0; i < messages.size(); i++) {
  			Message m = (Message) messages.elementAt(i);
! 			if (m.getField(RFC822.MESSAGE_ID) != null
! 				&& messageid.equals(m.getField(RFC822.MESSAGE_ID))) {
  				return true;
  			}
***************
*** 844,848 ****
  	public void removeMessage(Message message) {
  
! 		if (!exists(message.getField(MessageConstants.MESSAGE_ID)))
  			return;
  
--- 844,848 ----
  	public void removeMessage(Message message) {
  
! 		if (!exists(message.getField(RFC822.MESSAGE_ID)))
  			return;
  
***************
*** 882,886 ****
  				new MessageEvent(
  					this,
! 					message.getField(MessageConstants.MESSAGE_ID),
  					getMessageCount());
  
--- 882,886 ----
  				new MessageEvent(
  					this,
! 					message.getField(RFC822.MESSAGE_ID),
  					getMessageCount());
  
***************
*** 1475,1479 ****
  					this,
  					getMessage(getMessageCount() - 1).getField(
! 						MessageConstants.MESSAGE_ID),
  					getMessageCount() - 1);
  
--- 1475,1479 ----
  					this,
  					getMessage(getMessageCount() - 1).getField(
! 						RFC822.MESSAGE_ID),
  					getMessageCount() - 1);
  

--- MessageConstants.java DELETED ---

Index: Message.java
===================================================================
RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/mail/Message.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Message.java	14 Mar 2005 20:27:52 -0000	1.5
--- Message.java	21 Mar 2005 17:17:13 -0000	1.6
***************
*** 319,326 ****
  	public String[] getReferrences() {
  
! 		if(getField(MessageConstants.REFERENCES) == null)
  			return null;
  		
! 		return MailDecoder.getReferences(getField(MessageConstants.REFERENCES));
  		
  
--- 319,326 ----
  	public String[] getReferrences() {
  
! 		if(getField(RFC822.REFERENCES) == null)
  			return null;
  		
! 		return MailDecoder.getReferences(getField(RFC822.REFERENCES));
  		
  
***************
*** 337,341 ****
  			Message m = (Message)super.clone();
  			
! 			m.setField(MessageConstants.MESSAGE_ID, MailUtils.getUniqeID());
  			
  			return m;
--- 337,341 ----
  			Message m = (Message)super.clone();
  			
! 			m.setField(RFC822.MESSAGE_ID, MailUtils.getUniqeID());
  			
  			return m;
***************
*** 364,368 ****
  		String stringdate = buffer.toString();
  
! 		setField(MessageConstants.DATE, stringdate);
  
  	}
--- 364,368 ----
  		String stringdate = buffer.toString();
  
! 		setField(RFC822.DATE, stringdate);
  
  	}
***************
*** 375,379 ****
  	public String getSubject() {
  
! 		String s = (String) getField(MessageConstants.SUBJECT);
  
  		if (s == null)
--- 375,379 ----
  	public String getSubject() {
  
! 		String s = (String) getField(RFC822.SUBJECT);
  
  		if (s == null)
***************
*** 404,413 ****
  			 */
  			String datestring =
! 				getField(MessageConstants.DELIVERY_DATE);
  				
  			//just double checking
  			if(datestring == null) {
  				
! 				datestring = getField(MessageConstants.DATE);	
  			
  				if(datestring == null) {
--- 404,413 ----
  			 */
  			String datestring =
! 				getField(RFC822.DELIVERY_DATE);
  				
  			//just double checking
  			if(datestring == null) {
  				
! 				datestring = getField(RFC822.DATE);	
  			
  				if(datestring == null) {
***************
*** 415,419 ****
  					doDate();
  				
! 					datestring = getField(MessageConstants.DATE);
  				}
  					
--- 415,419 ----
  					doDate();
  				
! 					datestring = getField(RFC822.DATE);
  				}