You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jaxme-dev@ws.apache.org by jo...@apache.org on 2006/09/19 15:13:21 UTC
svn commit: r447838 - in /webservices/jaxme/branches: MAVEN/
MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/
MAVEN/projects/jm/src/test/resources/ b0_5/
b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/ b0_5/src/test/jaxb/
Author: jochen
Date: Tue Sep 19 06:13:19 2006
New Revision: 447838
URL: http://svn.apache.org/viewvc?view=rev&rev=447838
Log:
Invalid code was generated for an xs:list with item type xs:QName.
Modified:
webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/AtomicTypeSGImpl.java
webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/DateTimeSG.java
webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/DecimalSG.java
webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/PrimitiveTypeSG.java
webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/QNameSG.java
webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/types.xsd
webservices/jaxme/branches/MAVEN/status.xml
webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/AtomicTypeSGImpl.java
webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/DateTimeSG.java
webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/DecimalSG.java
webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/PrimitiveTypeSG.java
webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/QNameSG.java
webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/StringSG.java
webservices/jaxme/branches/b0_5/src/test/jaxb/types.xsd
webservices/jaxme/branches/b0_5/status.xml
Modified: webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/AtomicTypeSGImpl.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/AtomicTypeSGImpl.java?view=diff&rev=447838&r1=447837&r2=447838
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/AtomicTypeSGImpl.java (original)
+++ webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/AtomicTypeSGImpl.java Tue Sep 19 06:13:19 2006
@@ -108,12 +108,8 @@
}
public TypedValue getCastToString(SimpleTypeSG pController, JavaMethod pMethod, Object pValue, DirectAccessible pData) {
- return getCastToString(pController, pValue, pData);
- }
-
- public TypedValue getCastToString(SimpleTypeSG pController, Object pValue, DirectAccessible pData) {
- return new TypedValueImpl(new Object[]{pData, ".getDatatypeConverter().print" + getDatatypeName() + "(", pValue, ")"},
- String.class);
+ return new TypedValueImpl(new Object[]{pData, ".getDatatypeConverter().print" + getDatatypeName() + "(", pValue, ")"},
+ String.class);
}
public Object getEqualsCheck(SimpleTypeSG pController, JavaMethod pMethod, Object pValue1, Object pValue2)
Modified: webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/DateTimeSG.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/DateTimeSG.java?view=diff&rev=447838&r1=447837&r2=447838
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/DateTimeSG.java (original)
+++ webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/DateTimeSG.java Tue Sep 19 06:13:19 2006
@@ -118,7 +118,7 @@
}
}
- public TypedValue getCastToString(SimpleTypeSG pController, Object pValue, DirectAccessible pData) {
+ public final TypedValue getCastToString(SimpleTypeSG pController, JavaMethod pMethod, Object pValue, DirectAccessible pData) {
Object v = new Object[]{pData, ".getJMMarshaller().get" + getDatatypeName()
+ "Format().format(", pValue, ")"};
return new TypedValueImpl(v, StringSG.STRING_TYPE);
Modified: webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/DecimalSG.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/DecimalSG.java?view=diff&rev=447838&r1=447837&r2=447838
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/DecimalSG.java (original)
+++ webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/DecimalSG.java Tue Sep 19 06:13:19 2006
@@ -22,7 +22,6 @@
import org.apache.ws.jaxme.generator.sg.SGlet;
import org.apache.ws.jaxme.generator.sg.SchemaSG;
import org.apache.ws.jaxme.generator.sg.SimpleTypeSG;
-import org.apache.ws.jaxme.impl.DatatypeConverterImpl;
import org.apache.ws.jaxme.js.JavaMethod;
import org.apache.ws.jaxme.js.JavaQName;
import org.apache.ws.jaxme.js.JavaQNameImpl;
@@ -32,6 +31,7 @@
import org.apache.ws.jaxme.xs.XSType;
import org.apache.ws.jaxme.xs.parser.impl.LocSAXException;
import org.xml.sax.SAXException;
+
/**
* @author <a href="mailto:joe@ispsoft.de">Jochen Wiedmann</a>
Modified: webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/PrimitiveTypeSG.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/PrimitiveTypeSG.java?view=diff&rev=447838&r1=447837&r2=447838
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/PrimitiveTypeSG.java (original)
+++ webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/PrimitiveTypeSG.java Tue Sep 19 06:13:19 2006
@@ -57,11 +57,11 @@
return v;
}
- public TypedValue getCastToString(SimpleTypeSG pController, Object pValue, DirectAccessible pData) {
+ public TypedValue getCastToString(SimpleTypeSG pController, JavaMethod pMethod, Object pValue, DirectAccessible pData) {
if (pController.isNullable()) {
pValue = new Object[]{pValue, "." + getPrimitiveRuntimeType(pController).getClassName() +"Value()"};
}
- return super.getCastToString(pController, pValue, pData);
+ return super.getCastToString(pController, pMethod, pValue, pData);
}
public void forAllValues(SimpleTypeSG pController, JavaMethod pMethod, Object pValue, SGlet pSGlet) throws SAXException {
Modified: webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/QNameSG.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/QNameSG.java?view=diff&rev=447838&r1=447837&r2=447838
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/QNameSG.java (original)
+++ webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/generator/types/QNameSG.java Tue Sep 19 06:13:19 2006
@@ -67,8 +67,13 @@
".getNamespaceSupport())" }, QNAME_TYPE);
}
- public TypedValue getCastToString(SimpleTypeSG pController, Object pValue, DirectAccessible pData) {
- return new TypedValueImpl(new Object[]{ pData, ".getElementQName(this, ", pValue, ".getNamespaceURI(), ", pValue,
+ public TypedValue getCastToString(SimpleTypeSG pController, JavaMethod pMethod, Object pValue, DirectAccessible pData) {
+ if (!(pValue instanceof DirectAccessible)) {
+ LocalJavaField value = pMethod.newJavaField(QNAME_TYPE);
+ value.addLine(pValue);
+ pValue = value;
+ }
+ return new TypedValueImpl(new Object[]{ pData, ".getElementQName(this, ", pValue, ".getNamespaceURI(), ", pValue,
".getLocalPart())" }, String.class);
}
Modified: webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/types.xsd
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/types.xsd?view=diff&rev=447838&r1=447837&r2=447838
==============================================================================
Binary files - no diff available.
Modified: webservices/jaxme/branches/MAVEN/status.xml
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/MAVEN/status.xml?view=diff&rev=447838&r1=447837&r2=447838
==============================================================================
--- webservices/jaxme/branches/MAVEN/status.xml (original)
+++ webservices/jaxme/branches/MAVEN/status.xml Tue Sep 19 06:13:19 2006
@@ -78,6 +78,9 @@
A jaxb:baseType definition was ignored, if it modified a global type,
which has already been in use.
</action>
+ <action dev="JW" type="fix" context="generator">
+ Invalid code was generated for an xs:list with item type xs:QName.
+ </action>
</release>
<release version="0.5.1" date="Not yet published">
<action dev="JW" type="enhancement" context="js">
Modified: webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/AtomicTypeSGImpl.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/AtomicTypeSGImpl.java?view=diff&rev=447838&r1=447837&r2=447838
==============================================================================
--- webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/AtomicTypeSGImpl.java (original)
+++ webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/AtomicTypeSGImpl.java Tue Sep 19 06:13:19 2006
@@ -108,12 +108,8 @@
}
public TypedValue getCastToString(SimpleTypeSG pController, JavaMethod pMethod, Object pValue, DirectAccessible pData) {
- return getCastToString(pController, pValue, pData);
- }
-
- public TypedValue getCastToString(SimpleTypeSG pController, Object pValue, DirectAccessible pData) {
- return new TypedValueImpl(new Object[]{pData, ".getDatatypeConverter().print" + getDatatypeName() + "(", pValue, ")"},
- String.class);
+ return new TypedValueImpl(new Object[]{pData, ".getDatatypeConverter().print" + getDatatypeName() + "(", pValue, ")"},
+ String.class);
}
public Object getEqualsCheck(SimpleTypeSG pController, JavaMethod pMethod, Object pValue1, Object pValue2)
Modified: webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/DateTimeSG.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/DateTimeSG.java?view=diff&rev=447838&r1=447837&r2=447838
==============================================================================
--- webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/DateTimeSG.java (original)
+++ webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/DateTimeSG.java Tue Sep 19 06:13:19 2006
@@ -118,7 +118,7 @@
}
}
- public TypedValue getCastToString(SimpleTypeSG pController, Object pValue, DirectAccessible pData) {
+ public final TypedValue getCastToString(SimpleTypeSG pController, JavaMethod pMethod, Object pValue, DirectAccessible pData) {
Object v = new Object[]{pData, ".getJMMarshaller().get" + getDatatypeName()
+ "Format().format(", pValue, ")"};
return new TypedValueImpl(v, StringSG.STRING_TYPE);
Modified: webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/DecimalSG.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/DecimalSG.java?view=diff&rev=447838&r1=447837&r2=447838
==============================================================================
--- webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/DecimalSG.java (original)
+++ webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/DecimalSG.java Tue Sep 19 06:13:19 2006
@@ -22,7 +22,6 @@
import org.apache.ws.jaxme.generator.sg.SGlet;
import org.apache.ws.jaxme.generator.sg.SchemaSG;
import org.apache.ws.jaxme.generator.sg.SimpleTypeSG;
-import org.apache.ws.jaxme.impl.DatatypeConverterImpl;
import org.apache.ws.jaxme.js.JavaMethod;
import org.apache.ws.jaxme.js.JavaQName;
import org.apache.ws.jaxme.js.JavaQNameImpl;
@@ -32,6 +31,7 @@
import org.apache.ws.jaxme.xs.XSType;
import org.apache.ws.jaxme.xs.parser.impl.LocSAXException;
import org.xml.sax.SAXException;
+
/**
* @author <a href="mailto:joe@ispsoft.de">Jochen Wiedmann</a>
Modified: webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/PrimitiveTypeSG.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/PrimitiveTypeSG.java?view=diff&rev=447838&r1=447837&r2=447838
==============================================================================
--- webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/PrimitiveTypeSG.java (original)
+++ webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/PrimitiveTypeSG.java Tue Sep 19 06:13:19 2006
@@ -57,11 +57,11 @@
return v;
}
- public TypedValue getCastToString(SimpleTypeSG pController, Object pValue, DirectAccessible pData) {
+ public TypedValue getCastToString(SimpleTypeSG pController, JavaMethod pMethod, Object pValue, DirectAccessible pData) {
if (pController.isNullable()) {
pValue = new Object[]{pValue, "." + getPrimitiveRuntimeType(pController).getClassName() +"Value()"};
}
- return super.getCastToString(pController, pValue, pData);
+ return super.getCastToString(pController, pMethod, pValue, pData);
}
public void forAllValues(SimpleTypeSG pController, JavaMethod pMethod, Object pValue, SGlet pSGlet) throws SAXException {
Modified: webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/QNameSG.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/QNameSG.java?view=diff&rev=447838&r1=447837&r2=447838
==============================================================================
--- webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/QNameSG.java (original)
+++ webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/QNameSG.java Tue Sep 19 06:13:19 2006
@@ -67,8 +67,13 @@
".getNamespaceSupport())" }, QNAME_TYPE);
}
- public TypedValue getCastToString(SimpleTypeSG pController, Object pValue, DirectAccessible pData) {
- return new TypedValueImpl(new Object[]{ pData, ".getElementQName(this, ", pValue, ".getNamespaceURI(), ", pValue,
+ public TypedValue getCastToString(SimpleTypeSG pController, JavaMethod pMethod, Object pValue, DirectAccessible pData) {
+ if (!(pValue instanceof DirectAccessible)) {
+ LocalJavaField value = pMethod.newJavaField(QNAME_TYPE);
+ value.addLine(pValue);
+ pValue = value;
+ }
+ return new TypedValueImpl(new Object[]{ pData, ".getElementQName(this, ", pValue, ".getNamespaceURI(), ", pValue,
".getLocalPart())" }, String.class);
}
Modified: webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/StringSG.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/StringSG.java?view=diff&rev=447838&r1=447837&r2=447838
==============================================================================
--- webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/StringSG.java (original)
+++ webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/generator/types/StringSG.java Tue Sep 19 06:13:19 2006
@@ -60,7 +60,7 @@
return new TypedValueImpl(pValue, STRING_TYPE);
}
- public TypedValue getCastToString(SimpleTypeSG pController, Object pValue, DirectAccessible pData) {
+ public TypedValue getCastToString(SimpleTypeSG pController, JavaMethod pMethod, Object pValue, DirectAccessible pData) {
return new TypedValueImpl(pValue, STRING_TYPE);
}
Modified: webservices/jaxme/branches/b0_5/src/test/jaxb/types.xsd
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/src/test/jaxb/types.xsd?view=diff&rev=447838&r1=447837&r2=447838
==============================================================================
Binary files - no diff available.
Modified: webservices/jaxme/branches/b0_5/status.xml
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/status.xml?view=diff&rev=447838&r1=447837&r2=447838
==============================================================================
--- webservices/jaxme/branches/b0_5/status.xml (original)
+++ webservices/jaxme/branches/b0_5/status.xml Tue Sep 19 06:13:19 2006
@@ -74,6 +74,9 @@
A jaxb:baseType definition was ignored, if it modified a global type,
which has already been in use.
</action>
+ <action dev="JW" type="fix" context="generator">
+ Invalid code was generated for an xs:list with item type xs:QName.
+ </action>
</release>
<release version="0.5.1" date="06-Jan-2006">
<action dev="JW" type="enhancement" context="js">
@@ -88,11 +91,11 @@
<action dev="JW" type="fix" context="generator">
The source distribution did not contain the necessary
build scripts. (JAXME-67, Boris Gruschke,
- <boris at gruschke.de>)
+ boris at gruschke.de)
</action>
<action dev="JW" type="fix" context="runtime">
It wasn't possible to set the properties JAXME_FORMAT_*.
- David Gilliland <dgilliland62 at users.sourceforge.net>
+ (David Gilliland, dgilliland62 at users.sourceforge.net)
</action>
<action dev="JW" type="fix" context="generator">
The generated marshallers didn't honor the JAXME_FORMAT_*.
---------------------------------------------------------------------
To unsubscribe, e-mail: jaxme-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: jaxme-dev-help@ws.apache.org