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

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

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

Modified Files:
	BindingGenerator.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: BindingGenerator.java
===================================================================
RCS file: /cvsroot/jibx/core/build/src/org/jibx/binding/BindingGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** BindingGenerator.java	25 Jun 2008 12:29:45 -0000	1.7
--- BindingGenerator.java	28 Apr 2009 12:52:53 -0000	1.8
***************
*** 1,4 ****
  /*
! Copyright (c) 2004-2008, Dennis M. Sosnoski
  All rights reserved.
  
--- 1,4 ----
  /*
! Copyright (c) 2004-2009, Dennis M. Sosnoski.
  All rights reserved.
  
***************
*** 284,288 ****
                      
                      // check for standard library classes we can handle
!                     ClassFile pcf = ClassCache.getClassFile(tname);
                      ClassItem init = pcf.getInitializerMethod
                          ("(Ljava/lang/String;)");
--- 284,288 ----
                      
                      // check for standard library classes we can handle
!                     ClassFile pcf = ClassCache.requireClassFile(tname);
                      ClassItem init = pcf.getInitializerMethod
                          ("(Ljava/lang/String;)");
***************
*** 302,306 ****
                      int split = mname.lastIndexOf('.');
                      ClassFile dcf =
!                         ClassCache.getClassFile(mname.substring(0, split));
                      ClassItem dser =
                          dcf.getStaticMethod(mname.substring(split+1),
--- 302,306 ----
                      int split = mname.lastIndexOf('.');
                      ClassFile dcf =
!                         ClassCache.requireClassFile(mname.substring(0, split));
                      ClassItem dser =
                          dcf.getStaticMethod(mname.substring(split+1),
***************
*** 373,377 ****
                      
                      // no defined handling, check for collection vs. structure
!                     ClassFile pcf = ClassCache.getClassFile(tname);
                      StructureElementBase element;
                      if (pcf.isImplements("Ljava/util/List;")) {
--- 373,377 ----
                      
                      // no defined handling, check for collection vs. structure
!                     ClassFile pcf = ClassCache.requireClassFile(tname);
                      StructureElementBase element;
                      if (pcf.isImplements("Ljava/util/List;")) {
***************
*** 470,474 ****
                          
                          // check for standard library classes we can handle
!                         ClassFile pcf = ClassCache.getClassFile(tname);
                          if (pcf.getInitializerMethod("()") != null) {
                              simple = pcf.getMethod("toString",
--- 470,474 ----
                          
                          // check for standard library classes we can handle
!                         ClassFile pcf = ClassCache.requireClassFile(tname);
                          if (pcf.getInitializerMethod("()") != null) {
                              simple = pcf.getMethod("toString",
***************
*** 498,503 ****
                          String mname = (String)m_enumerationNames.get(tname);
                          int split = mname.lastIndexOf('.');
!                         ClassFile dcf =
!                             ClassCache.getClassFile(mname.substring(0, split));
                          ClassItem dser =
                              dcf.getStaticMethod(mname.substring(split+1),
--- 498,503 ----
                          String mname = (String)m_enumerationNames.get(tname);
                          int split = mname.lastIndexOf('.');
!                         ClassFile dcf = ClassCache.
!                             requireClassFile(mname.substring(0, split));
                          ClassItem dser =
                              dcf.getStaticMethod(mname.substring(split+1),
***************
*** 557,561 ****
                          
                          // no defined handling, check collection vs. structure
!                         ClassFile pcf = ClassCache.getClassFile(tname);
                          StructureElementBase element;
                          if (pcf.isImplements("Ljava/util/List;")) {
--- 557,561 ----
                          
                          // no defined handling, check collection vs. structure
!                         ClassFile pcf = ClassCache.requireClassFile(tname);
                          StructureElementBase element;
                          if (pcf.isImplements("Ljava/util/List;")) {
***************
*** 832,836 ****
              boolean drop = false;
              String name = (String)names.get(i);
!             ClassFile cf = ClassCache.getClassFile(name);
              if (cf.isImplements("Ljava/util/List;") ||
                  cf.isImplements("Ljava/util/Map;")) {
--- 832,836 ----
              boolean drop = false;
              String name = (String)names.get(i);
!             ClassFile cf = ClassCache.requireClassFile(name);
              if (cf.isImplements("Ljava/util/List;") ||
                  cf.isImplements("Ljava/util/Map;")) {
***************
*** 888,892 ****
              String cname = (String)names.get(i);
              if (!abstracts.contains(cname)) {
!                 ClassFile cf = ClassCache.getClassFile(cname);
                  MappingElementBase mapping = createMapping(cf, false);
                  mapping.setComment(" generated mapping for class " + cname);
--- 888,892 ----
              String cname = (String)names.get(i);
              if (!abstracts.contains(cname)) {
!                 ClassFile cf = ClassCache.requireClassFile(cname);
                  MappingElementBase mapping = createMapping(cf, false);
                  mapping.setComment(" generated mapping for class " + cname);
***************
*** 896,900 ****
          for (Iterator iter = abstracts.iterator(); iter.hasNext();) {
              String cname = (String)iter.next();
!             ClassFile cf = ClassCache.getClassFile(cname);
              MappingElementBase mapping = createMapping(cf, true);
              mapping.setComment(" generate abstract mapping for class " + cname);
--- 896,900 ----
          for (Iterator iter = abstracts.iterator(); iter.hasNext();) {
              String cname = (String)iter.next();
!             ClassFile cf = ClassCache.requireClassFile(cname);
              MappingElementBase mapping = createMapping(cf, true);
              mapping.setComment(" generate abstract mapping for class " + cname);


------------------------------------------------------------------------------
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]