[Mailsomething-cvs] mailsomething/src/net/sf/mailsomething/mail MailboxFilter.java,1.1,1.2 Mailbox.java,1.6,1.7 Message.java,1.6,1.7 MailAccount.java,1.4,1.5

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

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

Modified Files:
	MailboxFilter.java Mailbox.java Message.java MailAccount.java 
Log Message:


Index: Mailbox.java
===================================================================
RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/mail/Mailbox.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Mailbox.java	21 Mar 2005 17:17:12 -0000	1.6
--- Mailbox.java	24 Mar 2005 14:00:35 -0000	1.7
***************
*** 356,359 ****
--- 356,372 ----
  	 */
  	public MailboxHolder getParentMailbox() {
+ 		
+ 		if(parentMailbox == null) {
+ 			
+ 			MailAccount a = (MailAccount)handler;
+ 			
+ 			parentMailbox = a.getMailbox(getParent());
+ 			
+ 			
+ 		}
+ 		
+ 		if(parentMailbox == null)
+ 			parentMailbox = (MailboxHolder)handler;
+ 		
  		return parentMailbox;
  	}

Index: MailAccount.java
===================================================================
RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/mail/MailAccount.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MailAccount.java	20 Mar 2005 20:38:46 -0000	1.4
--- MailAccount.java	24 Mar 2005 14:00:36 -0000	1.5
***************
*** 8,11 ****
--- 8,12 ----
  import java.util.EventListener;
  
+ import net.sf.classifier4J.IClassifier;
  import net.sf.mailsomething.util.event.*;
  
***************
*** 118,121 ****
--- 119,124 ----
  	protected boolean runthread = true;
  	
+ 	transient IClassifier classifier;
+ 	
  	/**
  	 * Constructor for serializing purposes. Should not be called directly,
***************
*** 362,365 ****
--- 365,370 ----
  	 */
  	public Mailbox getMailbox(String name) {
+ 		
+ 		
  				
  		if(name.indexOf(getDelimiter()) != -1) {
***************
*** 1286,1289 ****
--- 1291,1306 ----
  	
  	
+ 	/**
+ 	 * @return Returns the classifier.
+ 	 */
+ 	public IClassifier getClassifier() {
+ 		return classifier;
+ 	}
+ 	/**
+ 	 * @param classifier The classifier to set.
+ 	 */
+ 	public void setClassifier(IClassifier classifier) {
+ 		this.classifier = classifier;
+ 	}
  }
  

Index: Message.java
===================================================================
RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/mail/Message.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Message.java	21 Mar 2005 17:17:13 -0000	1.6
--- Message.java	24 Mar 2005 14:00:35 -0000	1.7
***************
*** 705,708 ****
--- 705,713 ----
  	
  	
+ 	public String[] getHeader() {
+ 		
+ 		return headerLines;
+ 	}
+ 	
  	
  	

Index: MailboxFilter.java
===================================================================
RCS file: /cvsroot/mailsomething/mailsomething/src/net/sf/mailsomething/mail/MailboxFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MailboxFilter.java	3 Apr 2004 07:56:48 -0000	1.1
--- MailboxFilter.java	24 Mar 2005 14:00:35 -0000	1.2
***************
*** 19,26 ****
  	private Mailbox source;
  	
! 	private int matchType = MATCHANY;
  	
! 	public static int MATCHALL = 0;
! 	public static int MATCHANY = 1;
  	
  	private String name = "";
--- 19,26 ----
  	private Mailbox source;
  	
! 	private int matchType = MATCH_ANY;
  	
! 	public static int MATCH_ALL = 0;
! 	public static int MATCH_ANY = 1;
  	
  	private String name = "";
***************
*** 75,84 ****
  			if(criterion.checkCriteria(message)) {
  				satisfies = true;
! 				if (this.matchType == MATCHANY) 
  					break;	
  						
  			} else {
  				satisfies = false;
! 				if (this.matchType == MATCHALL)
  					break;		
  		
--- 75,84 ----
  			if(criterion.checkCriteria(message)) {
  				satisfies = true;
! 				if (this.matchType == MATCH_ANY) 
  					break;	
  						
  			} else {
  				satisfies = false;
! 				if (this.matchType == MATCH_ALL)
  					break;