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 rd...@apache.org on 2009/04/08 06:10:36 UTC
svn commit: r762748 - in /james/imap/trunk:
deployment/src/test/java/org/apache/james/mailboxmanager/torque/
torque/src/main/java/org/apache/james/mailboxmanager/torque/
Author: rdonkin
Date: Tue Apr 7 12:40:02 2009
New Revision: 762748
URL: http://svn.apache.org/viewvc?rev=762748&view=rev
Log:
Tidy up some Java 1.5 stuff before getting cracking with the implementation IMAP-73 https://issues.apache.org/jira/browse/IMAP-73
Modified:
james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/SimpleUserManager.java
james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/UserDetails.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UserManager.java
Modified: james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/SimpleUserManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/SimpleUserManager.java?rev=762748&r1=762747&r2=762748&view=diff
==============================================================================
--- james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/SimpleUserManager.java (original)
+++ james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/SimpleUserManager.java Tue Apr 7 12:40:02 2009
@@ -27,10 +27,10 @@
public class SimpleUserManager implements UserManager {
- private final Map users;
+ private final Map<String, UserDetails> users;
public SimpleUserManager() {
- this.users = new HashMap();
+ this.users = new HashMap<String, UserDetails>();
}
public boolean isAuthentic(String userid, String passwd) {
@@ -54,7 +54,7 @@
user.addSubscription(mailbox);
}
- public Collection subscriptions(String userid) throws SubscriptionException {
+ public Collection<String> subscriptions(String userid) throws SubscriptionException {
UserDetails user = (UserDetails) users.get(userid);
if (user == null) {
user = new UserDetails(userid);
Modified: james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/UserDetails.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/UserDetails.java?rev=762748&r1=762747&r2=762748&view=diff
==============================================================================
--- james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/UserDetails.java (original)
+++ james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/UserDetails.java Tue Apr 7 12:40:02 2009
@@ -40,7 +40,7 @@
this.password = password;
}
- public Collection getSubscriptions() {
+ public Collection<String> getSubscriptions() {
return subscriptions;
}
Modified: james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java?rev=762748&r1=762747&r2=762748&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java Tue Apr 7 12:40:02 2009
@@ -63,13 +63,13 @@
private final ReadWriteLock lock;
- private final Map mailboxes;
+ private final Map<String, TorqueMailbox> mailboxes;
private final UserManager userManager;
public TorqueMailboxManager(final UserManager userManager) {
this.lock = new ReentrantWriterPreferenceReadWriteLock();
- mailboxes = new HashMap();
+ mailboxes = new HashMap<String, TorqueMailbox>();
this.userManager = userManager;
}
@@ -347,7 +347,7 @@
userManager.subscribe(user, mailbox);
}
- public Collection subscriptions(String user) throws SubscriptionException {
+ public Collection<String> subscriptions(String user) throws SubscriptionException {
return userManager.subscriptions(user);
}
Modified: james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UserManager.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UserManager.java?rev=762748&r1=762747&r2=762748&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UserManager.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UserManager.java Tue Apr 7 12:40:02 2009
@@ -30,7 +30,7 @@
public void subscribe(String user, String mailbox)
throws SubscriptionException;
- public Collection subscriptions(String user) throws SubscriptionException;
+ public Collection<String> subscriptions(String user) throws SubscriptionException;
public void unsubscribe(String user, String mailbox)
throws SubscriptionException;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org