[Columba-cvs] columba/src/mail/core/org/columba/mail/folder/virtual VirtualFolder.java,1.94,1.95

[Timo S. <ts...@us...>]

Update of /cvsroot/columba/columba/src/mail/core/org/columba/mail/folder/virtual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30273/src/mail/core/org/columba/mail/folder/virtual

Modified Files:
	VirtualFolder.java 
Log Message:
[intern]Refactoring of the HeaderCacheFramework. Now HeaderList and its persistance are transparently handeled. Now we can even start into looking to use BerkelyDB in the future. Unplanned but not unwelcome this refactoring also includes some IMAP speedus :-)

Index: VirtualFolder.java
===================================================================
RCS file: /cvsroot/columba/columba/src/mail/core/org/columba/mail/folder/virtual/VirtualFolder.java,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** VirtualFolder.java	27 Aug 2005 16:33:15 -0000	1.94
--- VirtualFolder.java	28 Aug 2005 19:52:17 -0000	1.95
***************
*** 42,46 ****
  import org.columba.mail.folder.FolderChildrenIterator;
  import org.columba.mail.folder.FolderFactory;
- import org.columba.mail.folder.IHeaderListStorage;
  import org.columba.mail.folder.IMailFolder;
  import org.columba.mail.folder.IMailbox;
--- 42,45 ----
***************
*** 48,51 ****
--- 47,51 ----
  import org.columba.mail.folder.event.IFolderEvent;
  import org.columba.mail.folder.headercache.CachedHeaderfields;
+ import org.columba.mail.folder.headercache.HeaderList;
  import org.columba.mail.folder.imap.IMAPFolder;
  import org.columba.mail.folder.search.DefaultSearchEngine;
***************
*** 54,58 ****
  import org.columba.mail.gui.tree.FolderTreeModel;
  import org.columba.mail.message.ColumbaHeader;
- import org.columba.mail.message.HeaderList;
  import org.columba.mail.message.IHeaderList;
  import org.columba.ristretto.message.Attributes;
--- 54,57 ----
***************
*** 80,84 ****
  	protected int nextUid;
  
! 	protected HeaderList headerList;
  
  	private boolean active;
--- 79,83 ----
  	protected int nextUid;
  
! 	protected IHeaderList headerList;
  
  	private boolean active;
***************
*** 184,188 ****
  
  	public boolean exists(Object uid) throws Exception {
! 		return headerList.containsKey(uid);
  	}
  
--- 183,187 ----
  
  	public boolean exists(Object uid) throws Exception {
! 		return headerList.exists(uid);
  	}
  
***************
*** 491,495 ****
  
  	/**
! 	 * @see org.columba.modules.mail.folder.Folder#removeMessage(Object)
  	 */
  	public void removeMessage(Object uid) throws Exception {
--- 490,494 ----
  
  	/**
! 	 * @see org.columba.modules.mail.folder.Folder#remove(Object)
  	 */
  	public void removeMessage(Object uid) throws Exception {
***************
*** 988,1000 ****
  	}
  
- 	/**
- 	 * @see org.columba.mail.folder.Folder#getHeaderListStorage()
- 	 */
- 	public IHeaderListStorage getHeaderListStorage() {
- 
- 		// not necessary
- 
- 		return null;
- 	}
  
  	/**
--- 987,990 ----