You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by do...@apache.org on 2013/09/12 05:42:13 UTC
svn commit: r1522236 - in /james/hupa/trunk:
client/src/main/java/org/apache/hupa/client/
client/src/main/java/org/apache/hupa/client/place/
client/src/main/java/org/apache/hupa/client/ui/
widgets/src/main/java/org/apache/hupa/widgets/ui/
Author: dongxu
Date: Thu Sep 12 03:42:12 2013
New Revision: 1522236
URL: http://svn.apache.org/r1522236
Log:
remove some warnings and create the AbstractPlace that can give place infomation
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/AbstractPlace.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginLayout.java
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522236&r1=1522235&r2=1522236&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java Thu Sep 12 03:42:12 2013
@@ -20,6 +20,7 @@
package org.apache.hupa.client;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.client.activity.NotificationActivity;
import org.apache.hupa.client.activity.ToolBarActivity;
import org.apache.hupa.client.activity.TopBarActivity;
@@ -45,6 +46,10 @@ import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
=======
+=======
+import java.util.logging.Logger;
+
+>>>>>>> remove some warnings and create the AbstractPlace that can give place infomation
import org.apache.hupa.client.bundles.HupaResources;
import org.apache.hupa.client.place.DefaultPlace;
import org.apache.hupa.client.place.MailFolderPlace;
@@ -101,9 +106,12 @@ public class HupaController {
@Inject private PlaceController placeController;
@Inject private HupaRequestFactory requestFactory;
private Place currentPlace;
-
+
@Inject private LoginLayoutable loginLayout;
+ private static final Logger log = Logger.getLogger(HupaController.class
+ .getName());
+
@Inject
<<<<<<< HEAD
public HupaController(EventBus eventBus) {
@@ -256,7 +264,7 @@ public class HupaController {
private final class PlaceChangHandler implements PlaceChangeEvent.Handler {
@Override
public void onPlaceChange(PlaceChangeEvent event) {
-
+ log.fine("place changed to " + event.getNewPlace());
if (placeChange(event)) {
checkSession();
}
@@ -274,21 +282,22 @@ public class HupaController {
currentPlace = newPlace;
}
}
-//
-// private void checkSession() {
-// CheckSessionRequest checkSession = requestFactory.sessionRequest();
-// checkSession.isValid().fire(new Receiver<Boolean>() {
-// @Override
-// public void onSuccess(Boolean sessionValid) {
-// if (!sessionValid) {
-// RootLayoutPanel.get().add(loginLayout.get());//
-// HupaController.this.placeController
-// .goTo(new DefaultPlace());
-// // this?
-// }
-// }
-// });
-// }
+
+ //
+ // private void checkSession() {
+ // CheckSessionRequest checkSession = requestFactory.sessionRequest();
+ // checkSession.isValid().fire(new Receiver<Boolean>() {
+ // @Override
+ // public void onSuccess(Boolean sessionValid) {
+ // if (!sessionValid) {
+ // RootLayoutPanel.get().add(loginLayout.get());//
+ // HupaController.this.placeController
+ // .goTo(new DefaultPlace());
+ // // this?
+ // }
+ // }
+ // });
+ // }
private boolean placeChange(PlaceChangeEvent event) {
return currentPlace != null
@@ -311,18 +320,18 @@ public class HupaController {
@Override
public void onSuccess(Boolean sessionValid) {
RootLayoutPanel.get().clear();
- RootLayoutPanel.get().add(loginLayout.get());//
+ RootLayoutPanel.get().add(hupaLayout.get());//
if (!sessionValid) {
-// RootLayoutPanel.get().clear();
-// RootLayoutPanel.get().add(loginLayout.get());//
-// HupaController.this.placeController
-// .goTo(new DefaultPlace());
+ // RootLayoutPanel.get().clear();
+ // RootLayoutPanel.get().add(loginLayout.get());//
+ // HupaController.this.placeController
+ // .goTo(new DefaultPlace());
// this?
}
}
-
+
@Override
- public void onFailure(ServerFailure error){
+ public void onFailure(ServerFailure error) {
RootLayoutPanel.get().clear();
RootLayoutPanel.get().add(loginLayout.get());
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/AbstractPlace.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/AbstractPlace.java?rev=1522236&r1=1522235&r2=1522236&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/AbstractPlace.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/AbstractPlace.java Thu Sep 12 03:42:12 2013
@@ -23,13 +23,19 @@ import com.google.gwt.place.shared.Place
public class AbstractPlace extends Place {
+<<<<<<< HEAD
public static final String SPLITTER = ":";
+=======
+>>>>>>> remove some warnings and create the AbstractPlace that can give place infomation
@Override
public String toString() {
return getClass().getName().substring(
getClass().getName().lastIndexOf("."));
}
+<<<<<<< HEAD
+=======
+>>>>>>> remove some warnings and create the AbstractPlace that can give place infomation
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java?rev=1522236&r1=1522235&r2=1522236&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/DefaultPlace.java Thu Sep 12 03:42:12 2013
@@ -63,11 +63,10 @@ public class DefaultPlace extends Abstra
>>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
package org.apache.hupa.client.place;
-import com.google.gwt.place.shared.Place;
import com.google.gwt.place.shared.PlaceTokenizer;
import com.google.gwt.place.shared.Prefix;
-public class DefaultPlace extends Place {
+public class DefaultPlace extends AbstractPlace {
@Prefix("")
public static class Tokenizer implements PlaceTokenizer<DefaultPlace> {
@@ -82,6 +81,7 @@ public class DefaultPlace extends Place
return "";
}
}
+<<<<<<< HEAD
public String toString(){
return this.getClass().getName()+"->[home page]";
@@ -90,5 +90,7 @@ public class DefaultPlace extends Place
>>>>>>> Change to new mvp framework - first step
=======
>>>>>>> Change to new mvp framework - first step
+=======
+>>>>>>> remove some warnings and create the AbstractPlace that can give place infomation
}
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java?rev=1522236&r1=1522235&r2=1522236&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/IMAPMessagePlace.java Thu Sep 12 03:42:12 2013
@@ -65,6 +65,7 @@ import org.apache.hupa.shared.domain.Use
>>>>>>>
=======
+<<<<<<< HEAD
>>>>>>> 1. improve the inbox folder place.
import com.google.gwt.place.shared.Place;
import com.google.gwt.place.shared.PlaceTokenizer;
@@ -81,6 +82,12 @@ public class IMAPMessagePlace extends Pl
=======
=======
+=======
+import com.google.gwt.place.shared.PlaceTokenizer;
+import com.google.gwt.place.shared.Prefix;
+
+public class IMAPMessagePlace extends AbstractPlace {
+>>>>>>> remove some warnings and create the AbstractPlace that can give place infomation
>>>>>>> forward and reply message to use RF
private Message message;
@@ -191,10 +198,6 @@ public class IMAPMessagePlace extends Pl
}
}
- public String toString() {
- return this.getClass().getName() + "->[IMAPMessage]";
- }
-
public IMAPMessagePlace with(User user, ImapFolder folder, Message message, MessageDetails messageDetails) {
this.message = message;
this.messageDetails = messageDetails;
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java?rev=1522236&r1=1522235&r2=1522236&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MailFolderPlace.java Thu Sep 12 03:42:12 2013
@@ -22,11 +22,10 @@ package org.apache.hupa.client.place;
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.User;
-import com.google.gwt.place.shared.Place;
import com.google.gwt.place.shared.PlaceTokenizer;
import com.google.gwt.place.shared.Prefix;
-public class MailFolderPlace extends Place {
+public class MailFolderPlace extends AbstractPlace {
private static final String PREFIX = "folder";
private User user;
@@ -57,10 +56,6 @@ public class MailFolderPlace extends Pla
return PREFIX.hashCode();
}
- public String toString() {
- return this.getClass().getName() + "->[Inbox]" + folderName;
- }
-
public MailFolderPlace with(User user) {
this.user = user;
return this;
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java?rev=1522236&r1=1522235&r2=1522236&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/MessageSendPlace.java Thu Sep 12 03:42:12 2013
@@ -88,6 +88,7 @@ import com.google.gwt.place.shared.Prefi
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public class MessageSendPlace extends AbstractPlace {
@@ -213,6 +214,9 @@ public class MessageSendPlace extends Pl
>>>>>>> 1. improve the inbox folder place.
=======
public class MessageSendPlace extends Place {
+=======
+public class MessageSendPlace extends AbstractPlace {
+>>>>>>> remove some warnings and create the AbstractPlace that can give place infomation
private User user ;
@@ -236,10 +240,6 @@ public class MessageSendPlace extends Pl
}
}
- public String toString() {
- return this.getClass().getName() + "->[MessageSend]";
- }
-
public Place with(User user, ImapFolder folder, Message message, MessageDetails messageDetails, Type forward) {
this.forward = forward;
this.user = user;
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml?rev=1522236&r1=1522235&r2=1522236&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml Thu Sep 12 03:42:12 2013
@@ -83,11 +83,17 @@
<g:DockLayoutPanel unit="PX" ui:field="Header">
<g:north size="23">
<<<<<<< HEAD
+<<<<<<< HEAD
<hupa:TopBarView />
>>>>>>> make login page as one part of the overall layout & splite layout to little one
=======
<hupa:TopBarView ui:field="topBarView"/>
>>>>>>> integrate them as a whole one - first: make the default place work
+=======
+ <g:SimplePanel>
+ <hupa:TopBarView ui:field="topBarView" />
+ </g:SimplePanel>
+>>>>>>> remove some warnings and create the AbstractPlace that can give place infomation
</g:north>
<g:center>
<g:LayoutPanel addStyleNames="{style.feature}"
@@ -104,10 +110,13 @@
<g:SimpleLayoutPanel ui:field="navigationContainer" />
=======
<g:layer width="177px" left="10px">
- <hupa:LogoView ui:field="logoView"/>
+ <g:SimplePanel>
+ <hupa:LogoView ui:field="logoView" />
+ </g:SimplePanel>
</g:layer>
<g:layer width="301px" right="0">
<<<<<<< HEAD
+<<<<<<< HEAD
<hupa:NavigationView />
>>>>>>> make login page as one part of the overall layout & splite layout to little one
</g:layer>
@@ -131,6 +140,11 @@
=======
<hupa:NavigationView ui:field="navigationView"/>
>>>>>>> integrate them as a whole one - first: make the default place work
+=======
+ <g:SimplePanel>
+ <hupa:NavigationView ui:field="navigationView" />
+ </g:SimplePanel>
+>>>>>>> remove some warnings and create the AbstractPlace that can give place infomation
</g:layer>
<g:layer left="0%" width="0%" top="0%" height="0%">
<hupa:_CenterContactPanel ui:field="contactPanel" />
@@ -146,7 +160,9 @@
<g:layer left='10px' right='10px' top='88px' bottom="20px">
<g:DockLayoutPanel ui:field="MainBox">
<g:north size="40">
- <hupa:ToolBarView ui:field="toolBarView"/>
+ <g:SimplePanel>
+ <hupa:ToolBarView ui:field="toolBarView" />
+ </g:SimplePanel>
</g:north>
<g:center>
<g:SplitLayoutPanel ui:field="MessageSpace">
@@ -154,7 +170,9 @@
<g:LayoutPanel ui:field="LeftBox"
addStyleNames="{style.folderList} {style.box} {style.listBox}">
<g:layer top="0" height="100%">
- <hupa:FolderListView ui:field="folderListView"/>
+ <g:SimplePanel>
+ <hupa:FolderListView ui:field="folderListView" />
+ </g:SimplePanel>
</g:layer>
<g:layer bottom="0" height="41px">
<g:SimplePanel styleName="{style.boxFooter}">
@@ -172,10 +190,15 @@
<g:LayoutPanel addStyleNames="{style.box}"
ui:field="MessageListBox">
<g:layer>
- <hupa:MessageListView ui:field="messageView"/>
+ <g:SimplePanel>
+ <hupa:MessageListView ui:field="messageView" />
+ </g:SimplePanel>
</g:layer>
<g:layer bottom="0" height="25px">
- <hupa:MessageListFooterView ui:field="messageListFooterView"/>
+ <g:SimplePanel>
+ <hupa:MessageListFooterView
+ ui:field="messageListFooterView" />
+ </g:SimplePanel>
</g:layer>
</g:LayoutPanel>
</g:north>
@@ -183,10 +206,14 @@
<g:LayoutPanel addStyleNames="{style.box}"
ui:field="MessageContentBox">
<g:layer>
- <hupa:MessageContentView ui:field="messageContentView"/>
+ <g:SimplePanel>
+ <hupa:MessageContentView ui:field="messageContentView" />
+ </g:SimplePanel>
</g:layer>
<g:layer bottom="0" height="25px">
- <hupa:StatusView ui:field="statusView"/>
+ <g:SimplePanel>
+ <hupa:StatusView ui:field="statusView" />
+ </g:SimplePanel>
</g:layer>
</g:LayoutPanel>
</g:center>
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginLayout.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginLayout.java?rev=1522236&r1=1522235&r2=1522236&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginLayout.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LoginLayout.java Thu Sep 12 03:42:12 2013
@@ -32,6 +32,7 @@ public class LoginLayout implements Logi
@UiField SimplePanel loginContainer;
<<<<<<< HEAD
+<<<<<<< HEAD
private LayoutPanel loginMainPanel;
@@ -51,27 +52,31 @@ public class LoginLayout implements Logi
=======
+=======
+
+>>>>>>> remove some warnings and create the AbstractPlace that can give place infomation
private LayoutPanel loginMainPanel;
-
- public LoginLayout(){
+
+ public LoginLayout() {
this.loginMainPanel = binder.createAndBindUi(this);
}
-
+
@Override
- public AcceptsOneWidget getLoginView(){
+ public AcceptsOneWidget getLoginView() {
return new AcceptsOneWidget() {
@Override
public void setWidget(IsWidget w) {
- Widget widget = Widget.asWidgetOrNull(w);
- if(widget != null){
- loginContainer.add(widget);
- }
+ loginContainer.add(Widget.asWidgetOrNull(w));
}
};
-
+
}
+<<<<<<< HEAD
>>>>>>> integrate them as a whole one - first: make the default place work
+=======
+
+>>>>>>> remove some warnings and create the AbstractPlace that can give place infomation
@Override
public LayoutPanel get() {
return loginMainPanel;
Modified: james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java?rev=1522236&r1=1522235&r2=1522236&view=diff
==============================================================================
--- james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java (original)
+++ james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java Thu Sep 12 03:42:12 2013
@@ -102,6 +102,7 @@ public class MultiValueSuggestArea exten
public String getValue() {
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
return DOM.getElementProperty(getValueBox().getElement(), "value");
=======
return DOM.getElementProperty(getTextBox().getElement(), "value");
@@ -109,12 +110,16 @@ public class MultiValueSuggestArea exten
=======
return DOM.getElementProperty(getTextBox().getElement(), "value");
>>>>>>> first commit
+=======
+ return DOM.getElementProperty(getValueBox().getElement(), "value");
+>>>>>>> remove some warnings and create the AbstractPlace that can give place infomation
}
@Override
public void setValue(String text) {
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
DOM.setElementProperty(getValueBox().getElement(), "value", text);
=======
DOM.setElementProperty(getTextBox().getElement(), "value", text);
@@ -122,6 +127,9 @@ public class MultiValueSuggestArea exten
=======
DOM.setElementProperty(getTextBox().getElement(), "value", text);
>>>>>>> first commit
+=======
+ DOM.setElementProperty(getValueBox().getElement(), "value", text);
+>>>>>>> remove some warnings and create the AbstractPlace that can give place infomation
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org