[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:13:37
Message-ID: E1DzHNZ-0002th-Jt () committer01 ! frg ! pub ! inap ! atl ! jboss ! com
[Download RAW message or body]
User: aloubyansky
Date: 05/07/31 13:13:37
Modified: src/main/org/jboss/xb/binding/sunday/unmarshalling
AttributeBinding.java AttributeHandler.java
DefaultSchemaResolver.java ElementBinding.java
SundayContentHandler.java XsdBinder.java
Log:
make [Element|Attribute]Binding.get<XXX>MetaData() return metadata taking into \
account metadata inherited from its type binding
Revision Changes Path
1.6 +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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- AttributeBinding.java 25 Jul 2005 16:21:15 -0000 1.5
+++ AttributeBinding.java 31 Jul 2005 17:13:37 -0000 1.6
@@ -11,7 +11,7 @@
/**
* @author <a href="mailto:alex@jboss.org">Alexey Loubyansky</a>
- * @version <tt>$Revision: 1.5 $</tt>
+ * @version <tt>$Revision: 1.6 $</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.4 +1 -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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- AttributeHandler.java 25 Jul 2005 16:21:15 -0000 1.3
+++ AttributeHandler.java 31 Jul 2005 17:13:37 -0000 1.4
@@ -13,7 +13,7 @@
/**
* @author <a href="mailto:alex@jboss.org">Alexey Loubyansky</a>
- * @version <tt>$Revision: 1.3 $</tt>
+ * @version <tt>$Revision: 1.4 $</tt>
*/
public abstract class AttributeHandler
{
@@ -32,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.4 +3 -3 \
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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- DefaultSchemaResolver.java 29 Jul 2005 10:15:11 -0000 1.3
+++ DefaultSchemaResolver.java 31 Jul 2005 17:13:37 -0000 1.4
@@ -19,7 +19,7 @@
* the schema xsd.
*
* @author Scott.Stark@jboss.org
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class DefaultSchemaResolver
implements SchemaBindingResolver
@@ -78,7 +78,7 @@
catch (Exception e)
{
if( trace )
- log.trace("Failed to nsUri as systemID", e);
+ log.trace("Failed to use nsUri as systemID", e);
}
if( is == null && schemaLocation != null )
@@ -91,7 +91,7 @@
catch (Exception e)
{
if( trace )
- log.trace("Failed to schemaLocation as systemID", e);
+ log.trace("Failed to use schemaLocation as systemID", e);
}
if( is == null )
1.4 +17 -7 \
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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ElementBinding.java 25 Jul 2005 16:21:15 -0000 1.3
+++ ElementBinding.java 31 Jul 2005 17:13:37 -0000 1.4
@@ -19,7 +19,7 @@
/**
* @author <a href="mailto:alex@jboss.org">Alexey Loubyansky</a>
- * @version <tt>$Revision: 1.3 $</tt>
+ * @version <tt>$Revision: 1.4 $</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)
@@ -91,7 +96,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 +111,7 @@
public ValueMetaData getValueMetaData()
{
- return valueMetaData;
+ return valueMetaData != null ? valueMetaData : \
typeBinding.getValueMetaData(); }
public void setValueMetaData(ValueMetaData valueMetaData)
@@ -166,11 +176,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.11 +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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- SundayContentHandler.java 29 Jul 2005 10:15:11 -0000 1.10
+++ SundayContentHandler.java 31 Jul 2005 17:13:37 -0000 1.11
@@ -27,7 +27,7 @@
* re-gathering this same metadata again.
*
* @author <a href="mailto:alex@jboss.org">Alexey Loubyansky</a>
- * @version <tt>$Revision: 1.10 $</tt>
+ * @version <tt>$Revision: 1.11 $</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.13 +3 -5 \
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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- XsdBinder.java 29 Jul 2005 10:15:11 -0000 1.12
+++ XsdBinder.java 31 Jul 2005 17:13:37 -0000 1.13
@@ -52,7 +52,7 @@
/**
* @author <a href="mailto:alex@jboss.org">Alexey Loubyansky</a>
- * @version <tt>$Revision: 1.12 $</tt>
+ * @version <tt>$Revision: 1.13 $</tt>
*/
public class XsdBinder
{
@@ -92,8 +92,7 @@
* @param encoding - optional stream encoding
* @return SchemaBinding mapping
*/
- public static final SchemaBinding bind(InputStream xsdStream, String encoding,
- String baseURI)
+ public static final SchemaBinding bind(InputStream xsdStream, String encoding, \
String baseURI) {
XSModel model = loadSchema(xsdStream, encoding, baseURI);
return bind(model, baseURI);
@@ -105,8 +104,7 @@
* @param encoding - optional reader encoding
* @return SchemaBinding mapping
*/
- public static final SchemaBinding bind(Reader xsdReader, String encoding,
- String baseURI)
+ public static final SchemaBinding bind(Reader xsdReader, String encoding, \
String baseURI) {
XSModel model = loadSchema(xsdReader, encoding, baseURI);
return bind(model, baseURI);
-------------------------------------------------------
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