Changeset 1092

Timestamp:

02/27/10 17:43:39 (2 years ago)

Author:

jharrop

Message:

don't trip up on bookmarks

File:

• trunk/docx4j/src/main/java/org/docx4j/model/table/TableModel.java (modified) (4 diffs)

trunk/docx4j/src/main/java/org/docx4j/model/table/TableModel.java

@@ -25 +25 @@
 import java.util.Vector;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
 import javax.xml.transform.TransformerException;
 
 import org.apache.log4j.Logger;
-import org.docx4j.UnitsOfMeasurement;
 import org.docx4j.XmlUtils;
-import org.docx4j.convert.out.Converter;
 import org.docx4j.jaxb.Context;
 import org.docx4j.model.Model;
 import org.docx4j.model.PropertyResolver;
 import org.docx4j.model.TransformState;
-import org.docx4j.model.properties.Property;
 import org.docx4j.model.structure.PageDimensions;
 import org.docx4j.openpackaging.exceptions.Docx4JException;
-import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-
 import org.docx4j.wml.CTTblPrBase;
 import org.docx4j.wml.ObjectFactory;
@@ -56 +49 @@
 import org.docx4j.wml.TcPrInner.GridSpan;
 import org.docx4j.wml.TcPrInner.VMerge;
-
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
 
 /**
@@ -298 +293 @@
                 int r = 0;
                 for (Object o : rows) {
-                        startRow();
-                        Tr tr = (Tr) o;
+                        startRow();                     
+                        Tr tr = null;
+                         if (o instanceof org.docx4j.wml.Tr) {                           
+                                 log.debug( "\n in w:tr .. ");
+                                 tr = (org.docx4j.wml.Tr)o;             
+                         } else if (o instanceof javax.xml.bind.JAXBElement
+                                         && ((JAXBElement)o).getDeclaredType().getName().equals("org.docx4j.wml.Tr")) {
+                                 tr = (org.docx4j.wml.Tr)((JAXBElement)o).getValue();
+                         } else {
+                                 // What?
+                                if (o instanceof javax.xml.bind.JAXBElement) {
+                                        if (((JAXBElement) o).getDeclaredType().getName().equals(
+                                                        "org.docx4j.wml.CTMarkupRange")) {
+                                                // Ignore w:bookmarkEnd
+                                        } else {
+                                                log.warn("TODO - skipping JAXBElement:  "
+                                                                                + ((JAXBElement) o).getDeclaredType()
+                                                                                                .getName());
+                                                log.debug(XmlUtils.marshaltoString(o, true));
+                                        }
+                                } else {
+                                        log.warn("TODO - skipping:  " + o.getClass().getName());
+                                        log.debug(XmlUtils.marshaltoString(o, true));
+                                }
+                                continue;
+                         }                      
+                        
                         if (borderConflictResolutionRequired && tr.getTblPrEx()!=null
                                         && tr.getTblPrEx().getTblCellSpacing()!=null) {
@@ -308 +328 @@
                         for (Object o2 : cells) {
 
-                                if (o2 instanceof javax.xml.bind.JAXBElement) {
-
-                                        //                                      System.out.println( ((JAXBElement)o2).getName() );
-                                        //                                      System.out.println( ((JAXBElement)o2).getDeclaredType().getName() + "\n\n");
-
-                                        Tc tc = (Tc) ((JAXBElement) o2).getValue();
-                                        Node wtrNode = cellContents.item(r); //w:tr
-                                        addCell(tc, wtrNode.getChildNodes().item(c));
-                                        // addCell(tc, cellContents.item(i));
-                                        // i++;
-                                        c++;
-
-                                } else {
-
-                                        log.warn("Encountered unexpected: "
-                                                        + o2.getClass().getName());
-                                }
+                                Tc tc = null;
+                                 if (o2 instanceof org.docx4j.wml.Tc) {                          
+                                         tc = (org.docx4j.wml.Tc)o2;            
+                                 } else if (o2 instanceof javax.xml.bind.JAXBElement
+                                                 && ((JAXBElement)o2).getDeclaredType().getName().equals("org.docx4j.wml.Tc")) {
+                                         tc = (org.docx4j.wml.Tc)((JAXBElement)o2).getValue();
+                                 } else {
+                                         // What?
+                                         if (o2 instanceof javax.xml.bind.JAXBElement) {
+                                                 log.warn("TODO - skipping JAXBElement:  " + ((JAXBElement)o2).getDeclaredType().getName() );
+                                         } else {
+                                                 log.warn("TODO - skipping:  " + o2.getClass().getName() );
+                                         }
+                                         log.debug( XmlUtils.marshaltoString(o2, true));
+                                         continue;
+                                 }
+                                
+                                Node wtrNode = cellContents.item(r); //w:tr
+                                addCell(tc, wtrNode.getChildNodes().item(c));
+                                // addCell(tc, cellContents.item(i));
+                                // i++;
+                                c++;
+
                         }
                         r++;