Author: norman
Date: Mon Jul 27 12:55:10 2009
New Revision: 798118
URL: http://svn.apache.org/viewvc?rev=798118&view=rev
Log:
Make sure the uploader is reset when a folder was selected
Set max. upoad size to 10mb
Modified:
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/war/WEB-INF/web.xml
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=798118&r1=798117&r2=798118&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 12:55:10 2009
@@ -31,11 +31,13 @@
import net.customware.gwt.presenter.client.widget.WidgetDisplay;
import net.customware.gwt.presenter.client.widget.WidgetPresenter;
+import org.apache.hupa.shared.data.Message;
import org.apache.hupa.shared.data.MessageAttachment;
import org.apache.hupa.shared.data.MessageContent;
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.LoadMessagesEvent;
+import org.apache.hupa.shared.events.LoadMessagesEventHandler;
import org.apache.hupa.shared.events.LoginEvent;
import org.apache.hupa.shared.events.LoginEventHandler;
import org.apache.hupa.shared.events.SentMessageEvent;
@@ -57,6 +59,7 @@
private DispatchAsync dispatcher;
public static final Place PLACE = new Place("IMAPMessageSend");
private ArrayList<MessageAttachment> aList = new
ArrayList<MessageAttachment>();
+ private UploaderValueChangeHandler handler = new
UploaderValueChangeHandler();
@Inject
public IMAPMessageSendPresenter(Display display, EventBus eventBus,
DispatchAsync dispatcher) {
@@ -75,6 +78,7 @@
public HasText getMessageText();
public HasClickHandlers getSendClick();
public IUploader getUploader();
+ public void resetUploader();
}
@Override
@@ -92,17 +96,14 @@
}
});
- display.getUploader().setOnFinishHandler(new
ValueChangeHandler<IUploader>() {
+ eventBus.addHandler(LoadMessagesEvent.TYPE, new
LoadMessagesEventHandler() {
- public void onValueChange(ValueChangeEvent<IUploader>
event) {
- String name = ((Uploader)
event.getValue()).fileInput
- .getFilename();
- MessageAttachment attachment = new
MessageAttachment();
- attachment.setName(name);
- aList.add(attachment);
+ public void onLoadMessagesEvent(LoadMessagesEvent
loadMessagesEvent) {
+ reset();
}
-
+
});
+ display.getUploader().setOnFinishHandler(handler);
display.getSendClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
@@ -164,7 +165,8 @@
}
private void reset() {
- display.getUploader().clear();
+ display.resetUploader();
+ display.getUploader().setOnChangeHandler(handler);
display.getBccText().setText("");
display.getCcText().setText("");
display.getToText().setText("");
@@ -194,4 +196,15 @@
// TODO Auto-generated method stub
}
+
+ private class UploaderValueChangeHandler implements
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);
+ }
+
+ }
}
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=798118&r1=798117&r2=798118&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 12:55:10 2009
@@ -43,6 +43,7 @@
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.Grid;
import com.google.gwt.user.client.ui.HasText;
+import com.google.gwt.user.client.ui.HasWidgets;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.TextArea;
import com.google.gwt.user.client.ui.TextBox;
@@ -278,4 +279,10 @@
public IUploader getUploader() {
return uploader;
}
+
+ public void resetUploader() {
+ uploader.removeFromParent();
+ uploader = new MultiUploader(new UploadProgress());
+ detailGrid.setWidget(5, 1, uploader);
+ }
}
Modified: labs/hupa/war/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/labs/hupa/war/WEB-INF/web.xml?rev=798118&r1=798117&r2=798118&view=diff
==============================================================================
--- labs/hupa/war/WEB-INF/web.xml (original)
+++ labs/hupa/war/WEB-INF/web.xml Mon Jul 27 12:55:10 2009
@@ -5,24 +5,36 @@
<web-app>
- <!-- Default page to serve -->
- <welcome-file-list>
- <welcome-file>Hupa.html</welcome-file>
- </welcome-file-list>
-
- <!-- Servlets -->
+ <!-- Default page to serve -->
+ <welcome-file-list>
+ <welcome-file>Hupa.html</welcome-file>
+ </welcome-file-list>
- <filter>
- <filter-name>guiceFilter</filter-name>
- <filter-class>com.google.inject.servlet.GuiceFilter</filter-class>
- </filter>
+ <context-param>
+ <!-- max size of the upload request (10MB) -->
+ <param-name>maxSize</param-name>
+ <param-value>10485760</param-value>
+ </context-param>
+ <context-param>
+ <!--
+ useful in development mode to see the upload progress
bar in fast
+ networks
+ -->
+ <param-name>slowUploads</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
+ <filter>
+ <filter-name>guiceFilter</filter-name>
+
<filter-class>com.google.inject.servlet.GuiceFilter</filter-class>
+ </filter>
- <filter-mapping>
- <filter-name>guiceFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <listener>
-
<listener-class>org.apache.hupa.server.guice.MyGuiceServletConfig</listener-class>
- </listener>
+ <filter-mapping>
+ <filter-name>guiceFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <listener>
+
<listener-class>org.apache.hupa.server.guice.MyGuiceServletConfig</listener-class>
+ </listener>
</web-app>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@labs.apache.org
For additional commands, e-mail: commits-h...@labs.apache.org
