Changeset 1635 for trunk/docx4j/src/main/java

Timestamp:

08/05/11 01:22:49 (10 months ago)

Author:

jharrop

Message:

findImageData() use XmlUtils?.unwrap so a bit cleaner.

File:

• trunk/docx4j/src/main/java/org/docx4j/model/images/WordXmlPictureE10.java (modified) (1 diff)

trunk/docx4j/src/main/java/org/docx4j/model/images/WordXmlPictureE10.java

@@ -138 +138 @@
         } else {
                 for (Object o : shape.getPathOrFormulasOrHandles() ) {
-                        if (o instanceof JAXBElement ) {
-                                JAXBElement jb = (JAXBElement)o;
-                                if (jb.getDeclaredType().getName().equals("org.docx4j.vml.CTImageData")) {
-                                        imageData = (CTImageData)jb.getValue();
-                                        break;
-                                } else {
-                                        log.debug("Skipping " +
-                                                        XmlUtils.JAXBElementDebug((JAXBElement)o)
-                                                        );
-                                }
+                        
+                        Object o2 = XmlUtils.unwrap(o);
+                        if (o2 instanceof org.docx4j.vml.CTImageData) {
+                                        imageData = (CTImageData)o2;
+                                        break;
                         } else {
                                 log.error( o.getClass().getName() );