Author: manolo
Date: Fri May 4 10:07:35 2012
New Revision: 1333852
URL: http://svn.apache.org/viewvc?rev=1333852&view=rev
Log:
Fix: reply messages was removing the old subject some times
Modified:
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/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/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=1333852&r1=1333851&r2=1333852&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
Fri May 4 10:07:35 2012
@@ -117,6 +117,7 @@ public class MainView extends Composite
// Not used so far
// createNorth();
// dockPanel.add(north, DockPanel.NORTH);
+ // dockPanel.setCellHorizontalAlignment(north, DockPanel.ALIGN_RIGHT);
createWest();
dockPanel.add(west, DockPanel.WEST);
@@ -124,7 +125,6 @@ public class MainView extends Composite
createCenter();
dockPanel.add(center, DockPanel.CENTER);
- dockPanel.setCellHorizontalAlignment(north, DockPanel.ALIGN_RIGHT);
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=1333852&r1=1333851&r2=1333852&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
Fri May 4 10:07:35 2012
@@ -294,13 +294,17 @@ public class MessageSendPresenter extend
if (type.equals(Type.NEW) && mailto != null) {
display.getToText().setText(mailto);
} else if (type.equals(Type.FORWARD)) {
- if (oldmessage.getSubject() != null &&
!oldmessage.getSubject().toLowerCase().startsWith("fwd:")) {
- display.getSubjectText().setText("Fwd: " +
oldmessage.getSubject());
- }
+ String subject = oldmessage.getSubject() != null ?
oldmessage.getSubject().trim() : "";
+ if (!subject.toLowerCase().startsWith("fwd:")){
+ subject = "Fwd: " + subject;
+ }
+ display.getSubjectText().setText(subject);
} else if (type.equals(Type.REPLY) || type.equals(Type.REPLY_ALL)) {
- if (oldmessage.getSubject() != null &&
!oldmessage.getSubject().toLowerCase().startsWith("re:")) {
- display.getSubjectText().setText("Re: " +
oldmessage.getSubject());
- }
+ String subject = oldmessage.getSubject() != null ?
oldmessage.getSubject().trim() : "";
+ if (!subject.toLowerCase().startsWith("re:")){
+ subject = "Re: " + subject;
+ }
+ display.getSubjectText().setText(subject);
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=1333852&r1=1333851&r2=1333852&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
Fri May 4 10:07:35 2012
@@ -130,9 +130,6 @@ public class MessageSendView extends Com
new
EmailListValidator(getToText()).addActionForFailure(sAction).addActionForFailure(fAction),
new
NotEmptyValidator(getToText()).addActionForFailure(sAction).addActionForFailure(fAction));
- try {
- } catch (Exception e) {
- }
}
/*
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=1333852&r1=1333851&r2=1333852&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
Fri May 4 10:07:35 2012
@@ -259,7 +259,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;
}
}
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=1333852&r1=1333851&r2=1333852&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
Fri May 4 10:07:35 2012
@@ -40,7 +40,7 @@ public class FetchMessagesHandlerTest ex
MockIMAPFolder f = (MockIMAPFolder)store.getFolder("WHATEVER");
f.create(Folder.HOLDS_MESSAGES);
- ByteArrayInputStream is = new ByteArrayInputStream("From:
\"[email protected]\" <[email protected]>\nTo: [email protected]\nSubject:
something\n\ndata".getBytes());
+ ByteArrayInputStream is = new ByteArrayInputStream("From: \"a b
c\"<[email protected]>\nTo: [email protected]\nSubject: something\n\ndata".getBytes());
MimeMessage m1 = new MimeMessage(session, is);
is = new ByteArrayInputStream("From:
\"=?ISO-8859-1?Q?Manolo_Pe=F1a?=\" <[email protected]>\nTo: [email protected]\nSubject:
something\n\ndata".getBytes());
MimeMessage m2 = new MimeMessage(session, is);
@@ -54,7 +54,7 @@ public class FetchMessagesHandlerTest ex
assertEquals(3, msgs.size());
msgs = fetchMessagesHandler.convert(10, f, new Message[]{m1});
- assertEquals("[email protected] <[email protected]>", msgs.get(0).getFrom());
+ assertEquals("a b c <[email protected]>", msgs.get(0).getFrom());
msgs = fetchMessagesHandler.convert(10, f, new Message[]{m2});
assertEquals("Manolo Pe\u00F1a <[email protected]>",
msgs.get(0).getFrom());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
