Author: dongxu
Date: Thu Sep 12 04:22:48 2013
New Revision: 1522339
URL: http://svn.apache.org/r1522339
Log:
fix the bugs resulted from the no unit tests
Modified:
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/ToolBarActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessagesCellTable.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssMessagesCellTable.css
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=1522339&r1=1522338&r2=1522339&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:22:48 2013
@@ -278,6 +278,7 @@ import org.apache.hupa.shared.events.Log
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
+import com.google.gwt.core.shared.GWT;
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.place.shared.PlaceController;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
@@ -293,6 +294,7 @@ public class MessageListActivity extends
@Inject private Displayable display;
@Inject private HupaRequestFactory requestFactory;
@Inject private PlaceController placeController;
+ @Inject private ToolBarActivity.Displayable toolBarDisplay;
private ImapFolder folder;
private String searchValue;
private User user;
@@ -334,13 +336,16 @@ public class MessageListActivity extends
}
}
});
+ } else if (hasChangedFirstCol(event)) {
+ Scheduler.get().scheduleDeferred(new
ScheduledCommand() {
+ @Override
+ public void execute() {
+
toolBarDisplay.enableMessageTools();
+ }
+ });
}
}
- private boolean
hasClickedButFirstCol(CellPreviewEvent<Message> event) {
- return
"click".equals(event.getNativeEvent().getType()) && 0 != event.getColumn();
- }
-
});
display.getGrid().addRangeChangeHandler(new
RangeChangeEvent.Handler() {
@Override
@@ -348,9 +353,26 @@ public class MessageListActivity extends
fetch(event.getNewRange().getStart());
}
});
-
+ if (!pending) {
+ pending = true;
+ Scheduler.get().scheduleFinally(new ScheduledCommand() {
+ @Override
+ public void execute() {
+ pending = false;
+ fetch(0);
+ }
+ });
+ }
}
+ private boolean hasClickedButFirstCol(CellPreviewEvent<Message> event) {
+ return "click".equals(event.getNativeEvent().getType()) && 0 !=
event.getColumn();
+ }
+ private boolean hasChangedFirstCol(CellPreviewEvent<Message> event) {
+ GWT.log(event.getNativeEvent().getType() + " "
+ +
("change".equals(event.getNativeEvent().getType()) && 0 == event.getColumn()));
+ return "change".equals(event.getNativeEvent().getType()) && 0
== event.getColumn();
+ }
public void fetch(final int start) {
FetchMessagesRequest req = requestFactory.messagesRequest();
FetchMessagesAction action =
req.create(FetchMessagesAction.class);
@@ -391,23 +413,25 @@ public class MessageListActivity extends
}
});
- eventBus.addHandler(LoginEvent.TYPE, new LoginEventHandler() {
- public void onLogin(LoginEvent event) {
- user = event.getUser();
- folder = new
ImapFolderImpl(user.getSettings().getInboxFolderName());
- searchValue = null;
- if (!pending) {
- pending = true;
- Scheduler.get().scheduleFinally(new
ScheduledCommand() {
- @Override
- public void execute() {
- pending = false;
- fetch(0);
- }
- });
- }
- }
- });
+// eventBus.addHandler(LoginEvent.TYPE, new LoginEventHandler() {
+// public void onLogin(LoginEvent event) {
+// user = event.getUser();
+// if (folder == null) {
+// folder = new
ImapFolderImpl(user.getSettings().getInboxFolderName());
+// searchValue = null;
+// if (!pending) {
+// pending = true;
+//
Scheduler.get().scheduleFinally(new ScheduledCommand() {
+// @Override
+// public void execute() {
+// pending = false;
+// fetch(0);
+// }
+// });
+// }
+// }
+// }
+// });
}
@@ -437,8 +461,8 @@ public class MessageListActivity extends
public void setFolder(ImapFolder folder) {
this.folder = folder;
- if (folder != null)
- fetch(0);
+ // if (folder != null)
+ // fetch(0);
}
>>>>>>> prepare for message content panel
}
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=1522339&r1=1522338&r2=1522339&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:22:48 2013
@@ -171,6 +171,8 @@ import org.apache.hupa.shared.domain.Mes
import org.apache.hupa.shared.domain.SetFlagAction;
import org.apache.hupa.shared.events.ExpandMessageEvent;
import org.apache.hupa.shared.events.ExpandMessageEventHandler;
+import org.apache.hupa.shared.events.LoadMessagesEvent;
+import org.apache.hupa.shared.events.LoadMessagesEventHandler;
import org.apache.hupa.shared.events.LoginEvent;
import org.apache.hupa.shared.events.LoginEventHandler;
@@ -221,6 +223,11 @@ public class ToolBarActivity extends App
.getMessageDetails()));
}
});
+ eventBus.addHandler(LoadMessagesEvent.TYPE, new
LoadMessagesEventHandler() {
+ public void onLoadMessagesEvent(LoadMessagesEvent
loadMessagesEvent) {
+ display.disableMessageTools();
+ }
+ });
registerHandler(display.getMark().addClickHandler(new
ClickHandler() {
public void onClick(ClickEvent event) {
// Reposition the popup relative to the button
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java?rev=1522339&r1=1522338&r2=1522339&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java
Thu Sep 12 04:22:48 2013
@@ -117,9 +117,14 @@ public class ToolBarActivityMapper exten
=======
@Override
+<<<<<<< HEAD
Activity asyncLoadActivity(Place place) {
final String token = ((MailFolderPlace)place).getFullName();
>>>>>>> fixed issue#11, write a subclass of SplitLayoutPanel to override its
>>>>>>> onResize but failed, use the native one, and then refactor some names
+=======
+ Activity asyncLoadActivity(final Place place) {
+
+>>>>>>> fix the bugs resulted from the no unit tests
return new ActivityAsyncProxy() {
@Override
protected void doAsync(RunAsyncCallback callback) {
@@ -128,6 +133,10 @@ public class ToolBarActivityMapper exten
@Override
protected Activity createInstance() {
+ String token = null;
+ if(place instanceof MailFolderPlace){
+ token =
((MailFolderPlace)place).getFullName();
+ }
return
toolBarActivityProvider.get().with(token);
}
};
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=1522339&r1=1522338&r2=1522339&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 04:22:48 2013
@@ -658,7 +658,7 @@ public class MessagesCellTable extends D
@Override
public void update(int index, Message object,
Boolean value) {
selectionModel.setSelected(object,
value);
- toolBarDisplay.disableMessageTools();
+ toolBarDisplay.enableMessageTools();
}
});
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssMessagesCellTable.css
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssMessagesCellTable.css?rev=1522339&r1=1522338&r2=1522339&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssMessagesCellTable.css
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssMessagesCellTable.css
Thu Sep 12 04:22:48 2013
@@ -121,16 +121,17 @@
}
.dataGridSelectedRow {
- color: white;
+ color: #333333;
height: auto;
overflow: auto;
background: #059ec6;
- background: -moz-linear-gradient(top, #019bc6 0%, #017cb4 100%);
- background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #019bc6),
- color-stop(100%, #017cb4) );
- background: -o-linear-gradient(top, #019bc6 0%, #017cb4 100%);
- background: -ms-linear-gradient(top, #019bc6 0%, #017cb4 100%);
- background: linear-gradient(top, #019bc6 0%, #017cb4 100%);
+ background: -moz-linear-gradient(top, #FFFCCE 0%, #FFFCCE 100%);
+ background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #FFFCCE),
+ color-stop(100%, #FFFCCE) );
+ background: -o-linear-gradient(top, #FFFCCE 0%, #FFFCCE 100%);
+ background: -ms-linear-gradient(top, #FFFCCE 0%, #FFFCCE 100%);
+ background: linear-gradient(top, #FFFCCE 0%, #FFFCCE 100%);
+ /*background: linear-gradient(top, #019bc6 0%, #017cb4 100%);*/
}
.dataGridSelectedRowCell {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
