From: Sandy M. <san...@us...> - 2005-12-21 17:18:01
|
Update of /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12560/src/java/edu/ufl/osg/webmail/util Modified Files: Util.java Log Message: Bug #1387314 : improved robustness of column sorting and styleistic cleanups Index: Util.java =================================================================== RCS file: /cvsroot/gatormail/GatorMail/src/java/edu/ufl/osg/webmail/util/Util.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Util.java 20 Sep 2005 15:22:15 -0000 1.5 --- Util.java 21 Dec 2005 17:17:50 -0000 1.6 *************** *** 77,80 **** --- 77,82 ---- private static final Logger logger = Logger.getLogger(Util.class.getName()); + private static final char QUOTE = '"'; + private static ResourceBundle bundle; *************** *** 113,117 **** * Always returns a JavaMail {@link javax.mail.Folder} prefering a cached on * if possible. This differers from {@link Util#getFolder(HttpSession, ! * String)} in that the returned {@link javax.mail.Folder} instance may be * the same one passed in as <code>folder</code>. * --- 115,119 ---- * Always returns a JavaMail {@link javax.mail.Folder} prefering a cached on * if possible. This differers from {@link Util#getFolder(HttpSession, ! * String)} in that the returned {@link javax.mail.Folder} instance may be * the same one passed in as <code>folder</code>. * *************** *** 164,169 **** } ! public static String getPartPath(final BodyPart part) throws MessagingException { ! final BodyPart bodyPart = part; final Multipart multipart = bodyPart.getParent(); int partNumber; --- 166,170 ---- } ! public static String getPartPath(final BodyPart bodyPart) throws MessagingException { final Multipart multipart = bodyPart.getParent(); int partNumber; *************** *** 224,227 **** --- 225,233 ---- try { d1 = m1.getReceivedDate(); + } catch (MessagingException me) { + me.printStackTrace(); + } + + try { d2 = m2.getReceivedDate(); } catch (MessagingException me) { *************** *** 251,264 **** final Message m1 = (Message)o1; - final Message m2 = (Message)o2; try { d1 = m1.getReceivedDate(); - d2 = m2.getReceivedDate(); - } catch (MessagingException me) { me.printStackTrace(); } --- 257,272 ---- final Message m1 = (Message)o1; final Message m2 = (Message)o2; try { d1 = m1.getReceivedDate(); } catch (MessagingException me) { me.printStackTrace(); + } + try { + d2 = m2.getReceivedDate(); + } catch (MessagingException me) { + me.printStackTrace(); } *************** *** 318,321 **** --- 326,331 ---- } } + } else { + d1 = ""; } *************** *** 348,352 **** --- 358,365 ---- } + } else { + d2 = ""; } + d1 = d1.toLowerCase(); d2 = d2.toLowerCase(); *************** *** 354,364 **** } catch (MessagingException me) { me.printStackTrace(); - } return d1.compareTo(d2); - } - } --- 367,374 ---- *************** *** 382,386 **** final Message m1 = (Message)o1; - final Message m2 = (Message)o2; --- 392,395 ---- *************** *** 415,418 **** --- 424,429 ---- } } + } else { + d1 = ""; } *************** *** 445,449 **** --- 456,463 ---- } + } else { + d2 = ""; } + d1 = d1.toLowerCase(); d2 = d2.toLowerCase(); *************** *** 484,493 **** try { - d1 = m1.getFrom(); d2 = m2.getFrom(); - } catch (MessagingException me) { me.printStackTrace(); } --- 498,510 ---- try { d2 = m2.getFrom(); } catch (MessagingException me) { me.printStackTrace(); + } + try { + d1 = m1.getFrom(); + } catch (MessagingException me) { + me.printStackTrace(); } *************** *** 507,536 **** while (d1.length > i && d2.length > i) { ! Object A = d1[i]; ! Object B = d2[i]; ! if (A == null && B == null) return 0; ! InternetAddress internetAddressA = (InternetAddress)A; ! InternetAddress internetAddressB = (InternetAddress)B; ! String AA = internetAddressA.getPersonal(); ! String BB = internetAddressB.getPersonal(); ! if (AA == null) { ! AA = internetAddressA.getAddress(); } ! if (BB == null) { ! BB = internetAddressB.getAddress(); } ! char quote = '"'; ! AA = AA.toLowerCase().replace(quote, ' ').trim(); ! BB = BB.toLowerCase().replace(quote, ' ').trim(); ! if (AA.compareTo(BB) == 0) { i++; } else { ! result = AA.compareTo(BB); i = d1.length; } --- 524,552 ---- while (d1.length > i && d2.length > i) { ! final Object a = d1[i]; ! final Object b = d2[i]; ! if (a == null && b == null) return 0; ! final InternetAddress internetAddressA = (InternetAddress)a; ! final InternetAddress internetAddressB = (InternetAddress)b; ! String aa = internetAddressA.getPersonal(); ! String bb = internetAddressB.getPersonal(); ! if (aa == null) { ! aa = internetAddressA.getAddress(); } ! if (bb == null) { ! bb = internetAddressB.getAddress(); } ! aa = aa.toLowerCase().replace(QUOTE, ' ').trim(); ! bb = bb.toLowerCase().replace(QUOTE, ' ').trim(); ! if (aa.compareTo(bb) == 0) { i++; } else { ! result = aa.compareTo(bb); i = d1.length; } *************** *** 567,572 **** try { d1 = m1.getFrom(); ! d2 = m2.getFrom(); } catch (MessagingException me) { me.printStackTrace(); --- 583,592 ---- try { d1 = m1.getFrom(); ! } catch (MessagingException me) { ! me.printStackTrace(); ! } + try { + d2 = m2.getFrom(); } catch (MessagingException me) { me.printStackTrace(); *************** *** 588,617 **** while (d1.length > i && d2.length > i) { ! Object A = d1[i]; ! Object B = d2[i]; ! if (A == null && B == null) return 0; ! InternetAddress internetAddressA = (InternetAddress)A; ! InternetAddress internetAddressB = (InternetAddress)B; ! String AA = internetAddressA.getPersonal(); ! String BB = internetAddressB.getPersonal(); ! if (AA == null) { ! AA = internetAddressA.getAddress(); } ! if (BB == null) { ! BB = internetAddressB.getAddress(); } ! char quote = '"'; ! AA = AA.toLowerCase().replace(quote, ' ').trim(); ! BB = BB.toLowerCase().replace(quote, ' ').trim(); ! if (BB.compareTo(AA) == 0) { i++; } else { ! result = BB.compareTo(AA); i = d1.length; } --- 608,636 ---- while (d1.length > i && d2.length > i) { ! final Object a = d1[i]; ! final Object b = d2[i]; ! if (a == null && b == null) return 0; ! final InternetAddress internetAddressA = (InternetAddress)a; ! final InternetAddress internetAddressB = (InternetAddress)b; ! String aa = internetAddressA.getPersonal(); ! String bb = internetAddressB.getPersonal(); ! if (aa == null) { ! aa = internetAddressA.getAddress(); } ! if (bb == null) { ! bb = internetAddressB.getAddress(); } ! aa = aa.toLowerCase().replace(QUOTE, ' ').trim(); ! bb = bb.toLowerCase().replace(QUOTE, ' ').trim(); ! if (bb.compareTo(aa) == 0) { i++; } else { ! result = bb.compareTo(aa); i = d1.length; } *************** *** 647,652 **** try { d1 = m1.getRecipients(Message.RecipientType.TO); ! d2 = m2.getRecipients(Message.RecipientType.TO); } catch (MessagingException me) { me.printStackTrace(); --- 666,675 ---- try { d1 = m1.getRecipients(Message.RecipientType.TO); ! } catch (MessagingException me) { ! me.printStackTrace(); ! } + try { + d2 = m2.getRecipients(Message.RecipientType.TO); } catch (MessagingException me) { me.printStackTrace(); *************** *** 668,699 **** while (d1.length > i && d2.length > i) { ! Object A = d1[i]; ! Object B = d2[i]; ! if (A == null && B == null) return 0; ! InternetAddress internetAddressA = (InternetAddress)A; ! InternetAddress internetAddressB = (InternetAddress)B; ! String AA = internetAddressA.getPersonal(); ! String BB = internetAddressB.getPersonal(); ! if (AA == null) { ! AA = internetAddressA.getAddress(); } ! if (BB == null) { ! BB = internetAddressB.getAddress(); } ! char quote = '"'; ! AA = AA.toLowerCase().replace(quote, ' ').trim(); ! BB = BB.toLowerCase().replace(quote, ' ').trim(); ! if (AA.compareTo(BB) == 0) { i++; } else { ! result = AA.compareTo(BB); i = d1.length; - } } --- 691,720 ---- while (d1.length > i && d2.length > i) { ! final Object a = d1[i]; ! final Object b = d2[i]; ! if (a == null && b == null) return 0; ! final InternetAddress internetAddressA = (InternetAddress)a; ! final InternetAddress internetAddressB = (InternetAddress)b; ! String aa = internetAddressA.getPersonal(); ! String bb = internetAddressB.getPersonal(); ! if (aa == null) { ! aa = internetAddressA.getAddress(); } ! if (bb == null) { ! bb = internetAddressB.getAddress(); } ! aa = aa.toLowerCase().replace(QUOTE, ' ').trim(); ! bb = bb.toLowerCase().replace(QUOTE, ' ').trim(); ! if (aa.compareTo(bb) == 0) { i++; } else { ! result = aa.compareTo(bb); i = d1.length; } } *************** *** 727,732 **** try { d1 = m1.getRecipients(Message.RecipientType.TO); ! d2 = m2.getRecipients(Message.RecipientType.TO); } catch (MessagingException me) { me.printStackTrace(); --- 748,757 ---- try { d1 = m1.getRecipients(Message.RecipientType.TO); ! } catch (MessagingException me) { ! me.printStackTrace(); ! } + try { + d2 = m2.getRecipients(Message.RecipientType.TO); } catch (MessagingException me) { me.printStackTrace(); *************** *** 748,789 **** while (d1.length > i && d2.length > i) { ! Object A = d1[i]; ! Object B = d2[i]; ! ! if (A == null && B == null) return 0; ! InternetAddress internetAddressA = (InternetAddress)A; ! InternetAddress internetAddressB = (InternetAddress)B; ! String AA = internetAddressA.getPersonal(); ! String BB = internetAddressB.getPersonal(); ! if (AA == null) { ! AA = internetAddressA.getAddress(); } ! if (BB == null) { ! BB = internetAddressB.getAddress(); ! } ! char quote = '"'; ! AA = AA.toLowerCase().replace(quote, ' ').trim(); ! BB = BB.toLowerCase().replace(quote, ' ').trim(); ! if (BB.compareTo(AA) == 0) { i++; } else { ! result = BB.compareTo(AA); i = d1.length; } - } return result; - } - } --- 773,808 ---- while (d1.length > i && d2.length > i) { ! final Object a = d1[i]; ! final Object b = d2[i]; ! if (a == null && b == null) return 0; ! final InternetAddress internetAddressA = (InternetAddress)a; ! final InternetAddress internetAddressB = (InternetAddress)b; ! String aa = internetAddressA.getPersonal(); ! String bb = internetAddressB.getPersonal(); + if (aa == null) { + aa = internetAddressA.getAddress(); } ! if (bb == null) { ! bb = internetAddressB.getAddress(); } ! aa = aa.toLowerCase().replace(QUOTE, ' ').trim(); ! bb = bb.toLowerCase().replace(QUOTE, ' ').trim(); ! if (bb.compareTo(aa) == 0) { i++; } else { ! result = bb.compareTo(aa); i = d1.length; } } return result; } } *************** *** 801,833 **** * second. */ - public int compare(final Object o1, final Object o2) { int d1 = 0; - int d2 = 0; final Message m1 = (Message)o1; - final Message m2 = (Message)o2; try { d1 = m1.getSize(); - d2 = m2.getSize(); - } catch (MessagingException me) { me.printStackTrace(); - } ! if (d1 < d2) ! return -1; ! else if (d1 == d2) ! return 0; ! else ! return 1; } - } --- 820,847 ---- * second. */ public int compare(final Object o1, final Object o2) { int d1 = 0; int d2 = 0; final Message m1 = (Message)o1; final Message m2 = (Message)o2; try { d1 = m1.getSize(); } catch (MessagingException me) { me.printStackTrace(); } ! try { ! d2 = m2.getSize(); ! } catch (MessagingException me) { ! me.printStackTrace(); ! } + if (d1 < d2) return -1; + else if (d1 == d2) return 0; + else return 1; } } *************** *** 845,874 **** * second. */ - public int compare(final Object o1, final Object o2) { int d1 = 0; - int d2 = 0; final Message m1 = (Message)o1; - final Message m2 = (Message)o2; try { d1 = m1.getSize(); - d2 = m2.getSize(); - } catch (MessagingException me) { me.printStackTrace(); } ! if (d2 < d1) ! return -1; ! else if (d1 == d2) ! return 0; ! else ! return 1; } } --- 859,885 ---- * second. */ public int compare(final Object o1, final Object o2) { int d1 = 0; int d2 = 0; final Message m1 = (Message)o1; final Message m2 = (Message)o2; try { d1 = m1.getSize(); } catch (MessagingException me) { me.printStackTrace(); + } + try { + d2 = m2.getSize(); + } catch (MessagingException me) { + me.printStackTrace(); } ! if (d2 < d1) return -1; ! else if (d1 == d2) return 0; ! else return 1; } } *************** *** 878,883 **** */ public static String getFromBundle(final String key) { ! if (bundle == null) ! bundle = ResourceBundle.getBundle("Messages"); return bundle.getString(key); } --- 889,893 ---- */ public static String getFromBundle(final String key) { ! if (bundle == null) bundle = ResourceBundle.getBundle("Messages"); return bundle.getString(key); } *************** *** 1026,1030 **** */ public static boolean isReservedFolder(final String folderName) { ! return ("INBOX".equals(folderName) || Constants.TRASH_FOLDER_FULLNAME.equals(folderName) || Constants.SENT_FOLDER_FULLNAME.equals(folderName)) ? true : false; } --- 1036,1040 ---- */ public static boolean isReservedFolder(final String folderName) { ! return ("INBOX".equals(folderName) || Constants.TRASH_FOLDER_FULLNAME.equals(folderName) || Constants.SENT_FOLDER_FULLNAME.equals(folderName)); } *************** *** 1150,1152 **** return webAppInit; } ! } --- 1160,1162 ---- return webAppInit; } ! } \ No newline at end of file |