Author: dongxu
Date: Thu Sep 12 04:45:29 2013
New Revision: 1522386
URL: http://svn.apache.org/r1522386
Log:
replace with IsWidget
Removed:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetDisplayable.java
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/ComposeToolBarActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelPropertiesActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LogoActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListFooterActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NavigationActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/StatusActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.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/activity/WestActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetContainerDisplayable.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=1522386&r1=1522385&r2=1522386&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:45:29 2013
@@ -71,7 +71,6 @@ import org.apache.hupa.client.place.Comp
import org.apache.hupa.client.rf.SendForwardMessageRequest;
import org.apache.hupa.client.rf.SendMessageRequest;
import org.apache.hupa.client.rf.SendReplyMessageRequest;
-import org.apache.hupa.client.ui.WidgetDisplayable;
import org.apache.hupa.client.validation.EmailListValidator;
import org.apache.hupa.shared.Util;
import org.apache.hupa.shared.data.MessageAttachmentImpl;
@@ -997,7 +996,7 @@ public class ComposeActivity extends App
>>>>>>> fixed issue#61; add loading to mark, unmark.
}
- public interface Displayable extends WidgetDisplayable {
+ public interface Displayable extends IsWidget {
String getFromText();
void showCc();
void hideCc();
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeToolBarActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeToolBarActivity.java?rev=1522386&r1=1522385&r2=1522386&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeToolBarActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeToolBarActivity.java
Thu Sep 12 04:45:29 2013
@@ -20,6 +20,7 @@
package org.apache.hupa.client.activity;
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.IsWidget;
@@ -29,6 +30,11 @@ import org.apache.hupa.client.ui.WidgetD
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
>>>>>>> toggle to display/hide the tool bar view to adjust the compose and
>>>>>>> message panel
+=======
+import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.user.client.ui.AcceptsOneWidget;
+import com.google.gwt.user.client.ui.IsWidget;
+>>>>>>> replace with IsWidget
import com.google.inject.Inject;
public class ComposeToolBarActivity extends AppBaseActivity {
@@ -41,8 +47,12 @@ public class ComposeToolBarActivity exte
@Inject private Displayable display;
<<<<<<< HEAD
+<<<<<<< HEAD
public interface Displayable extends IsWidget {}
=======
public interface Displayable extends WidgetDisplayable {}
>>>>>>> toggle to display/hide the tool bar view to adjust the compose and
>>>>>>> message panel
+=======
+ public interface Displayable extends IsWidget {}
+>>>>>>> replace with IsWidget
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java?rev=1522386&r1=1522385&r2=1522386&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/FolderListActivity.java
Thu Sep 12 04:45:29 2013
@@ -22,6 +22,7 @@ package org.apache.hupa.client.activity;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.events.RefreshUnreadEvent;
import org.apache.hupa.shared.events.RefreshUnreadEventHandler;
@@ -39,6 +40,11 @@ import org.apache.hupa.client.ui.WidgetD
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
>>>>>>> integrate all of the views to their corresponding activities and
>>>>>>> mappers
+=======
+import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.user.client.ui.AcceptsOneWidget;
+import com.google.gwt.user.client.ui.IsWidget;
+>>>>>>> replace with IsWidget
import com.google.inject.Inject;
public class FolderListActivity extends AppBaseActivity {
@@ -103,10 +109,14 @@ public class FolderListActivity extends
return this;
}
+<<<<<<< HEAD
>>>>>>> use GinFactoryModuleBuilder to inject multiple displayable instances
>>>>>>> of some activities
=======
>>>>>>> fixed issue#45, issue#47, issue#51. change the layout of composite,
>>>>>>> don't use contact instead of folders list
public interface Displayable extends WidgetDisplayable {
+=======
+ public interface Displayable extends IsWidget {
+>>>>>>> replace with IsWidget
void refresh();
}
>>>>>>> make reload mail folder place work, fixed issue #7
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java?rev=1522386&r1=1522385&r2=1522386&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/IMAPMessageListActivity.java
Thu Sep 12 04:45:29 2013
@@ -41,7 +41,6 @@ import org.apache.hupa.client.rf.DeleteM
import org.apache.hupa.client.rf.MoveMessageRequest;
import org.apache.hupa.client.rf.SetFlagRequest;
import org.apache.hupa.client.ui.MessagesCellTable;
-import org.apache.hupa.client.ui.WidgetDisplayable;
import org.apache.hupa.client.widgets.HasDialog;
import org.apache.hupa.shared.data.MessageImpl.IMAPFlag;
import org.apache.hupa.shared.domain.DeleteMessageAllAction;
@@ -75,6 +74,7 @@ import com.google.gwt.event.dom.client.H
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.HasValue;
+import com.google.gwt.user.client.ui.IsWidget;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.web.bindery.requestfactory.shared.Receiver;
@@ -348,7 +348,7 @@ public class IMAPMessageListActivity ext
@Inject private Displayable display;
@Inject private Provider<MessageSendPlace> messageSendPlaceProvider;
- public interface Displayable extends WidgetDisplayable {
+ public interface Displayable extends IsWidget {
public void setPostFetchMessageCount(int count);
public void fillSearchOracle(List<Message> messages);
public void setExpandLoading(boolean expanding);
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java?rev=1522386&r1=1522385&r2=1522386&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java
Thu Sep 12 04:45:29 2013
@@ -26,6 +26,7 @@ package org.apache.hupa.client.activity;
import org.apache.hupa.client.HupaController;
import org.apache.hupa.client.rf.DeleteFolderRequest;
import org.apache.hupa.client.ui.LabelNode;
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.DeleteFolderAction;
import org.apache.hupa.shared.domain.GenericResult;
import org.apache.hupa.shared.domain.ImapFolder;
@@ -126,6 +127,8 @@ import org.apache.hupa.client.rf.DeleteF
import org.apache.hupa.client.ui.LabelNode;
>>>>>>> make delete label in label setting work(backend now)
import org.apache.hupa.client.ui.WidgetDisplayable;
+=======
+>>>>>>> replace with IsWidget
import org.apache.hupa.shared.domain.DeleteFolderAction;
import org.apache.hupa.shared.domain.GenericResult;
import org.apache.hupa.shared.domain.ImapFolder;
@@ -140,6 +143,7 @@ import com.google.gwt.event.dom.client.H
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
+import com.google.gwt.user.client.ui.IsWidget;
import com.google.gwt.view.client.SingleSelectionModel;
import com.google.inject.Inject;
import com.google.web.bindery.requestfactory.shared.Receiver;
@@ -182,6 +186,7 @@ public class LabelListActivity extends A
}
<<<<<<< HEAD
+<<<<<<< HEAD
@Inject private Displayable display;
<<<<<<< HEAD
@@ -192,6 +197,9 @@ public class LabelListActivity extends A
=======
>>>>>>> make add of label setting work in backend
public interface Displayable extends WidgetDisplayable {
+=======
+ public interface Displayable extends IsWidget {
+>>>>>>> replace with IsWidget
final int CASCADE_TYPE_ADD = 0x01;
final int CASCADE_TYPE_RENAME = 0x02;
SingleSelectionModel<LabelNode> getSelectionModel();
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelPropertiesActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelPropertiesActivity.java?rev=1522386&r1=1522385&r2=1522386&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelPropertiesActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelPropertiesActivity.java
Thu Sep 12 04:45:29 2013
@@ -22,11 +22,11 @@ package org.apache.hupa.client.activity;
import java.util.List;
import org.apache.hupa.client.ui.LabelNode;
-import org.apache.hupa.client.ui.WidgetDisplayable;
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
+import com.google.gwt.user.client.ui.IsWidget;
import com.google.inject.Inject;
public class LabelPropertiesActivity extends AppBaseActivity {
@@ -38,7 +38,7 @@ public class LabelPropertiesActivity ext
@Inject private Displayable display;
- public interface Displayable extends WidgetDisplayable {
+ public interface Displayable extends IsWidget {
void cascade(LabelNode labelNode, List<LabelNode> list, int
cascadeTypeAdd);
HasClickHandlers getSave();
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java?rev=1522386&r1=1522385&r2=1522386&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LoginActivity.java
Thu Sep 12 04:45:29 2013
@@ -31,6 +31,7 @@ import org.apache.hupa.client.HupaConsta
import org.apache.hupa.client.place.FolderPlace;
import org.apache.hupa.client.rf.LoginUserRequest;
import org.apache.hupa.client.ui.HupaLayoutable;
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.User;
import org.apache.hupa.shared.events.FlashEvent;
import org.apache.hupa.shared.events.LoginEvent;
@@ -80,6 +81,8 @@ import org.apache.hupa.client.place.Fold
import org.apache.hupa.client.rf.LoginUserRequest;
import org.apache.hupa.client.ui.HupaLayoutable;
import org.apache.hupa.client.ui.WidgetDisplayable;
+=======
+>>>>>>> replace with IsWidget
import org.apache.hupa.shared.domain.User;
import org.apache.hupa.shared.events.FlashEvent;
import org.apache.hupa.shared.events.LoginEvent;
@@ -144,9 +147,13 @@ import com.google.gwt.user.client.ui.Foc
import com.google.gwt.user.client.ui.HasValue;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.gwt.user.client.ui.IsWidget;
=======
>>>>>>> integrate all of the views to their corresponding activities and
>>>>>>> mappers
+=======
+import com.google.gwt.user.client.ui.IsWidget;
+>>>>>>> replace with IsWidget
import com.google.gwt.user.client.ui.RootLayoutPanel;
import com.google.gwt.user.client.ui.Widget;
import com.google.inject.Inject;
@@ -528,6 +535,7 @@ public class LoginActivity extends Abstr
@Inject private HupaConstants constants;
public interface Displayable extends IsWidget {
+<<<<<<< HEAD
public HasClickHandlers getLoginClick();
public HasValue<String> getUserNameValue();
public HasValue<String> getPasswordValue();
@@ -549,6 +557,8 @@ public class LoginActivity extends Abstr
>>>>>>> scrub code
public interface Displayable extends WidgetDisplayable {
>>>>>>> Change to new mvp framework - first step
+=======
+>>>>>>> replace with IsWidget
public HasClickHandlers getLoginClick();
public HasValue<String> getUserNameValue();
public HasValue<String> getPasswordValue();
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LogoActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LogoActivity.java?rev=1522386&r1=1522385&r2=1522386&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LogoActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LogoActivity.java
Thu Sep 12 04:45:29 2013
@@ -20,6 +20,7 @@
package org.apache.hupa.client.activity;
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.IsWidget;
@@ -29,6 +30,11 @@ import org.apache.hupa.client.ui.WidgetD
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
>>>>>>> integrate all of the views to their corresponding activities and
>>>>>>> mappers
+=======
+import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.user.client.ui.AcceptsOneWidget;
+import com.google.gwt.user.client.ui.IsWidget;
+>>>>>>> replace with IsWidget
import com.google.inject.Inject;
public class LogoActivity extends AppBaseActivity {
@@ -41,8 +47,12 @@ public class LogoActivity extends AppBas
@Inject private Displayable display;
<<<<<<< HEAD
+<<<<<<< HEAD
public interface Displayable extends IsWidget {}
=======
public interface Displayable extends WidgetDisplayable {}
>>>>>>> integrate all of the views to their corresponding activities and
>>>>>>> mappers
+=======
+ public interface Displayable extends IsWidget {}
+>>>>>>> replace with IsWidget
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java?rev=1522386&r1=1522385&r2=1522386&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageContentActivity.java
Thu Sep 12 04:45:29 2013
@@ -34,6 +34,7 @@ import java.util.logging.Logger;
import org.apache.hupa.client.place.ComposePlace;
import org.apache.hupa.client.place.MessagePlace.TokenWrapper;
import org.apache.hupa.client.rf.GetMessageDetailsRequest;
+<<<<<<< HEAD
import org.apache.hupa.client.ui.ToolBarView.Parameters;
import org.apache.hupa.shared.SConsts;
import org.apache.hupa.shared.domain.GetMessageDetailsAction;
@@ -184,6 +185,8 @@ import org.apache.hupa.client.place.Mess
import org.apache.hupa.client.rf.GetMessageDetailsRequest;
>>>>>>> make reload message content work, use the same place with folder list,
>>>>>>> while separated with slash, that looks like Gmail's
import org.apache.hupa.client.ui.WidgetDisplayable;
+=======
+>>>>>>> replace with IsWidget
import org.apache.hupa.shared.domain.GetMessageDetailsAction;
import org.apache.hupa.shared.domain.GetMessageDetailsResult;
import org.apache.hupa.shared.domain.ImapFolder;
@@ -192,6 +195,7 @@ import org.apache.hupa.shared.domain.Mes
import com.google.gwt.activity.shared.Activity;
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
+import com.google.gwt.user.client.ui.IsWidget;
import com.google.inject.Inject;
import com.google.web.bindery.requestfactory.shared.Receiver;
import com.google.web.bindery.requestfactory.shared.ServerFailure;
@@ -248,8 +252,12 @@ public class MessageContentActivity exte
}
>>>>>>> scrub code
+<<<<<<< HEAD
>>>>>>> make reload message content work, use the same place with folder list,
>>>>>>> while separated with slash, that looks like Gmail's
public interface Displayable extends WidgetDisplayable {
+=======
+ public interface Displayable extends IsWidget {
+>>>>>>> replace with IsWidget
void fillMessageContent(String messageContent);
void setAttachments(List<MessageAttachment> attachements,
String folder, long uid);
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java?rev=1522386&r1=1522385&r2=1522386&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListActivity.java
Thu Sep 12 04:45:29 2013
@@ -34,6 +34,7 @@ import org.apache.hupa.client.place.Abst
import org.apache.hupa.client.place.FolderPlace;
import org.apache.hupa.client.place.MessagePlace;
import org.apache.hupa.client.rf.DeleteMessageByUidRequest;
+<<<<<<< HEAD
import org.apache.hupa.client.rf.GetMessageDetailsRequest;
import org.apache.hupa.client.rf.MoveMessageRequest;
import org.apache.hupa.client.ui.MessagesCellTable;
@@ -274,20 +275,22 @@ import org.apache.hupa.client.place.Mess
>>>>>>> change place management and make refresh folder and message list more
>>>>>>> gentle
import org.apache.hupa.client.rf.DeleteMessageByUidRequest;
import org.apache.hupa.client.rf.FetchMessagesRequest;
+=======
+>>>>>>> replace with IsWidget
import org.apache.hupa.client.rf.GetMessageDetailsRequest;
-import org.apache.hupa.client.ui.HasRefresh;
import org.apache.hupa.client.ui.MessagesCellTable;
<<<<<<< HEAD
>>>>>>> let messages list activity make use of mvp
=======
import org.apache.hupa.client.ui.ToolBarView;
+<<<<<<< HEAD
>>>>>>> fixed issue#61; add loading to mark, unmark.
import org.apache.hupa.client.ui.WidgetDisplayable;
+=======
+>>>>>>> replace with IsWidget
import org.apache.hupa.shared.data.ImapFolderImpl;
import org.apache.hupa.shared.domain.DeleteMessageByUidAction;
import org.apache.hupa.shared.domain.DeleteMessageResult;
-import org.apache.hupa.shared.domain.FetchMessagesAction;
-import org.apache.hupa.shared.domain.FetchMessagesResult;
import org.apache.hupa.shared.domain.GetMessageDetailsAction;
import org.apache.hupa.shared.domain.GetMessageDetailsResult;
import org.apache.hupa.shared.domain.ImapFolder;
@@ -300,10 +303,9 @@ import org.apache.hupa.shared.events.Ref
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
-import com.google.gwt.view.client.AsyncDataProvider;
+import com.google.gwt.user.client.ui.IsWidget;
import com.google.gwt.view.client.CellPreviewEvent;
import com.google.gwt.view.client.CellPreviewEvent.Handler;
-import com.google.gwt.view.client.HasData;
import com.google.inject.Inject;
import com.google.web.bindery.requestfactory.shared.Receiver;
import com.google.web.bindery.requestfactory.shared.ServerFailure;
@@ -392,6 +394,7 @@ public class MessageListActivity extends
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
@Inject private Displayable display;
<<<<<<< HEAD
@@ -406,6 +409,9 @@ public class MessageListActivity extends
=======
>>>>>>> make reload message content work, use the same place with folder list,
>>>>>>> while separated with slash, that looks like Gmail's
public interface Displayable extends WidgetDisplayable {
+=======
+ public interface Displayable extends IsWidget {
+>>>>>>> replace with IsWidget
MessagesCellTable getGrid();
void refresh();
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListFooterActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListFooterActivity.java?rev=1522386&r1=1522385&r2=1522386&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListFooterActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageListFooterActivity.java
Thu Sep 12 04:45:29 2013
@@ -20,6 +20,7 @@
package org.apache.hupa.client.activity;
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.shared.data.ImapFolderImpl;
import org.apache.hupa.shared.events.MoveMessageEvent;
@@ -38,6 +39,12 @@ import com.google.gwt.event.shared.Event
import com.google.gwt.user.cellview.client.SimplePager;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
>>>>>>> integrate all of the views to their corresponding activities and
>>>>>>> mappers
+=======
+import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.user.cellview.client.SimplePager;
+import com.google.gwt.user.client.ui.AcceptsOneWidget;
+import com.google.gwt.user.client.ui.IsWidget;
+>>>>>>> replace with IsWidget
import com.google.inject.Inject;
public class MessageListFooterActivity extends AppBaseActivity {
@@ -68,6 +75,7 @@ public class MessageListFooterActivity e
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public interface Displayable extends IsWidget {
SimplePager getPager();
HasVisibility getLabelsPanel();
@@ -78,6 +86,9 @@ public class MessageListFooterActivity e
>>>>>>> integrate all of the views to their corresponding activities and
>>>>>>> mappers
=======
public interface Displayable extends WidgetDisplayable {
+=======
+ public interface Displayable extends IsWidget {
+>>>>>>> replace with IsWidget
SimplePager getPager();
}
>>>>>>> try to rearrange the places and history managment.
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java?rev=1522386&r1=1522385&r2=1522386&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/MessageSendActivity.java
Thu Sep 12 04:45:29 2013
@@ -49,7 +49,6 @@ import org.apache.hupa.client.place.Mess
import org.apache.hupa.client.rf.SendForwardMessageRequest;
import org.apache.hupa.client.rf.SendMessageRequest;
import org.apache.hupa.client.rf.SendReplyMessageRequest;
-import org.apache.hupa.client.ui.WidgetDisplayable;
import org.apache.hupa.client.validation.EmailListValidator;
import org.apache.hupa.shared.Util;
import org.apache.hupa.shared.data.MessageAttachmentImpl;
@@ -197,6 +196,7 @@ import com.google.gwt.user.client.ui.Acc
import com.google.gwt.user.client.ui.Focusable;
import com.google.gwt.user.client.ui.HasHTML;
import com.google.gwt.user.client.ui.HasText;
+import com.google.gwt.user.client.ui.IsWidget;
import com.google.inject.Inject;
<<<<<<< HEAD
<<<<<<< HEAD
@@ -608,6 +608,7 @@ public class MessageSendActivity extends
private User user;
private SendMessageRequest sendReq;
+<<<<<<< HEAD
=======
=======
>>>>>>> 1. improve the inbox folder place.
@@ -1164,6 +1165,9 @@ public class MessageSendActivity extends
>>>>>>> scrub code
public interface Displayable extends WidgetDisplayable {
+=======
+ public interface Displayable extends IsWidget {
+>>>>>>> replace with IsWidget
public HasText getFromText();
public HasText getToText();
public HasText getCcText();
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NavigationActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NavigationActivity.java?rev=1522386&r1=1522385&r2=1522386&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NavigationActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NavigationActivity.java
Thu Sep 12 04:45:29 2013
@@ -20,6 +20,7 @@
package org.apache.hupa.client.activity;
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.IsWidget;
@@ -29,6 +30,11 @@ import org.apache.hupa.client.ui.WidgetD
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
>>>>>>> integrate all of the views to their corresponding activities and
>>>>>>> mappers
+=======
+import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.user.client.ui.AcceptsOneWidget;
+import com.google.gwt.user.client.ui.IsWidget;
+>>>>>>> replace with IsWidget
import com.google.inject.Inject;
public class NavigationActivity extends AppBaseActivity {
@@ -41,8 +47,12 @@ public class NavigationActivity extends
@Inject private Displayable display;
<<<<<<< HEAD
+<<<<<<< HEAD
public interface Displayable extends IsWidget {}
=======
public interface Displayable extends WidgetDisplayable {}
>>>>>>> integrate all of the views to their corresponding activities and
>>>>>>> mappers
+=======
+ public interface Displayable extends IsWidget {}
+>>>>>>> replace with IsWidget
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java?rev=1522386&r1=1522385&r2=1522386&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java
Thu Sep 12 04:45:29 2013
@@ -20,6 +20,7 @@
package org.apache.hupa.client.activity;
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.IsWidget;
@@ -29,6 +30,11 @@ import org.apache.hupa.client.ui.WidgetD
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
>>>>>>> add loading and notification bar(finishing the folder list click
>>>>>>> event), related to the issue#18
+=======
+import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.user.client.ui.AcceptsOneWidget;
+import com.google.gwt.user.client.ui.IsWidget;
+>>>>>>> replace with IsWidget
import com.google.inject.Inject;
public class NotificationActivity extends AppBaseActivity {
@@ -41,11 +47,15 @@ public class NotificationActivity extend
@Inject private Displayable display;
<<<<<<< HEAD
+<<<<<<< HEAD
public interface Displayable extends IsWidget {
void hideNotification();
void notice(String html);
=======
public interface Displayable extends WidgetDisplayable {
+=======
+ public interface Displayable extends IsWidget {
+>>>>>>> replace with IsWidget
void hideNotification();
<<<<<<< HEAD
void notice(SafeHtml html);
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/StatusActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/StatusActivity.java?rev=1522386&r1=1522385&r2=1522386&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/StatusActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/StatusActivity.java
Thu Sep 12 04:45:29 2013
@@ -20,6 +20,7 @@
package org.apache.hupa.client.activity;
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.IsWidget;
@@ -29,6 +30,11 @@ import org.apache.hupa.client.ui.WidgetD
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
>>>>>>> integrate all of the views to their corresponding activities and
>>>>>>> mappers
+=======
+import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.user.client.ui.AcceptsOneWidget;
+import com.google.gwt.user.client.ui.IsWidget;
+>>>>>>> replace with IsWidget
import com.google.inject.Inject;
public class StatusActivity extends AppBaseActivity {
@@ -41,8 +47,12 @@ public class StatusActivity extends AppB
@Inject private Displayable display;
<<<<<<< HEAD
+<<<<<<< HEAD
public interface Displayable extends IsWidget {}
=======
public interface Displayable extends WidgetDisplayable {}
>>>>>>> integrate all of the views to their corresponding activities and
>>>>>>> mappers
+=======
+ public interface Displayable extends IsWidget {}
+>>>>>>> replace with IsWidget
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java?rev=1522386&r1=1522385&r2=1522386&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ToolBarActivity.java
Thu Sep 12 04:45:29 2013
@@ -181,8 +181,11 @@ import org.apache.hupa.client.rf.SetFlag
import org.apache.hupa.client.ui.MessagesCellTable;
>>>>>>> link the mark action to the message list such that they can change
>>>>>>> upon the actions
import org.apache.hupa.client.ui.ToolBarView.Parameters;
+<<<<<<< HEAD
>>>>>>> coping with reply and forward sending message
import org.apache.hupa.client.ui.WidgetDisplayable;
+=======
+>>>>>>> replace with IsWidget
import org.apache.hupa.shared.data.MessageImpl.IMAPFlag;
import org.apache.hupa.shared.domain.GenericResult;
import org.apache.hupa.shared.domain.ImapFolder;
@@ -196,6 +199,7 @@ import com.google.gwt.event.dom.client.H
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.event.shared.HandlerRegistration;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
+import com.google.gwt.user.client.ui.IsWidget;
import com.google.gwt.user.client.ui.PopupPanel;
import com.google.inject.Inject;
import com.google.web.bindery.requestfactory.shared.Receiver;
@@ -282,6 +286,7 @@ public class ToolBarActivity extends App
});
}
+<<<<<<< HEAD
// FIXME: for some reason if we extend WidgetDisplayable we get the
error
// ToolBarActivity.java:[124,38] error: cannot find symbol
@@ -289,6 +294,9 @@ public class ToolBarActivity extends App
// FIXME: added this method until we fix the problem with
inheritance
com.google.gwt.user.client.ui.Widget asWidget();
+=======
+ public interface Displayable extends IsWidget {
+>>>>>>> replace with IsWidget
void enableSendingTools(boolean is);
HandlerRegistration getForwardReg();
HandlerRegistration getReplyAllReg();
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java?rev=1522386&r1=1522385&r2=1522386&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopActivity.java
Thu Sep 12 04:45:29 2013
@@ -29,7 +29,6 @@ import org.apache.hupa.client.HupaConsta
<<<<<<< HEAD
import org.apache.hupa.client.rf.IdleRequest;
import org.apache.hupa.client.rf.LogoutUserRequest;
-import org.apache.hupa.client.ui.WidgetDisplayable;
import org.apache.hupa.shared.domain.IdleAction;
import org.apache.hupa.shared.domain.IdleResult;
import org.apache.hupa.shared.domain.LogoutUserResult;
@@ -116,6 +115,7 @@ import com.google.gwt.event.shared.Event
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.HasText;
+import com.google.gwt.user.client.ui.IsWidget;
import com.google.inject.Inject;
import com.google.web.bindery.requestfactory.shared.Receiver;
@@ -408,6 +408,7 @@ public class TopActivity extends AppBase
private User user;
private ServerStatus serverStatus = ServerStatus.Available;
+<<<<<<< HEAD
=======
private Timer noopTimer = new IdleTimer();
@@ -456,6 +457,9 @@ public class TopActivity extends AppBase
>>>>>>> scrub code
public interface Displayable extends WidgetDisplayable {
+=======
+ public interface Displayable extends IsWidget {
+>>>>>>> replace with IsWidget
public HasClickHandlers getLogoutClick();
public HasClickHandlers getContactsClick();
public HasClickHandlers getMainClick();
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=1522386&r1=1522385&r2=1522386&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:45:29 2013
@@ -25,6 +25,7 @@ import org.apache.hupa.client.place.Defa
import org.apache.hupa.client.rf.CheckSessionRequest;
import org.apache.hupa.client.rf.LogoutUserRequest;
import org.apache.hupa.client.ui.LoginLayoutable;
+<<<<<<< HEAD
import org.apache.hupa.shared.domain.LogoutUserResult;
import org.apache.hupa.shared.domain.User;
import org.apache.hupa.shared.events.LoginEvent;
@@ -139,6 +140,8 @@ import org.apache.hupa.client.rf.LogoutU
import org.apache.hupa.client.ui.LoginLayoutable;
>>>>>>> add logout support
import org.apache.hupa.client.ui.WidgetDisplayable;
+=======
+>>>>>>> replace with IsWidget
import org.apache.hupa.shared.domain.LogoutUserResult;
import org.apache.hupa.shared.domain.User;
import org.apache.hupa.shared.events.LoginEvent;
@@ -153,6 +156,7 @@ import com.google.gwt.uibinder.client.Ui
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.IsWidget;
import com.google.gwt.user.client.ui.RootLayoutPanel;
import com.google.inject.Inject;
import com.google.web.bindery.requestfactory.shared.Receiver;
@@ -240,7 +244,7 @@ public class TopBarActivity extends AppB
return display.getUserLabel().getWidgetCount() < 1;
}
- public interface Displayable extends WidgetDisplayable {
+ public interface Displayable extends IsWidget {
HasClickHandlers getLogoutClick();
void showUserName(String userName);
HTMLPanel getUserLabel();
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java?rev=1522386&r1=1522385&r2=1522386&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java
Thu Sep 12 04:45:29 2013
@@ -31,7 +31,6 @@ import org.apache.hupa.client.activity.M
import org.apache.hupa.client.place.FolderPlace;
import org.apache.hupa.client.place.MessageSendPlace;
import org.apache.hupa.client.rf.GetMessageDetailsRequest;
-import org.apache.hupa.client.ui.WidgetDisplayable;
import org.apache.hupa.client.widgets.IMAPTreeItem;
import org.apache.hupa.shared.data.ImapFolderImpl;
import org.apache.hupa.shared.data.MessageImpl.IMAPFlag;
@@ -64,6 +63,7 @@ import com.google.gwt.event.shared.Event
import com.google.gwt.place.shared.Place;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
+import com.google.gwt.user.client.ui.IsWidget;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.web.bindery.requestfactory.shared.Receiver;
@@ -247,7 +247,7 @@ public class WestActivity extends AppBas
private String searchValue;
private Place currentPlace;
- public interface Displayable extends WidgetDisplayable {
+ public interface Displayable extends IsWidget {
}
=======
=======
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetContainerDisplayable.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetContainerDisplayable.java?rev=1522386&r1=1522385&r2=1522386&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetContainerDisplayable.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/WidgetContainerDisplayable.java
Thu Sep 12 04:45:29 2013
@@ -19,9 +19,10 @@
package org.apache.hupa.client.ui;
+import com.google.gwt.user.client.ui.IsWidget;
import com.google.gwt.user.client.ui.Widget;
-public interface WidgetContainerDisplayable extends WidgetDisplayable {
+public interface WidgetContainerDisplayable extends IsWidget {
void addWidget( Widget widget );
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
