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

List:       jboss-cvs-commits
Subject:    [jboss-cvs] jboss-common/src/main/org/jboss/xb/binding/sunday/unmarshalling   ...
From:       Alex Loubyansky <alex () jboss ! com>
Date:       2005-07-31 17:37:07
Message-ID: E1DzHkJ-0003Et-5l () committer01 ! frg ! pub ! inap ! atl ! jboss ! com
[Download RAW message or body]

  User: aloubyansky
  Date: 05/07/31 13:37:07

  Modified:    src/main/org/jboss/xb/binding/sunday/unmarshalling  
                        ElementBinding.java TypeBinding.java
  Log:
  make ElementBinding.getAddMethodMetaData() return metadata taking into account \
metadata inherited from its type binding, removed unused \
TypeBinding.[is|set]MapEntry[Key|Value] methods  
  Revision  Changes    Path
  1.5       +10 -2     \
jboss-common/src/main/org/jboss/xb/binding/sunday/unmarshalling/ElementBinding.java  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ElementBinding.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-common/src/main/org/jboss/xb/binding/sunday/unmarshalling/ElementBinding.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- ElementBinding.java	31 Jul 2005 17:13:37 -0000	1.4
  +++ ElementBinding.java	31 Jul 2005 17:37:07 -0000	1.5
  @@ -19,7 +19,7 @@
   
   /**
    * @author <a href="mailto:alex@jboss.org">Alexey Loubyansky</a>
  - * @version <tt>$Revision: 1.4 $</tt>
  + * @version <tt>$Revision: 1.5 $</tt>
    */
   public class ElementBinding
   {
  @@ -86,6 +86,8 @@
   
      public PropertyMetaData getPropertyMetaData()
      {
  +      // todo: this method doesn't check property metadata on its type because the \
rules to use property  +      // metadata on a type should be clarified.
         return propertyMetaData;
      }
   
  @@ -151,6 +153,7 @@
   
      public PutMethodMetaData getPutMethodMetaData()
      {
  +      // todo should types be allowed to have putMethod metadata
         return putMethodMetaData;
      }
   
  @@ -161,7 +164,12 @@
   
      public AddMethodMetaData getAddMethodMetaData()
      {
  -      return addMethodMetaData;
  +      AddMethodMetaData result =  addMethodMetaData;
  +      if(result == null && putMethodMetaData == null && propertyMetaData == null)
  +      {
  +         result = typeBinding.getAddMethodMetaData();
  +      }
  +      return result;
      }
   
      public void setAddMethodMetaData(AddMethodMetaData addMethodMetaData)
  
  
  
  1.10      +1 -25     \
jboss-common/src/main/org/jboss/xb/binding/sunday/unmarshalling/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/TypeBinding.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- TypeBinding.java	29 Jul 2005 10:15:11 -0000	1.9
  +++ TypeBinding.java	31 Jul 2005 17:37:07 -0000	1.10
  @@ -27,7 +27,7 @@
   
   /**
    * @author <a href="mailto:alex@jboss.org">Alexey Loubyansky</a>
  - * @version <tt>$Revision: 1.9 $</tt>
  + * @version <tt>$Revision: 1.10 $</tt>
    */
   public class TypeBinding
   {
  @@ -43,8 +43,6 @@
      private ValueMetaData valueMetaData;
      private PropertyMetaData propertyMetaData;
      private MapEntryMetaData mapEntryMetaData;
  -   private boolean mapEntryKey;
  -   private boolean mapEntryValue;
      private SchemaBinding schemaBinding; // todo it's optional for now...
      private SchemaBindingResolver schemaResolver;
      private TypeBinding baseType;
  @@ -80,8 +78,6 @@
         this.valueMetaData = baseType.valueMetaData;
         this.propertyMetaData = baseType.propertyMetaData;
         this.mapEntryMetaData = baseType.mapEntryMetaData;
  -      this.mapEntryKey = baseType.mapEntryKey;
  -      this.mapEntryValue = baseType.mapEntryValue;
         this.schemaBinding = baseType.schemaBinding;
         this.schemaResolver = baseType.schemaResolver;
         this.baseType = baseType;
  @@ -366,26 +362,6 @@
         this.schemaResolver = schemaResolver;
      }
   
  -   public boolean isMapEntryKey()
  -   {
  -      return mapEntryKey;
  -   }
  -
  -   public void setMapEntryKey(boolean mapEntryKey)
  -   {
  -      this.mapEntryKey = mapEntryKey;
  -   }
  -
  -   public boolean isMapEntryValue()
  -   {
  -      return mapEntryValue;
  -   }
  -
  -   public void setMapEntryValue(boolean mapEntryValue)
  -   {
  -      this.mapEntryValue = mapEntryValue;
  -   }
  -
      public MapEntryMetaData getMapEntryMetaData()
      {
         return mapEntryMetaData;
  
  
  


-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
jboss-cvs-commits mailing list
jboss-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jboss-cvs-commits


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