[Columba-cvs] SF.net SVN: columba:[453] columba/trunk/mail/src

[<es...@us...>]

Revision: 453
          http://columba.svn.sourceforge.net/columba/?rev=453&view=rev
Author:   eschman
Date:     2010-05-31 20:56:58 +0000 (Mon, 31 May 2010)

Log Message:
-----------
[internal] synchronizeHeaderlist() already receives the status from the server so there is no need to get it a second time

Modified Paths:
--------------
    columba/trunk/mail/src/main/java/org/columba/mail/folder/imap/IMAPFolder.java
    columba/trunk/mail/src/main/java/org/columba/mail/imap/IImapServer.java
    columba/trunk/mail/src/main/java/org/columba/mail/imap/IMAPServer.java
    columba/trunk/mail/src/test/java/org/columba/mail/imap/TestServer.java

Modified: columba/trunk/mail/src/main/java/org/columba/mail/folder/imap/IMAPFolder.java
===================================================================
--- columba/trunk/mail/src/main/java/org/columba/mail/folder/imap/IMAPFolder.java	2010-03-17 09:06:42 UTC (rev 452)
+++ columba/trunk/mail/src/main/java/org/columba/mail/folder/imap/IMAPFolder.java	2010-05-31 20:56:58 UTC (rev 453)
@@ -279,7 +279,7 @@
 		int largestLocalUid = localUids.size() > 0 ? ((Integer) localUids
 				.get(localUids.size() - 1)).intValue() : -1;
 
-		int largestRemoteUid = getServer().getLargestRemoteUid(this);
+		int largestRemoteUid = getServer().getLargestRemoteUid(this, status);
 
 		if (localUids.size() == status.getMessages()
 				&& largestRemoteUid == largestLocalUid) {

Modified: columba/trunk/mail/src/main/java/org/columba/mail/imap/IImapServer.java
===================================================================
--- columba/trunk/mail/src/main/java/org/columba/mail/imap/IImapServer.java	2010-03-17 09:06:42 UTC (rev 452)
+++ columba/trunk/mail/src/main/java/org/columba/mail/imap/IImapServer.java	2010-05-31 20:56:58 UTC (rev 453)
@@ -512,5 +512,7 @@
 
 	
 	public int getLargestRemoteUid(IMAPFolder folder) throws IOException, IMAPException, CommandCancelledException;
+
+	public int getLargestRemoteUid(IMAPFolder folder, MailboxStatus status) throws IOException, IMAPException, CommandCancelledException;
 	
 }
\ No newline at end of file

Modified: columba/trunk/mail/src/main/java/org/columba/mail/imap/IMAPServer.java
===================================================================
--- columba/trunk/mail/src/main/java/org/columba/mail/imap/IMAPServer.java	2010-03-17 09:06:42 UTC (rev 452)
+++ columba/trunk/mail/src/main/java/org/columba/mail/imap/IMAPServer.java	2010-05-31 20:56:58 UTC (rev 453)
@@ -634,6 +634,10 @@
 
 	public int getLargestRemoteUid(IMAPFolder folder) throws IOException, IMAPException, CommandCancelledException {
 		MailboxStatus status = getStatus(folder);
+		return getLargestRemoteUid(folder, status);
+	}
+
+	public int getLargestRemoteUid(IMAPFolder folder, MailboxStatus status) throws IOException, IMAPException, CommandCancelledException {
 		if(status.getUidNext() < 0 && status.getMessages() > 0 ) {
 			return fetchUid(new SequenceSet(status.getMessages()), folder);
 		} else {

Modified: columba/trunk/mail/src/test/java/org/columba/mail/imap/TestServer.java
===================================================================
--- columba/trunk/mail/src/test/java/org/columba/mail/imap/TestServer.java	2010-03-17 09:06:42 UTC (rev 452)
+++ columba/trunk/mail/src/test/java/org/columba/mail/imap/TestServer.java	2010-05-31 20:56:58 UTC (rev 453)
@@ -391,4 +391,9 @@
 		return maxUid;
 	}
 
+	public int getLargestRemoteUid(IMAPFolder folder, MailboxStatus status)
+			throws IOException, IMAPException, CommandCancelledException {
+		return getLargestRemoteUid(folder);
+	}
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.