[jboss-cvs] jboss-common/src/main/org/jboss/xb/binding/sunday/unmarshalling ...

[Alex L. <al...@jb...>]

  User: aloubyansky
  Date: 05/06/25 14:51:37

  Modified:    src/main/org/jboss/xb/binding/sunday/unmarshalling   Tag:
                        Branch_4_0 TypeBinding.java XsdBinder.java
  Log:
  backport from HEAD: support for jbxb:addMethod in type definition
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.4   +13 -1     jboss-common/src/main/org/jboss/xb/binding/sunday/unmarshalling/Attic/TypeBinding.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TypeBinding.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-common/src/main/org/jboss/xb/binding/sunday/unmarshalling/Attic/TypeBinding.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -b -r1.1.2.3 -r1.1.2.4
  --- TypeBinding.java	24 Jun 2005 13:22:48 -0000	1.1.2.3
  +++ TypeBinding.java	25 Jun 2005 18:51:37 -0000	1.1.2.4
  @@ -18,12 +18,13 @@
   import org.jboss.xb.binding.metadata.PropertyMetaData;
   import org.jboss.xb.binding.metadata.MapEntryMetaData;
   import org.jboss.xb.binding.metadata.CharactersMetaData;
  +import org.jboss.xb.binding.metadata.AddMethodMetaData;
   import org.jboss.xb.binding.sunday.unmarshalling.impl.runtime.RtElementHandler;
   import org.jboss.xb.binding.sunday.unmarshalling.impl.runtime.RtCharactersHandler;
   
   /**
    * @author <a href="mailto:al...@jb...">Alexey Loubyansky</a>
  - * @version <tt>$Revision: 1.1.2.3 $</tt>
  + * @version <tt>$Revision: 1.1.2.4 $</tt>
    */
   public class TypeBinding
   {
  @@ -46,6 +47,7 @@
      private boolean skip;
      private CharactersMetaData charMetaData;
      private PropertyMetaData wildcardPropertyMetaData;
  +   private AddMethodMetaData addMethodMetaData;
   
      public TypeBinding()
      {
  @@ -359,4 +361,14 @@
      {
         this.wildcardPropertyMetaData = wildcardPropertyMetaData;
      }
  +
  +   public void setAddMethodMetaData(AddMethodMetaData addMethodMetaData)
  +   {
  +      this.addMethodMetaData = addMethodMetaData;
  +   }
  +
  +   public AddMethodMetaData getAddMethodMetaData()
  +   {
  +      return addMethodMetaData;
  +   }
   }
  
  
  
  1.1.2.6   +13 -1     jboss-common/src/main/org/jboss/xb/binding/sunday/unmarshalling/Attic/XsdBinder.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: XsdBinder.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-common/src/main/org/jboss/xb/binding/sunday/unmarshalling/Attic/XsdBinder.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -b -r1.1.2.5 -r1.1.2.6
  --- XsdBinder.java	24 Jun 2005 13:22:48 -0000	1.1.2.5
  +++ XsdBinder.java	25 Jun 2005 18:51:37 -0000	1.1.2.6
  @@ -48,7 +48,7 @@
   
   /**
    * @author <a href="mailto:al...@jb...">Alexey Loubyansky</a>
  - * @version <tt>$Revision: 1.1.2.5 $</tt>
  + * @version <tt>$Revision: 1.1.2.6 $</tt>
    */
   public class XsdBinder
   {
  @@ -424,6 +424,18 @@
                        }
                        binding.setPropertyMetaData(propertyMetaData);
                     }
  +
  +                  AddMethodMetaData addMethodMetaData = appInfo.getAddMethodMetaData();
  +                  if(addMethodMetaData != null)
  +                  {
  +                     if(log.isTraceEnabled())
  +                     {
  +                        log.trace("complex type " + type.getName() +
  +                           ": elements of this type will be added to parent objects with addMethod=" +
  +                           addMethodMetaData.getMethodName() + ", valueType=" + addMethodMetaData.getValueType());
  +                     }
  +                     binding.setAddMethodMetaData(addMethodMetaData);
  +                  }
                  }
               }
            }