Author: dongxu
Date: Thu Sep 12 03:31:23 2013
New Revision: 1522215

URL: http://svn.apache.org/r1522215
Log:
scrub code

Modified:
    
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/WestActivity.java

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=1522215&r1=1522214&r2=1522215&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 03:31:23 2013
@@ -842,7 +842,8 @@ public class IMAPMessageListActivity ext
                DeleteMessageByUidRequest req = 
requestFactory.deleteMessageByUidRequest();
                DeleteMessageByUidAction action = 
req.create(DeleteMessageByUidAction.class);
                ImapFolder f = req.create(ImapFolder.class);
-               folder.setFolderTo(f);
+//             folder.setFolderTo(f); FIXME cannot use any more, for it's 
already a requestContext assigned.
+               clone(f, folder);
                action.setMessageUids(uids);
                action.setFolder(f);
                req.delete(action).fire(new Receiver<DeleteMessageResult>() {
@@ -853,6 +854,15 @@ public class IMAPMessageListActivity ext
                        }
                });
        }
+       private void clone(ImapFolder f, ImapFolder folder) {
+           f.setChildren(folder.getChildren());
+               f.setDelimiter(folder.getDelimiter());
+               f.setFullName(folder.getFullName());
+               f.setMessageCount(folder.getMessageCount());
+               f.setName(folder.getName());
+               f.setSubscribed(folder.getSubscribed());
+               f.setUnseenMessageCount(folder.getUnseenMessageCount());
+    }
 
        private void redrawTable() {
         
display.getTable().setVisibleRangeAndClearData(display.getTable().getVisibleRange(),
 true);

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=1522215&r1=1522214&r2=1522215&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 03:31:23 2013
@@ -802,11 +802,13 @@ System.out.println("1111111"+response);
 
                                public void onEditEvent(EditEvent event) {
                                        if 
(event.getEventType().equals(EditEvent.EventType.Stop)) {
-                                               ImapFolder iFolder = new 
ImapFolderImpl((String) event.getOldValue());
+                                               String oldFullName = (String) 
event.getOldValue();
                                                final String newName = (String) 
event.getNewValue();
-                                               if 
(iFolder.getFullName().equalsIgnoreCase(newName) == false) {
+                                               if 
(oldFullName.equalsIgnoreCase(newName) == false) {
                                                        RenameFolderRequest req 
= requestFactory.renameFolderRequest();
                                                        RenameFolderAction 
action = req.create(RenameFolderAction.class);
+                                                       ImapFolder iFolder = 
req.create(ImapFolder.class);
+                                                       
iFolder.setFullName(oldFullName);
                                                        
action.setNewName(newName);
                                                        
action.setFolder(iFolder);
                                                        
req.rename(action).fire(new Receiver<GenericResult>() {
@@ -816,8 +818,8 @@ System.out.println("1111111"+response);
                                                                }
                                                                @Override
                                                                public void 
onFailure(ServerFailure error) {
-                                                                       
record.cancelEdit();
                                                                        
GWT.log("Error while renaming" + error.getStackTraceString());
+                                                                       
record.cancelEdit();
                                                                }
                                                        });
                                                }
@@ -853,6 +855,16 @@ System.out.println("1111111"+response);
                return tList;
        }
 
+       private void cloneFolder(ImapFolder desc, ImapFolder src) {
+           desc.setChildren(src.getChildren());
+               desc.setDelimiter(src.getDelimiter());
+               desc.setFullName(src.getFullName());
+               desc.setMessageCount(src.getMessageCount());
+               desc.setName(src.getName());
+               desc.setSubscribed(src.getSubscribed());
+               desc.setUnseenMessageCount(src.getUnseenMessageCount());
+    }
+
        private void bind() {
 >>>>>>> try to change fetch messages to use RF
                eventBus.addHandler(LoadMessagesEvent.TYPE, new 
LoadMessagesEventHandler() {
@@ -929,7 +941,8 @@ System.out.println("1111111"+response);
                                GetMessageDetailsRequest req = 
requestFactory.messageDetailsRequest();
                                GetMessageDetailsAction action = 
req.create(GetMessageDetailsAction.class);
                                final ImapFolder f = 
req.create(ImapFolder.class);
-                               event.getFolder().setFolderTo(f);
+//                             event.getFolder().setFolderTo(f);
+                               cloneFolder(f, event.getFolder());
                                action.setFolder(f);
                                action.setUid(message.getUid());
                                req.get(action).fire(new 
Receiver<GetMessageDetailsResult>() {



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

Reply via email to