Author: dongxu
Date: Thu Sep 12 03:05:13 2013
New Revision: 1522165
URL: http://svn.apache.org/r1522165
Log:
Succeed creating new folder
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/rf/CreateFolderRequest.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CreateFolderService.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CreateFolderServiceImpl.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesService.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/CreateFolderActionImpl.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GenericResultImpl.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/CreateFolderAction.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GenericResult.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/ImapFolder.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/Message.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=1522165&r1=1522164&r2=1522165&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:05:13 2013
@@ -262,6 +262,7 @@ import org.apache.hupa.client.activity.M
import org.apache.hupa.client.place.IMAPMessagePlace;
import org.apache.hupa.client.place.MailFolderPlace;
import org.apache.hupa.client.place.MessageSendPlace;
+import org.apache.hupa.client.rf.CreateFolderRequest;
import org.apache.hupa.client.rf.HupaRequestFactory;
import org.apache.hupa.client.rf.ImapFolderRequest;
import org.apache.hupa.client.ui.WidgetContainerDisplayable;
@@ -270,6 +271,8 @@ import org.apache.hupa.client.widgets.IM
import org.apache.hupa.shared.data.ImapFolderImpl;
import org.apache.hupa.shared.data.MessageDetails;
import org.apache.hupa.shared.data.MessageImpl.IMAPFlag;
+import org.apache.hupa.shared.domain.CreateFolderAction;
+import org.apache.hupa.shared.domain.GenericResult;
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.Message;
import org.apache.hupa.shared.domain.User;
@@ -400,7 +403,11 @@ import com.google.inject.Inject;
>>>>>>>
=======
import com.google.web.bindery.requestfactory.shared.Receiver;
+<<<<<<< HEAD
>>>>>>> As the FetchFolders RequestFactory, but can not run correctly.
+=======
+import com.google.web.bindery.requestfactory.shared.ServerFailure;
+>>>>>>> Succeed creating new folder
public class WestActivity extends AbstractActivity {
@@ -458,6 +465,7 @@ public class WestActivity extends Abstra
@Inject private Provider<MessageSendPlace> messageSendPlaceProvider;
@Inject private Provider<IMAPMessagePlace> messagePlaceProvider;
<<<<<<< HEAD
+<<<<<<< HEAD
>>>>>>> fix issue 2&3. Handle exceptions thrown in async blocks &
>>>>>>> Simply injection code
private User user;
@@ -551,6 +559,9 @@ public class WestActivity extends Abstra
HupaRequestFactory rf = GWT.create(HupaRequestFactory.class);
=======
+=======
+ @Inject private HupaRequestFactory requestFactory;
+>>>>>>> Succeed creating new folder
private User user;
private ImapFolder folder;
@@ -763,16 +774,17 @@ System.out.println("1111111"+response);
ImapFolderImpl iFolder = new
ImapFolderImpl((String) event.getOldValue());
final String newName = (String)
event.getNewValue();
if
(iFolder.getFullName().equalsIgnoreCase(newName) == false) {
-// dispatcher.execute(new
RenameFolder(iFolder, newName), new HupaEvoCallback<GenericResult>(
-//
dispatcher, eventBus) {
-// public void
callback(GenericResult result) {
-//
folder.setFullName(newName);
-// }
-//
-// public void
callbackError(Throwable caught) {
-//
record.cancelEdit();
-// }
-// });
+ //
dispatcher.execute(new RenameFolder(iFolder,
+ // newName), new
HupaEvoCallback<GenericResult>(
+ // dispatcher,
eventBus) {
+ // public void
callback(GenericResult result) {
+ //
folder.setFullName(newName);
+ // }
+ //
+ // public void
callbackError(Throwable caught) {
+ // record.cancelEdit();
+ // }
+ // });
}
}
}
@@ -812,7 +824,7 @@ System.out.println("1111111"+response);
public void onLoadMessagesEvent(LoadMessagesEvent
loadMessagesEvent) {
showMessageTable(loadMessagesEvent.getUser(),
loadMessagesEvent.getFolder(),
-
loadMessagesEvent.getSearchValue());
+ loadMessagesEvent.getSearchValue());
}
});
@@ -1093,28 +1105,27 @@ System.out.println("1111111"+response);
public void onClick(ClickEvent event) {
editableTreeItem = display.createFolder(new
EditHandler() {
-
public void onEditEvent(EditEvent
event) {
final IMAPTreeItem item =
(IMAPTreeItem) event.getSource();
final String newValue =
(String) event.getNewValue();
- // if
- //
(event.getEventType().equals(EditEvent.EventType.Stop))
- // {
- // dispatcher.execute(new
CreateFolder(new
- //
ImapFolderImpl(newValue.trim())), new
- //
AsyncCallback<GenericResult>() {
- //
- // public void
onFailure(Throwable caught) {
- // GWT.log("Error while create
folder", caught);
- // item.cancelEdit();
- // }
- //
- // public void
onSuccess(GenericResult result) {
- // // Nothing todo
- // }
- //
- // });
- // }
+ if
(event.getEventType().equals(EditEvent.EventType.Stop)) {
+ CreateFolderRequest req
= requestFactory.createFolderRequest();
+ final
CreateFolderAction action = req.create(CreateFolderAction.class);
+ ImapFolder folder =
req.create(ImapFolder.class);
+
folder.setFullName(newValue.trim());
+
action.setFolder(folder);
+
req.create(action).fire(new Receiver<GenericResult>() {
+ @Override
+ public void
onSuccess(GenericResult response) {
+ //
Nothing todo
+ }
+ @Override
+ public void
onFailure(ServerFailure error) {
+
GWT.log("Error while create folder" + error.getStackTraceString());
+
item.cancelEdit();
+ }
+ });
+ }
}
});
@@ -1199,19 +1210,19 @@ System.out.println("1111111"+response);
}
private native void exportJSMethods(WestActivity westactivity) /*-{
-
$wnd.openLink =
function(url) {
-
try {
-
westactivi...@org.apache.hupa.client.activity.WestActivity::openLink(Ljava/lang/String;)
(url);
-
} catch(e) {}
-
return false;
-
};
-
$wnd.mailTo =
function(mail) {
-
try {
-
westactivi...@org.apache.hupa.client.activity.WestActivity::mailTo(Ljava/lang/String;)
(mail);
-
} catch(e) {}
-
return false;
-
};
-
}-*/;
+
$wnd.openLink = function(url) {
+ try {
+
westactivi...@org.apache.hupa.client.activity.WestActivity::openLink(Ljava/lang/String;)
(url);
+ }
catch(e) {}
+ return
false;
+ };
+
$wnd.mailTo = function(mail) {
+ try {
+
westactivi...@org.apache.hupa.client.activity.WestActivity::mailTo(Ljava/lang/String;)
(mail);
+ }
catch(e) {}
+ return
false;
+ };
+ }-*/;
private void showMessageTable(User user, ImapFolder folder, String
searchValue) {
this.user = user;
@@ -1235,12 +1246,12 @@ System.out.println("1111111"+response);
private void showForwardMessage(ForwardMessageEvent event) {
placeController.goTo(this.messageSendPlaceProvider.get().with(event.getUser(),
event.getFolder(),
- event.getMessage(), event.getMessageDetails(),
Type.FORWARD));
+ event.getMessage(), event.getMessageDetails(),
Type.FORWARD));
}
private void showReplyMessage(ReplyMessageEvent event) {
placeController.goTo(this.messageSendPlaceProvider.get().with(event.getUser(),
event.getFolder(),
- event.getMessage(), event.getMessageDetails(),
event.getReplyAll() ? Type.REPLY_ALL : Type.REPLY));
+ event.getMessage(), event.getMessageDetails(),
event.getReplyAll() ? Type.REPLY_ALL : Type.REPLY));
}
public interface Displayable extends WidgetContainerDisplayable {
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/CreateFolderRequest.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/CreateFolderRequest.java?rev=1522165&r1=1522164&r2=1522165&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/CreateFolderRequest.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/CreateFolderRequest.java
Thu Sep 12 03:05:13 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> Succeed creating new folder
package org.apache.hupa.client.rf;
import org.apache.hupa.server.ioc.IocRfServiceLocator;
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java?rev=1522165&r1=1522164&r2=1522165&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/rf/HupaRequestFactory.java
Thu Sep 12 03:05:13 2013
@@ -90,5 +90,9 @@ public interface HupaRequestFactory exte
>>>>>>> Make chechsession and login work with RF, with refactoring fetch
>>>>>>> folders.
=======
FetchMessagesRequest messagesRequest();
+<<<<<<< HEAD
>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable
>>>>>>> such that just get a NullPointerException in it.
+=======
+ CreateFolderRequest createFolderRequest();
+>>>>>>> Succeed creating new folder
}
\ No newline at end of file
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java?rev=1522165&r1=1522164&r2=1522165&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/ioc/GuiceServerModule.java
Thu Sep 12 03:05:13 2013
@@ -74,8 +74,13 @@ import org.apache.hupa.server.preference
import org.apache.hupa.server.service.CheckSessionService;
import org.apache.hupa.server.service.CheckSessionServiceImpl;
<<<<<<< HEAD
+<<<<<<< HEAD
>>>>>>> Make chechsession and login work with RF, with refactoring fetch
>>>>>>> folders.
=======
+=======
+import org.apache.hupa.server.service.CreateFolderService;
+import org.apache.hupa.server.service.CreateFolderServiceImpl;
+>>>>>>> Succeed creating new folder
import org.apache.hupa.server.service.FetchMessagesService;
import org.apache.hupa.server.service.FetchMessagesServiceImpl;
>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable
>>>>>>> such that just get a NullPointerException in it.
@@ -85,6 +90,7 @@ import org.apache.hupa.server.service.Lo
import org.apache.hupa.server.service.LoginUserServiceImpl;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.server.service.LogoutUserService;
import org.apache.hupa.server.service.LogoutUserServiceImpl;
import org.apache.hupa.server.service.MoveMessageService;
@@ -161,11 +167,19 @@ import org.apache.hupa.shared.domain.Tag
import org.apache.hupa.shared.data.FetchMessagesActionImpl;
import org.apache.hupa.shared.data.FetchMessagesResultImpl;
>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable
>>>>>>> such that just get a NullPointerException in it.
+=======
+import org.apache.hupa.shared.data.CreateFolderActionImpl;
+import org.apache.hupa.shared.data.FetchMessagesActionImpl;
+import org.apache.hupa.shared.data.FetchMessagesResultImpl;
+import org.apache.hupa.shared.data.GenericResultImpl;
+>>>>>>> Succeed creating new folder
import org.apache.hupa.shared.data.ImapFolderImpl;
import org.apache.hupa.shared.data.TagImpl;
import org.apache.hupa.shared.data.UserImpl;
+import org.apache.hupa.shared.domain.CreateFolderAction;
import org.apache.hupa.shared.domain.FetchMessagesAction;
import org.apache.hupa.shared.domain.FetchMessagesResult;
+import org.apache.hupa.shared.domain.GenericResult;
import org.apache.hupa.shared.domain.ImapFolder;
import org.apache.hupa.shared.domain.Settings;
<<<<<<< HEAD
@@ -250,7 +264,12 @@ public class GuiceServerModule extends A
bind(FetchMessagesAction.class).to(FetchMessagesActionImpl.class);
bind(FetchMessagesResult.class).to(FetchMessagesResultImpl.class);
bind(Tag.class).to(TagImpl.class);
+<<<<<<< HEAD
>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable
>>>>>>> such that just get a NullPointerException in it.
+=======
+ bind(GenericResult.class).to(GenericResultImpl.class);
+ bind(CreateFolderAction.class).to(CreateFolderActionImpl.class);
+>>>>>>> Succeed creating new folder
bind(CheckSessionService.class).to(CheckSessionServiceImpl.class);
bind(LoginUserService.class).to(LoginUserServiceImpl.class);
@@ -286,7 +305,11 @@ public class GuiceServerModule extends A
=======
=======
bind(FetchMessagesService.class).to(FetchMessagesServiceImpl.class);
+<<<<<<< HEAD
>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable
>>>>>>> such that just get a NullPointerException in it.
+=======
+
bind(CreateFolderService.class).to(CreateFolderServiceImpl.class);
+>>>>>>> Succeed creating new folder
bind(IMAPStoreCache.class).to(getIMAPStoreCacheClass()).in(Singleton.class);
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CreateFolderService.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CreateFolderService.java?rev=1522165&r1=1522164&r2=1522165&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CreateFolderService.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CreateFolderService.java
Thu Sep 12 03:05:13 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> Succeed creating new folder
package org.apache.hupa.server.service;
import org.apache.hupa.shared.domain.CreateFolderAction;
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CreateFolderServiceImpl.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CreateFolderServiceImpl.java?rev=1522165&r1=1522164&r2=1522165&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CreateFolderServiceImpl.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/CreateFolderServiceImpl.java
Thu Sep 12 03:05:13 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> Succeed creating new folder
package org.apache.hupa.server.service;
import javax.mail.Folder;
@@ -35,6 +38,7 @@ public class CreateFolderServiceImpl ext
public GenericResult create(CreateFolderAction action) throws Exception
{
User user = getUser();
ImapFolder folder = action.getFolder();
+<<<<<<< HEAD
IMAPStore store = cache.get(user);
Folder f = store.getFolder(folder.getFullName());
if (f.create(Folder.HOLDS_MESSAGES)) {
@@ -44,6 +48,23 @@ public class CreateFolderServiceImpl ext
logger.info("Unable to create folder " + folder + " for
user " + user);
throw new Exception("Unable to create folder " + folder
+ " for user " + user);
+=======
+
+ try {
+ IMAPStore store = cache.get(user);
+ Folder f = store.getFolder(folder.getFullName());
+ if (f.create(Folder.HOLDS_MESSAGES)) {
+ logger.info("Successfully create folder " +
folder + " for user " + user);
+ return new GenericResultImpl();
+ } else {
+ logger.info("Unable to create folder " + folder
+ " for user " + user);
+ throw new Exception("Unable to create folder "
+ folder + " for user " + user);
+
+ }
+ } catch (Exception e) {
+ logger.error("Error while creating folder " + folder +
" for user " + user, e);
+ throw new Exception("Error while creating folder " +
folder + " for user " + user, e);
+>>>>>>> Succeed creating new folder
}
}
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesService.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesService.java?rev=1522165&r1=1522164&r2=1522165&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesService.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/service/FetchMessagesService.java
Thu Sep 12 03:05:13 2013
@@ -39,6 +39,10 @@ import org.apache.hupa.shared.domain.Fet
import org.apache.hupa.shared.domain.FetchMessagesResult;
public interface FetchMessagesService {
+<<<<<<< HEAD
public FetchMessagesResult fetch(FetchMessagesAction action);
>>>>>>> try to fetch messages, yet can not fire the login event in ModelTable
>>>>>>> such that just get a NullPointerException in it.
+=======
+ FetchMessagesResult fetch(FetchMessagesAction action);
+>>>>>>> Succeed creating new folder
}
Modified:
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/CreateFolderActionImpl.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/CreateFolderActionImpl.java?rev=1522165&r1=1522164&r2=1522165&view=diff
==============================================================================
---
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/CreateFolderActionImpl.java
(original)
+++
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/CreateFolderActionImpl.java
Thu Sep 12 03:05:13 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> Succeed creating new folder
package org.apache.hupa.shared.data;
import org.apache.hupa.shared.domain.CreateFolderAction;
Modified:
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GenericResultImpl.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GenericResultImpl.java?rev=1522165&r1=1522164&r2=1522165&view=diff
==============================================================================
---
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GenericResultImpl.java
(original)
+++
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/data/GenericResultImpl.java
Thu Sep 12 03:05:13 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> Succeed creating new folder
package org.apache.hupa.shared.data;
import org.apache.hupa.shared.domain.GenericResult;
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=1522165&r1=1522164&r2=1522165&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:05:13 2013
@@ -335,6 +335,15 @@ public class ImapFolderImpl implements I
>>>>>>> first commit
=======
+<<<<<<< HEAD
>>>>>>> Aim to make the front end view work after the server side's IMAPFolder
>>>>>>> services RF being working, but there are issues on RF's find* method,
>>>>>>> I think.
+=======
+ // FIXME Could not locate setter for property name in type ImapFolderImpl
+ @Override
+ public void setName(String name) {
+ this.fullName = name;
+ }
+
+>>>>>>> Succeed creating new folder
}
Modified:
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/CreateFolderAction.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/CreateFolderAction.java?rev=1522165&r1=1522164&r2=1522165&view=diff
==============================================================================
---
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/CreateFolderAction.java
(original)
+++
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/CreateFolderAction.java
Thu Sep 12 03:05:13 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> Succeed creating new folder
package org.apache.hupa.shared.domain;
import com.google.web.bindery.requestfactory.shared.ProxyFor;
Modified:
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GenericResult.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GenericResult.java?rev=1522165&r1=1522164&r2=1522165&view=diff
==============================================================================
---
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GenericResult.java
(original)
+++
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/GenericResult.java
Thu Sep 12 03:05:13 2013
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
@@ -17,6 +18,8 @@
* under the License. *
****************************************************************/
+=======
+>>>>>>> Succeed creating new folder
package org.apache.hupa.shared.domain;
import com.google.web.bindery.requestfactory.shared.ProxyFor;
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=1522165&r1=1522164&r2=1522165&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:05:13 2013
@@ -9,6 +9,7 @@ import com.google.web.bindery.requestfac
public interface ImapFolder extends ValueProxy {
int getUnseenMessageCount();
String getName();
+ void setName(String name);
String getFullName();
void setFullName(String oldFullName);
List<ImapFolder> getChildren();
Modified:
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/Message.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/Message.java?rev=1522165&r1=1522164&r2=1522165&view=diff
==============================================================================
---
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/Message.java
(original)
+++
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/domain/Message.java
Thu Sep 12 03:05:13 2013
@@ -20,9 +20,12 @@
package org.apache.hupa.shared.domain;
<<<<<<< HEAD
+<<<<<<< HEAD
=======
import java.util.ArrayList;
>>>>>>> try to change fetch messages to use RF
+=======
+>>>>>>> Succeed creating new folder
import java.util.Date;
import java.util.List;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
