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:49:15 UTC

svn commit: r1522253 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: activity/ mapper/ ui/

Author: dongxu
Date: Thu Sep 12 03:49:15 2013
New Revision: 1522253

URL: http://svn.apache.org/r1522253
Log:
adjust to the ui of folder list panel

Modified:
    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/mapper/MessageContentActivityMapper.java
    james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.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/MessageListView.java
    james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml
    james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java

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=1522253&r1=1522252&r2=1522253&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 03:49:15 2013
@@ -179,7 +179,6 @@ public class MessageContentActivity exte
 	@Override
 	public void start(AcceptsOneWidget container, EventBus eventBus) {
 		display.fillMessageContent(messageDetails.getText());
-		System.out.println("+++"+messageDetails.getText());
 		container.setWidget(display.asWidget());
 	}
 

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java?rev=1522253&r1=1522252&r2=1522253&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageContentActivityMapper.java Thu Sep 12 03:49:15 2013
@@ -88,7 +88,6 @@ public class MessageContentActivityMappe
 		else if (place instanceof MailFolderPlace)
 			return null;
 		else if (place instanceof IMAPMessagePlace) {
-			System.out.println("+++___+_+_+_"+((IMAPMessagePlace) place).getMessageDetails().getText());
 			return messageContentActivityProvider.get().with((IMAPMessagePlace) place);
 		}
 		return null;

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java?rev=1522253&r1=1522252&r2=1522253&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java Thu Sep 12 03:49:15 2013
@@ -28,6 +28,7 @@ import com.google.gwt.dom.client.Style.U
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.AcceptsOneWidget;
+import com.google.gwt.user.client.ui.HTMLPanel;
 import com.google.gwt.user.client.ui.IsWidget;
 import com.google.gwt.user.client.ui.LayoutPanel;
 import com.google.gwt.user.client.ui.SimpleLayoutPanel;
@@ -241,10 +242,12 @@ import com.google.gwt.user.client.ui.IsW
 >>>>>>> integrate all of the views to their corresponding activities and mappers
 import com.google.gwt.user.client.ui.LayoutPanel;
 import com.google.gwt.user.client.ui.SimplePanel;
+import com.google.gwt.user.client.ui.SplitLayoutPanel;
 import com.google.gwt.user.client.ui.Widget;
 
 public class HupaLayout implements HupaLayoutable {
 
+	@UiField SplitLayoutPanel messageBox;
 	@UiField SimplePanel topBarContainer;
 	@UiField SimplePanel logoContainer;
 	
@@ -252,8 +255,12 @@ public class HupaLayout implements HupaL
 	@UiField LayoutPanel navigationContainer;
 	@UiField SimplePanel toolBarContainer;
 	@UiField SimplePanel folderListContainer;
+	@UiField LayoutPanel messageListBox;
 	@UiField LayoutPanel messageListContainer;
 	@UiField SimplePanel messageListFooterContainer;
+	
+	@UiField HTMLPanel contactBox;
+	
 	@UiField SimplePanel messageContentContainer;
 	@UiField SimplePanel statusContainer;
 
@@ -261,6 +268,7 @@ public class HupaLayout implements HupaL
 
 	public HupaLayout() {
 		hupaMainPanel = binder.createAndBindUi(this);
+		messageBox.setWidgetHidden(contactBox, true);
 	}
 
 	@Override

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=1522253&r1=1522252&r2=1522253&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:49:15 2013
@@ -213,16 +213,15 @@
 									</g:SimplePanel>
 								</g:layer>
 							</g:LayoutPanel>
-
 						</g:west>
 						<g:center>
-							<g:DockLayoutPanel unit="PCT" ui:field="RightBox">
+							<g:DockLayoutPanel unit="PCT" ui:field="rightBox">
 								<g:west size="100">
-									<g:SplitLayoutPanel ui:field="MessageBox">
+									<g:SplitLayoutPanel ui:field="messageBox">
 										<g:north size="200">
 											<g:LayoutPanel addStyleNames="{style.box}"
-												ui:field="MessageListBox">
-												<g:layer>
+												ui:field="messageListBox">
+												<g:layer top="0" height="175px">
 													<g:LayoutPanel ui:field="messageListContainer" />
 												</g:layer>
 												<g:layer bottom="0" height="25px">
@@ -230,6 +229,11 @@
 												</g:layer>
 											</g:LayoutPanel>
 										</g:north>
+										<g:west size="200">
+											<g:HTMLPanel ui:field="contactBox" addStyleNames="{style.box}">
+												Address
+											</g:HTMLPanel>
+										</g:west>
 										<g:center>
 											<g:LayoutPanel addStyleNames="{style.box}"
 												ui:field="MessageContentBox">

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java?rev=1522253&r1=1522252&r2=1522253&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.java Thu Sep 12 03:49:15 2013
@@ -190,6 +190,7 @@ public class MessageListView extends Com
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 	interface MessageListUiBinder extends UiBinder<HTMLPanel, MessageListView> {
 >>>>>>> make login page as one part of the overall layout & splite layout to little one
 =======
@@ -198,6 +199,9 @@ public class MessageListView extends Com
 =======
 	interface MessageListUiBinder extends UiBinder<LayoutPanel, MessageListView> {
 >>>>>>> make message list view panel work as expected partly
+=======
+	interface MessageListUiBinder extends UiBinder<MessagesCellTable, MessageListView> {
+>>>>>>> adjust to the ui of folder list panel
 	}
 
 	private static MessageListUiBinder binder = GWT.create(MessageListUiBinder.class);

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml?rev=1522253&r1=1522252&r2=1522253&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageListView.ui.xml Thu Sep 12 03:49:15 2013
@@ -12,6 +12,7 @@
 <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
     xmlns:g='urn:import:com.google.gwt.user.client.ui'>
 	<g:SimpleLayoutPanel ui:field="thisView" />
 =======
@@ -34,4 +35,8 @@
 		</g:layer>
 	</g:LayoutPanel>
 >>>>>>> make message list view panel work as expected partly
+=======
+	xmlns:hupa='urn:import:org.apache.hupa.client.ui'>
+	<hupa:MessagesCellTable ui:field="table" />
+>>>>>>> adjust to the ui of folder list panel
 </ui:UiBinder>
\ No newline at end of file

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java?rev=1522253&r1=1522252&r2=1522253&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java Thu Sep 12 03:49:15 2013
@@ -545,10 +545,12 @@ public class MessagesCellTable extends D
 			return item == null ? null : item.getUid();
 		}
 	};
-	private final SelectionModel<? super Message> selectionModel = new MultiSelectionModel<Message>(KEY_PROVIDER);
+	private final SelectionModel<? super Message> selectionModel = new MultiSelectionModel<Message>(
+			KEY_PROVIDER);
 
 	@Inject
-	public MessagesCellTable(final HupaImageBundle imageBundle, final HupaConstants constants) {
+	public MessagesCellTable(final HupaImageBundle imageBundle,
+			final HupaConstants constants) {
 		super(PAGE_SIZE);
 		this.imageBundle = imageBundle;
 
@@ -562,7 +564,8 @@ public class MessagesCellTable extends D
 		header.setUpdater(new ValueUpdater<Boolean>() {
 			@Override
 			public void update(Boolean value) {
-				List<Message> displayedItems = MessagesCellTable.this.getVisibleItems();
+				List<Message> displayedItems = MessagesCellTable.this
+						.getVisibleItems();
 				for (Message msg : displayedItems) {
 					selectionModel.setSelected(msg, value);
 				}
@@ -581,7 +584,9 @@ public class MessagesCellTable extends D
 		setColumnWidth(dateCol, 10, Unit.EM);
 		setRowCount(PAGE_SIZE, false);
 		setKeyboardSelectionPolicy(KeyboardSelectionPolicy.DISABLED);
-		setSelectionModel(selectionModel, DefaultSelectionEventManager.<Message> createCheckboxManager(0));
+		setAutoHeaderRefreshDisabled(true);
+		setSelectionModel(selectionModel,
+				DefaultSelectionEventManager.<Message> createCheckboxManager(0));
 	}
 
 	public class CheckboxColumn extends Column<Message, Boolean> {



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org