Author: rfeng
Date: Thu Sep 21 16:11:10 2006
New Revision: 448732
URL: http://svn.apache.org/viewvc?view=rev&rev=448732
Log:
Code clean and minor improvement
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/extension/SimpleTypeMapperExtension.java
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/extension/SimpleTypeMapperExtensionTestCase.java
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/extension/SimpleTypeMapperExtension.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/extension/SimpleTypeMapperExtension.java?view=diff&rev=448732&r1=448731&r2=448732
==============================================================================
---
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/extension/SimpleTypeMapperExtension.java
(original)
+++
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/extension/SimpleTypeMapperExtension.java
Thu Sep 21 16:11:10 2006
@@ -100,9 +100,6 @@
}
public Object toJavaObject(XmlSchemaSimpleType simpleType, String value,
TransformationContext context) {
- NamespaceContext namespaceContext =
- (NamespaceContext) ((context != null) ?
context.getMetadata().get(NamespaceContext.class) : null);
-
/**
* <ul>
* <li>xsd:string --- java.lang.String
@@ -180,8 +177,12 @@
} else if (type.equals(XSD_BASE64)) {
return parseBase64Binary(value);
} else if (type.equals(XSD_QNAME)) {
+ NamespaceContext namespaceContext =
+ (NamespaceContext) ((context != null) ?
context.getMetadata().get(NamespaceContext.class) : null);
return parseQName(value, namespaceContext);
} else if (type.equals(XSD_NOTATION)) {
+ NamespaceContext namespaceContext =
+ (NamespaceContext) ((context != null) ?
context.getMetadata().get(NamespaceContext.class) : null);
return parseQName(value, namespaceContext);
} else if (type.equals(XSD_YEAR)) {
return factory.newXMLGregorianCalendar(value);
@@ -200,28 +201,13 @@
public String toXMLLiteral(XmlSchemaSimpleType simpleType, Object obj,
TransformationContext context) {
if (obj instanceof Float || obj instanceof Double) {
- double data;
if (obj instanceof Float) {
- data = ((Float) obj).doubleValue();
+ return printDouble(((Float) obj).floatValue());
} else {
- data = ((Double) obj).doubleValue();
- }
- if (Double.isNaN(data)) {
- return "NaN";
- } else if (data == Double.POSITIVE_INFINITY) {
- return "INF";
- } else if (data == Double.NEGATIVE_INFINITY) {
- return "-INF";
- } else {
- return obj.toString();
+ return printDouble(((Double) obj).doubleValue());
}
} else if (obj instanceof GregorianCalendar) {
GregorianCalendar calendar = (GregorianCalendar) obj;
- /*
- * if (type.equals(XSD_DATE)) { return printDate(calendar); } else
if (type.equals(XSD_TIME)) { return
- * printTime(calendar); } else if (type.equals(XSD_DATETIME)) {
return printDateTime(calendar); } else {
- * return printDateTime(calendar); }
- */
return toXMLGregorianCalendar(calendar).toXMLFormat();
} else if (obj instanceof Date) {
return toXMLGregorianCalendar((Date) obj).toXMLFormat();
@@ -234,6 +220,10 @@
} else if (simpleType.getQName().equals(XSD_HEXBIN)) {
return printHexBinary((byte[]) obj);
}
+ } else if(obj instanceof QName) {
+ NamespaceContext namespaceContext =
+ (NamespaceContext) ((context != null) ?
context.getMetadata().get(NamespaceContext.class) : null);
+ return printQName((QName) obj, namespaceContext);
}
return obj.toString();
}
Modified:
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/extension/SimpleTypeMapperExtensionTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/extension/SimpleTypeMapperExtensionTestCase.java?view=diff&rev=448732&r1=448731&r2=448732
==============================================================================
---
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/extension/SimpleTypeMapperExtensionTestCase.java
(original)
+++
incubator/tuscany/java/sca/services/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/extension/SimpleTypeMapperExtensionTestCase.java
Thu Sep 21 16:11:10 2006
@@ -84,6 +84,7 @@
TransformationContext context = new TransformationContextImpl();
NamespaceContext namespaceContext =
EasyMock.createMock(NamespaceContext.class);
EasyMock.expect(namespaceContext.getNamespaceURI(EasyMock.eq("f"))).andReturn("http://foo";).anyTimes();
+
EasyMock.expect(namespaceContext.getPrefix(EasyMock.eq("http://foo";))).andReturn("f").anyTimes();
EasyMock.replay(namespaceContext);
context.getMetadata().put(NamespaceContext.class, namespaceContext);
for (XmlSchemaSimpleType simpleType :
SimpleTypeMapperExtension.XSD_SIMPLE_TYPES.values()) {
@@ -92,13 +93,16 @@
if (value instanceof String[]) {
for (String s : (String[]) value) {
Object obj = extension.toJavaObject(simpleType, s,
context);
- extension.toXMLLiteral(simpleType, obj, context);
+ String str = extension.toXMLLiteral(simpleType, obj,
context);
+ assertNotNull(str);
+ // assertTrue("[" + name + "] " + s + " " + str,
str.contains((String) s));
}
} else if (value instanceof String) {
Object obj = extension.toJavaObject(simpleType, (String)
value, context);
- extension.toXMLLiteral(simpleType, obj, context);
+ String str = extension.toXMLLiteral(simpleType, obj, context);
+ assertNotNull(str);
+ // assertTrue("[" + name + "] " + value + " " + str,
str.contains((String) value));
}
- // assertTrue("[" + type + "] " + str + " " + value,
str.contains(value));
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
