Changeset 446 for trunk/LogicMail/src/org/logicprobe/LogicMail/ui/CompositionScreen.java

Timestamp:

05/30/09 17:10:16 (3 years ago)

Author:

octorian

Message:

Merge of 1.1 changes from r445 (Manual language selection, initial Vietnamese translation (very rough), QP decoding fix, and Unicode normalizer integration with mappings for Vietnamese)

File:

• trunk/LogicMail/src/org/logicprobe/LogicMail/ui/CompositionScreen.java (modified) (12 diffs)

trunk/LogicMail/src/org/logicprobe/LogicMail/ui/CompositionScreen.java

@@ -46 +46 @@
 import org.logicprobe.LogicMail.conf.AccountConfig;
 import org.logicprobe.LogicMail.conf.IdentityConfig;
+import org.logicprobe.LogicMail.conf.MailSettings;
 import org.logicprobe.LogicMail.message.Message;
 import org.logicprobe.LogicMail.message.MessageContent;
@@ -63 +64 @@
 import org.logicprobe.LogicMail.model.MessageNodeListener;
 import org.logicprobe.LogicMail.util.EventObjectRunnable;
+import org.logicprobe.LogicMail.util.UnicodeNormalizer;
 
 
@@ -76 +78 @@
     private AccountNode accountNode;
     private AccountConfig accountConfig;
+    private UnicodeNormalizer unicodeNormalizer;
     
     private BorderedFieldManager recipientsFieldManager;
@@ -129 +132 @@
         this.accountConfig = accountNode.getAccountConfig();
         this.identityConfig = accountConfig.getIdentityConfig();
+        if(MailSettings.getInstance().getGlobalConfig().getUnicodeNormalization()) {
+            unicodeNormalizer = UnicodeNormalizer.getInstance();
+        }
 
         initFields();
@@ -155 +161 @@
         this.accountConfig = accountNode.getAccountConfig();
         this.identityConfig = accountConfig.getIdentityConfig();
+        if(MailSettings.getInstance().getGlobalConfig().getUnicodeNormalization()) {
+            unicodeNormalizer = UnicodeNormalizer.getInstance();
+        }
 
         initFields();
@@ -217 +226 @@
                 if(content instanceof TextContent) {
                     messageEditField.insert("\r\n");
-                    messageEditField.insert(((TextContent)content).getText());
+                    messageEditField.insert(normalize(((TextContent)content).getText()));
                     messageEditField.setCursorPosition(0);
                 }
@@ -223 +232 @@
 
         // Set the subject
-        subjectEditField.setText(message.getSubject());
+        subjectEditField.setText(normalize(message.getSubject()));
 
         // Set the recipients
@@ -229 +238 @@
         if (recipients != null) {
             for (i = 0; i < recipients.length; i++) {
-                insertRecipientField(EmailAddressBookEditField.ADDRESS_TO).setText(recipients[i].toString());
+                insertRecipientField(EmailAddressBookEditField.ADDRESS_TO).setText(normalize(recipients[i].toString()));
             }
         }
@@ -236 +245 @@
         if (recipients != null) {
             for (i = 0; i < recipients.length; i++) {
-                insertRecipientField(EmailAddressBookEditField.ADDRESS_CC).setText(recipients[i].toString());
+                insertRecipientField(EmailAddressBookEditField.ADDRESS_CC).setText(normalize(recipients[i].toString()));
             }
         }
@@ -243 +252 @@
         if (recipients != null) {
             for (i = 0; i < recipients.length; i++) {
-                insertRecipientField(EmailAddressBookEditField.ADDRESS_BCC).setText(recipients[i].toString());
+                insertRecipientField(EmailAddressBookEditField.ADDRESS_BCC).setText(normalize(recipients[i].toString()));
             }
         }
@@ -263 +272 @@
     
     private void initFields() {
-
         recipientsFieldManager = new BorderedFieldManager(
                         Manager.NO_HORIZONTAL_SCROLL
@@ -566 +574 @@
         return super.keyChar(key, status, time);
     }
+
+    /**
+     * Run the Unicode normalizer on the provide string,
+     * only if normalization is enabled in the configuration.
+     * If normalization is disabled, this method returns
+     * the input unmodified.
+     * 
+     * @param input Input string
+     * @return Normalized string
+     */
+    private String normalize(String input) {
+        if(unicodeNormalizer == null) {
+            return input;
+        }
+        else {
+            return unicodeNormalizer.normalize(input);
+        }
+    }
 }