[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jibx-cvs
Subject:    [Jibx-cvs] core/build/src/org/jibx/binding/model
From:       Dennis Sosnoski <dsosnoski () users ! sourceforge ! net>
Date:       2009-04-28 12:52:55
Message-ID: E1Lymnv-0004TM-C6 () fdv4jf1 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Update of /cvsroot/jibx/core/build/src/org/jibx/binding/model
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17164/src/org/jibx/binding/model


Modified Files:
	BindingOrganizer.java 
Log Message:
Pass default prefix map to BindingOrganizer.configureFiles(), and make sure every \
<namespace> element added to the root binding has a prefix.

Index: BindingOrganizer.java
===================================================================
RCS file: /cvsroot/jibx/core/build/src/org/jibx/binding/model/BindingOrganizer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** BindingOrganizer.java	9 Apr 2009 11:34:55 -0000	1.8
--- BindingOrganizer.java	28 Apr 2009 12:52:53 -0000	1.9
***************
*** 198,205 ****
              if (prefix == null) {
                  prefix = m_uniquePrefixes.add(BASE_PREFIX);
-             }
-             if (m_nsPrefixes.containsKey(uri)) {
                  holder.setPrefix(prefix);
!             } else {
                  if (prefix.length() == 0) {
                      prefix = null;
--- 198,204 ----
              if (prefix == null) {
                  prefix = m_uniquePrefixes.add(BASE_PREFIX);
                  holder.setPrefix(prefix);
!             }
!             if (!m_nsPrefixes.containsKey(uri)) {
                  if (prefix.length() == 0) {
                      prefix = null;
***************
*** 301,307 ****
       * @param pack target package for binding
       * @param pregens pregenerated bindings to be included in root binding
       * @return root or singleton binding holder
       */
!     public BindingHolder configureFiles(String name, String pack, List pregens) {
          
          // make sure not already called
--- 300,307 ----
       * @param pack target package for binding
       * @param pregens pregenerated bindings to be included in root binding
+      * @param dfltprefs map from namespace URI to default prefix
       * @return root or singleton binding holder
       */
!     public BindingHolder configureFiles(String name, String pack, List pregens, Map \
dfltprefs) {  
          // make sure not already called
***************
*** 430,434 ****
              NamespaceElement namespace = new NamespaceElement();
              namespace.setUri(uri);
!             String prefix = (String)m_nsPrefixes.get(uri);
              namespace.setPrefix(prefix);
              rhold.addNamespace(namespace);
--- 430,442 ----
              NamespaceElement namespace = new NamespaceElement();
              namespace.setUri(uri);
!             String prefix;
!             if (m_nsPrefixes.containsKey(uri)) {
!                 prefix = (String)m_nsPrefixes.get(uri);
!             } else {
!                 prefix = (String)dfltprefs.get(uri);
!                 if (prefix == null) {
!                     prefix = m_uniquePrefixes.add(BASE_PREFIX);
!                 }
!             }
              namespace.setPrefix(prefix);
              rhold.addNamespace(namespace);


------------------------------------------------------------------------------
Register Now & Save for Velocity, the Web Performance & Operations 
Conference from O'Reilly Media. Velocity features a full day of 
expert-led, hands-on workshops and two days of sessions from industry 
leaders in dedicated Performance & Operations tracks. Use code vel09scf 
and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
_______________________________________________
Jibx-cvs mailing list
Jibx-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jibx-cvs


[prev in list] [next in list] [prev in thread] [next in thread]