Author: dongxu Date: Thu Sep 12 03:08:08 2013 New Revision: 1522169 URL: http://svn.apache.org/r1522169 Log: fix the frozen autobean issue, yet another occur
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/WestActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/ImapFolder.java 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=1522169&r1=1522168&r2=1522169&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:08:08 2013 @@ -264,6 +264,7 @@ import org.apache.hupa.client.place.Mail import org.apache.hupa.client.place.MessageSendPlace; import org.apache.hupa.client.rf.CreateFolderRequest; import org.apache.hupa.client.rf.DeleteFolderRequest; +import org.apache.hupa.client.rf.FetchMessagesRequest; import org.apache.hupa.client.rf.HupaRequestFactory; import org.apache.hupa.client.rf.ImapFolderRequest; import org.apache.hupa.client.rf.RenameFolderRequest; @@ -775,7 +776,7 @@ System.out.println("1111111"+response); public void onEditEvent(EditEvent event) { if (event.getEventType().equals(EditEvent.EventType.Stop)) { - ImapFolderImpl iFolder = new ImapFolderImpl((String) event.getOldValue()); + ImapFolder iFolder = new ImapFolderImpl((String) event.getOldValue()); final String newName = (String) event.getNewValue(); if (iFolder.getFullName().equalsIgnoreCase(newName) == false) { RenameFolderRequest req = requestFactory.renameFolderRequest(); @@ -1024,6 +1025,7 @@ System.out.println("1111111"+response); tItem = (IMAPTreeItem) event.getSelectedItem(); if (tItem.isEdit()) return; +<<<<<<< HEAD folder = (ImapFolder) tItem.getUserObject(); eventBus.fireEvent(new LoadMessagesEvent(user, folder)); } @@ -1066,6 +1068,14 @@ System.out.println("1111111"+response); if (tItem.isEdit()) return; folder = (ImapFolder) tItem.getUserObject(); +======= + ImapFolder editableFolder = (ImapFolder) tItem.getUserObject(); + FetchMessagesRequest req = requestFactory.messagesRequest(); + folder = req.edit(editableFolder); + +// folder = (ImapFolder) tItem.getUserObject(); + eventBus.fireEvent(new LoadMessagesEvent(user, folder)); +>>>>>>> fix the frozen autobean issue, yet another occur if (folder.getFullName().equalsIgnoreCase(user.getSettings().getInboxFolderName())) { display.getDeleteEnable().setEnabled(false); display.getRenameEnable().setEnabled(false); @@ -1076,7 +1086,28 @@ System.out.println("1111111"+response); } }); +<<<<<<< HEAD >>>>>>> try to change fetch messages to use RF +======= + //FIXME why another? +// display.getTree().addSelectionHandler(new SelectionHandler<TreeItem>() { +// +// public void onSelection(SelectionEvent<TreeItem> event) { +// tItem = (IMAPTreeItem) event.getSelectedItem(); +// if (tItem.isEdit()) +// return; +// folder = (ImapFolder) tItem.getUserObject(); +// if (folder.getFullName().equalsIgnoreCase(user.getSettings().getInboxFolderName())) { +// display.getDeleteEnable().setEnabled(false); +// display.getRenameEnable().setEnabled(false); +// } else { +// display.getDeleteEnable().setEnabled(true); +// display.getRenameEnable().setEnabled(true); +// } +// } +// +// }); +>>>>>>> fix the frozen autobean issue, yet another occur display.getRenameClick().addClickHandler(new ClickHandler() { public void onClick(ClickEvent event) { @@ -1237,6 +1268,8 @@ System.out.println("1111111"+response); this.user = user; this.folder = folder; this.searchValue = searchValue; + + // FIXME goto? placeController.goTo(new MailFolderPlace().with(user, folder, searchValue)); // placeController.goTo(mailInboxPlaceProvider.get().with(user)); // System.out.println("111"); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java?rev=1522169&r1=1522168&r2=1522169&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageTableModel.java Thu Sep 12 03:08:08 2013 @@ -88,6 +88,7 @@ import com.google.gwt.gen2.table.client. import com.google.gwt.gen2.table.client.TableModelHelper.Request; import com.google.inject.Inject; import com.google.web.bindery.requestfactory.shared.Receiver; +import com.google.web.bindery.requestfactory.shared.ServerFailure; /** * TableModel which retrieve the messages for the user @@ -285,20 +286,23 @@ public class MessageTableModel extends M } FetchMessagesRequest req = requestFactory.messagesRequest(); final FetchMessagesAction action = req.create(FetchMessagesAction.class); - final ImapFolder input = req.create(ImapFolder.class); - input.setChildren(folder.getChildren()); - input.setDelimiter(folder.getDelimiter()); - input.setFullName(folder.getFullName()); - input.setName(folder.getName()); - input.setUnseenMessageCount(folder.getUnseenMessageCount()); // FIXME cannot put setFolder to the first place - action.setFolder(input); action.setOffset(request.getNumRows()); + action.setFolder(folder); action.setSearchString(searchValue); action.setStart(request.getStartRow()); req.fetch(action).fire(new Receiver<FetchMessagesResult>() { + + @Override + public void onFailure(ServerFailure error) { + if (error.isFatal()) { + throw new RuntimeException(error.getMessage()); + } + } @Override public void onSuccess(final FetchMessagesResult result) { + assert result != null; + System.out.println(result.getOffset()); folder.setMessageCount(result.getRealCount()); folder.setUnseenMessageCount(result.getRealUnreadCount()); setRowCount(result.getRealCount()); Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java?rev=1522169&r1=1522168&r2=1522169&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java Thu Sep 12 03:08:08 2013 @@ -148,7 +148,11 @@ public class ImapFolderImpl implements I ======= >>>>>>> try to fetch messages, yet can not fire the login event in ModelTable >>>>>>> such that just get a NullPointerException in it. private List<ImapFolder> children = new ArrayList<ImapFolder>(); +<<<<<<< HEAD >>>>>>> Make the ValueProxy(ImapFolder) work with Manolo's patch. Hupa can >>>>>>> display folders in west view with RequestFactory >>>>>>> now.:shared/src/main/java/org/apache/hupa/shared/data/ImapFolderImpl.java +======= + private String name; +>>>>>>> fix the frozen autobean issue, yet another occur private String fullName; private String delimiter; private int messageCount; @@ -170,7 +174,6 @@ public class ImapFolderImpl implements I return subscribed; } - /** * Get the name of the folder * @@ -180,10 +183,12 @@ public class ImapFolderImpl implements I if (delimiter != null) { String fParts[] = getFullName().split("\\" + delimiter); if (fParts != null && fParts.length > 0) { - return fParts[fParts.length - 1]; + name = fParts[fParts.length - 1]; + return name; } } - return fullName; + name = fullName; + return name; } /** @@ -341,7 +346,7 @@ public class ImapFolderImpl implements I // FIXME Could not locate setter for property name in type ImapFolderImpl @Override public void setName(String name) { - this.fullName = name; + this.name = name; } >>>>>>> Succeed creating new folder Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/ImapFolder.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/ImapFolder.java?rev=1522169&r1=1522168&r2=1522169&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/ImapFolder.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/ImapFolder.java Thu Sep 12 03:08:08 2013 @@ -16,7 +16,9 @@ public interface ImapFolder extends Valu void setChildren(List<ImapFolder> children); void setUnseenMessageCount(int count); void setMessageCount(int realCount); + int getMessageCount(); String getDelimiter(); void setDelimiter(String delimiter); void setSubscribed(boolean subscribed); + boolean getSubscribed(); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org