Changeset 1184

Timestamp:

08/11/10 00:17:18 (18 months ago)

Author:

jharrop

Message:

Utility method to getPreferredPrefix irrespective of whether using Java 6 or JAXB RI.
Use this method in JAXBElementDebug.

Location:

trunk/docx4j/src/main/java/org/docx4j

Files:

• XmlUtils.java (modified) (1 diff)
• jaxb/NamespacePrefixMapperUtils.java (modified) (2 diffs)

trunk/docx4j/src/main/java/org/docx4j/XmlUtils.java

@@ -178 +178 @@
                 String prefix = null;
                 if (o.getName().getNamespaceURI()!=null) {
-                        prefix = NamespacePrefixMapper.getPreferredPrefix(o.getName().getNamespaceURI() );
+                        try {
+                                prefix = NamespacePrefixMapperUtils.getPreferredPrefix(o.getName().getNamespaceURI(), null, false);
+                        } catch (JAXBException e) {
+                                e.printStackTrace();
+                        }
                 }
                 if (prefix!=null) {

trunk/docx4j/src/main/java/org/docx4j/jaxb/NamespacePrefixMapperUtils.java

@@ -16 +16 @@
         try {
                 c = Class.forName("com.sun.xml.bind.marshaller.NamespacePrefixMapper");
-                return new NamespacePrefixMapper();
+                return new NamespacePrefixMapper();  // JAXB Reference Implementation 
         } catch (ClassNotFoundException cnfe) {
                 // JAXB Reference Implementation not present
+                // Use Java 6 implementation
                 log.info("JAXB RI (com.sun.xml.bind.marshaller.NamespacePrefixMapper) not present.  Trying Java 6 implementation.");
                 try {
@@ -96 +97 @@
         }
         
+        public static String getPreferredPrefix(String namespaceUri, String suggestion, boolean requirePrefix) throws JAXBException {
+
+                Object namespacePrefixMapper = getPrefixMapper();
+                
+                if ( namespacePrefixMapper instanceof NamespacePrefixMapperSunInternal) {
+                        // Java 6
+                        return ((NamespacePrefixMapperSunInternal)namespacePrefixMapper).getPreferredPrefix(namespaceUri, suggestion, requirePrefix); 
+                        
+                } else if (namespacePrefixMapper instanceof NamespacePrefixMapper) {
+                // JAXB Reference Implementation                
+                        return ((NamespacePrefixMapper)namespacePrefixMapper).getPreferredPrefix(namespaceUri, suggestion, requirePrefix); 
+                        
+                } else {
+                        log.warn("Namespace prefix mapper not found!");
+                        return null;
+                }
+                
+        }
+        
 }