Author: norman
Date: Tue Jul 28 14:03:54 2009
New Revision: 798530
URL: http://svn.apache.org/viewvc?rev=798530&view=rev
Log:
start to implement History handling
Added:
labs/hupa/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java
- copied, changed from r798406,
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageSendPresenter.java
labs/hupa/src/main/java/org/apache/hupa/client/mvp/MessageSendView.java
- copied, changed from r798406,
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageSendView.java
Removed:
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageSendPresenter.java
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageSendView.java
Modified:
labs/hupa/src/main/java/org/apache/hupa/client/Hupa.java
labs/hupa/src/main/java/org/apache/hupa/client/gin/HupaClientModule.java
labs/hupa/src/main/java/org/apache/hupa/client/gin/HupaGinjector.java
labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessagePresenter.java
labs/hupa/src/main/java/org/apache/hupa/client/mvp/LoginPresenter.java
labs/hupa/src/main/java/org/apache/hupa/client/mvp/MainPresenter.java
labs/hupa/war/Hupa.html
Modified: labs/hupa/src/main/java/org/apache/hupa/client/Hupa.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/Hupa.java?rev=798530&r1=798529&r2=798530&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/Hupa.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/Hupa.java Tue Jul 28
14:03:54 2009
@@ -33,6 +33,8 @@
AppPresenter aPres = injector.getAppPresenter();
aPres.go(RootPanel.get());
+
+ injector.getPlaceManager().fireCurrentPlace();
}
}
Modified:
labs/hupa/src/main/java/org/apache/hupa/client/gin/HupaClientModule.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/gin/HupaClientModule.java?rev=798530&r1=798529&r2=798530&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/gin/HupaClientModule.java
(original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/gin/HupaClientModule.java
Tue Jul 28 14:03:54 2009
@@ -28,8 +28,8 @@
import org.apache.hupa.client.mvp.IMAPMessageListPresenter;
import org.apache.hupa.client.mvp.IMAPMessageListView;
import org.apache.hupa.client.mvp.IMAPMessagePresenter;
-import org.apache.hupa.client.mvp.IMAPMessageSendPresenter;
-import org.apache.hupa.client.mvp.IMAPMessageSendView;
+import org.apache.hupa.client.mvp.MessageSendPresenter;
+import org.apache.hupa.client.mvp.MessageSendView;
import org.apache.hupa.client.mvp.IMAPMessageView;
import org.apache.hupa.client.mvp.LoginPresenter;
import org.apache.hupa.client.mvp.LoginView;
@@ -48,7 +48,7 @@
bindPresenter(IMAPMessageListPresenter.class,IMAPMessageListPresenter.Display.class,IMAPMessageListView.class);
bindPresenter(IMAPMessagePresenter.class,IMAPMessagePresenter.Display.class,IMAPMessageView.class);
bindPresenter(MainPresenter.class,MainPresenter.Display.class,MainView.class);
- bindPresenter(IMAPMessageSendPresenter.class,
IMAPMessageSendPresenter.Display.class, IMAPMessageSendView.class);
+ bindPresenter(MessageSendPresenter.class,
MessageSendPresenter.Display.class, MessageSendView.class);
bind(AppPresenter.class).in(Singleton.class);
}
Modified: labs/hupa/src/main/java/org/apache/hupa/client/gin/HupaGinjector.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/gin/HupaGinjector.java?rev=798530&r1=798529&r2=798530&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/gin/HupaGinjector.java
(original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/gin/HupaGinjector.java Tue
Jul 28 14:03:54 2009
@@ -19,6 +19,7 @@
package org.apache.hupa.client.gin;
import net.customware.gwt.dispatch.client.gin.ClientDispatchModule;
+import net.customware.gwt.presenter.client.place.PlaceManager;
import org.apache.hupa.client.mvp.AppPresenter;
@@ -28,4 +29,5 @@
@GinModules({ClientDispatchModule.class,HupaClientModule.class})
public interface HupaGinjector extends Ginjector {
public AppPresenter getAppPresenter();
+ public PlaceManager getPlaceManager();
}
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=798530&r1=798529&r2=798530&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
Tue Jul 28 14:03:54 2009
@@ -104,6 +104,7 @@
toBuf.append(", ");
}
}
+
display.getTo().setText(toBuf.toString());;
display.getSubject().setText(message.getHeader().getSubject());
display.getContent().setHTML(message.getMessageContent().getText());
@@ -143,8 +144,29 @@
@Override
protected void onPlaceRequest(PlaceRequest request) {
- // TODO Auto-generated method stub
+ String from = request.getParameter("from", user.getName());
+ display.getFrom().setText(from);
+
+
+ String to = request.getParameter("to", null);
+ if (to != null) {
+ display.getTo().setText(to);
+ }
+ String cc = request.getParameter("cc", null);
+ if (cc != null) {
+ display.getCc().setText(cc);
+ }
+
+ String subject = request.getParameter("subject", null);
+ if (subject != null) {
+ display.getSubject().setText(subject);
+ }
+
+ String bodytext = request.getParameter("bodytext", null);
+ if (bodytext != null) {
+ display.getContent().setText(bodytext);
+ }
}
@Override
Modified: labs/hupa/src/main/java/org/apache/hupa/client/mvp/LoginPresenter.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/client/mvp/LoginPresenter.java?rev=798530&r1=798529&r2=798530&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/client/mvp/LoginPresenter.java
(original)
+++ labs/hupa/src/main/java/org/apache/hupa/client/mvp/LoginPresenter.java Tue
Jul 28 14:03:54 2009
@@ -23,6 +23,7 @@
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.place.PlaceRequestEvent;
import net.customware.gwt.presenter.client.widget.WidgetDisplay;
import net.customware.gwt.presenter.client.widget.WidgetPresenter;
@@ -35,6 +36,7 @@
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.user.client.History;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.Focusable;
import com.google.gwt.user.client.ui.HasText;
@@ -103,7 +105,6 @@
display.getLoginClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
- GWT.log("HERE", null);
doLogin();
}
@@ -111,8 +112,6 @@
display.getResetClick().addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
- GWT.log("RESET", null);
-
doReset();
}
@@ -121,8 +120,10 @@
@Override
protected void onPlaceRequest(PlaceRequest request) {
- // TODO Auto-generated method stub
-
+ String username = request.getParameter("username",null);
+ if (username != null) {
+ display.getUserNameValue().setValue(username);
+ }
}
@Override
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=798530&r1=798529&r2=798530&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 Tue
Jul 28 14:03:54 2009
@@ -92,11 +92,11 @@
private IMAPTreeItem tItem;
private IMAPMessageListPresenter messageListPresenter;
private IMAPMessagePresenter messagePresenter;
- private IMAPMessageSendPresenter sendPresenter;
+ private MessageSendPresenter sendPresenter;
public static final Place PLACE = new Place("Main");
@Inject
- public MainPresenter(MainPresenter.Display display, EventBus bus,
DispatchAsync dispatcher,IMAPMessageListPresenter messageListPresenter,
IMAPMessagePresenter messagePresenter, IMAPMessageSendPresenter sendPresenter) {
+ public MainPresenter(MainPresenter.Display display, EventBus bus,
DispatchAsync dispatcher,IMAPMessageListPresenter messageListPresenter,
IMAPMessagePresenter messagePresenter, MessageSendPresenter sendPresenter) {
super(display,bus);
this.dispatcher = dispatcher;
this.messageListPresenter = messageListPresenter;
Copied:
labs/hupa/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java
(from r798406,
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/MessageSendPresenter.java?p2=labs/hupa/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java&p1=labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageSendPresenter.java&r1=798406&r2=798530&rev=798530&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/MessageSendPresenter.java
Tue Jul 28 14:03:54 2009
@@ -53,16 +53,16 @@
import com.google.gwt.user.client.ui.HasText;
import com.google.inject.Inject;
-public class IMAPMessageSendPresenter extends
WidgetPresenter<IMAPMessageSendPresenter.Display>{
+public class MessageSendPresenter extends
WidgetPresenter<MessageSendPresenter.Display>{
private User user;
private DispatchAsync dispatcher;
- public static final Place PLACE = new Place("IMAPMessageSend");
+ public static final Place PLACE = new Place("MessageSend");
private ArrayList<MessageAttachment> aList = new
ArrayList<MessageAttachment>();
private UploaderValueChangeHandler handler = new
UploaderValueChangeHandler();
@Inject
- public IMAPMessageSendPresenter(Display display, EventBus eventBus,
DispatchAsync dispatcher) {
+ public MessageSendPresenter(Display display, EventBus eventBus,
DispatchAsync dispatcher) {
super(display, eventBus);
this.dispatcher = dispatcher;
bind();
@@ -177,8 +177,34 @@
@Override
protected void onPlaceRequest(PlaceRequest request) {
- // TODO Auto-generated method stub
+ String from = request.getParameter("from", user.getName());
+ display.getFromText().setText(from);
+
+
+ String to = request.getParameter("to", null);
+ if (to != null) {
+ display.getToText().setText(to);
+ }
+
+ String cc = request.getParameter("cc", null);
+ if (cc != null) {
+ display.getCcText().setText(cc);
+ }
+ String bcc = request.getParameter("bcc", null);
+ if (bcc != null) {
+ display.getBccText().setText(bcc);
+ }
+
+ String subject = request.getParameter("subject", null);
+ if (subject != null) {
+ display.getSubjectText().setText(subject);
+ }
+
+ String bodytext = request.getParameter("bodytext", null);
+ if (bodytext != null) {
+ display.getMessageText().setText(bodytext);
+ }
}
@Override
Copied: labs/hupa/src/main/java/org/apache/hupa/client/mvp/MessageSendView.java
(from r798406,
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/MessageSendView.java?p2=labs/hupa/src/main/java/org/apache/hupa/client/mvp/MessageSendView.java&p1=labs/hupa/src/main/java/org/apache/hupa/client/mvp/IMAPMessageSendView.java&r1=798406&r2=798530&rev=798530&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/MessageSendView.java Tue
Jul 28 14:03:54 2009
@@ -43,7 +43,6 @@
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;
@@ -51,8 +50,8 @@
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
-public class IMAPMessageSendView extends Composite implements
- IMAPMessageSendPresenter.Display {
+public class MessageSendView extends Composite implements
+ MessageSendPresenter.Display {
private HupaConstants constants = GWT.create(HupaConstants.class);
private Grid detailGrid = new Grid(6, 3);
private Label from = new Label();
@@ -67,7 +66,7 @@
private ValidationProcessor validator = new DefaultValidationProcessor(
vMessages);
- public IMAPMessageSendView() {
+ public MessageSendView() {
VerticalPanel mPanel = new VerticalPanel();
mPanel.setWidth("100%");
mPanel.setSpacing(5);
Modified: labs/hupa/war/Hupa.html
URL:
http://svn.apache.org/viewvc/labs/hupa/war/Hupa.html?rev=798530&r1=798529&r2=798530&view=diff
==============================================================================
--- labs/hupa/war/Hupa.html (original)
+++ labs/hupa/war/Hupa.html Tue Jul 28 14:03:54 2009
@@ -36,7 +36,7 @@
<body>
<!-- OPTIONAL: include this if you want history support -->
- <iframe src="javascript:''" id="__gwt_historyFrame" tabIndex='-1'
style="position:absolute;width:0;height:0;border:0"></iframe>
+ <iframe src="javascript:''" id="__gwt_historyFrame"
style="width:0;height:0;border:0"></iframe>
<iframe src="" id="__download" style="width:0;height:0;border:0"></iframe>
</body>
</html>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
