james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From don...@apache.org
Subject svn commit: r1522433 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client: mapper/MessageListFooterActivityMapper.java ui/ContentSplitLayoutPanel.java ui/_CenterSettingPanel.java
Date Thu, 12 Sep 2013 05:02:12 GMT
Author: dongxu
Date: Thu Sep 12 05:02:12 2013
New Revision: 1522433

URL: http://svn.apache.org/r1522433
Log:
fixed issue#66 and remove one useless class, make MessageListFooterActivityMapper do not map
anything when it comes to setting place

Removed:
    james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ContentSplitLayoutPanel.java
Modified:
    james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListFooterActivityMapper.java
    james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListFooterActivityMapper.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListFooterActivityMapper.java?rev=1522433&r1=1522432&r2=1522433&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListFooterActivityMapper.java
(original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/MessageListFooterActivityMapper.java
Thu Sep 12 05:02:12 2013
@@ -20,10 +20,10 @@
 package org.apache.hupa.client.mapper;
 
 import org.apache.hupa.client.activity.MessageListFooterActivity;
-import org.apache.hupa.client.place.DefaultPlace;
 
 import com.google.gwt.activity.shared.Activity;
 <<<<<<< HEAD
+<<<<<<< HEAD
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.RunAsyncCallback;
 =======
@@ -31,6 +31,8 @@ import com.google.gwt.activity.shared.Ac
 <<<<<<< HEAD
 >>>>>>> integrate all of the views to their corresponding activities
and mappers
 =======
+=======
+>>>>>>> fixed issue#66 and remove one useless class, make MessageListFooterActivityMapper
do not map anything when it comes to setting place
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.RunAsyncCallback;
 >>>>>>> support code split
@@ -39,10 +41,14 @@ import com.google.inject.Inject;
 import com.google.inject.Provider;
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 public class MessageListFooterActivityMapper extends _MessageActivityMapper {
 =======
 public class MessageListFooterActivityMapper implements ActivityMapper {
 >>>>>>> integrate all of the views to their corresponding activities
and mappers
+=======
+public class MessageListFooterActivityMapper extends _MessageActivityMapper {
+>>>>>>> fixed issue#66 and remove one useless class, make MessageListFooterActivityMapper
do not map anything when it comes to setting place
 	private final Provider<MessageListFooterActivity> messageListFooterActivityProvider;
 
 	@Inject
@@ -52,12 +58,16 @@ public class MessageListFooterActivityMa
 	}
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> fixed issue#66 and remove one useless class, make MessageListFooterActivityMapper
do not map anything when it comes to setting place
 	@Override
 	protected Activity lazyLoadActivity(Place place) {return new ActivityAsyncProxy() {
 		@Override
 		protected void doAsync(RunAsyncCallback callback) {
 			GWT.runAsync(callback);
 		}
+<<<<<<< HEAD
 
 		@Override
 		protected Activity createInstance() {
@@ -80,4 +90,12 @@ public class MessageListFooterActivityMa
 		};
 	}
 >>>>>>> integrate all of the views to their corresponding activities
and mappers
+=======
+
+		@Override
+		protected Activity createInstance() {
+			return messageListFooterActivityProvider.get();
+		}
+	};}
+>>>>>>> fixed issue#66 and remove one useless class, make MessageListFooterActivityMapper
do not map anything when it comes to setting place
 }

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java?rev=1522433&r1=1522432&r2=1522433&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java
(original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java
Thu Sep 12 05:02:12 2013
@@ -94,12 +94,18 @@ import java.util.Arrays;
 import java.util.List;
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 import com.google.gwt.cell.client.TextCell;
 >>>>>>> make label settings prototype
 =======
+=======
+import org.apache.hupa.client.ui.FolderListView.Resources;
+
+>>>>>>> fixed issue#66 and remove one useless class, make MessageListFooterActivityMapper
do not map anything when it comes to setting place
 import com.google.gwt.cell.client.AbstractCell;
 >>>>>>> try to rearrange the places and history managment.
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.resources.client.ClientBundle.Source;
 import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
@@ -132,8 +138,15 @@ public class _CenterSettingPanel extends
 
 	private static final List<String> TABS = Arrays.asList("Folders");
 
+	public interface Resources extends CellList.Resources {
+
+		Resources INSTANCE = GWT.create(Resources.class);
+
+		@Source("res/CssLabelListView.css")
+		public CellList.Style cellListStyle();
+	}
 	private CellList<String> createTabList() {
-		CellList<String> cellList = new CellList<String>(new SpanCell());
+		CellList<String> cellList = new CellList<String>(new SpanCell(), Resources.INSTANCE);
 		cellList.setKeyboardSelectionPolicy(KeyboardSelectionPolicy.ENABLED);
 		final SingleSelectionModel<String> selectionModel = new SingleSelectionModel<String>();
 		cellList.setSelectionModel(selectionModel);
@@ -168,7 +181,7 @@ public class _CenterSettingPanel extends
 			if (value == null) {
 				return;
 			}
-			sb.appendHtmlConstant("<span style='display: block;color: #376572;text-shadow: 0px
1px 1px #fff;text-decoration: none;cursor: default;padding: 6px 8px 2px 8px;height: 17px;white-space:
nowrap;'>");
+			sb.appendHtmlConstant("<span >");
 			sb.appendHtmlConstant(value);
 			sb.appendHtmlConstant("</span>");
 		}



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


Mime
View raw message