[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:42:00
Message-ID: E1DzHp2-0003G2-2T () committer01 ! frg ! pub ! inap ! atl ! jboss ! com
[Download RAW message or body]
User: aloubyansky
Date: 05/07/31 13:42:00
Modified: src/main/org/jboss/xb/binding/sunday/unmarshalling
Tag: Branch_4_0 AttributeBinding.java
AttributeHandler.java DefaultSchemaResolver.java
ElementBinding.java SundayContentHandler.java
XsdBinder.java TypeBinding.java
Log:
backport from head: make [Element|Attribute]Binding.get<XXX>MetaData() return \
metadata taking into account metadata inherited from its type binding
Revision Changes Path
No revision
No revision
1.1.2.4 +2 -2 \
jboss-common/src/main/org/jboss/xb/binding/sunday/unmarshalling/AttributeBinding.java \
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AttributeBinding.java
===================================================================
RCS file: /cvsroot/jboss/jboss-common/src/main/org/jboss/xb/binding/sunday/unmarshalling/AttributeBinding.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
--- AttributeBinding.java 29 Jul 2005 15:34:49 -0000 1.1.2.3
+++ AttributeBinding.java 31 Jul 2005 17:41:59 -0000 1.1.2.4
@@ -11,7 +11,7 @@
/**
* @author <a href="mailto:alex@jboss.org">Alexey Loubyansky</a>
- * @version <tt>$Revision: 1.1.2.3 $</tt>
+ * @version <tt>$Revision: 1.1.2.4 $</tt>
*/
public class AttributeBinding
{
@@ -59,7 +59,7 @@
public ValueMetaData getValueMetaData()
{
- return valueMetaData;
+ return valueMetaData != null ? valueMetaData : type.getValueMetaData();
}
public void setValueMetaData(ValueMetaData valueMetaData)
1.1.2.3 +2 -6 \
jboss-common/src/main/org/jboss/xb/binding/sunday/unmarshalling/AttributeHandler.java \
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AttributeHandler.java
===================================================================
RCS file: /cvsroot/jboss/jboss-common/src/main/org/jboss/xb/binding/sunday/unmarshalling/AttributeHandler.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- AttributeHandler.java 25 Jul 2005 16:19:40 -0000 1.1.2.2
+++ AttributeHandler.java 31 Jul 2005 17:41:59 -0000 1.1.2.3
@@ -8,11 +8,12 @@
import javax.xml.namespace.QName;
import javax.xml.namespace.NamespaceContext;
+
import org.jboss.xb.binding.metadata.ValueMetaData;
/**
* @author <a href="mailto:alex@jboss.org">Alexey Loubyansky</a>
- * @version <tt>$Revision: 1.1.2.2 $</tt>
+ * @version <tt>$Revision: 1.1.2.3 $</tt>
*/
public abstract class AttributeHandler
{
@@ -31,11 +32,6 @@
{
TypeBinding type = binding.getType();
ValueMetaData valueMetaData = binding.getValueMetaData();
- if(valueMetaData == null)
- {
- valueMetaData = type.getValueMetaData();
- }
-
return type == null ? value : type.getSimpleType().unmarshal(attrName, type, \
nsCtx, valueMetaData, value); }
1.1.2.2 +1 -1 \
jboss-common/src/main/org/jboss/xb/binding/sunday/unmarshalling/DefaultSchemaResolver.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DefaultSchemaResolver.java
===================================================================
RCS file: /cvsroot/jboss/jboss-common/src/main/org/jboss/xb/binding/sunday/unmarshalling/DefaultSchemaResolver.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- DefaultSchemaResolver.java 29 Jul 2005 15:34:49 -0000 1.1.2.1
+++ DefaultSchemaResolver.java 31 Jul 2005 17:41:59 -0000 1.1.2.2
@@ -19,7 +19,7 @@
* the schema xsd.
*
* @author Scott.Stark@jboss.org
- * @version $Revision: 1.1.2.1 $
+ * @version $Revision: 1.1.2.2 $
*/
public class DefaultSchemaResolver
implements SchemaBindingResolver
1.1.2.5 +26 -8 \
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.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- ElementBinding.java 25 Jul 2005 04:57:16 -0000 1.1.2.4
+++ ElementBinding.java 31 Jul 2005 17:41:59 -0000 1.1.2.5
@@ -19,7 +19,7 @@
/**
* @author <a href="mailto:alex@jboss.org">Alexey Loubyansky</a>
- * @version <tt>$Revision: 1.1.2.4 $</tt>
+ * @version <tt>$Revision: 1.1.2.5 $</tt>
*/
public class ElementBinding
{
@@ -36,7 +36,7 @@
private boolean mapEntryKey;
private boolean mapEntryValue;
private boolean multiOccurs;
- private boolean skip;
+ private Boolean skip;
public ElementBinding(SchemaBinding schema, TypeBinding typeBinding)
{
@@ -71,7 +71,12 @@
public ClassMetaData getClassMetaData()
{
- return classMetaData;
+ ClassMetaData result = classMetaData;
+ if(result == null && mapEntryMetaData == null)
+ {
+ result = typeBinding.getClassMetaData();
+ }
+ return result;
}
public void setClassMetaData(ClassMetaData classMetaData)
@@ -81,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;
}
@@ -91,7 +98,12 @@
public MapEntryMetaData getMapEntryMetaData()
{
- return mapEntryMetaData;
+ MapEntryMetaData result = mapEntryMetaData;
+ if(result == null && classMetaData == null)
+ {
+ result = typeBinding.getMapEntryMetaData();
+ }
+ return result;
}
public void setMapEntryMetaData(MapEntryMetaData mapEntryMetaData)
@@ -101,7 +113,7 @@
public ValueMetaData getValueMetaData()
{
- return valueMetaData;
+ return valueMetaData != null ? valueMetaData : \
typeBinding.getValueMetaData(); }
public void setValueMetaData(ValueMetaData valueMetaData)
@@ -141,6 +153,7 @@
public PutMethodMetaData getPutMethodMetaData()
{
+ // todo should types be allowed to have putMethod metadata
return putMethodMetaData;
}
@@ -151,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)
@@ -166,11 +184,11 @@
public void setSkip(boolean skip)
{
- this.skip = skip;
+ this.skip = skip ? Boolean.TRUE : Boolean.FALSE;
}
public boolean isSkip()
{
- return skip;
+ return skip == null ? typeBinding.isSkip() : skip.booleanValue();
}
}
1.1.2.6 +4 -8 \
jboss-common/src/main/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SundayContentHandler.java
===================================================================
RCS file: /cvsroot/jboss/jboss-common/src/main/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.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
--- SundayContentHandler.java 29 Jul 2005 15:34:49 -0000 1.1.2.5
+++ SundayContentHandler.java 31 Jul 2005 17:41:59 -0000 1.1.2.6
@@ -27,7 +27,7 @@
* re-gathering this same metadata again.
*
* @author <a href="mailto:alex@jboss.org">Alexey Loubyansky</a>
- * @version <tt>$Revision: 1.1.2.5 $</tt>
+ * @version <tt>$Revision: 1.1.2.6 $</tt>
*/
public class SundayContentHandler
implements JBossXBParser.ContentHandler
@@ -121,16 +121,12 @@
ValueMetaData valueMetaData = elementBinding.getValueMetaData();
if(valueMetaData == null)
{
- valueMetaData = typeBinding.getValueMetaData();
- if(valueMetaData == null)
- {
CharactersMetaData charactersMetaData = \
typeBinding.getCharactersMetaData(); if(charactersMetaData != null)
{
valueMetaData = charactersMetaData.getValue();
}
}
- }
// todo valueMetaData is available from typeBinding
unmarshalled = dataContent == null ?
1.1.2.10 +1 -1 \
jboss-common/src/main/org/jboss/xb/binding/sunday/unmarshalling/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/XsdBinder.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -b -r1.1.2.9 -r1.1.2.10
--- XsdBinder.java 29 Jul 2005 15:34:49 -0000 1.1.2.9
+++ XsdBinder.java 31 Jul 2005 17:41:59 -0000 1.1.2.10
@@ -52,7 +52,7 @@
/**
* @author <a href="mailto:alex@jboss.org">Alexey Loubyansky</a>
- * @version <tt>$Revision: 1.1.2.9 $</tt>
+ * @version <tt>$Revision: 1.1.2.10 $</tt>
*/
public class XsdBinder
{
1.1.2.8 +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.1.2.7
retrieving revision 1.1.2.8
diff -u -b -r1.1.2.7 -r1.1.2.8
--- TypeBinding.java 29 Jul 2005 15:34:49 -0000 1.1.2.7
+++ TypeBinding.java 31 Jul 2005 17:41:59 -0000 1.1.2.8
@@ -27,7 +27,7 @@
/**
* @author <a href="mailto:alex@jboss.org">Alexey Loubyansky</a>
- * @version <tt>$Revision: 1.1.2.7 $</tt>
+ * @version <tt>$Revision: 1.1.2.8 $</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]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic