Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageByUid.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageByUid.java?rev=1522132&r1=1522131&r2=1522132&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageByUid.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageByUid.java Thu Sep 12 02:42:10 2013 @@ -21,8 +21,12 @@ package org.apache.hupa.shared.rpc; import java.util.ArrayList; +<<<<<<< HEAD import org.apache.hupa.shared.proxy.IMAPFolderProxy; +======= +import org.apache.hupa.shared.data.IMAPFolder; +>>>>>>> first commit public class DeleteMessageByUid extends DeleteMessage { @@ -30,7 +34,11 @@ public class DeleteMessageByUid extends private ArrayList<Long> messageUids; +<<<<<<< HEAD public DeleteMessageByUid(IMAPFolderProxy folder, ArrayList<Long> messageUids) { +======= + public DeleteMessageByUid(IMAPFolder folder, ArrayList<Long> messageUids) { +>>>>>>> first commit super(folder); this.messageUids = messageUids; }
Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageResult.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageResult.java?rev=1522132&r1=1522131&r2=1522132&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageResult.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/DeleteMessageResult.java Thu Sep 12 02:42:10 2013 @@ -23,8 +23,13 @@ import java.io.Serializable; import net.customware.gwt.dispatch.shared.Result; +<<<<<<< HEAD import org.apache.hupa.shared.data.User; import org.apache.hupa.shared.proxy.IMAPFolderProxy; +======= +import org.apache.hupa.shared.data.IMAPFolder; +import org.apache.hupa.shared.data.User; +>>>>>>> first commit public class DeleteMessageResult implements Result, Serializable { @@ -33,7 +38,11 @@ public class DeleteMessageResult impleme */ private static final long serialVersionUID = -5149203502019947912L; private User user; +<<<<<<< HEAD private IMAPFolderProxy folder; +======= + private IMAPFolder folder; +>>>>>>> first commit private int deleteCount; @@ -43,7 +52,11 @@ public class DeleteMessageResult impleme } +<<<<<<< HEAD public DeleteMessageResult(User user,IMAPFolderProxy folder, int deleteCount) { +======= + public DeleteMessageResult(User user,IMAPFolder folder, int deleteCount) { +>>>>>>> first commit this.user = user; this.folder = folder; this.deleteCount = deleteCount; @@ -57,7 +70,11 @@ public class DeleteMessageResult impleme return user; } +<<<<<<< HEAD public IMAPFolderProxy getFolder() { +======= + public IMAPFolder getFolder() { +>>>>>>> first commit return folder; } Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchFoldersResult.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchFoldersResult.java?rev=1522132&r1=1522131&r2=1522132&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchFoldersResult.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchFoldersResult.java Thu Sep 12 02:42:10 2013 @@ -20,11 +20,20 @@ package org.apache.hupa.shared.rpc; import java.io.Serializable; +<<<<<<< HEAD import java.util.List; import net.customware.gwt.dispatch.shared.Result; import org.apache.hupa.shared.proxy.IMAPFolderProxy; +======= +import java.util.ArrayList; +import java.util.List; + +import org.apache.hupa.shared.data.IMAPFolder; + +import net.customware.gwt.dispatch.shared.Result; +>>>>>>> first commit public class FetchFoldersResult implements Result, Serializable { @@ -32,9 +41,15 @@ public class FetchFoldersResult implemen * */ private static final long serialVersionUID = -6215610133650989605L; +<<<<<<< HEAD private List<IMAPFolderProxy> folders; public FetchFoldersResult(List<IMAPFolderProxy> folders) { +======= + private List<IMAPFolder> folders; + + public FetchFoldersResult(List<IMAPFolder> folders) { +>>>>>>> first commit this.folders=folders; } @@ -42,24 +57,40 @@ public class FetchFoldersResult implemen private FetchFoldersResult() { } +<<<<<<< HEAD public List<IMAPFolderProxy> getFolders() { +======= + public List<IMAPFolder> getFolders() { +>>>>>>> first commit return folders; } public String toString() { StringBuffer ret = new StringBuffer(""); +<<<<<<< HEAD for (IMAPFolderProxy folder : folders) { ret.append(folder.getFullName()).append("\n"); for (IMAPFolderProxy f : folder.getChildIMAPFolders()) { +======= + for (IMAPFolder folder : folders) { + ret.append(folder.getFullName()).append("\n"); + for (IMAPFolder f : folder.getChildIMAPFolders()) { +>>>>>>> first commit childFolder(f, ret); } } return ret.toString(); } +<<<<<<< HEAD private void childFolder(IMAPFolderProxy child, StringBuffer ret) { ret.append(child.getFullName()).append("\n"); for (IMAPFolderProxy folder : child.getChildIMAPFolders()) { +======= + private void childFolder(IMAPFolder child, StringBuffer ret) { + ret.append(child.getFullName()).append("\n"); + for (IMAPFolder folder : child.getChildIMAPFolders()) { +>>>>>>> first commit childFolder(folder, ret); } } Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchMessages.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchMessages.java?rev=1522132&r1=1522131&r2=1522132&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchMessages.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchMessages.java Thu Sep 12 02:42:10 2013 @@ -23,12 +23,20 @@ import java.io.Serializable; import net.customware.gwt.dispatch.shared.Action; +<<<<<<< HEAD import org.apache.hupa.shared.proxy.IMAPFolderProxy; +======= +import org.apache.hupa.shared.data.IMAPFolder; +>>>>>>> first commit public class FetchMessages implements Action<FetchMessagesResult>, Serializable { private static final long serialVersionUID = -3181183289937321202L; +<<<<<<< HEAD private IMAPFolderProxy folder; +======= + private IMAPFolder folder; +>>>>>>> first commit private int start; private int offset; private String searchString; @@ -36,14 +44,22 @@ public class FetchMessages implements Ac protected FetchMessages() { } +<<<<<<< HEAD public FetchMessages(IMAPFolderProxy folder,int start, int offset,String searchString) { +======= + public FetchMessages(IMAPFolder folder,int start, int offset,String searchString) { +>>>>>>> first commit this.folder = folder; this.start = start; this.offset = offset; this.searchString = searchString; } +<<<<<<< HEAD public IMAPFolderProxy getFolder() { +======= + public IMAPFolder getFolder() { +>>>>>>> first commit return folder; } Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchRecentMessages.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchRecentMessages.java?rev=1522132&r1=1522131&r2=1522132&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchRecentMessages.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/FetchRecentMessages.java Thu Sep 12 02:42:10 2013 @@ -19,7 +19,11 @@ package org.apache.hupa.shared.rpc; +<<<<<<< HEAD import org.apache.hupa.shared.proxy.IMAPFolderProxy; +======= +import org.apache.hupa.shared.data.IMAPFolder; +>>>>>>> first commit public class FetchRecentMessages extends FetchMessages{ @@ -28,7 +32,11 @@ public class FetchRecentMessages extends protected FetchRecentMessages() { } +<<<<<<< HEAD public FetchRecentMessages(IMAPFolderProxy folder, int start, +======= + public FetchRecentMessages(IMAPFolder folder, int start, +>>>>>>> first commit int offset, String searchString) { super(folder, start, offset, searchString); } Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ForwardMessage.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ForwardMessage.java?rev=1522132&r1=1522131&r2=1522132&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ForwardMessage.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ForwardMessage.java Thu Sep 12 02:42:10 2013 @@ -20,16 +20,27 @@ package org.apache.hupa.shared.rpc; +<<<<<<< HEAD import org.apache.hupa.shared.data.SMTPMessage; import org.apache.hupa.shared.proxy.IMAPFolderProxy; +======= +import org.apache.hupa.shared.data.IMAPFolder; +import org.apache.hupa.shared.data.SMTPMessage; +>>>>>>> first commit public class ForwardMessage extends SendMessage { private static final long serialVersionUID = 1656671247843122192L; private long uid; +<<<<<<< HEAD private IMAPFolderProxy folder; public ForwardMessage(SMTPMessage msg, IMAPFolderProxy folder, long uid) { +======= + private IMAPFolder folder; + + public ForwardMessage(SMTPMessage msg, IMAPFolder folder, long uid) { +>>>>>>> first commit super(msg); this.uid = uid; this.folder = folder; @@ -42,7 +53,11 @@ public class ForwardMessage extends Send return uid; } +<<<<<<< HEAD public IMAPFolderProxy getFolder() { +======= + public IMAPFolder getFolder() { +>>>>>>> first commit return folder; } } Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/GetMessageDetails.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/GetMessageDetails.java?rev=1522132&r1=1522131&r2=1522132&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/GetMessageDetails.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/GetMessageDetails.java Thu Sep 12 02:42:10 2013 @@ -24,15 +24,26 @@ import java.io.Serializable; import net.customware.gwt.dispatch.shared.Action; +<<<<<<< HEAD import org.apache.hupa.shared.proxy.IMAPFolderProxy; +======= +import org.apache.hupa.shared.data.IMAPFolder; +>>>>>>> first commit public class GetMessageDetails implements Action<GetMessageDetailsResult>, Serializable { private static final long serialVersionUID = 5826298202494313834L; +<<<<<<< HEAD private IMAPFolderProxy folder; private long uid; public GetMessageDetails(IMAPFolderProxy folder, long uid) { +======= + private IMAPFolder folder; + private long uid; + + public GetMessageDetails(IMAPFolder folder, long uid) { +>>>>>>> first commit this.folder = folder; this.uid = uid; } @@ -41,7 +52,11 @@ public class GetMessageDetails implement private GetMessageDetails() { } +<<<<<<< HEAD public IMAPFolderProxy getFolder() { +======= + public IMAPFolder getFolder() { +>>>>>>> first commit return folder; } Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ReplyMessage.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ReplyMessage.java?rev=1522132&r1=1522131&r2=1522132&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ReplyMessage.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ReplyMessage.java Thu Sep 12 02:42:10 2013 @@ -20,15 +20,24 @@ package org.apache.hupa.shared.rpc; +<<<<<<< HEAD import org.apache.hupa.shared.data.SMTPMessage; import org.apache.hupa.shared.proxy.IMAPFolderProxy; +======= +import org.apache.hupa.shared.data.IMAPFolder; +import org.apache.hupa.shared.data.SMTPMessage; +>>>>>>> first commit public class ReplyMessage extends ForwardMessage { private static final long serialVersionUID = -383135476236902779L; +<<<<<<< HEAD public ReplyMessage(SMTPMessage msg, IMAPFolderProxy folder, long uid) { +======= + public ReplyMessage(SMTPMessage msg, IMAPFolder folder, long uid) { +>>>>>>> first commit super(msg, folder, uid); } Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/SetFlag.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/SetFlag.java?rev=1522132&r1=1522131&r2=1522132&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/SetFlag.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/SetFlag.java Thu Sep 12 02:42:10 2013 @@ -24,18 +24,30 @@ import java.util.ArrayList; import net.customware.gwt.dispatch.shared.Action; +<<<<<<< HEAD import org.apache.hupa.shared.data.Message.IMAPFlag; import org.apache.hupa.shared.proxy.IMAPFolderProxy; +======= +import org.apache.hupa.shared.data.IMAPFolder; +import org.apache.hupa.shared.data.Message.IMAPFlag; +>>>>>>> first commit public class SetFlag implements Action<GenericResult>, Serializable { private static final long serialVersionUID = 662741801793895357L; private IMAPFlag flag; private ArrayList<Long> uids; +<<<<<<< HEAD private IMAPFolderProxy folder; private boolean value; public SetFlag(IMAPFolderProxy folder, IMAPFlag flag, boolean value, ArrayList<Long> uids) { +======= + private IMAPFolder folder; + private boolean value; + + public SetFlag(IMAPFolder folder, IMAPFlag flag, boolean value, ArrayList<Long> uids) { +>>>>>>> first commit this.flag = flag; this.value = value; this.uids = uids; @@ -45,7 +57,11 @@ public class SetFlag implements Action<G protected SetFlag() { } +<<<<<<< HEAD public IMAPFolderProxy getFolder() { +======= + public IMAPFolder getFolder() { +>>>>>>> first commit return folder; } Modified: james/hupa/trunk/src/site/resources/demo/index.html URL: http://svn.apache.org/viewvc/james/hupa/trunk/src/site/resources/demo/index.html?rev=1522132&r1=1522131&r2=1522132&view=diff ============================================================================== --- james/hupa/trunk/src/site/resources/demo/index.html (original) +++ james/hupa/trunk/src/site/resources/demo/index.html Thu Sep 12 02:42:10 2013 @@ -74,6 +74,7 @@ p { } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> constantly changed by manolo .red { @@ -103,6 +104,9 @@ pre { >>>>>>> first commit ======= >>>>>>> constantly changed by manolo +======= +</style> +>>>>>>> first commit </head> <body> @@ -115,6 +119,7 @@ pre { <div class='text box'> <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <p> <ul> <li>Hupa in <a href=/hupa.demo>Demo</a> mode: @@ -128,6 +133,11 @@ pre { <ul> <li>Hupa in <a href=/hupa.demo>Demo</a> mode: >>>>>>> constantly changed by manolo +======= + <p>You can select one of our demo instances: + <ul> + <li>Hupa in <b>Demo</b> mode: <a href=/hupa.demo>http</a>: +>>>>>>> first commit <ul> <li>Username is set to <b>'demo'</b> and the password is <b>'demo'</b></li> <li>Uses a collection of example messages and stub @@ -135,6 +145,7 @@ pre { <li>In this instance you can test almost the Hupa features, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD but emails you send will never reach the addressee.</li> </ul></li> </li> @@ -173,6 +184,16 @@ $ java -jar hupa-0.0.2-SNAPSHOT.war ======= <li>Will work with any imap enabled account in gmail.</li> >>>>>>> constantly changed by manolo +======= + but emails you send will never reach the addressee, + and message search is not implemented.</li> + </ul></li> + </li> + + <li>Hupa for <b>Gmail</b>: <a href=https://james.zones.apache.org/hupa.gmail>https</a> | <a href=/hupa.gmail>http</a> + <ul> + <li>It will work with any imap enabled account in gmail.</li> +>>>>>>> first commit <li>You have to provide a valid gmail username (don't forget the domain part) and your password.</li> <li>Because this instance and gmail servers are far away, and @@ -180,6 +201,7 @@ $ java -jar hupa-0.0.2-SNAPSHOT.war the application.</li> <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <li>You can read your real messages, search them, and use Hupa to reply and send messages to your contacts.</li> <div class='warn'> @@ -216,6 +238,20 @@ $ java -jar hupa-0.0.2-SNAPSHOT.war ======= --> >>>>>>> constantly changed by manolo +======= + <li>You can manage your folders, read your messages, search them, reply and send + messages to your contacts.</li> + <div class='warn'> + <p>Like any other email client, Hupa needs your credentials in order to + open a secure session with gmail servers. </p> + <p>Hupa uses a SSL + channel to comunicate with gmail; + in the same way we recomend that + you use hupa via HTTPS so as the communication between your browser and Hupa + were not compromissed. </p> + <p>Because this is a demo instance we are using a + self-signed certificate.</p> +>>>>>>> first commit </div> </ul></li> </ul> Modified: james/hupa/trunk/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/src/site/xdoc/index.xml?rev=1522132&r1=1522131&r2=1522132&view=diff ============================================================================== --- james/hupa/trunk/src/site/xdoc/index.xml (original) +++ james/hupa/trunk/src/site/xdoc/index.xml Thu Sep 12 02:42:10 2013 @@ -28,6 +28,7 @@ <p> Hupa is a functional and well designed email client, ready for <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD reading, sending and managing messages, but it still lacks of many features email clients nowadays have.</p> ======= @@ -38,12 +39,17 @@ reading, sending and managing messages, but it still lacks of many features email clients nowadays have.</p> >>>>>>> constantly changed by manolo +======= + reading, sending and managing messages, but it lacks of many features + email clients nowadays have like address book </p> +>>>>>>> first commit </section> <section name="Releases"> <p> <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> constantly changed by manolo Last release is Hupa 0.0.2:<br/> @@ -62,6 +68,11 @@ >>>>>>> first commit ======= >>>>>>> constantly changed by manolo +======= + Although there isn't a stable release yet you can download the latest + <a href='https://builds.apache.org/job/hupa-trunk/lastBuild/org.apache.hupa$hupa/artifact/org.apache.hupa/hupa/0.0.2-SNAPSHOT/hupa-0.0.2-SNAPSHOT.war'> + 0.2-SNAPSHOT +>>>>>>> first commit </a> from our continuous integration server. </p> @@ -79,6 +90,7 @@ <subsection name="2012"> <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> constantly changed by manolo <h4>Jun/2012 - Hupa 0.2 released</h4> @@ -106,6 +118,13 @@ target="_blank">GSOC student</a> who will work with Hupa this Summer making it better !. >>>>>>> constantly changed by manolo +======= + <h4>Apr/2012 - Hupa evolution accepted</h4> + <p> + Whe have got a GSOC student who will work with Hupa this Summer + <a href="http://www.google-melange.com/gsoc/proposal/review/google/gsoc2012/echo/1" + target="_blank">making it better.</a> +>>>>>>> first commit </p> <h4>Mar/2012 - removed snapshots</h4> <p>Removed snapshot dependencies, updated to last GWT release, @@ -128,6 +147,7 @@ <subsection name="2010"> <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <h4>Jun/2010 - Hupa 0.0.1</h4> ======= <h4>Jun/2010 - Hupa 0.1</h4> @@ -135,6 +155,9 @@ ======= <h4>Jun/2010 - Hupa 0.0.1</h4> >>>>>>> constantly changed by manolo +======= + <h4>Jun/2010 - Hupa 0.1</h4> +>>>>>>> first commit <p>First beta release, with an improved interface and fully functional (read, edit, send, secure, attachments, etc)</p> </subsection> Modified: james/hupa/trunk/widgets/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/widgets/pom.xml?rev=1522132&r1=1522131&r2=1522132&view=diff ============================================================================== --- james/hupa/trunk/widgets/pom.xml (original) +++ james/hupa/trunk/widgets/pom.xml Thu Sep 12 02:42:10 2013 @@ -1,5 +1,6 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> constantly changed by manolo <?xml version="1.0" encoding="ISO-8859-1"?> @@ -44,6 +45,8 @@ </dependency> <<<<<<< HEAD ======= +======= +>>>>>>> first commit <?xml version="1.0" encoding="ISO-8859-1"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -87,15 +90,19 @@ <groupId>com.google.gwt</groupId> <artifactId>gwt-incubator</artifactId> </dependency> +<<<<<<< HEAD >>>>>>> first commit ======= >>>>>>> constantly changed by manolo +======= +>>>>>>> first commit <dependency> <groupId>org.cobogw.gwt</groupId> <artifactId>cobogw</artifactId> </dependency> <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> constantly changed by manolo </dependencies> @@ -118,6 +125,8 @@ </build> <<<<<<< HEAD ======= +======= +>>>>>>> first commit </dependencies> <build> <resources> @@ -136,7 +145,10 @@ </resource> </resources> </build> +<<<<<<< HEAD >>>>>>> first commit ======= >>>>>>> constantly changed by manolo +======= +>>>>>>> first commit </project> Modified: james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml?rev=1522132&r1=1522131&r2=1522132&view=diff ============================================================================== --- james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml (original) +++ james/hupa/trunk/widgets/src/main/java/org/apache/hupa/Widgets.gwt.xml Thu Sep 12 02:42:10 2013 @@ -19,6 +19,12 @@ <inherits name='com.google.gwt.user.User'/> <inherits name='com.google.gwt.widgetideas.WidgetIdeas'/> <<<<<<< HEAD +<<<<<<< HEAD +======= + <inherits name='com.google.gwt.gen2.commonwidget.CommonWidget' /> + <inherits name='com.google.gwt.gen2.table.override.Override'/> + <inherits name='com.google.gwt.gen2.table.ScrollTable'/> +>>>>>>> first commit ======= <inherits name='com.google.gwt.gen2.commonwidget.CommonWidget' /> <inherits name='com.google.gwt.gen2.table.override.Override'/> @@ -29,17 +35,23 @@ <source path="widgets"/> <<<<<<< HEAD +<<<<<<< HEAD <replace-with class="org.apache.hupa.widgets.ui.impl.RndPanelGeneratorCss3"> <when-type-is class="org.apache.hupa.widgets.ui.impl.RndPanelGenerator"/> </replace-with> <replace-with class="org.apache.hupa.widgets.ui.impl.RndPanelGeneratorDecorator"> ======= +======= +>>>>>>> first commit <replace-with class="org.apache.hupa.widgets.ui.impl.RndPanelGeneratorImpl"> <when-type-is class="org.apache.hupa.widgets.ui.impl.RndPanelGenerator"/> </replace-with> <replace-with class="org.apache.hupa.widgets.ui.impl.RndPanelGeneratorImplIE"> +<<<<<<< HEAD +>>>>>>> first commit +======= >>>>>>> first commit <when-type-is class="org.apache.hupa.widgets.ui.impl.RndPanelGenerator"/> <any> Modified: james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/WidgetsCSS.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/WidgetsCSS.java?rev=1522132&r1=1522131&r2=1522132&view=diff ============================================================================== --- james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/WidgetsCSS.java (original) +++ james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/WidgetsCSS.java Thu Sep 12 02:42:10 2013 @@ -26,8 +26,12 @@ public class WidgetsCSS { public static final String C_hupa_rnd_container = "hupa-rounded"; public static final String C_attachment = "hupa-attachment"; <<<<<<< HEAD +<<<<<<< HEAD public static final String C_attachment_view = "hupa-attachment-view"; ======= >>>>>>> first commit +======= + +>>>>>>> first commit } Modified: james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java?rev=1522132&r1=1522131&r2=1522132&view=diff ============================================================================== --- james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java (original) +++ james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java Thu Sep 12 02:42:10 2013 @@ -32,22 +32,29 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Timer; <<<<<<< HEAD +<<<<<<< HEAD import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Focusable; import com.google.gwt.user.client.ui.HasHTML; import com.google.gwt.user.client.ui.RichTextArea; ======= +======= +>>>>>>> first commit import com.google.gwt.user.client.ui.Focusable; import com.google.gwt.user.client.ui.HasHTML; import com.google.gwt.user.client.ui.RichTextArea; import com.google.gwt.user.client.ui.VerticalPanel; +<<<<<<< HEAD +>>>>>>> first commit +======= >>>>>>> first commit /** * Wysiwyg editor for composing and editing emails in Hupa */ <<<<<<< HEAD +<<<<<<< HEAD public class Editor extends FlowPanel implements HasHTML, Focusable { RichTextArea area = new RichTextArea(); @@ -232,6 +239,8 @@ public class Editor extends FlowPanel im }-*/; ======= +======= +>>>>>>> first commit public class Editor extends VerticalPanel implements HasHTML, Focusable { RichTextArea area = new RichTextArea(); @@ -404,5 +413,8 @@ public class Editor extends VerticalPane }-*/; +<<<<<<< HEAD +>>>>>>> first commit +======= >>>>>>> first commit } Modified: james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java?rev=1522132&r1=1522131&r2=1522132&view=diff ============================================================================== --- james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java (original) +++ james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java Thu Sep 12 02:42:10 2013 @@ -20,11 +20,14 @@ package org.apache.hupa.widgets.ui; <<<<<<< HEAD +<<<<<<< HEAD import com.google.gwt.event.dom.client.KeyCodes; import com.google.gwt.event.dom.client.KeyDownEvent; import com.google.gwt.event.dom.client.KeyDownHandler; ======= >>>>>>> first commit +======= +>>>>>>> first commit import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Focusable; @@ -56,6 +59,7 @@ public class MultiValueSuggestArea exten // I've sent a patch to gwt. super(oracle, new TextArea() { <<<<<<< HEAD +<<<<<<< HEAD { // Avoid entering a new-line when selecting a suggestion element @@ -70,6 +74,8 @@ public class MultiValueSuggestArea exten } ======= >>>>>>> first commit +======= +>>>>>>> first commit String search = null; @@ -95,19 +101,27 @@ public class MultiValueSuggestArea exten @Override public String getValue() { <<<<<<< HEAD +<<<<<<< HEAD return DOM.getElementProperty(getValueBox().getElement(), "value"); ======= return DOM.getElementProperty(getTextBox().getElement(), "value"); >>>>>>> first commit +======= + return DOM.getElementProperty(getTextBox().getElement(), "value"); +>>>>>>> first commit } @Override public void setValue(String text) { <<<<<<< HEAD +<<<<<<< HEAD DOM.setElementProperty(getValueBox().getElement(), "value", text); ======= DOM.setElementProperty(getTextBox().getElement(), "value", text); >>>>>>> first commit +======= + DOM.setElementProperty(getTextBox().getElement(), "value", text); +>>>>>>> first commit } } Modified: james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/PagingOptions.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/PagingOptions.java?rev=1522132&r1=1522131&r2=1522132&view=diff ============================================================================== --- james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/PagingOptions.java (original) +++ james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/PagingOptions.java Thu Sep 12 02:42:10 2013 @@ -57,10 +57,17 @@ public class PagingOptions extends Compo public PagingOptions(final PagingScrollTable<?> table, PagingOptionsConstants constants, Loading loading) { this.loading = loading; +<<<<<<< HEAD firstLink = new EnableHyperlink("<< " + constants.pageFirst(),null); prevLink = new EnableHyperlink("< " + constants.pagePrev(),null); lastLink = new EnableHyperlink(constants.pageLast() + " >>",null); nextLink = new EnableHyperlink(constants.pageNext() + " >",null); +======= + firstLink = new EnableHyperlink("<< " + constants.pageFirst(),""); + prevLink = new EnableHyperlink("< " + constants.pagePrev(),""); + lastLink = new EnableHyperlink(constants.pageLast() + " >>",""); + nextLink = new EnableHyperlink(constants.pageNext() + " >",""); +>>>>>>> first commit pagingPanel.setSpacing(3); pagingPanel.add(panel); Modified: james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RndPanel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RndPanel.java?rev=1522132&r1=1522131&r2=1522132&view=diff ============================================================================== --- james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RndPanel.java (original) +++ james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/RndPanel.java Thu Sep 12 02:42:10 2013 @@ -26,6 +26,10 @@ import com.google.gwt.user.client.ui.Wid import org.apache.hupa.widgets.ui.impl.RndPanelGenerator; <<<<<<< HEAD +<<<<<<< HEAD +======= +import org.apache.hupa.widgets.ui.impl.RndPanelGeneratorImpl; +>>>>>>> first commit ======= import org.apache.hupa.widgets.ui.impl.RndPanelGeneratorImpl; >>>>>>> first commit --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org