Changeset 1746 for trunk

Timestamp:

01/10/12 15:09:03 (5 months ago)

Author:

jharrop

Message:

Support for DECIMAL_ZERO (01, 02, 03 ..) and basic support for "Legal" numbering

Location:

trunk/docx4j/src/main/java/org/docx4j/model/listnumbering

Files:

• ListLevel.java (modified) (3 diffs)
• ListNumberingDefinition.java (modified) (3 diffs)
• NumberFormatDecimalZero.java (added)

trunk/docx4j/src/main/java/org/docx4j/model/listnumbering/ListLevel.java

@@ -333 +333 @@
                 return converter.format(current).toUpperCase();
         }               
+        if (numFmt.equals( NumberFormat.DECIMAL_ZERO ) ) {                      
+                NumberFormatDecimalZero converter = new NumberFormatDecimalZero(); 
+                return converter.format(current);
+        }
         
         log.error("Unhandled numFmt: " + numFmt.name() );
@@ -338 +342 @@
     }
     
+    public String getCurrentValueUnformatted()
+    {           
+        return this.counter.getCurrentValue().toString();
+    }    
     
     /**
@@ -394 +402 @@
 //                      this.numFmt = numFmt;
 //              }
-        private NumberFormat getNumFmt() {
+        protected NumberFormat getNumFmt() {
                 return numFmt;
         }

trunk/docx4j/src/main/java/org/docx4j/model/listnumbering/ListNumberingDefinition.java

@@ -93 +93 @@
 import org.docx4j.XmlUtils;
 import org.docx4j.wml.Lvl;
+import org.docx4j.wml.NumberFormat;
 import org.docx4j.wml.Numbering;
 import org.docx4j.wml.Numbering.Num.LvlOverride.StartOverride;
@@ -252 +253 @@
     public String GetCurrentNumberString(String level)
     {
-        String formatString = this.levels.get(level).getLevelText();
+        ListLevel controllingLvl = this.levels.get( level ); 
+        
+        boolean isLegal = controllingLvl.getJaxbAbstractLvl().getIsLgl() !=null 
+                                                && controllingLvl.getJaxbAbstractLvl().getIsLgl().isVal();
+        log.debug("isLegal: " + isLegal);
+        
+        String formatString = controllingLvl.getLevelText();
         log.debug("levelText: " + formatString );
         StringBuilder result = new StringBuilder();
@@ -269 +276 @@
                     // as it turns out, in the format String, the level is 1-based
                     int levelId =  Integer.parseInt(formatStringLevel) - 1;
-                    result.append(this.levels.get( Integer.toString(levelId) ).getCurrentValueFormatted() );
+                    ListLevel lvl = this.levels.get( Integer.toString(levelId) );
+                    if (level.equals("" + levelId) // this bit is the actual level 
+                                && lvl.getNumFmt().equals( NumberFormat.DECIMAL_ZERO )) { // Where this level sets <w:isLgl>, what other formats are to be respected?
+                        result.append(lvl.getCurrentValueFormatted() );                         
+                    } else if (isLegal ) {
+                        // Use normal decimal numbering
+                        result.append(lvl.getCurrentValueUnformatted() );
+                        
+                    } else {
+                        // Usual case
+                        result.append(lvl.getCurrentValueFormatted() );
+                    }
                     i++;
                 }