Changeset 1735

Timestamp:

12/27/11 03:47:16 (5 months ago)

Author:

jharrop

Message:

comments only

Location:

trunk/docx4j/src/main/java/org/docx4j/model/fields/merge

Files:

• DataFieldName.java (modified) (2 diffs)
• MailMerger.java (modified) (2 diffs)

trunk/docx4j/src/main/java/org/docx4j/model/fields/merge/DataFieldName.java

@@ -4 +4 @@
  * The name of the data field.
  * 
- * When Word performs a mail merge, it treats this as case-insensitive.
+ * When Word performs a mail merge, it treats this as case-insensitive
+ * (and takes the first matching field).
  * 
- * The purpose of this class is to do the same.
+ * The purpose of this class is to ensure the key provided is
+ * case-insensitive.
  * 
  * @author jharrop
@@ -15 +17 @@
         String name;
         
-        DataFieldName(String name) {
+        public DataFieldName(String name) {
                 
                 this.name = name.toUpperCase();

trunk/docx4j/src/main/java/org/docx4j/model/fields/merge/MailMerger.java

@@ -316 +316 @@
 
                 Map<DataFieldName, String> map = new HashMap<DataFieldName, String>();
+                map.put( new DataFieldName("KundenNAme"), "Daffy duck");
                 map.put( new DataFieldName("Kundenname"), "Plutext");
                 map.put(new DataFieldName("Kundenstrasse"), "Bourke Street");
@@ -326 +327 @@
                 
                 data.add(map);          
-                // Word matches irrespective of case, and takes the first matching field