Update of /cvsroot/jaxme/JaxMe2/src/net/sf/jaxme/generator/javasg/types
In directory sc8-pr-cvs1:/tmp/cvs-serv3549/src/net/sf/jaxme/generator/javasg/types
Modified Files:
TypeSGImpl.java Base64BinaryTypeSG.java ComplexTypeSGImpl.java
DurationTypeSG.java StringTypeSG.java HexBinaryTypeSG.java
Log Message:
Made the test suite working again. Bugfix by Marty Kube.
Index: TypeSGImpl.java
===================================================================
RCS file:
/cvsroot/jaxme/JaxMe2/src/net/sf/jaxme/generator/javasg/types/TypeSGImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- TypeSGImpl.java 8 Feb 2003 02:06:33 -0000 1.5
+++ TypeSGImpl.java 12 Feb 2003 18:55:44 -0000 1.6
@@ -277,35 +277,40 @@
result = getClassName(pType, SchemaClass.CLASS_TYPE_XML_INTERFACE);
String packageName = getPackageName(pType);
if (packageName == null) {
- packageName = result.getPackageName();
+ JavaQName implClassName = getClassName(pType, SchemaClass.CLASS_TYPE_XML);
+ packageName = implClassName.getPackageName();
}
result = JavaQNameImpl.getInstance(packageName, result.getClassName() + "Impl");
} else if (SchemaClass.CLASS_TYPE_MANAGER.equals(pClassType)) {
result = getClassName(pType, SchemaClass.CLASS_TYPE_XML_INTERFACE);
String packageName = getPackageName(pType);
if (packageName == null) {
- packageName = getPackageName(pType);
+ JavaQName implClassName = getClassName(pType, SchemaClass.CLASS_TYPE_XML);
+ packageName = implClassName.getPackageName();
}
result = JavaQNameImpl.getInstance(packageName, result.getClassName() +
"Manager");
} else if (SchemaClass.CLASS_TYPE_UNMARSHALLER.equals(pClassType)) {
result = getClassName(pType, SchemaClass.CLASS_TYPE_XML_INTERFACE);
String packageName = getPackageName(pType);
if (packageName == null) {
- packageName = getPackageName(pType);
+ JavaQName implClassName = getClassName(pType, SchemaClass.CLASS_TYPE_XML);
+ packageName = implClassName.getPackageName();
}
result = JavaQNameImpl.getInstance(packageName, result.getClassName() +
"Unmarshaller");
} else if (SchemaClass.CLASS_TYPE_MARSHALLER.equals(pClassType)) {
result = getClassName(pType, SchemaClass.CLASS_TYPE_XML_INTERFACE);
String packageName = getPackageName(pType);
if (packageName == null) {
- packageName = result.getPackageName();
+ JavaQName implClassName = getClassName(pType, SchemaClass.CLASS_TYPE_XML);
+ packageName = implClassName.getPackageName();
}
result = JavaQNameImpl.getInstance(packageName, result.getClassName() +
"Marshaller");
} else if (SchemaClass.CLASS_TYPE_VALIDATOR.equals(pClassType)) {
result = getClassName(pType, SchemaClass.CLASS_TYPE_XML_INTERFACE);
String packageName = getPackageName(pType);
if (packageName == null) {
- packageName = result.getPackageName();
+ JavaQName implClassName = getClassName(pType, SchemaClass.CLASS_TYPE_XML);
+ packageName = implClassName.getPackageName();
}
result = JavaQNameImpl.getInstance(packageName, result.getClassName() +
"Validator");
} else if (SchemaClass.CLASS_TYPE_ENUMERATION.equals(pClassType)) {
Index: Base64BinaryTypeSG.java
===================================================================
RCS file:
/cvsroot/jaxme/JaxMe2/src/net/sf/jaxme/generator/javasg/types/Base64BinaryTypeSG.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Base64BinaryTypeSG.java 10 Feb 2003 21:07:46 -0000 1.1
+++ Base64BinaryTypeSG.java 12 Feb 2003 18:55:44 -0000 1.2
@@ -51,8 +51,7 @@
}
public Object getCastToString(SchemaSimpleType pType, JavaMethod pMethod,
- Object pValue,
- ComplexTypeSG.UnmarshallerSGData pUnmarshallerData)
+ Object pValue, Object pSerializerData)
throws SchemaException {
return new Object[]{Base64Binary.class, ".encode(", pValue, ")"};
}
Index: ComplexTypeSGImpl.java
===================================================================
RCS file:
/cvsroot/jaxme/JaxMe2/src/net/sf/jaxme/generator/javasg/types/ComplexTypeSGImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ComplexTypeSGImpl.java 31 Jan 2003 20:15:55 -0000 1.4
+++ ComplexTypeSGImpl.java 12 Feb 2003 18:55:44 -0000 1.5
@@ -958,7 +958,8 @@
} else {
SchemaSimpleType sst = (SchemaSimpleType) st;
SimpleTypeSG stsg = getFactory().getSimpleTypeSG(sst);
- Object v = new Object[]{arrayVar, ".get(", loopVar, ")"};
+ Object v = new Object[]{"((", sst.getRuntimeType(), ") ", arrayVar,
+ ".get(", loopVar, "))"};
v = stsg.getCastToString(sst, jm, v, "pData");
jm.addLine("marshalAtomicChild(pData, ",
JavaSource.getQuoted(child.getQName().getNamespaceURI()),
Index: DurationTypeSG.java
===================================================================
RCS file:
/cvsroot/jaxme/JaxMe2/src/net/sf/jaxme/generator/javasg/types/DurationTypeSG.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DurationTypeSG.java 10 Feb 2003 21:07:46 -0000 1.2
+++ DurationTypeSG.java 12 Feb 2003 18:55:44 -0000 1.3
@@ -51,8 +51,7 @@
}
public Object getCastToString(SchemaSimpleType pType, JavaMethod pMethod,
- Object pValue,
- ComplexTypeSG.UnmarshallerSGData pUnmarshallerData)
+ Object pValue, Object pSerializerData)
throws SchemaException {
return new Object[]{pValue, ".toString()"};
}
Index: StringTypeSG.java
===================================================================
RCS file:
/cvsroot/jaxme/JaxMe2/src/net/sf/jaxme/generator/javasg/types/StringTypeSG.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- StringTypeSG.java 9 Feb 2003 17:51:57 -0000 1.5
+++ StringTypeSG.java 12 Feb 2003 18:55:44 -0000 1.6
@@ -25,8 +25,7 @@
}
public Object getCastToString(SchemaSimpleType pType, JavaMethod pMethod,
- Object pValue,
- ComplexTypeSG.UnmarshallerSGData pUnmarshallerData)
+ Object pValue, Object pSerializerData)
throws SchemaException {
return pValue;
}
Index: HexBinaryTypeSG.java
===================================================================
RCS file:
/cvsroot/jaxme/JaxMe2/src/net/sf/jaxme/generator/javasg/types/HexBinaryTypeSG.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- HexBinaryTypeSG.java 10 Feb 2003 21:07:46 -0000 1.1
+++ HexBinaryTypeSG.java 12 Feb 2003 18:55:45 -0000 1.2
@@ -49,8 +49,7 @@
}
public Object getCastToString(SchemaSimpleType pType, JavaMethod pMethod,
- Object pValue,
- ComplexTypeSG.UnmarshallerSGData pUnmarshallerData)
+ Object pValue, Object pSerializerData)
throws SchemaException {
return new Object[]{HexBinary.class, ".encode(", pValue, ")"};
}
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Jaxme-jaxb-dev mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jaxme-jaxb-dev
