Author: dongxu Date: Thu Sep 12 02:42:51 2013 New Revision: 1522133 URL: http://svn.apache.org/r1522133 Log: constant changed by manolo
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mvp/MainView.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ContactsHandlerTest.java james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.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=1522133&r1=1522132&r2=1522133&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:42:51 2013 @@ -132,6 +132,7 @@ public class MainView extends Composite dockPanel.setWidth("100%"); <<<<<<< HEAD +<<<<<<< HEAD // Not used so far // createNorth(); // dockPanel.add(north, DockPanel.NORTH); @@ -145,12 +146,17 @@ public class MainView extends Composite dockPanel.add(center, DockPanel.CENTER); ======= createNorth(); +======= + // Not used so far + // createNorth(); + // dockPanel.add(north, DockPanel.NORTH); + +>>>>>>> constant changed by manolo createWest(); - createCenter(); - - dockPanel.add(north, DockPanel.NORTH); dockPanel.add(west, DockPanel.WEST); dockPanel.setCellWidth(west, "160px"); + + createCenter(); dockPanel.add(center, DockPanel.CENTER); dockPanel.setCellHorizontalAlignment(north, DockPanel.ALIGN_RIGHT); >>>>>>> first commit @@ -202,7 +208,11 @@ public class MainView extends Composite west.add(panel); } +<<<<<<< HEAD >>>>>>> first commit +======= + @SuppressWarnings("unused") +>>>>>>> constant changed by manolo private void createNorth() { north = new VerticalPanel(); north.setWidth("100%"); 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=1522133&r1=1522132&r2=1522133&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:42:51 2013 @@ -166,6 +166,7 @@ public abstract class AbstractFetchMessa String from = null; if (m.getFrom() != null && m.getFrom().length >0 ) { <<<<<<< HEAD +<<<<<<< HEAD from = MessageUtils.decodeText(m.getFrom()[0].toString()); ======= from = m.getFrom()[0].toString().trim(); @@ -176,12 +177,16 @@ public abstract class AbstractFetchMessa logger.debug("Unable to decode from " + from + " " + e.getMessage()); } >>>>>>> first commit +======= + from = decodeText(m.getFrom()[0].toString()); +>>>>>>> constant changed by manolo } msg.setFrom(from); String replyto = null; if (m.getReplyTo() != null && m.getReplyTo().length >0 ) { <<<<<<< HEAD +<<<<<<< HEAD replyto = MessageUtils.decodeText(m.getReplyTo()[0].toString()); ======= replyto = m.getReplyTo()[0].toString().trim(); @@ -192,6 +197,9 @@ public abstract class AbstractFetchMessa logger.debug("Unable to decode replyto " + replyto + " " + e.getMessage()); } >>>>>>> first commit +======= + replyto = decodeText(m.getReplyTo()[0].toString()); +>>>>>>> constant changed by manolo } msg.setReplyto(replyto); @@ -201,6 +209,7 @@ public abstract class AbstractFetchMessa if (toArray != null) { for (Address addr : toArray) { <<<<<<< HEAD +<<<<<<< HEAD String mailTo = MessageUtils.decodeText(addr.toString()); to.add(mailTo); ======= @@ -214,14 +223,20 @@ public abstract class AbstractFetchMessa if (mailTo != null) to.add(mailTo); >>>>>>> first commit +======= + String mailTo = decodeText(addr.toString()); + to.add(mailTo); +>>>>>>> constant changed by manolo } } msg.setTo(to); + // Check if a subject exist and if so decode it String subject = m.getSubject(); if (subject != null) { <<<<<<< HEAD +<<<<<<< HEAD subject = MessageUtils.decodeText(subject); ======= try { @@ -230,6 +245,9 @@ public abstract class AbstractFetchMessa logger.debug("Unable to decode subject " + subject + " " + e.getMessage()); } >>>>>>> first commit +======= + subject = decodeText(subject); +>>>>>>> constant changed by manolo } msg.setSubject(subject); @@ -239,6 +257,7 @@ public abstract class AbstractFetchMessa if (ccArray != null) { for (Address addr : ccArray) { <<<<<<< HEAD +<<<<<<< HEAD String mailCc = MessageUtils.decodeText(addr.toString()); cc.add(mailCc); ======= @@ -252,18 +271,28 @@ public abstract class AbstractFetchMessa if (mailCc != null) cc.add(mailCc); >>>>>>> first commit +======= + String mailCc = decodeText(addr.toString()); + cc.add(mailCc); +>>>>>>> constant changed by manolo } } msg.setCc(cc); <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> constant changed by manolo userPreferences.addContact(from); userPreferences.addContact(to); userPreferences.addContact(replyto); userPreferences.addContact(cc); +<<<<<<< HEAD ======= >>>>>>> first commit +======= +>>>>>>> constant changed by manolo // Using sentDate since received date is not useful in the view when using fetchmail msg.setReceivedDate(m.getSentDate()); @@ -339,8 +368,28 @@ public abstract class AbstractFetchMessa } } <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> first commit +======= + + /** + * Decode iso-xxxx strings present in subjects and emails like: + * + * =?ISO-8859-1?Q?No=20hay=20ma=F1ana?= <he...@hupa.org> + */ + private String decodeText(String s) { + String ret = s; + try { + ret = MimeUtility.decodeText(s); + } catch (UnsupportedEncodingException e) { + logger.debug("Unable to decode text " + s + " " + e.getMessage()); + } + // Remove quotes around names in email addresses + ret = ret.replaceFirst("^[\"' ]+(.*?)[\"' ]+<", "$1 <"); + return ret; + } +>>>>>>> constant changed by manolo } Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java?rev=1522133&r1=1522132&r2=1522133&view=diff ============================================================================== --- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java (original) +++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java Thu Sep 12 02:42:51 2013 @@ -26,6 +26,7 @@ import java.util.List; <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= import java.util.regex.Pattern; >>>>>>> first commit @@ -34,6 +35,8 @@ import java.util.regex.Pattern; ======= import java.util.regex.Pattern; >>>>>>> first commit +======= +>>>>>>> constant changed by manolo /** * @@ -71,10 +74,14 @@ public abstract class UserPreferencesSto if (mails != null) { for (String mail: mails) { <<<<<<< HEAD +<<<<<<< HEAD if (mail != null && !mail.matches(REGEX_OMITTED_EMAILS)) { ======= if (!mail.matches(REGEX_OMITTED_EMAILS)) { >>>>>>> first commit +======= + if (mail != null && !mail.matches(REGEX_OMITTED_EMAILS)) { +>>>>>>> constant changed by manolo Contact contact = new Contact(mail); addContact(contact); } Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ContactsHandlerTest.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ContactsHandlerTest.java?rev=1522133&r1=1522132&r2=1522133&view=diff ============================================================================== --- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ContactsHandlerTest.java (original) +++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/ContactsHandlerTest.java Thu Sep 12 02:42:51 2013 @@ -24,6 +24,7 @@ import junit.framework.Assert; import org.apache.hupa.server.HupaGuiceTestCase; import org.apache.hupa.shared.rpc.Contacts; <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.shared.rpc.ContactsResult.Contact; public class ContactsHandlerTest extends HupaGuiceTestCase { @@ -44,15 +45,31 @@ public class ContactsHandlerTest extends userPreferences.addContact("<someb...@foo.com> <someb...@foo.com>"); Assert.assertEquals(2, getContacts().length); ======= +======= +import org.apache.hupa.shared.rpc.ContactsResult.Contact; +>>>>>>> constant changed by manolo public class ContactsHandlerTest extends HupaGuiceTestCase { + + private Contact[] getContacts() throws Exception { + return contactsHandler.execute(new Contacts(), null).getContacts(); + } public void testContactsHandler() throws Exception { - Assert.assertEquals(0, contactsHandler.execute(new Contacts(), null).getContacts().length); + Assert.assertEquals(0, getContacts().length); userPreferences.addContact("Somebody <someb...@foo.com>"); userPreferences.addContact(" Some.body <someb...@foo.com> "); +<<<<<<< HEAD Assert.assertEquals(1, contactsHandler.execute(new Contacts(), null).getContacts().length); >>>>>>> first commit +======= + userPreferences.addContact("\"somebody\" <someb...@foo.com>"); + Assert.assertEquals(1, getContacts().length); + userPreferences.addContact("<someb...@foo.com>"); + userPreferences.addContact("someb...@foo.com"); + userPreferences.addContact("\"someb...@foo.com\" <someb...@foo.com>"); + Assert.assertEquals(2, getContacts().length); +>>>>>>> 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=1522133&r1=1522132&r2=1522133&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:42:51 2013 @@ -41,6 +41,7 @@ public class FetchMessagesHandlerTest ex f.create(Folder.HOLDS_MESSAGES); <<<<<<< 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()); @@ -48,8 +49,11 @@ public class FetchMessagesHandlerTest ex is = new ByteArrayInputStream("From: a...@foo.com\nTo: \"<b...@foo.com>\" <b...@foo.com>\nSubject: =?ISO-8859-1?Q?Monta=F1a?=\n\ndata".getBytes()); ======= ByteArrayInputStream is = new ByteArrayInputStream("From: a...@foo.com\nTo: b...@foo.com\nSubject: something\n\ndata".getBytes()); +======= + ByteArrayInputStream is = new ByteArrayInputStream("From: \"a...@foo.com\" <a...@foo.com>\nTo: b...@foo.com\nSubject: something\n\ndata".getBytes()); +>>>>>>> constant 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()); + 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); is = new ByteArrayInputStream("From: a...@foo.com\nTo: b...@foo.com\nSubject: =?ISO-8859-1?Q?Monta=F1a?=\n\ndata".getBytes()); >>>>>>> first commit @@ -61,11 +65,17 @@ public class FetchMessagesHandlerTest ex msgs = fetchMessagesHandler.convert(10, f, new Message[]{m1, m2, m3}); assertEquals(3, msgs.size()); <<<<<<< HEAD +<<<<<<< HEAD msgs = fetchMessagesHandler.convert(10, f, new Message[]{m1}); assertEquals("a b c <a...@foo.com>", msgs.get(0).getFrom()); ======= >>>>>>> first commit +======= + + msgs = fetchMessagesHandler.convert(10, f, new Message[]{m1}); + assertEquals("a...@foo.com <a...@foo.com>", msgs.get(0).getFrom()); +>>>>>>> constant changed by manolo msgs = fetchMessagesHandler.convert(10, f, new Message[]{m2}); assertEquals("Manolo Pe\u00F1a <pe...@foo.com>", msgs.get(0).getFrom()); Modified: james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java?rev=1522133&r1=1522132&r2=1522133&view=diff ============================================================================== --- james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java (original) +++ james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java Thu Sep 12 02:42:51 2013 @@ -93,6 +93,7 @@ public class ContactsResult implements R <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> first commit public static class Contact implements Result, Serializable { @@ -146,6 +147,8 @@ public class ContactsResult implements R <<<<<<< HEAD >>>>>>> first commit ======= +======= +>>>>>>> constant changed by manolo public static class Contact implements Result, Serializable { private static final long serialVersionUID = -8632580327693416473L; public String mail; @@ -155,6 +158,7 @@ public class ContactsResult implements R } public Contact(String address) { +<<<<<<< HEAD mail = address.replaceAll("^.*<([^>]+)>\\s*$", "$1"); realname = mail.equals(address) ? mail : address @@ -165,6 +169,14 @@ public class ContactsResult implements R // remove end symbols in the name .replaceAll("[\\s\"'>]+$", "") ; +======= + mail = address.replaceAll("^.*<([^>]+)>", "$1"); + + realname = mail.equals(address) ? mail : address + .replaceAll("<.+$", "") + .replaceAll("^[\\s\"']+", "") + .replaceAll("[\\s\"']+$", ""); +>>>>>>> constant changed by manolo if (realname.isEmpty()) realname = mail; @@ -202,8 +214,11 @@ public class ContactsResult implements R public void setContacts(Contact[] contacts) { this.contacts = contacts; } +<<<<<<< HEAD >>>>>>> constant changed by manolo ======= >>>>>>> first commit +======= +>>>>>>> constant changed by manolo } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org