Author: norman
Date: Tue Sep 1 16:50:53 2009
New Revision: 810118
URL: http://svn.apache.org/viewvc?rev=810118&view=rev
Log:
Start to add support for user settings (LABS-428)
Added:
labs/hupa/server/src/main/java/org/apache/hupa/server/guice/DefaultUserSettingsProvider.java
labs/hupa/shared/src/main/java/org/apache/hupa/shared/data/Settings.java
Modified:
labs/hupa/.classpath
labs/hupa/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/IMAPFolderPresenter.java
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/IMAPFolderView.java
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
labs/hupa/client/src/main/resources/config.properties
labs/hupa/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java
labs/hupa/server/src/main/java/org/apache/hupa/server/handler/DeleteMessageHandler.java
labs/hupa/server/src/main/java/org/apache/hupa/server/handler/LoginUserHandler.java
labs/hupa/server/src/test/java/org/apache/hupa/server/handler/AbstractHandlerTest.java
labs/hupa/server/src/test/java/org/apache/hupa/server/handler/DeleteMessageHandlerTest.java
labs/hupa/server/src/test/java/org/apache/hupa/server/handler/LoginUserHandlerTest.java
labs/hupa/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
labs/hupa/shared/src/main/java/org/apache/hupa/shared/data/User.java
Modified: labs/hupa/.classpath
URL:
http://svn.apache.org/viewvc/labs/hupa/.classpath?rev=810118&r1=810117&r2=810118&view=diff
==============================================================================
--- labs/hupa/.classpath (original)
+++ labs/hupa/.classpath Tue Sep 1 16:50:53 2009
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="shared/target/classes"
path="shared/src/main/java"/>
- <classpathentry kind="src" output="server/war/WEB-INF/classes"
path="server/src/main/java"/>
- <classpathentry excluding="**" kind="src"
output="server/war/WEB-INF/classes" path="server/src/main/resources"/>
- <classpathentry kind="src" output="server/target/test-classes"
path="server/src/test/java"/>
- <classpathentry kind="src" output="widgets/target/classes"
path="widgets/src/main/java"/>
- <classpathentry kind="src" output="client/war/WEB-INF/classes"
path="client/src/main/java"/>
- <classpathentry kind="src" path="client/src/main/resources/"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con"
path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
- <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="war/WEB-INF/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="shared/target/classes"
path="shared/src/main/java"/>
+ <classpathentry kind="src" output="server/war/WEB-INF/classes"
path="server/src/main/java"/>
+ <classpathentry excluding="**" kind="src"
output="server/war/WEB-INF/classes" path="server/src/main/resources"/>
+ <classpathentry kind="src" output="server/target/test-classes"
path="server/src/test/java"/>
+ <classpathentry kind="src" output="widgets/target/classes"
path="widgets/src/main/java"/>
+ <classpathentry kind="src" output="client/war/WEB-INF/classes"
path="client/src/main/java"/>
+ <classpathentry kind="src" path="client/src/main/resources"/>
+ <classpathentry kind="con"
path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
+ <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="war/WEB-INF/classes"/>
+</classpath>
Modified: labs/hupa/client/src/main/java/org/apache/hupa/Hupa.gwt.xml
URL:
http://svn.apache.org/viewvc/labs/hupa/client/src/main/java/org/apache/hupa/Hupa.gwt.xml?rev=810118&r1=810117&r2=810118&view=diff
==============================================================================
--- labs/hupa/client/src/main/java/org/apache/hupa/Hupa.gwt.xml (original)
+++ labs/hupa/client/src/main/java/org/apache/hupa/Hupa.gwt.xml Tue Sep 1
16:50:53 2009
@@ -4,8 +4,9 @@
<!-- Inherit the core Web Toolkit stuff. -->
<inherits name='com.google.gwt.user.User'/>
+ <!--
<inherits name="com.google.gwt.i18n.I18N"/>
-
+ -->
<inherits name='org.apache.hupa.Shared'/>
<inherits name='org.apache.hupa.Widgets'/>
Modified:
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/IMAPFolderPresenter.java
URL:
http://svn.apache.org/viewvc/labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/IMAPFolderPresenter.java?rev=810118&r1=810117&r2=810118&view=diff
==============================================================================
---
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/IMAPFolderPresenter.java
(original)
+++
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/IMAPFolderPresenter.java
Tue Sep 1 16:50:53 2009
@@ -165,7 +165,7 @@
}
// Store the INBOX as starting point after first loading
- if
(iFolder.getFullName().equals(IMAPFolder.DEFAULT_INBOX)) {
+ if
(iFolder.getFullName().equals(user.getSettings().getInboxFolderName())) {
folder = iFolder;
tItem = record;
}
@@ -207,8 +207,8 @@
public void onDecreaseUnseenEvent(DecreaseUnseenEvent
event) {
// Check if the folder was the trash folder. If
not increase the message count of the trash folder
- if
(IMAPFolder.DEFAULT_TRASH.equalsIgnoreCase(event.getFolder().getFullName()) ==
false) {
- display.increaseUnseenMessageCount(new
IMAPFolder(IMAPFolder.DEFAULT_TRASH),event.getAmount());
+ if
(user.getSettings().getTrashFolderName().equalsIgnoreCase(event.getFolder().getFullName())
== false) {
+ display.increaseUnseenMessageCount(new
IMAPFolder(user.getSettings().getTrashFolderName()),event.getAmount());
}
display.decreaseUnseenMessageCount(event.getFolder(),event.getAmount());
}
@@ -229,7 +229,7 @@
public void onSelection(SelectionEvent<TreeItem> event)
{
tItem = (IMAPTreeItem)event.getSelectedItem();
folder = (IMAPFolder) tItem.getUserObject();
- if
(folder.getFullName().equalsIgnoreCase(IMAPFolder.DEFAULT_INBOX)) {
+ if
(folder.getFullName().equalsIgnoreCase(user.getSettings().getInboxFolderName()))
{
display.getDeleteEnable().setEnabled(false);
display.getRenameEnable().setEnabled(false);
} else {
Modified:
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/IMAPFolderView.java
URL:
http://svn.apache.org/viewvc/labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/IMAPFolderView.java?rev=810118&r1=810117&r2=810118&view=diff
==============================================================================
---
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/IMAPFolderView.java
(original)
+++
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/IMAPFolderView.java
Tue Sep 1 16:50:53 2009
@@ -139,9 +139,11 @@
IMAPTreeItem item = treeList.get(i);
bindDropController(item);
folderTree.addItem(item);
- if (((IMAPFolder)
item.getUserObject()).getFullName().equalsIgnoreCase(IMAPFolder.DEFAULT_INBOX))
{
+
+ if (((IMAPFolder)
item.getUserObject()).getFullName().equalsIgnoreCase(user.getSettings().getInboxFolderName()))
{
folderTree.setSelectedItem(item, false);
}
+
}
}
@@ -327,14 +329,16 @@
public void deleteSelectedFolder() {
folderTree.getSelectedItem().remove();
+
// Select the INBOX after delete folder
for (int i = 0; i < folderTree.getItemCount(); i++) {
IMAPTreeItem item = (IMAPTreeItem)
folderTree.getItem(i);
- if (((IMAPFolder)
item.getUserObject()).getFullName().equalsIgnoreCase(IMAPFolder.DEFAULT_INBOX))
{
+ if (((IMAPFolder)
item.getUserObject()).getFullName().equalsIgnoreCase(user.getSettings().getInboxFolderName()))
{
folderTree.setSelectedItem(item, true);
break;
}
}
+
}
/*
Modified:
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java
URL:
http://svn.apache.org/viewvc/labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java?rev=810118&r1=810117&r2=810118&view=diff
==============================================================================
---
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java
(original)
+++
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java
Tue Sep 1 16:50:53 2009
@@ -142,7 +142,7 @@
registerHandler(display.getDeleteClick().addClickHandler(new
com.google.gwt.event.dom.client.ClickHandler() {
public void
onClick(com.google.gwt.event.dom.client.ClickEvent event) {
- if
(folder.getFullName().equals(IMAPFolder.DEFAULT_TRASH)) {
+ if
(folder.getFullName().equals(user.getSettings().getTrashFolderName())) {
display.getConfirmDialog().show();
} else {
deleteMessages();
Modified:
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
URL:
http://svn.apache.org/viewvc/labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java?rev=810118&r1=810117&r2=810118&view=diff
==============================================================================
---
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
(original)
+++
labs/hupa/client/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
Tue Sep 1 16:50:53 2009
@@ -168,7 +168,7 @@
public void bind(User user) {
this.user = user;
- folder = new IMAPFolder(IMAPFolder.DEFAULT_INBOX);
+ folder = new
IMAPFolder(user.getSettings().getInboxFolderName());
bind();
refreshDisplay();
Modified: labs/hupa/client/src/main/resources/config.properties
URL:
http://svn.apache.org/viewvc/labs/hupa/client/src/main/resources/config.properties?rev=810118&r1=810117&r2=810118&view=diff
==============================================================================
--- labs/hupa/client/src/main/resources/config.properties (original)
+++ labs/hupa/client/src/main/resources/config.properties Tue Sep 1 16:50:53
2009
@@ -5,6 +5,12 @@
# Use SSL/TLS to connect to the IMAP server
IMAPS=true
+# For gmail change this to [GMail]\Sent
+DefaultSentFolder=Sent
+# For gmail change this to [GMail]\Trash
+DefaultTrashFolder=Trash
+
+
# The IP or domainname of the SMTP server
SMTPServerAddress=smtp.gmail.com
# The port of the SMTP server
@@ -12,4 +18,4 @@
# Use AUTH for SMTP
SMTPAuth=true
# Use SSL/TLS to connect to the SMTP server
-SMTPS=true
\ No newline at end of file
+SMTPS=true
Added:
labs/hupa/server/src/main/java/org/apache/hupa/server/guice/DefaultUserSettingsProvider.java
URL:
http://svn.apache.org/viewvc/labs/hupa/server/src/main/java/org/apache/hupa/server/guice/DefaultUserSettingsProvider.java?rev=810118&view=auto
==============================================================================
---
labs/hupa/server/src/main/java/org/apache/hupa/server/guice/DefaultUserSettingsProvider.java
(added)
+++
labs/hupa/server/src/main/java/org/apache/hupa/server/guice/DefaultUserSettingsProvider.java
Tue Sep 1 16:50:53 2009
@@ -0,0 +1,50 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.hupa.server.guice;
+
+import org.apache.hupa.shared.data.Settings;
+
+import com.google.inject.Provider;
+import com.google.inject.name.Named;
+
+public class DefaultUserSettingsProvider implements Provider<Settings> {
+ private String inboxFolder;
+ private String sentFolder;
+ private String trashFolder;
+
+ public DefaultUserSettingsProvider(@Named("DefaultInboxFolder") String
inboxFolder, @Named("DefaultSentFolder") String sentFolder,
@Named("DefaultTrashFolder") String trashFolder) {
+ this.inboxFolder = inboxFolder;
+ this.sentFolder = sentFolder;
+ this.trashFolder = trashFolder;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see com.google.inject.Provider#get()
+ */
+ public Settings get() {
+ Settings settings = new Settings();
+ settings.setInboxFolderName(inboxFolder);
+ settings.setSentFolderName(sentFolder);
+ settings.setTrashFolderName(trashFolder);
+ return settings;
+ }
+
+}
Modified:
labs/hupa/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java
URL:
http://svn.apache.org/viewvc/labs/hupa/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java?rev=810118&r1=810117&r2=810118&view=diff
==============================================================================
---
labs/hupa/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java
(original)
+++
labs/hupa/server/src/main/java/org/apache/hupa/server/handler/AbstractSendMessageHandler.java
Tue Sep 1 16:50:53 2009
@@ -181,7 +181,7 @@
// store message in sent folder
IMAPStore iStore = cache.get(user);
- IMAPFolder folder = (IMAPFolder)
iStore.getFolder(org.apache.hupa.shared.data.IMAPFolder.DEFAULT_SENT);
+ IMAPFolder folder = (IMAPFolder)
iStore.getFolder(user.getSettings().getSentFolderName());
if (folder.exists() == false) {
folder.create(IMAPFolder.READ_WRITE);
}
Modified:
labs/hupa/server/src/main/java/org/apache/hupa/server/handler/DeleteMessageHandler.java
URL:
http://svn.apache.org/viewvc/labs/hupa/server/src/main/java/org/apache/hupa/server/handler/DeleteMessageHandler.java?rev=810118&r1=810117&r2=810118&view=diff
==============================================================================
---
labs/hupa/server/src/main/java/org/apache/hupa/server/handler/DeleteMessageHandler.java
(original)
+++
labs/hupa/server/src/main/java/org/apache/hupa/server/handler/DeleteMessageHandler.java
Tue Sep 1 16:50:53 2009
@@ -81,8 +81,8 @@
Message[] mArray = messages.toArray(new
Message[messages.size()]);
// check if the delete was triggered not in the trash
folder
- if
(folder.getFullName().equalsIgnoreCase(IMAPFolder.DEFAULT_TRASH) == false) {
- com.sun.mail.imap.IMAPFolder trashFolder =
(com.sun.mail.imap.IMAPFolder) store.getFolder(IMAPFolder.DEFAULT_TRASH);
+ if
(folder.getFullName().equalsIgnoreCase(user.getSettings().getTrashFolderName())
== false) {
+ com.sun.mail.imap.IMAPFolder trashFolder =
(com.sun.mail.imap.IMAPFolder)
store.getFolder(user.getSettings().getTrashFolderName());
boolean trashFound = false;
// if the trash folder does not exist we create
it
Modified:
labs/hupa/server/src/main/java/org/apache/hupa/server/handler/LoginUserHandler.java
URL:
http://svn.apache.org/viewvc/labs/hupa/server/src/main/java/org/apache/hupa/server/handler/LoginUserHandler.java?rev=810118&r1=810117&r2=810118&view=diff
==============================================================================
---
labs/hupa/server/src/main/java/org/apache/hupa/server/handler/LoginUserHandler.java
(original)
+++
labs/hupa/server/src/main/java/org/apache/hupa/server/handler/LoginUserHandler.java
Tue Sep 1 16:50:53 2009
@@ -27,6 +27,7 @@
import org.apache.commons.logging.Log;
import org.apache.hupa.server.IMAPStoreCache;
+import org.apache.hupa.shared.data.Settings;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.rpc.LoginUser;
import org.apache.hupa.shared.rpc.LoginUserResult;
@@ -44,12 +45,14 @@
private final IMAPStoreCache cache;
private final Log logger;
private final Provider<HttpSession> sessionProvider;
+ private final Provider<Settings> settingsProvider;
@Inject
- public LoginUserHandler(IMAPStoreCache cache, Log
logger,Provider<HttpSession> sessionProvider) {
+ public LoginUserHandler(IMAPStoreCache cache, Log logger,
Provider<HttpSession> sessionProvider, Provider<Settings> settingsProvider) {
this.cache = cache;
this.logger = logger;
this.sessionProvider = sessionProvider;
+ this.settingsProvider = settingsProvider;
}
/*
@@ -71,7 +74,7 @@
cache.get(user);
user.setAuthenticated(true);
-
+ user.setSettings(settingsProvider.get());
// store the session id for later usage
HttpSession session = sessionProvider.get();
user.setSessionId(session.getId());
Modified:
labs/hupa/server/src/test/java/org/apache/hupa/server/handler/AbstractHandlerTest.java
URL:
http://svn.apache.org/viewvc/labs/hupa/server/src/test/java/org/apache/hupa/server/handler/AbstractHandlerTest.java?rev=810118&r1=810117&r2=810118&view=diff
==============================================================================
---
labs/hupa/server/src/test/java/org/apache/hupa/server/handler/AbstractHandlerTest.java
(original)
+++
labs/hupa/server/src/test/java/org/apache/hupa/server/handler/AbstractHandlerTest.java
Tue Sep 1 16:50:53 2009
@@ -28,6 +28,7 @@
import org.apache.hupa.server.mock.MockHttpSession;
import org.apache.hupa.server.mock.MockIMAPStore;
import org.apache.hupa.server.mock.MockIMAPStoreCache;
+import org.apache.hupa.shared.data.Settings;
import org.apache.hupa.shared.data.User;
import com.google.inject.Provider;
@@ -65,6 +66,7 @@
user.setName("test");
user.setPassword("password");
user.setSessionId(VALID_ID);
+ user.setSettings(new Settings());
return user;
}
}
Modified:
labs/hupa/server/src/test/java/org/apache/hupa/server/handler/DeleteMessageHandlerTest.java
URL:
http://svn.apache.org/viewvc/labs/hupa/server/src/test/java/org/apache/hupa/server/handler/DeleteMessageHandlerTest.java?rev=810118&r1=810117&r2=810118&view=diff
==============================================================================
---
labs/hupa/server/src/test/java/org/apache/hupa/server/handler/DeleteMessageHandlerTest.java
(original)
+++
labs/hupa/server/src/test/java/org/apache/hupa/server/handler/DeleteMessageHandlerTest.java
Tue Sep 1 16:50:53 2009
@@ -79,7 +79,7 @@
uids.add(new Long(3));
DeleteMessage action = new DeleteMessage(VALID_ID, folder,
uids);
- MockIMAPFolder f3 = (MockIMAPFolder)
store.getFolder(IMAPFolder.DEFAULT_TRASH);
+ MockIMAPFolder f3 = (MockIMAPFolder)
store.getFolder(user.getSettings().getTrashFolderName());
assertFalse("Trash folder not exists yet",f3.exists());
try {
@@ -90,7 +90,7 @@
assertEquals("Only 1 message left", 1,
f.getMessageCount());
- MockIMAPFolder f2 = (MockIMAPFolder)
store.getFolder(IMAPFolder.DEFAULT_TRASH);
+ MockIMAPFolder f2 = (MockIMAPFolder)
store.getFolder(user.getSettings().getTrashFolderName());
assertTrue("Trash folder created",f2.exists());
assertEquals("2 messages moved", 2,
f2.getMessageCount());
} catch (ActionException e) {
@@ -107,7 +107,7 @@
storeCache.addValidUser(user.getName(), user.getPassword());
session.setAttribute("user", user);
IMAPFolder folder = new IMAPFolder();
- folder.setFullName(IMAPFolder.DEFAULT_TRASH);
+ folder.setFullName(user.getSettings().getTrashFolderName());
MockIMAPStore store = (MockIMAPStore) storeCache.get(user);
store.clear();
Modified:
labs/hupa/server/src/test/java/org/apache/hupa/server/handler/LoginUserHandlerTest.java
URL:
http://svn.apache.org/viewvc/labs/hupa/server/src/test/java/org/apache/hupa/server/handler/LoginUserHandlerTest.java?rev=810118&r1=810117&r2=810118&view=diff
==============================================================================
---
labs/hupa/server/src/test/java/org/apache/hupa/server/handler/LoginUserHandlerTest.java
(original)
+++
labs/hupa/server/src/test/java/org/apache/hupa/server/handler/LoginUserHandlerTest.java
Tue Sep 1 16:50:53 2009
@@ -22,13 +22,20 @@
import net.customware.gwt.dispatch.shared.ActionException;
import org.apache.hupa.server.mock.MockLog;
+import org.apache.hupa.shared.data.Settings;
import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.rpc.LoginUser;
import org.apache.hupa.shared.rpc.LoginUserResult;
+import com.google.inject.Provider;
+
public class LoginUserHandlerTest extends AbstractHandlerTest{
- private LoginUserHandler handler = new LoginUserHandler(storeCache, new
MockLog(),sessionProvider);
-
+ private LoginUserHandler handler = new LoginUserHandler(storeCache, new
MockLog(),sessionProvider, new Provider<Settings>() {
+
+ public Settings get() {
+ return new Settings();
+ }
+ });
public void testInvalidLogin() {
try {
handler.execute(new LoginUser("invalid","invalid"),
null);
Modified:
labs/hupa/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
URL:
http://svn.apache.org/viewvc/labs/hupa/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java?rev=810118&r1=810117&r2=810118&view=diff
==============================================================================
--- labs/hupa/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
(original)
+++ labs/hupa/shared/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
Tue Sep 1 16:50:53 2009
@@ -32,9 +32,6 @@
*
*/
private static final long serialVersionUID = 2084188092060266479L;
- public static final String DEFAULT_INBOX = "INBOX";
- public static final String DEFAULT_TRASH = "Trash";
- public static final String DEFAULT_SENT = "Sent";
private ArrayList<IMAPFolder> childs = new ArrayList<IMAPFolder>();
private String fullName;
Added: labs/hupa/shared/src/main/java/org/apache/hupa/shared/data/Settings.java
URL:
http://svn.apache.org/viewvc/labs/hupa/shared/src/main/java/org/apache/hupa/shared/data/Settings.java?rev=810118&view=auto
==============================================================================
--- labs/hupa/shared/src/main/java/org/apache/hupa/shared/data/Settings.java
(added)
+++ labs/hupa/shared/src/main/java/org/apache/hupa/shared/data/Settings.java
Tue Sep 1 16:50:53 2009
@@ -0,0 +1,63 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.hupa.shared.data;
+
+import java.io.Serializable;
+
+public class Settings implements Serializable{
+
+ public static final String DEFAULT_INBOX = "INBOX";
+ public static final String DEFAULT_TRASH = "Trash";
+ public static final String DEFAULT_SENT = "Sent";
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -8051377307421345664L;
+ private String trashFolderName = DEFAULT_TRASH;
+ private String sentFolderName = DEFAULT_SENT;
+ private String inboxFolderName = DEFAULT_INBOX;
+
+ public String getInboxFolderName() {
+ return inboxFolderName;
+ }
+
+ public void setInboxFolderName(String inboxFolderName) {
+ this.inboxFolderName = inboxFolderName;
+ }
+
+ public String getTrashFolderName() {
+ return trashFolderName;
+ }
+
+ public void setTrashFolderName(String trashFolderName) {
+ this.trashFolderName = trashFolderName;
+ }
+
+ public String getSentFolderName() {
+ return sentFolderName;
+ }
+
+ public void setSentFolderName(String sentFolderName) {
+ this.sentFolderName = sentFolderName;
+ }
+
+
+}
Modified: labs/hupa/shared/src/main/java/org/apache/hupa/shared/data/User.java
URL:
http://svn.apache.org/viewvc/labs/hupa/shared/src/main/java/org/apache/hupa/shared/data/User.java?rev=810118&r1=810117&r2=810118&view=diff
==============================================================================
--- labs/hupa/shared/src/main/java/org/apache/hupa/shared/data/User.java
(original)
+++ labs/hupa/shared/src/main/java/org/apache/hupa/shared/data/User.java Tue
Sep 1 16:50:53 2009
@@ -38,7 +38,8 @@
private Date loginDate;
private boolean auth;
private String sessionId;
-
+ private Settings settings;
+
/**
* The name of the User
@@ -137,6 +138,14 @@
public void setSessionId(String sessionId) {
this.sessionId = sessionId;
}
+
+ public void setSettings(Settings settings) {
+ this.settings = settings;
+ }
+
+ public Settings getSettings() {
+ return settings;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
