You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/03/15 07:22:36 UTC

svn commit: r923075 - /james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/UserMetaDataRepositorySubscripter.java

Author: norman
Date: Mon Mar 15 06:22:36 2010
New Revision: 923075

URL: http://svn.apache.org/viewvc?rev=923075&view=rev
Log:
rework to reflect api changes in imap trunk

Modified:
    james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/UserMetaDataRepositorySubscripter.java

Modified: james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/UserMetaDataRepositorySubscripter.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/UserMetaDataRepositorySubscripter.java?rev=923075&r1=923074&r2=923075&view=diff
==============================================================================
--- james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/UserMetaDataRepositorySubscripter.java (original)
+++ james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/UserMetaDataRepositorySubscripter.java Mon Mar 15 06:22:36 2010
@@ -31,8 +31,8 @@ import org.apache.commons.logging.LogFac
 import org.apache.james.api.user.UserMetaDataRespository;
 import org.apache.james.api.user.UserRepositoryException;
 import org.apache.james.imap.api.display.HumanReadableText;
+import org.apache.james.imap.mailbox.MailboxSession;
 import org.apache.james.imap.mailbox.SubscriptionException;
-import org.apache.james.imap.mailbox.MailboxSession.User;
 import org.apache.james.imap.store.Subscriber;
 
 /**
@@ -57,9 +57,13 @@ public class UserMetaDataRepositorySubsc
     }
     
 
-    public void subscribe(User user, String mailbox) throws SubscriptionException {
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.imap.store.Subscriber#subscribe(org.apache.james.imap.mailbox.MailboxSession, java.lang.String)
+     */
+    public void subscribe(MailboxSession session, String mailbox) throws SubscriptionException {
         try {
-            final UserSubscription subscription = getUserSubscription(user.getUserName());
+            final UserSubscription subscription = getUserSubscription(session.getUser().getUserName());
             subscription.subscribe(mailbox);
         } catch (UserRepositoryException e) {
             throw new SubscriptionException(HumanReadableText.GENERIC_SUBSCRIPTION_FAILURE, e);
@@ -67,10 +71,15 @@ public class UserMetaDataRepositorySubsc
     }
 
 
+
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.imap.store.Subscriber#subscriptions(org.apache.james.imap.mailbox.MailboxSession)
+     */
     @SuppressWarnings("unchecked")
-    public Collection<String> subscriptions(User user) throws SubscriptionException {
+    public Collection<String> subscriptions(MailboxSession session) throws SubscriptionException {
         try {
-            final UserSubscription subscription = getUserSubscription(user.getUserName());
+            final UserSubscription subscription = getUserSubscription(session.getUser().getUserName());
             final Collection<String> results = (Collection) subscription.subscriptions().clone();
             return results;
         } catch (UserRepositoryException e) {
@@ -78,9 +87,13 @@ public class UserMetaDataRepositorySubsc
         }
     }
 
-    public void unsubscribe(User user, String mailbox) throws SubscriptionException {
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.imap.store.Subscriber#unsubscribe(org.apache.james.imap.mailbox.MailboxSession, java.lang.String)
+     */
+    public void unsubscribe(MailboxSession session, String mailbox) throws SubscriptionException {
         try {
-            final UserSubscription subscription = getUserSubscription(user.getUserName());
+            final UserSubscription subscription = getUserSubscription(session.getUser().getUserName());
             subscription.unsubscribe(mailbox);
         } catch (UserRepositoryException e) {
             throw new SubscriptionException(HumanReadableText.GENERIC_UNSUBSCRIPTION_FAILURE, e);
@@ -132,6 +145,7 @@ public class UserMetaDataRepositorySubsc
             }
         }
 
+        @SuppressWarnings("unchecked")
         public HashSet<String> subscriptions() throws UserRepositoryException {
             try {
                 final HashSet<String> storedSubscriptions = (HashSet<String>) repository.getAttribute(user, META_DATA_KEY);



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org