You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by no...@apache.org on 2009/07/27 09:41:12 UTC
svn commit: r798062 - in /labs/hupa: ./
src/main/java/org/apache/hupa/client/mvp/
src/main/java/org/apache/hupa/server/
src/main/java/org/apache/hupa/shared/data/
src/main/java/org/apache/hupa/shared/events/
src/main/java/org/apache/hupa/shared/rpc/
Author: norman
Date: Mon Jul 27 07:41:10 2009
New Revision: 798062
URL: http://svn.apache.org/viewvc?rev=798062&view=rev
Log:
Store sent messages to IMAP Sent folder
Add javadocs
Some renaming of classes to better represent the usage
Added:
labs/hupa/src/main/java/org/apache/hupa/shared/data/Message.java
- copied, changed from r798026, labs/hupa/src/main/java/org/apache/hupa/shared/data/SMTPMessage.java
labs/hupa/src/main/java/org/apache/hupa/shared/data/User.java
- copied, changed from r798026, labs/hupa/src/main/java/org/apache/hupa/shared/data/SMTPUser.java
Removed:
labs/hupa/src/main/java/org/apache/hupa/shared/data/IMAPUser.java
labs/hupa/src/main/java/org/apache/hupa/shared/data/SMTPMessage.java
labs/hupa/src/main/java/org/apache/hupa/shared/data/SMTPUser.java
Modified:
labs/hupa/.classpath
labs/hupa/.project
labs/hupa/src/main/java/org/apache/hupa/client/mvp/AppPresenter.java
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageSendPresenter.java
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageSendView.java
labs/hupa/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
labs/hupa/src/main/java/org/apache/hupa/server/ExposeMessageHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/FetchFoldersHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/FetchMessagesHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/IMAPStoreCache.java
labs/hupa/src/main/java/org/apache/hupa/server/LoginUserHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/LogoutUserHandler.java
labs/hupa/src/main/java/org/apache/hupa/server/SendMessageHandler.java
labs/hupa/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
labs/hupa/src/main/java/org/apache/hupa/shared/data/IMAPMessage.java
labs/hupa/src/main/java/org/apache/hupa/shared/data/MessageAttachment.java
labs/hupa/src/main/java/org/apache/hupa/shared/data/MessageContent.java
labs/hupa/src/main/java/org/apache/hupa/shared/data/MessageHeader.java
labs/hupa/src/main/java/org/apache/hupa/shared/events/ExpandMessageEvent.java
labs/hupa/src/main/java/org/apache/hupa/shared/events/LoadMessagesEvent.java
labs/hupa/src/main/java/org/apache/hupa/shared/events/LoginEvent.java
labs/hupa/src/main/java/org/apache/hupa/shared/events/LogoutEvent.java
labs/hupa/src/main/java/org/apache/hupa/shared/rpc/DeleteMessage.java
labs/hupa/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageResult.java
labs/hupa/src/main/java/org/apache/hupa/shared/rpc/ExposeMessage.java
labs/hupa/src/main/java/org/apache/hupa/shared/rpc/FetchFolders.java
labs/hupa/src/main/java/org/apache/hupa/shared/rpc/FetchMessages.java
labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LoginUserResult.java
labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LogoutUser.java
labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LogoutUserResult.java
labs/hupa/src/main/java/org/apache/hupa/shared/rpc/Noop.java
labs/hupa/src/main/java/org/apache/hupa/shared/rpc/SendMessage.java
Modified: labs/hupa/.classpath
URL: http://svn.apache.org/viewvc/labs/hupa/.classpath?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/.classpath (original)
+++ labs/hupa/.classpath Mon Jul 27 07:41:10 2009
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <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="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="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="target/classes"/>
+</classpath>
Modified: labs/hupa/.project
URL: http://svn.apache.org/viewvc/labs/hupa/.project?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/.project (original)
+++ labs/hupa/.project Mon Jul 27 07:41:10 2009
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>Hupa</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.google.gdt.eclipse.core.webAppProjectValidator</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.google.gwt.eclipse.core.gwtProjectValidator</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.google.gwt.eclipse.core.gwtNature</nature>
- <nature>com.google.gdt.eclipse.core.webAppNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>Hupa</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.google.gdt.eclipse.core.webAppProjectValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.google.gwt.eclipse.core.gwtProjectValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>com.google.gwt.eclipse.core.gwtNature</nature>
+ <nature>com.google.gdt.eclipse.core.webAppNature</nature>
+ </natures>
+</projectDescription>
Modified: labs/hupa/src/main/java/org/apache/hupa/client/mvp/AppPresenter.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/mvp/AppPresenter.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/mvp/AppPresenter.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/mvp/AppPresenter.java Mon Jul 27 07:41:10 2009
@@ -23,7 +23,7 @@
import net.customware.gwt.dispatch.client.DispatchAsync;
import net.customware.gwt.presenter.client.EventBus;
-import org.apache.hupa.shared.data.IMAPUser;
+import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.events.LoginEvent;
import org.apache.hupa.shared.events.LoginEventHandler;
import org.apache.hupa.shared.events.LogoutEvent;
@@ -45,7 +45,7 @@
private MainPresenter mainPresenter;
private Timer noopTimer;
private DispatchAsync dispatcher;
- private IMAPUser user;
+ private User user;
@Inject
Modified: labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListPresenter.java Mon Jul 27 07:41:10 2009
@@ -33,7 +33,7 @@
import org.apache.hupa.client.events.HasClickHandlers;
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.IMAPMessage;
-import org.apache.hupa.shared.data.IMAPUser;
+import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.events.ExpandMessageEvent;
import org.apache.hupa.shared.events.LoadMessagesEvent;
import org.apache.hupa.shared.events.LoadMessagesEventHandler;
@@ -59,12 +59,12 @@
public com.google.gwt.event.dom.client.HasClickHandlers getNewClick();
public ArrayList<Long> getSelectedMessagesUids();
public com.google.gwt.event.dom.client.HasClickHandlers getDeleteClick();
- public void reloadData(IMAPUser user, IMAPFolder folder,String searchValue);
+ public void reloadData(User user, IMAPFolder folder,String searchValue);
public void removeMessages(ArrayList<Long> uids);
public void reset();
}
- private IMAPUser user;
+ private User user;
private IMAPFolder folder;
private String searchValue;
private DispatchAsync dispatcher;
Modified: labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageListView.java Mon Jul 27 07:41:10 2009
@@ -35,7 +35,7 @@
import org.apache.hupa.client.widgets.ToolTipProvider;
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.IMAPMessage;
-import org.apache.hupa.shared.data.IMAPUser;
+import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.data.IMAPMessage.IMAPFlag;
import org.apache.hupa.shared.events.MessagesReceivedEvent;
import org.apache.hupa.shared.rpc.FetchMessages;
@@ -90,7 +90,7 @@
private HupaConstants constants = GWT.create(HupaConstants.class);
private DispatchAsync dispatcher;
- private IMAPUser user;
+ private User user;
private IMAPFolder folder;
private String searchValue;
@@ -448,7 +448,7 @@
return mailTable.getDataTable();
}
- public void reloadData(IMAPUser user, IMAPFolder folder,String searchValue) {
+ public void reloadData(User user, IMAPFolder folder,String searchValue) {
this.user = user;
this.folder = folder;
this.searchValue = searchValue;
Modified: labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java Mon Jul 27 07:41:10 2009
@@ -32,7 +32,7 @@
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.IMAPMessage;
import org.apache.hupa.shared.data.MessageAttachment;
-import org.apache.hupa.shared.data.IMAPUser;
+import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.events.LoadMessagesEvent;
import org.apache.hupa.shared.rpc.DeleteMessage;
import org.apache.hupa.shared.rpc.DeleteMessageResult;
@@ -66,7 +66,7 @@
private IMAPMessage message;
private DispatchAsync dispatcher;
private IMAPFolder folder;
- private IMAPUser user;
+ private User user;
@Inject
private IMAPMessagePresenter(IMAPMessagePresenter.Display display,EventBus bus, DispatchAsync dispatcher) {
@@ -76,7 +76,7 @@
}
- public void bind(IMAPUser user, IMAPFolder folder, IMAPMessage message) {
+ public void bind(User user, IMAPFolder folder, IMAPMessage message) {
this.message = message;
this.folder = folder;
this.user = user;
@@ -107,7 +107,7 @@
display.getTo().setText(toBuf.toString());;
display.getSubject().setText(message.getHeader().getSubject());
display.getContent().setHTML(message.getMessageContent().getText());
- display.setAttachments(message.getMessageContent().getIMAPMessageAttachments(),user.getName(),user.getPassword(), folder.getFullName(),message.getUid());
+ display.setAttachments(message.getMessageContent().getMessageAttachments(),user.getName(),user.getPassword(), folder.getFullName(),message.getUid());
}
@Override
Modified: labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageSendPresenter.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageSendPresenter.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageSendPresenter.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageSendPresenter.java Mon Jul 27 07:41:10 2009
@@ -19,13 +19,23 @@
package org.apache.hupa.client.mvp;
+import gwtupload.client.IUploader;
+import gwtupload.client.Uploader;
+
import java.util.ArrayList;
+import net.customware.gwt.dispatch.client.DispatchAsync;
+import net.customware.gwt.presenter.client.EventBus;
+import net.customware.gwt.presenter.client.place.Place;
+import net.customware.gwt.presenter.client.place.PlaceRequest;
+import net.customware.gwt.presenter.client.widget.WidgetDisplay;
+import net.customware.gwt.presenter.client.widget.WidgetPresenter;
+
import org.apache.hupa.shared.data.MessageAttachment;
-import org.apache.hupa.shared.data.MessageHeader;
-import org.apache.hupa.shared.data.IMAPUser;
import org.apache.hupa.shared.data.MessageContent;
-import org.apache.hupa.shared.data.SMTPMessage;
+import org.apache.hupa.shared.data.MessageHeader;
+import org.apache.hupa.shared.data.Message;
+import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.events.LoginEvent;
import org.apache.hupa.shared.events.LoginEventHandler;
import org.apache.hupa.shared.events.SentMessageEvent;
@@ -35,22 +45,18 @@
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.HasClickHandlers;
+import com.google.gwt.event.logical.shared.ValueChangeEvent;
+import com.google.gwt.event.logical.shared.ValueChangeHandler;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.HasText;
import com.google.inject.Inject;
-import net.customware.gwt.dispatch.client.DispatchAsync;
-import net.customware.gwt.presenter.client.EventBus;
-import net.customware.gwt.presenter.client.place.Place;
-import net.customware.gwt.presenter.client.place.PlaceRequest;
-import net.customware.gwt.presenter.client.widget.WidgetDisplay;
-import net.customware.gwt.presenter.client.widget.WidgetPresenter;
-
public class IMAPMessageSendPresenter extends WidgetPresenter<IMAPMessageSendPresenter.Display>{
- private IMAPUser user;
+ private User user;
private DispatchAsync dispatcher;
public static final Place PLACE = new Place("IMAPMessageSend");
+ private ArrayList<MessageAttachment> aList = new ArrayList<MessageAttachment>();
@Inject
public IMAPMessageSendPresenter(Display display, EventBus eventBus, DispatchAsync dispatcher) {
@@ -68,7 +74,7 @@
public HasText getSubjectText();
public HasText getMessageText();
public HasClickHandlers getSendClick();
- public ArrayList<String> getAttachments();
+ public IUploader getUploader();
}
@Override
@@ -86,12 +92,23 @@
}
});
+ display.getUploader().setOnFinishHandler(new ValueChangeHandler<IUploader>() {
+
+ public void onValueChange(ValueChangeEvent<IUploader> event) {
+ String name = ((Uploader) event.getValue()).fileInput
+ .getFilename();
+ MessageAttachment attachment = new MessageAttachment();
+ attachment.setName(name);
+ aList.add(attachment);
+ }
+
+ });
display.getSendClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
- SMTPMessage message = new SMTPMessage();
+ Message message = new Message();
MessageHeader header = new MessageHeader();
MessageContent content = new MessageContent();
@@ -123,14 +140,8 @@
header.setSubject(display.getSubjectText().getText());
content.setText(display.getMessageText().getText());
- ArrayList<MessageAttachment> attachList = new ArrayList<MessageAttachment>();
- ArrayList<String> aList = display.getAttachments();
- for (int i = 0; i < aList.size();i++) {
- MessageAttachment attachment = new MessageAttachment();
- attachment.setName(aList.get(i));
- attachList.add(attachment);
- }
- content.setIMAPMessageAttachments(attachList);
+
+ content.setMessageAttachments(aList);
message.setHeader(header);
message.setMessageContent(content);
dispatcher.execute(new SendMessage(user,message), new AsyncCallback<EmptyResult>() {
@@ -140,6 +151,7 @@
}
public void onSuccess(EmptyResult result) {
+ reset();
eventBus.fireEvent(new SentMessageEvent());
}
@@ -151,6 +163,14 @@
});
}
+ private void reset() {
+ display.getUploader().clear();
+ display.getBccText().setText("");
+ display.getCcText().setText("");
+ display.getToText().setText("");
+ display.getSubjectText().setText("");
+ display.getFromText().setText("");
+ }
@Override
protected void onPlaceRequest(PlaceRequest request) {
Modified: labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageSendView.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageSendView.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageSendView.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageSendView.java Mon Jul 27 07:41:10 2009
@@ -19,8 +19,6 @@
package org.apache.hupa.client.mvp;
-import java.util.ArrayList;
-
import eu.maydu.gwt.validation.client.DefaultValidationProcessor;
import eu.maydu.gwt.validation.client.ValidationAction;
import eu.maydu.gwt.validation.client.ValidationProcessor;
@@ -32,7 +30,6 @@
import eu.maydu.gwt.validation.client.validators.standard.NotEmptyValidator;
import gwtupload.client.IUploader;
import gwtupload.client.MultiUploader;
-import gwtupload.client.Uploader;
import org.apache.hupa.client.HupaConstants;
import org.apache.hupa.client.widgets.UploadProgress;
@@ -43,8 +40,6 @@
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.HasClickHandlers;
-import com.google.gwt.event.logical.shared.ValueChangeEvent;
-import com.google.gwt.event.logical.shared.ValueChangeHandler;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.Grid;
import com.google.gwt.user.client.ui.HasText;
@@ -64,7 +59,6 @@
private TextBox cc = new TextBox();
private TextBox bcc = new TextBox();
private TextBox subject = new TextBox();
- private ArrayList<String> attachments = new ArrayList<String>();
private MultiUploader uploader = new MultiUploader(new UploadProgress());
private TextArea text = new TextArea();
private Button sendButton = new Button(constants.sendButton());
@@ -140,14 +134,6 @@
text.setHeight("400px");
text.setVisibleLines(50);
- uploader.setOnFinishHandler(new ValueChangeHandler<IUploader>() {
-
- public void onValueChange(ValueChangeEvent<IUploader> event) {
- attachments.add(((Uploader) event.getValue()).fileInput
- .getFilename());
- }
-
- });
/*
* uploader.setOnFinishHandler(new ValueChangeHandler<IUploader>() {
* public void onValueChange(ValueChangeEvent<IUploader> event) {
@@ -289,7 +275,7 @@
}
- public ArrayList<String> getAttachments() {
- return attachments;
+ public IUploader getUploader() {
+ return uploader;
}
}
Modified: labs/hupa/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java Mon Jul 27 07:41:10 2009
@@ -34,7 +34,7 @@
import org.apache.hupa.client.widgets.IMAPTreeItem;
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.IMAPMessage;
-import org.apache.hupa.shared.data.IMAPUser;
+import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.data.IMAPMessage.IMAPFlag;
import org.apache.hupa.shared.events.ExpandMessageEvent;
import org.apache.hupa.shared.events.ExpandMessageEventHandler;
@@ -86,7 +86,7 @@
}
private DispatchAsync dispatcher;
- private IMAPUser user;
+ private User user;
private IMAPFolder folder;
private IMAPTreeItem tItem;
Modified: labs/hupa/src/main/java/org/apache/hupa/server/ExposeMessageHandler.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/ExposeMessageHandler.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/ExposeMessageHandler.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/server/ExposeMessageHandler.java Mon Jul 27 07:41:10 2009
@@ -39,7 +39,7 @@
import org.apache.hupa.shared.data.IMAPMessage;
import org.apache.hupa.shared.data.MessageAttachment;
import org.apache.hupa.shared.data.MessageContent;
-import org.apache.hupa.shared.data.IMAPUser;
+import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.rpc.ExposeMessage;
import org.apache.hupa.shared.rpc.ExposeMessageResult;
@@ -71,7 +71,7 @@
}
- protected IMAPMessage exposeMessage(IMAPUser user, IMAPFolder folder, IMAPMessage msg) throws ActionException {
+ protected IMAPMessage exposeMessage(User user, IMAPFolder folder, IMAPMessage msg) throws ActionException {
if (msg.isExposed()) {
return msg;
@@ -101,7 +101,6 @@
} else if (con instanceof Multipart) {
Multipart mp = (Multipart) con;
ArrayList<MessageAttachment> attachmentList = new ArrayList<MessageAttachment>();
- boolean hasAttachment = false;
StringBuffer sbPlain = new StringBuffer();
StringBuffer sbHTML = new StringBuffer();
for (int i = 0; i < mp.getCount(); i++) {
@@ -124,7 +123,6 @@
} else {
if (part.getFileName() != null) {
- hasAttachment = true;
MessageAttachment attachment = new MessageAttachment();
attachment.setName(MimeUtility.decodeText(part.getFileName()));
attachment.setContentType(part.getContentType());
@@ -143,7 +141,7 @@
}
content.setIsHTML(isHTML);
- content.setIMAPMessageAttachments(attachmentList);
+ content.setMessageAttachments(attachmentList);
}
f.setFlags(new Message[] {message}, new Flags(Flag.SEEN), true);
f.close(false);
Modified: labs/hupa/src/main/java/org/apache/hupa/server/FetchFoldersHandler.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/FetchFoldersHandler.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/FetchFoldersHandler.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/server/FetchFoldersHandler.java Mon Jul 27 07:41:10 2009
@@ -30,7 +30,7 @@
import org.apache.commons.logging.Log;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.IMAPUser;
+import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.rpc.FetchFolders;
import org.apache.hupa.shared.rpc.FetchFoldersResult;
@@ -64,7 +64,7 @@
return FetchFolders.class;
}
- protected ArrayList<IMAPFolder> getFolders(IMAPUser user)
+ protected ArrayList<IMAPFolder> getFolders(User user)
throws ActionException {
ArrayList<IMAPFolder> fList = new ArrayList<IMAPFolder>();
IMAPStore store = null;
Modified: labs/hupa/src/main/java/org/apache/hupa/server/FetchMessagesHandler.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/FetchMessagesHandler.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/FetchMessagesHandler.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/server/FetchMessagesHandler.java Mon Jul 27 07:41:10 2009
@@ -38,9 +38,9 @@
import org.apache.commons.logging.Log;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.MessageHeader;
import org.apache.hupa.shared.data.IMAPMessage;
-import org.apache.hupa.shared.data.IMAPUser;
+import org.apache.hupa.shared.data.MessageHeader;
+import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.data.IMAPMessage.IMAPFlag;
import org.apache.hupa.shared.rpc.FetchMessages;
import org.apache.hupa.shared.rpc.FetchMessagesResult;
@@ -75,7 +75,7 @@
}
- protected FetchMessagesResult getMessages(IMAPUser user,IMAPFolder folder, int start, int offset,String searchString) throws ActionException {
+ protected FetchMessagesResult getMessages(User user,IMAPFolder folder, int start, int offset,String searchString) throws ActionException {
ArrayList<IMAPMessage> mList = new ArrayList<IMAPMessage>();
int end = start + offset;
IMAPStore store = null;
Modified: labs/hupa/src/main/java/org/apache/hupa/server/IMAPStoreCache.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/IMAPStoreCache.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/IMAPStoreCache.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/server/IMAPStoreCache.java Mon Jul 27 07:41:10 2009
@@ -27,7 +27,7 @@
import javax.mail.Session;
import org.apache.commons.logging.Log;
-import org.apache.hupa.shared.data.IMAPUser;
+import org.apache.hupa.shared.data.User;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@@ -50,7 +50,7 @@
System.setProperty("mail.mime.decodetext.strict", "false");
}
- public synchronized IMAPStore get(IMAPUser user) throws MessagingException {
+ public synchronized IMAPStore get(User user) throws MessagingException {
return get(user.getName(),user.getPassword());
}
@@ -65,7 +65,7 @@
return store;
}
- public synchronized void delete(IMAPUser user) {
+ public synchronized void delete(User user) {
delete(user.getName());
}
Modified: labs/hupa/src/main/java/org/apache/hupa/server/LoginUserHandler.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/LoginUserHandler.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/LoginUserHandler.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/server/LoginUserHandler.java Mon Jul 27 07:41:10 2009
@@ -19,14 +19,12 @@
package org.apache.hupa.server;
-import java.util.Date;
-
import net.customware.gwt.dispatch.server.ActionHandler;
import net.customware.gwt.dispatch.server.ExecutionContext;
import net.customware.gwt.dispatch.shared.ActionException;
import org.apache.commons.logging.Log;
-import org.apache.hupa.shared.data.IMAPUser;
+import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.rpc.LoginUser;
import org.apache.hupa.shared.rpc.LoginUserResult;
@@ -60,16 +58,15 @@
return LoginUser.class;
}
- protected IMAPUser login(String username, String password)
+ protected User login(String username, String password)
throws ActionException {
try {
- IMAPUser user = new IMAPUser();
+ User user = new User();
user.setName(username);
user.setPassword(password);
cache.get(user);
- user.setLoginDate(new Date());
user.setAuthenticated(true);
return user;
Modified: labs/hupa/src/main/java/org/apache/hupa/server/LogoutUserHandler.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/LogoutUserHandler.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/LogoutUserHandler.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/server/LogoutUserHandler.java Mon Jul 27 07:41:10 2009
@@ -25,7 +25,7 @@
import net.customware.gwt.dispatch.shared.ActionException;
import org.apache.commons.logging.Log;
-import org.apache.hupa.shared.data.IMAPUser;
+import org.apache.hupa.shared.data.User;
import org.apache.hupa.shared.rpc.LogoutUser;
import org.apache.hupa.shared.rpc.LogoutUserResult;
@@ -45,7 +45,7 @@
public LogoutUserResult execute(LogoutUser action, ExecutionContext arg1)
throws ActionException {
- IMAPUser user = action.getUser();
+ User user = action.getUser();
user.setAuthenticated(false);
cache.delete(user);
Modified: labs/hupa/src/main/java/org/apache/hupa/server/SendMessageHandler.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/SendMessageHandler.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/server/SendMessageHandler.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/server/SendMessageHandler.java Mon Jul 27 07:41:10 2009
@@ -19,6 +19,7 @@
package org.apache.hupa.server;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -27,10 +28,12 @@
import javax.activation.DataHandler;
import javax.activation.DataSource;
+import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Multipart;
import javax.mail.Session;
import javax.mail.Transport;
+import javax.mail.Flags.Flag;
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeBodyPart;
@@ -45,22 +48,25 @@
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.logging.Log;
import org.apache.hupa.shared.data.MessageAttachment;
-import org.apache.hupa.shared.data.SMTPMessage;
import org.apache.hupa.shared.rpc.EmptyResult;
import org.apache.hupa.shared.rpc.SendMessage;
import com.google.inject.Inject;
+import com.sun.mail.imap.IMAPFolder;
+import com.sun.mail.imap.IMAPStore;
public class SendMessageHandler implements
ActionHandler<SendMessage, EmptyResult> {
private Log logger;
private FileItemRegistry registry;
+ private IMAPStoreCache store;
@Inject
- public SendMessageHandler(Log logger, FileItemRegistry registry) {
+ public SendMessageHandler(Log logger, FileItemRegistry registry,IMAPStoreCache store) {
this.logger = logger;
this.registry = registry;
+ this.store = store;
}
public EmptyResult execute(SendMessage action, ExecutionContext context)
@@ -71,7 +77,7 @@
Session session = Session.getDefaultInstance(props);
MimeMessage message = new MimeMessage(session);
- SMTPMessage m = action.getMessage();
+ org.apache.hupa.shared.data.Message m = action.getMessage();
message.setFrom(new InternetAddress(m.getHeader().getFrom()));
ArrayList<String> to = m.getHeader().getTo();
@@ -88,7 +94,7 @@
message.setSubject(m.getHeader().getSubject());
ArrayList<MessageAttachment> attachments = m.getMessageContent()
- .getIMAPMessageAttachments();
+ .getMessageAttachments();
if (attachments == null || attachments.isEmpty()) {
message.setText(m.getMessageContent().getText());
} else {
@@ -107,7 +113,7 @@
messageBodyPart = new MimeBodyPart();
DataSource source = new FileItemDataStore(fItem);
messageBodyPart.setDataHandler(new DataHandler(source));
- messageBodyPart.setFileName(fItem.getName());
+ messageBodyPart.setFileName(source.getName());
multipart.addBodyPart(messageBodyPart);
}
// Put parts in message
@@ -121,6 +127,15 @@
.getName(), action.getUser().getPassword());
transport.sendMessage(message, message.getAllRecipients());
+ // store message in sent folder
+ IMAPStore iStore = store.get(action.getUser());
+ IMAPFolder folder = (IMAPFolder) iStore.getFolder(org.apache.hupa.shared.data.IMAPFolder.DEFAULT_SENT);
+ if (folder.exists() == false) {
+ folder.create(IMAPFolder.READ_WRITE);
+ }
+ message.setFlag(Flag.SEEN, true);
+ folder.appendMessages(new Message[] {message});
+ folder.close(false);
} catch (AddressException e) {
logger.error("Error while parsing recipient", e);
throw new ActionException("Error while parsing recipient");
@@ -131,6 +146,10 @@
return new EmptyResult();
}
+ /*
+ * (non-Javadoc)
+ * @see net.customware.gwt.dispatch.server.ActionHandler#getActionType()
+ */
public Class<SendMessage> getActionType() {
return SendMessage.class;
}
@@ -148,18 +167,42 @@
this.item = item;
}
+ /*
+ * (non-Javadoc)
+ * @see javax.activation.DataSource#getContentType()
+ */
public String getContentType() {
return item.getContentType();
}
+ /*
+ * (non-Javadoc)
+ * @see javax.activation.DataSource#getInputStream()
+ */
public InputStream getInputStream() throws IOException {
return item.getInputStream();
}
+ /*
+ * (non-Javadoc)
+ * @see javax.activation.DataSource#getName()
+ */
public String getName() {
- return item.getName();
+ String fullName = item.getName();
+
+ // Strip path from file
+ int index = fullName.lastIndexOf(File.separator);
+ if (index == -1) {
+ return fullName;
+ } else {
+ return fullName.substring(index +1 ,fullName.length());
+ }
}
+ /*
+ * (non-Javadoc)
+ * @see javax.activation.DataSource#getOutputStream()
+ */
public OutputStream getOutputStream() throws IOException {
return null;
}
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/data/IMAPFolder.java Mon Jul 27 07:41:10 2009
@@ -23,6 +23,10 @@
import java.util.ArrayList;
import java.util.List;
+/**
+ * IMAPFolder
+ *
+ */
public class IMAPFolder implements Serializable {
/**
@@ -31,6 +35,7 @@
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 List<IMAPFolder> childs = new ArrayList<IMAPFolder>();
private String fullName;
@@ -45,6 +50,11 @@
setFullName(fullName);
}
+ /**
+ * Get the name of the folder
+ *
+ * @return name
+ */
public String getName() {
if (delimiter != null) {
String fParts[] = getFullName().split("\\" + delimiter);
@@ -55,42 +65,91 @@
return fullName;
}
+ /**
+ * Set the child folders
+ *
+ * @param childs
+ */
public void setChildIMAPFolders(List<IMAPFolder> childs) {
this.childs = childs;
}
+ /**
+ * Return the childs of this folder
+ *
+ * @return childs
+ */
public List<IMAPFolder> getChildIMAPFolders() {
return childs;
}
+ /**
+ * Return the full name of the folder. This include the full path
+ * @return
+ */
public String getFullName() {
return fullName;
}
+ /**
+ * Set the full name of the folder
+ *
+ * @param fullName
+ */
public void setFullName(String fullName) {
this.fullName = fullName;
}
+ /**
+ * Set the delimiter which is used to seperate folders
+ *
+ * @param delimiter
+ */
public void setDelimiter(String delimiter) {
this.delimiter = delimiter;
}
+ /**
+ * Return the delimiter
+ *
+ * @return delimiter
+ */
public String getDelimiter() {
return delimiter;
}
+ /**
+ * Return the total message count of the messages that exists within this folder
+ *
+ * @return msgCount
+ */
public int getMessageCount() {
return msgCount;
}
+ /**
+ * Set total message count
+ *
+ * @param msgCount
+ */
public void setMessageCount(int msgCount) {
this.msgCount = msgCount;
}
+ /**
+ * Set the count of all unseen messages within this folder
+ *
+ * @param unseenMsgCount
+ */
public void setUnseenMessageCount(int unseenMsgCount) {
this.unseenMsgCount = unseenMsgCount;
}
+ /**
+ * Return the unseen message count
+ *
+ * @return unseenMsgCount
+ */
public int getUnseeMessageCount() {
return unseenMsgCount;
}
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/data/IMAPMessage.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/data/IMAPMessage.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/data/IMAPMessage.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/data/IMAPMessage.java Mon Jul 27 07:41:10 2009
@@ -21,7 +21,7 @@
import java.util.List;
-public class IMAPMessage extends SMTPMessage {
+public class IMAPMessage extends Message {
/**
*
*/
Copied: labs/hupa/src/main/java/org/apache/hupa/shared/data/Message.java (from r798026, labs/hupa/src/main/java/org/apache/hupa/shared/data/SMTPMessage.java)
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/data/Message.java?p2=labs/hupa/src/main/java/org/apache/hupa/shared/data/Message.java&p1=labs/hupa/src/main/java/org/apache/hupa/shared/data/SMTPMessage.java&r1=798026&r2=798062&rev=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/data/SMTPMessage.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/data/Message.java Mon Jul 27 07:41:10 2009
@@ -21,7 +21,11 @@
import java.io.Serializable;
-public class SMTPMessage implements Serializable{
+/**
+ *
+ *
+ */
+public class Message implements Serializable{
/**
*
@@ -30,22 +34,43 @@
private MessageHeader header;
private MessageContent content;
+ /**
+ * set the header of the message
+ *
+ * @param header
+ */
public void setHeader(MessageHeader header) {
this.header = header;
}
+ /**
+ * Return the header of the message
+ *
+ * @return header
+ */
public MessageHeader getHeader() {
return header;
}
+ /**
+ * Set the content of the message
+ *
+ * @param content
+ */
public void setMessageContent(MessageContent content) {
this.content = content;
}
+ /**
+ * return the content of the message
+ *
+ * @return content
+ */
public MessageContent getMessageContent() {
return content;
}
+
public boolean isExposed() {
if (getHeader() != null && getMessageContent() != null) {
return true;
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/data/MessageAttachment.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/data/MessageAttachment.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/data/MessageAttachment.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/data/MessageAttachment.java Mon Jul 27 07:41:10 2009
@@ -21,6 +21,11 @@
import java.io.Serializable;
+/**
+ * Attachment of a message
+ *
+ *
+ */
public class MessageAttachment implements Serializable {
/**
@@ -31,27 +36,57 @@
private int size;
private String name;
+ /**
+ * Set the name of the attachment
+ *
+ * @param name
+ */
public void setName(String name) {
this.name = name;
}
+ /**
+ * Return the name of the attachment
+ *
+ * @return name
+ */
public String getName() {
return name;
}
+ /**
+ * Set the content-type of the attachment
+ *
+ * @param cType
+ */
public void setContentType(String cType) {
this.cType = cType;
}
+ /**
+ * Return the content-type of the attachment
+ *
+ * @return cType
+ */
public String getContentType() {
return cType;
}
+ /**
+ * Set the content size in bytes
+ *
+ * @param size
+ */
public void setSize(int size) {
this.size = size;
}
+ /**
+ * Return the content size in bytes
+ *
+ * @return size
+ */
public int getSize() {
return size;
}
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/data/MessageContent.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/data/MessageContent.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/data/MessageContent.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/data/MessageContent.java Mon Jul 27 07:41:10 2009
@@ -31,27 +31,56 @@
private String text;
private ArrayList<MessageAttachment> aList;
+ /**
+ * Set if the count is plain/html
+ *
+ * @param isHTML
+ */
public void setIsHTML(boolean isHTML) {
this.isHTML = isHTML;
}
+ /**
+ * Return if the content is plain/html or plain/text
+ *
+ * @return isHTML
+ */
public boolean isHTML() {
return isHTML;
}
+ /**
+ * Set the body text of the content
+ *
+ * @param text
+ */
public void setText(String text) {
this.text = text;
}
+ /**
+ * Return the body text of the content
+ * @return
+ */
public String getText() {
return text;
}
- public void setIMAPMessageAttachments(ArrayList<MessageAttachment> aList) {
+ /**
+ * Set the attachments
+ *
+ * @param aList
+ */
+ public void setMessageAttachments(ArrayList<MessageAttachment> aList) {
this.aList = aList;
}
- public ArrayList<MessageAttachment> getIMAPMessageAttachments() {
+ /**
+ * Return the attachments
+ *
+ * @return aList
+ */
+ public ArrayList<MessageAttachment> getMessageAttachments() {
return aList;
}
}
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/data/MessageHeader.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/data/MessageHeader.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/data/MessageHeader.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/data/MessageHeader.java Mon Jul 27 07:41:10 2009
@@ -23,6 +23,11 @@
import java.util.ArrayList;
import java.util.Date;
+/**
+ *
+ * Header of a Message
+ *
+ */
public class MessageHeader implements Serializable {
/**
@@ -36,22 +41,43 @@
private ArrayList<String> cc;
private Date rDate;
+ /**
+ * Set a raw String representation of the header
+ *
+ * @param raw
+ */
public void setRawHeader(String raw) {
this.raw = raw;
}
+ /**
+ * Return a raw String representation of the header
+ *
+ * @return raw
+ */
public String getRawHeader() {
return raw;
}
+ /**
+ * Set the From: header field
+ *
+ * @param from
+ */
public void setFrom(String from) {
this.from = from;
}
+ /**
+ * Return the From: header field
+ *
+ * @return from
+ */
public String getFrom() {
return from;
}
+
public void setCc(ArrayList<String> cc) {
this.cc = cc;
}
@@ -60,10 +86,20 @@
return cc;
}
+ /**
+ * Set the Subject: header field
+ *
+ * @param subject
+ */
public void setSubject(String subject) {
this.subject = subject;
}
+ /**
+ * Return the Subject: header field
+ *
+ * @return subject
+ */
public String getSubject() {
return subject;
}
@@ -77,6 +113,7 @@
}
+
public void setReceivedDate(Date rDate) {
this.rDate = rDate;
}
@@ -84,5 +121,13 @@
public Date getReceivedDate() {
return rDate;
}
+
+ /*
+ * (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ public String toString() {
+ return raw;
+ }
}
Copied: labs/hupa/src/main/java/org/apache/hupa/shared/data/User.java (from r798026, labs/hupa/src/main/java/org/apache/hupa/shared/data/SMTPUser.java)
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/data/User.java?p2=labs/hupa/src/main/java/org/apache/hupa/shared/data/User.java&p1=labs/hupa/src/main/java/org/apache/hupa/shared/data/SMTPUser.java&r1=798026&r2=798062&rev=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/data/SMTPUser.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/data/User.java Mon Jul 27 07:41:10 2009
@@ -20,8 +20,14 @@
package org.apache.hupa.shared.data;
import java.io.Serializable;
+import java.util.Date;
-public class SMTPUser implements Serializable{
+/**
+ * User which will get used for login to the IMAP and SMTP account
+ *
+ *
+ */
+public class User implements Serializable{
/**
*
@@ -29,34 +35,96 @@
private static final long serialVersionUID = -573674209289821920L;
private String name;
private String password;
+ private Date loginDate;
+ private boolean auth;
+
+ /**
+ * The name of the User
+ *
+ * @param name
+ */
public void setName(String name) {
this.name = name;
}
+ /**
+ * Get name of the User
+ *
+ * @return name
+ */
public String getName() {
return name;
}
+ /**
+ * Set the Password of the User
+ *
+ * @param password
+ */
public void setPassword(String password) {
this.password = password;
}
+ /**
+ * Get the Password of the User
+ *
+ * @return password
+ */
public String getPassword() {
return password;
}
+ /*
+ * (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
public String toString() {
return getName();
}
+ /*
+ * (non-Javadoc)
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
public boolean equals(Object object) {
- if (object instanceof IMAPUser) {
- if (((SMTPUser) object).getName().equals(getName())) {
+ if (object instanceof User) {
+ if (((User) object).getName().equals(getName())) {
return true;
}
}
return false;
}
+
+ /**
+ * Get the Date on which the User was logged in the last time
+ *
+ * @return loginDate
+ */
+ public Date getLoginDate() {
+ return loginDate;
+ }
+
+ /**
+ * Set if the User was successful authenticated
+ *
+ * @param auth
+ */
+ public void setAuthenticated(boolean auth) {
+ this.auth = auth;
+ if (auth) {
+ loginDate = new Date();
+ }
+ }
+
+ /**
+ * Get if the User was successful authenticated
+ *
+ * @return auth
+ */
+ public boolean getAuthenticated() {
+ return auth;
+ }
+
}
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/events/ExpandMessageEvent.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/events/ExpandMessageEvent.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/events/ExpandMessageEvent.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/events/ExpandMessageEvent.java Mon Jul 27 07:41:10 2009
@@ -21,7 +21,7 @@
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.IMAPMessage;
-import org.apache.hupa.shared.data.IMAPUser;
+import org.apache.hupa.shared.data.User;
import com.google.gwt.event.shared.GwtEvent;
@@ -29,10 +29,10 @@
public static Type<ExpandMessageEventHandler> TYPE = new Type<ExpandMessageEventHandler>();
private IMAPMessage message;
- private IMAPUser user;
+ private User user;
private IMAPFolder folder;
- public ExpandMessageEvent(IMAPUser user, IMAPFolder folder, IMAPMessage message) {
+ public ExpandMessageEvent(User user, IMAPFolder folder, IMAPMessage message) {
this.message = message;
this.folder = folder;
this.user = user;
@@ -42,7 +42,7 @@
return message;
}
- public IMAPUser getUser () {
+ public User getUser () {
return user;
}
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/events/LoadMessagesEvent.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/events/LoadMessagesEvent.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/events/LoadMessagesEvent.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/events/LoadMessagesEvent.java Mon Jul 27 07:41:10 2009
@@ -21,26 +21,26 @@
package org.apache.hupa.shared.events;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.IMAPUser;
+import org.apache.hupa.shared.data.User;
import com.google.gwt.event.shared.GwtEvent;
public class LoadMessagesEvent extends GwtEvent<LoadMessagesEventHandler>{
public static Type<LoadMessagesEventHandler> TYPE = new Type<LoadMessagesEventHandler>();
- private IMAPUser user;
+ private User user;
private IMAPFolder folder;
private String searchValue;
- public LoadMessagesEvent(IMAPUser user, IMAPFolder folder) {
+ public LoadMessagesEvent(User user, IMAPFolder folder) {
this(user,folder,null);
}
- public LoadMessagesEvent(IMAPUser user, IMAPFolder folder, String searchValue) {
+ public LoadMessagesEvent(User user, IMAPFolder folder, String searchValue) {
this.user = user;
this.folder = folder;
this.searchValue = searchValue;
}
- public IMAPUser getUser() {
+ public User getUser() {
return user;
}
public IMAPFolder getFolder() {
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/events/LoginEvent.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/events/LoginEvent.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/events/LoginEvent.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/events/LoginEvent.java Mon Jul 27 07:41:10 2009
@@ -19,20 +19,20 @@
package org.apache.hupa.shared.events;
-import org.apache.hupa.shared.data.IMAPUser;
+import org.apache.hupa.shared.data.User;
import com.google.gwt.event.shared.GwtEvent;
public class LoginEvent extends GwtEvent<LoginEventHandler>{
public static Type<LoginEventHandler> TYPE = new Type<LoginEventHandler>();
- private IMAPUser user;
+ private User user;
- public LoginEvent(IMAPUser user) {
+ public LoginEvent(User user) {
this.user = user;
}
- public IMAPUser getUser() {
+ public User getUser() {
return user;
}
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/events/LogoutEvent.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/events/LogoutEvent.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/events/LogoutEvent.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/events/LogoutEvent.java Mon Jul 27 07:41:10 2009
@@ -19,14 +19,14 @@
package org.apache.hupa.shared.events;
-import org.apache.hupa.shared.data.IMAPUser;
+import org.apache.hupa.shared.data.User;
import com.google.gwt.event.shared.GwtEvent;
public class LogoutEvent extends GwtEvent<LogoutEventHandler>{
public static Type<LogoutEventHandler> TYPE = new Type<LogoutEventHandler>();
- private IMAPUser user;
- public LogoutEvent(IMAPUser user) {
+ private User user;
+ public LogoutEvent(User user) {
this.user = user;
}
@@ -40,7 +40,7 @@
return TYPE;
}
- public IMAPUser getUser() {
+ public User getUser() {
return user;
}
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/rpc/DeleteMessage.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/rpc/DeleteMessage.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/rpc/DeleteMessage.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/rpc/DeleteMessage.java Mon Jul 27 07:41:10 2009
@@ -5,7 +5,7 @@
import net.customware.gwt.dispatch.shared.Action;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.IMAPUser;
+import org.apache.hupa.shared.data.User;
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
@@ -32,7 +32,7 @@
*
*/
private static final long serialVersionUID = 801294103124082592L;
- private IMAPUser user;
+ private User user;
private IMAPFolder folder;
private ArrayList<Long> messageUids;
@@ -40,13 +40,13 @@
private DeleteMessage() {
}
- public DeleteMessage(IMAPUser user,IMAPFolder folder, ArrayList<Long> messageUids) {
+ public DeleteMessage(User user,IMAPFolder folder, ArrayList<Long> messageUids) {
this.user = user;
this.folder = folder;
this.messageUids = messageUids;
}
- public IMAPUser getUser() {
+ public User getUser() {
return user;
}
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageResult.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageResult.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageResult.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageResult.java Mon Jul 27 07:41:10 2009
@@ -21,18 +21,18 @@
import java.util.ArrayList;
-import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.IMAPUser;
-
import net.customware.gwt.dispatch.shared.Result;
+import org.apache.hupa.shared.data.IMAPFolder;
+import org.apache.hupa.shared.data.User;
+
public class DeleteMessageResult implements Result{
/**
*
*/
private static final long serialVersionUID = -5149203502019947912L;
- private IMAPUser user;
+ private User user;
private IMAPFolder folder;
private ArrayList<Long> messageUids;
@@ -43,13 +43,13 @@
}
- public DeleteMessageResult(IMAPUser user,IMAPFolder folder, ArrayList<Long> messageUids) {
+ public DeleteMessageResult(User user,IMAPFolder folder, ArrayList<Long> messageUids) {
this.user = user;
this.folder = folder;
this.messageUids = messageUids;
}
- public IMAPUser getUser() {
+ public User getUser() {
return user;
}
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/rpc/ExposeMessage.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/rpc/ExposeMessage.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/rpc/ExposeMessage.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/rpc/ExposeMessage.java Mon Jul 27 07:41:10 2009
@@ -22,7 +22,7 @@
import org.apache.hupa.shared.data.IMAPFolder;
import org.apache.hupa.shared.data.IMAPMessage;
-import org.apache.hupa.shared.data.IMAPUser;
+import org.apache.hupa.shared.data.User;
import net.customware.gwt.dispatch.shared.Action;
@@ -32,7 +32,7 @@
*
*/
private static final long serialVersionUID = 5826298202494313834L;
- private IMAPUser user;
+ private User user;
private IMAPFolder folder;
private IMAPMessage message;
@@ -41,13 +41,13 @@
}
- public ExposeMessage(IMAPUser user, IMAPFolder folder,IMAPMessage message) {
+ public ExposeMessage(User user, IMAPFolder folder,IMAPMessage message) {
this.user = user;
this.folder = folder;
this.message = message;
}
- public IMAPUser getUser() {
+ public User getUser() {
return user;
}
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/rpc/FetchFolders.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/rpc/FetchFolders.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/rpc/FetchFolders.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/rpc/FetchFolders.java Mon Jul 27 07:41:10 2009
@@ -19,10 +19,10 @@
package org.apache.hupa.shared.rpc;
-import org.apache.hupa.shared.data.IMAPUser;
-
import net.customware.gwt.dispatch.shared.Action;
+import org.apache.hupa.shared.data.User;
+
public class FetchFolders implements Action<FetchFoldersResult>{
@@ -30,9 +30,9 @@
*
*/
private static final long serialVersionUID = 8515539585915762904L;
- private IMAPUser user;
+ private User user;
- public FetchFolders(IMAPUser user) {
+ public FetchFolders(User user) {
this.user = user;
}
@@ -40,7 +40,7 @@
private FetchFolders() {
}
- public IMAPUser getUser() {
+ public User getUser() {
return user;
}
}
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/rpc/FetchMessages.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/rpc/FetchMessages.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/rpc/FetchMessages.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/rpc/FetchMessages.java Mon Jul 27 07:41:10 2009
@@ -22,7 +22,7 @@
import net.customware.gwt.dispatch.shared.Action;
import org.apache.hupa.shared.data.IMAPFolder;
-import org.apache.hupa.shared.data.IMAPUser;
+import org.apache.hupa.shared.data.User;
public class FetchMessages implements Action<FetchMessagesResult>{
@@ -30,13 +30,13 @@
*
*/
private static final long serialVersionUID = -3181183289937321202L;
- private IMAPUser user;
+ private User user;
private IMAPFolder folder;
private int start;
private int offset;
private String searchString;
- public FetchMessages(IMAPUser user, IMAPFolder folder,int start, int offset,String searchString) {
+ public FetchMessages(User user, IMAPFolder folder,int start, int offset,String searchString) {
this.user= user;
this.folder = folder;
this.start = start;
@@ -49,7 +49,7 @@
}
- public IMAPUser getUser() {
+ public User getUser() {
return user;
}
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LoginUserResult.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LoginUserResult.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LoginUserResult.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LoginUserResult.java Mon Jul 27 07:41:10 2009
@@ -19,26 +19,26 @@
package org.apache.hupa.shared.rpc;
-import org.apache.hupa.shared.data.IMAPUser;
-
import net.customware.gwt.dispatch.shared.Result;
+import org.apache.hupa.shared.data.User;
+
public class LoginUserResult implements Result{
/**
*
*/
private static final long serialVersionUID = -8740775403377441876L;
- private IMAPUser user;
+ private User user;
- public LoginUserResult(IMAPUser user) {
+ public LoginUserResult(User user) {
this.user = user;
}
@SuppressWarnings("unused")
private LoginUserResult() {}
- public IMAPUser getUser() {
+ public User getUser() {
return user;
}
}
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LogoutUser.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LogoutUser.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LogoutUser.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LogoutUser.java Mon Jul 27 07:41:10 2009
@@ -19,28 +19,28 @@
package org.apache.hupa.shared.rpc;
-import org.apache.hupa.shared.data.IMAPUser;
-
import net.customware.gwt.dispatch.shared.Action;
+import org.apache.hupa.shared.data.User;
+
public class LogoutUser implements Action<LogoutUserResult>{
/**
*
*/
private static final long serialVersionUID = 2255166545722718094L;
- private IMAPUser user;
+ private User user;
@SuppressWarnings("unused")
private LogoutUser() {
}
- public LogoutUser(IMAPUser user) {
+ public LogoutUser(User user) {
this.user = user;
}
- public IMAPUser getUser() {
+ public User getUser() {
return user;
}
}
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LogoutUserResult.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LogoutUserResult.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LogoutUserResult.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/rpc/LogoutUserResult.java Mon Jul 27 07:41:10 2009
@@ -19,19 +19,19 @@
package org.apache.hupa.shared.rpc;
-import org.apache.hupa.shared.data.IMAPUser;
-
import net.customware.gwt.dispatch.shared.Result;
+import org.apache.hupa.shared.data.User;
+
public class LogoutUserResult implements Result {
/**
*
*/
private static final long serialVersionUID = -1788523843461596092L;
- private IMAPUser user;
+ private User user;
- public LogoutUserResult(IMAPUser user) {
+ public LogoutUserResult(User user) {
this.user = user;
}
@@ -39,7 +39,7 @@
private LogoutUserResult() {
}
- public IMAPUser getUser() {
+ public User getUser() {
return user;
}
}
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/rpc/Noop.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/rpc/Noop.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/rpc/Noop.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/rpc/Noop.java Mon Jul 27 07:41:10 2009
@@ -19,27 +19,27 @@
package org.apache.hupa.shared.rpc;
-import org.apache.hupa.shared.data.IMAPUser;
-
import net.customware.gwt.dispatch.shared.Action;
+import org.apache.hupa.shared.data.User;
+
public class Noop implements Action<NoopResult>{
/**
*
*/
private static final long serialVersionUID = 4076791577558340559L;
- private IMAPUser user;
+ private User user;
@SuppressWarnings("unused")
private Noop() {
}
- public Noop(IMAPUser user) {
+ public Noop(User user) {
this.user = user;
}
- public IMAPUser getUser() {
+ public User getUser() {
return user;
}
}
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/rpc/SendMessage.java
URL: http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/rpc/SendMessage.java?rev=798062&r1=798061&r2=798062&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/rpc/SendMessage.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/rpc/SendMessage.java Mon Jul 27 07:41:10 2009
@@ -3,8 +3,8 @@
import net.customware.gwt.dispatch.shared.Action;
-import org.apache.hupa.shared.data.SMTPMessage;
-import org.apache.hupa.shared.data.SMTPUser;
+import org.apache.hupa.shared.data.Message;
+import org.apache.hupa.shared.data.User;
public class SendMessage implements Action<EmptyResult>{
@@ -12,24 +12,24 @@
*
*/
private static final long serialVersionUID = 973668124208945015L;
- private SMTPMessage msg;
- private SMTPUser user;
+ private Message msg;
+ private User user;
@SuppressWarnings("unused")
private SendMessage() {
}
- public SendMessage(SMTPUser user, SMTPMessage msg) {
+ public SendMessage(User user, Message msg) {
this.msg = msg;
this.user = user;
}
- public SMTPMessage getMessage() {
+ public Message getMessage() {
return msg;
}
- public SMTPUser getUser() {
+ public User getUser() {
return user;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org