fixed issue#66 and remove one useless class, make MessageListFooterActivityMapper do not map anything when it comes to setting place
git-svn-id: https://svn.apache.org/repos/asf/james/hupa/trunk@1522433 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/client/src/main/java/org/apache/hupa/client/mapper/MessageListFooterActivityMapper.java b/client/src/main/java/org/apache/hupa/client/mapper/MessageListFooterActivityMapper.java
index 5916f9a..ac46a13 100644
--- a/client/src/main/java/org/apache/hupa/client/mapper/MessageListFooterActivityMapper.java
+++ b/client/src/main/java/org/apache/hupa/client/mapper/MessageListFooterActivityMapper.java
@@ -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 @@
<<<<<<< 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.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 @@
}
<<<<<<< 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 @@
};
}
>>>>>>> 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
}
diff --git a/client/src/main/java/org/apache/hupa/client/ui/ContentSplitLayoutPanel.java b/client/src/main/java/org/apache/hupa/client/ui/ContentSplitLayoutPanel.java
deleted file mode 100644
index f33cd4f..0000000
--- a/client/src/main/java/org/apache/hupa/client/ui/ContentSplitLayoutPanel.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.apache.hupa.client.ui;
-
-import com.google.gwt.user.client.ui.SplitLayoutPanel;
-import com.google.inject.Inject;
-
-public class ContentSplitLayoutPanel extends SplitLayoutPanel {
-
- @Inject MessagesCellTable table;
-
- public ContentSplitLayoutPanel(){
- super();
- }
- public ContentSplitLayoutPanel(int splitterSize){
- super(splitterSize);
- }
-}
diff --git a/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java b/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java
index 7df5f61..e1b85cc 100644
--- a/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java
+++ b/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java
@@ -94,12 +94,18 @@
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 @@
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 @@
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>");
}
