Author: dongxu Date: Thu Sep 12 02:43:25 2013 New Revision: 1522134 URL: http://svn.apache.org/r1522134 Log: constantly changed by manolo
Modified: james/hupa/trunk/client/pom.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendView.java james/hupa/trunk/pom.xml james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java Modified: james/hupa/trunk/client/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/pom.xml?rev=1522134&r1=1522133&r2=1522134&view=diff ============================================================================== --- james/hupa/trunk/client/pom.xml (original) +++ james/hupa/trunk/client/pom.xml Thu Sep 12 02:43:25 2013 @@ -48,12 +48,18 @@ <dependency> <groupId>org.apache.hupa</groupId> <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> constantly changed by manolo <artifactId>hupa-mock</artifactId> </dependency> <dependency> <groupId>org.apache.hupa</groupId> +<<<<<<< HEAD ======= >>>>>>> first commit +======= +>>>>>>> constantly changed by manolo <artifactId>hupa-shared</artifactId> </dependency> <dependency> @@ -383,6 +389,7 @@ </plugin> </plugins> </build> +<<<<<<< HEAD <profiles> <profile> <id>prod</id> @@ -399,4 +406,6 @@ <gwt.logLevel>ERROR</gwt.logLevel> </properties> >>>>>>> first commit +======= +>>>>>>> constantly changed by manolo </project> Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java?rev=1522134&r1=1522133&r2=1522134&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java Thu Sep 12 02:43:25 2013 @@ -150,6 +150,7 @@ public class MainView extends Composite // Not used so far // createNorth(); // dockPanel.add(north, DockPanel.NORTH); + // dockPanel.setCellHorizontalAlignment(north, DockPanel.ALIGN_RIGHT); >>>>>>> constant changed by manolo createWest(); @@ -158,8 +159,11 @@ public class MainView extends Composite createCenter(); dockPanel.add(center, DockPanel.CENTER); +<<<<<<< HEAD dockPanel.setCellHorizontalAlignment(north, DockPanel.ALIGN_RIGHT); >>>>>>> first commit +======= +>>>>>>> constantly changed by manolo dockPanel.setCellHorizontalAlignment(center, DockPanel.ALIGN_LEFT); initWidget(dockPanel); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java?rev=1522134&r1=1522133&r2=1522134&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendPresenter.java Thu Sep 12 02:43:25 2013 @@ -331,11 +331,15 @@ public class MessageSendPresenter extend display.getToText().setText(mailto); } else if (type.equals(Type.FORWARD)) { <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> constantly changed by manolo String subject = oldmessage.getSubject() != null ? oldmessage.getSubject().trim() : ""; if (!subject.toLowerCase().startsWith("fwd:")){ subject = "Fwd: " + subject; } display.getSubjectText().setText(subject); +<<<<<<< HEAD } else if (type.equals(Type.REPLY) || type.equals(Type.REPLY_ALL)) { String subject = oldmessage.getSubject() != null ? oldmessage.getSubject().trim() : ""; if (!subject.toLowerCase().startsWith("re:")){ @@ -351,6 +355,14 @@ public class MessageSendPresenter extend display.getSubjectText().setText("Re: " + oldmessage.getSubject()); } >>>>>>> first commit +======= + } else if (type.equals(Type.REPLY) || type.equals(Type.REPLY_ALL)) { + String subject = oldmessage.getSubject() != null ? oldmessage.getSubject().trim() : ""; + if (!subject.toLowerCase().startsWith("re:")){ + subject = "Re: " + subject; + } + display.getSubjectText().setText(subject); +>>>>>>> constantly changed by manolo if (type.equals(Type.REPLY)) { if (oldmessage.getReplyto() != null && !oldmessage.getFrom().contains(oldmessage.getReplyto())) { display.getToText().setText(oldmessage.getReplyto()); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendView.java?rev=1522134&r1=1522133&r2=1522134&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MessageSendView.java Thu Sep 12 02:43:25 2013 @@ -131,11 +131,14 @@ public class MessageSendView extends Com new NotEmptyValidator(getToText()).addActionForFailure(sAction).addActionForFailure(fAction)); <<<<<<< HEAD +<<<<<<< HEAD ======= try { } catch (Exception e) { } >>>>>>> first commit +======= +>>>>>>> constantly changed by manolo } /* Modified: james/hupa/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/pom.xml?rev=1522134&r1=1522133&r2=1522134&view=diff ============================================================================== --- james/hupa/trunk/pom.xml (original) +++ james/hupa/trunk/pom.xml Thu Sep 12 02:43:25 2013 @@ -194,9 +194,36 @@ ======= <gwtVersion>2.4.0</gwtVersion> <gwtMavenVersion>2.4.0</gwtMavenVersion> + <gwt.moduleSuffix></gwt.moduleSuffix> + <gwt.logLevel>ERROR</gwt.logLevel> <jettyVersion>7.3.0.v20110203</jettyVersion> + <mock.scope>test</mock.scope> </properties> +<<<<<<< HEAD >>>>>>> first commit +======= + + <profiles> + <profile> + <!-- Agressive js compression. Compile for all browsers and languages --> + <id>prod</id> + <properties> + <gwt.moduleSuffix>Prod</gwt.moduleSuffix> + <gwt.disableClassMetadata>true</gwt.disableClassMetadata> + <gwt.disableCastChecking>true</gwt.disableCastChecking> + <gwt.logLevel>TRACE</gwt.logLevel> + </properties> + </profile> + <profile> + <!-- Deliver Hupa with Demo stuff --> + <id>demo</id> + <properties> + <mock.scope></mock.scope> + </properties> + </profile> + </profiles> + +>>>>>>> constantly changed by manolo <dependencyManagement> <dependencies> <dependency> @@ -204,6 +231,9 @@ <artifactId>hupa-mock</artifactId> <version>${project.version}</version> <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> constantly changed by manolo <scope>${mock.scope}</scope> </dependency> <dependency> Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java?rev=1522134&r1=1522133&r2=1522134&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java Thu Sep 12 02:43:25 2013 @@ -388,7 +388,7 @@ public abstract class AbstractFetchMessa logger.debug("Unable to decode text " + s + " " + e.getMessage()); } // Remove quotes around names in email addresses - ret = ret.replaceFirst("^[\"' ]+(.*?)[\"' ]+<", "$1 <"); + ret = ret.replaceFirst("^[\"' ]+([^\"]*)[\"' ]+<", "$1 <"); return ret; } >>>>>>> constant changed by manolo Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java?rev=1522134&r1=1522133&r2=1522134&view=diff ============================================================================== --- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java (original) +++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java Thu Sep 12 02:43:25 2013 @@ -42,6 +42,7 @@ public class FetchMessagesHandlerTest ex <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ByteArrayInputStream is = new ByteArrayInputStream("From: \"a b c\"<a...@foo.com>\nTo: b...@foo.com\nSubject: something\n\ndata".getBytes()); MimeMessage m1 = new MimeMessage(session, is); is = new ByteArrayInputStream("From: \"=?ISO-8859-1?Q?Manolo_Pe=F1a?=\" <pe...@foo.com>\nTo: b...@foo.com\nSubject: something\n\ndata".getBytes()); @@ -52,6 +53,9 @@ public class FetchMessagesHandlerTest ex ======= ByteArrayInputStream is = new ByteArrayInputStream("From: \"a...@foo.com\" <a...@foo.com>\nTo: b...@foo.com\nSubject: something\n\ndata".getBytes()); >>>>>>> constant changed by manolo +======= + ByteArrayInputStream is = new ByteArrayInputStream("From: \"a b c\"<a...@foo.com>\nTo: b...@foo.com\nSubject: something\n\ndata".getBytes()); +>>>>>>> constantly changed by manolo MimeMessage m1 = new MimeMessage(session, is); is = new ByteArrayInputStream("From: \"=?ISO-8859-1?Q?Manolo_Pe=F1a?=\" <pe...@foo.com>\nTo: b...@foo.com\nSubject: something\n\ndata".getBytes()); MimeMessage m2 = new MimeMessage(session, is); @@ -74,8 +78,12 @@ public class FetchMessagesHandlerTest ex ======= msgs = fetchMessagesHandler.convert(10, f, new Message[]{m1}); +<<<<<<< HEAD assertEquals("a...@foo.com <a...@foo.com>", msgs.get(0).getFrom()); >>>>>>> constant changed by manolo +======= + assertEquals("a b c <a...@foo.com>", msgs.get(0).getFrom()); +>>>>>>> constantly changed by manolo msgs = fetchMessagesHandler.convert(10, f, new Message[]{m2}); assertEquals("Manolo Pe\u00F1a <pe...@foo.com>", msgs.get(0).getFrom()); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org