Author: dongxu
Date: Thu Sep 12 04:08:47 2013
New Revision: 1522302
URL: http://svn.apache.org/r1522302
Log:
add user label, yet issue46 occur
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1522302&r1=1522301&r2=1522302&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
Thu Sep 12 04:08:47 2013
@@ -67,6 +67,9 @@ import org.apache.hupa.shared.domain.Gen
import org.apache.hupa.shared.domain.MessageAttachment;
import org.apache.hupa.shared.domain.SendMessageAction;
import org.apache.hupa.shared.domain.SmtpMessage;
+import org.apache.hupa.shared.domain.User;
+import org.apache.hupa.shared.events.LoginEvent;
+import org.apache.hupa.shared.events.LoginEventHandler;
>>>>>>> make send text mail work excellently
import com.google.gwt.event.dom.client.ClickEvent;
@@ -102,6 +105,7 @@ import com.google.gwt.user.client.Window
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.HasHTML;
import com.google.gwt.user.client.ui.HasText;
+import com.google.gwt.user.client.ui.ListBox;
import com.google.inject.Inject;
import com.google.web.bindery.requestfactory.shared.Receiver;
@@ -111,12 +115,17 @@ public class ComposeActivity extends App
private SmtpMessage message;
private List<MessageAttachment> attachments = new
ArrayList<MessageAttachment>();
private Type type = Type.NEW;
+<<<<<<< HEAD
>>>>>>> make send text mail work excellently
+=======
+ private User user;
+>>>>>>> add user label, yet issue46 occur
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
container.setWidget(display.asWidget());
<<<<<<< HEAD
+<<<<<<< HEAD
bindTo(eventBus);
fillHeader();
}
@@ -365,10 +374,19 @@ public class ComposeActivity extends App
=======
+=======
+>>>>>>> add user label, yet issue46 occur
bindTo(eventBus);
+ if (user != null)
+ display.getFromList().addItem(user.getName());
}
private void bindTo(EventBus eventBus) {
+ eventBus.addHandler(LoginEvent.TYPE, new LoginEventHandler() {
+ public void onLogin(LoginEvent event) {
+ user = event.getUser();
+ }
+ });
registerHandler(display.getSendClick().addClickHandler(sendClickHandler));
}
@@ -590,6 +608,11 @@ public class ComposeActivity extends App
HasText getMessageText();
HasHTML getMessageHTML();
+<<<<<<< HEAD
>>>>>>> make send text mail work excellently
+=======
+
+ ListBox getFromList();
+>>>>>>> add user label, yet issue46 occur
}
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java?rev=1522302&r1=1522301&r2=1522302&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
Thu Sep 12 04:08:47 2013
@@ -149,7 +149,9 @@ import com.google.gwt.event.dom.client.C
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
+import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HTMLPanel;
import com.google.gwt.user.client.ui.RootLayoutPanel;
import com.google.inject.Inject;
@@ -160,12 +162,17 @@ public class TopBarActivity extends AppB
@Inject private Displayable display;
@Inject private LoginLayoutable loginLayout;
+
+ @UiField protected HTMLPanel userLabel;
private User user;
@Override
public void start(AcceptsOneWidget container, EventBus eventBus) {
container.setWidget(display.asWidget());
- bindTo(this.eventBus);
+ bindTo(eventBus);
+ if (user != null) {
+ display.getUserLabel().add(new HTML(user.getName()));
+ }
}
<<<<<<< HEAD
@@ -181,12 +188,11 @@ public class TopBarActivity extends AppB
user = event.getUser();
}
});
- registerHandler(display.getLogoutClick().addClickHandler(
- new ClickHandler() {
- public void onClick(ClickEvent event) {
- doLogout();
- }
- }));
+ registerHandler(display.getLogoutClick().addClickHandler(new
ClickHandler() {
+ public void onClick(ClickEvent event) {
+ doLogout();
+ }
+ }));
}
private void doLogout() {
@@ -198,16 +204,14 @@ public class TopBarActivity extends AppB
eventBus.fireEvent(new
LogoutEvent(response.getUser()));
RootLayoutPanel.get().clear();
RootLayoutPanel.get().add(loginLayout.get());
- TopBarActivity.this.placeController
- .goTo(new
DefaultPlace("@"));
+
TopBarActivity.this.placeController.goTo(new DefaultPlace("@"));
}
@Override
public void onFailure(ServerFailure error) {
RootLayoutPanel.get().clear();
RootLayoutPanel.get().add(loginLayout.get());
- TopBarActivity.this.placeController
- .goTo(new
DefaultPlace("@"));
+
TopBarActivity.this.placeController.goTo(new DefaultPlace("@"));
}
});
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java?rev=1522302&r1=1522301&r2=1522302&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java
Thu Sep 12 04:08:47 2013
@@ -175,8 +175,6 @@ public class ComposeView extends Composi
headerTable.setWidget(ROW_SUBJECT, 0, new Label("Subject"));
selectFrom = new ListBox();
- selectFrom.addItem("echo...@gmail.com");
- selectFrom.addItem("bar");
sendButton = new Button("Send message");
saveButton = new Button("Save as draft");
cancelButton = new Button("Cancel");
@@ -275,8 +273,14 @@ public class ComposeView extends Composi
@Override
public String getFromText() {
+ // TODO hardcode to the first identifier
return selectFrom.getItemText(0);
}
+
+ @Override
+ public ListBox getFromList(){
+ return selectFrom;
+ }
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
