You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by ra...@apache.org on 2005/05/13 01:16:34 UTC
svn commit: r169907 - in /xmlbeans/trunk/src:
typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeCodePrinter.java
typeimpl/org/apache/xmlbeans/impl/schema/StscTranslator.java
xmlpublic/org/apache/xmlbeans/XmlErrorCodes.java
xmlpublic/org/apache/xmlbeans/message.properties
Author: radup
Date: Thu May 12 16:16:32 2005
New Revision: 169907
URL: http://svn.apache.org/viewcvs?rev=169907&view=rev
Log:
A few minor fixes.
Modified:
xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeCodePrinter.java
xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscTranslator.java
xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlErrorCodes.java
xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/message.properties
Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeCodePrinter.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeCodePrinter.java?rev=169907&r1=169906&r2=169907&view=diff
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeCodePrinter.java (original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeCodePrinter.java Thu May 12 16:16:32 2005
@@ -1039,7 +1039,16 @@
emit("java.util.List<" + wrappedType + "> get" + propertyName + "List();");
}
- printJavaDoc("Gets array of all " + propdesc + "s");
+ if (_useJava15)
+ {
+ emit("");
+ emit("/**");
+ emit(" * Gets array of all " + propdesc + "s");
+ emit(" * @deprecated");
+ emit(" */");
+ }
+ else
+ printJavaDoc("Gets array of all " + propdesc + "s");
emit(type + "[] get" + arrayName + "();");
printJavaDoc("Gets ith " + propdesc);
@@ -1053,7 +1062,16 @@
emit("java.util.List<" + xtype + "> xget" + propertyName + "List();");
}
- printJavaDoc("Gets (as xml) array of all " + propdesc + "s");
+ if (_useJava15)
+ {
+ emit("");
+ emit("/**");
+ emit(" * Gets (as xml) array of all " + propdesc + "s");
+ emit(" * @deprecated");
+ emit(" */");
+ }
+ else
+ printJavaDoc("Gets (as xml) array of all " + propdesc + "s");
emit(xtype + "[] xget" + arrayName + "();");
printJavaDoc("Gets (as xml) ith " + propdesc);
@@ -1127,7 +1145,7 @@
if (!xmltype)
{
printJavaDoc("Sets (as xml) array of all " + propdesc);
- emit("void xset" + arrayName + "(" + xtype + "[]" + safeVarName + "Array);");
+ emit("void xset" + arrayName + "(" + xtype + "[] " + safeVarName + "Array);");
printJavaDoc("Sets (as xml) ith " + propdesc);
emit("void xset" + arrayName + "(int i, " + xtype + " " + safeVarName + ");");
Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscTranslator.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscTranslator.java?rev=169907&r1=169906&r2=169907&view=diff
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscTranslator.java (original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscTranslator.java Thu May 12 16:16:32 2005
@@ -1159,7 +1159,14 @@
c.dispose();
if (arrayType != null)
{
- wat = new SOAPArrayType(arrayType, new NamespaceContext(xsdElt));
+ try
+ {
+ wat = new SOAPArrayType(arrayType, new NamespaceContext(xsdElt));
+ }
+ catch (XmlValueOutOfRangeException e)
+ {
+ state.error(XmlErrorCodes.SOAPARRAY, new Object[] {arrayType}, xsdElt);
+ }
}
impl.setWsdlArrayType(wat);
@@ -1659,7 +1666,7 @@
}
catch (XmlValueOutOfRangeException e)
{
- state.error(XmlErrorCodes.QNAME, null, xsdAttr);
+ state.error(XmlErrorCodes.SOAPARRAY, new Object[] {arrayType}, xsdAttr);
}
}
Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlErrorCodes.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlErrorCodes.java?rev=169907&r1=169906&r2=169907&view=diff
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlErrorCodes.java (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlErrorCodes.java Thu May 12 16:16:32 2005
@@ -1815,6 +1815,11 @@
/**
*
*/
+ public static final String SOAPARRAY = "soaparray";
+
+ /**
+ *
+ */
public static final String FACET_FIXED = "facet-fixed";
/**
Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/message.properties
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/message.properties?rev=169907&r1=169906&r2=169907&view=diff
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/message.properties (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/message.properties Thu May 12 16:16:32 2005
@@ -912,6 +912,9 @@
cvc-complex-type.prohibited-attribute = \
Attribute is prohibited: {0}
+soaparray = \
+Invalid SOAP Array reference: {0} (prefix declaration not found or incorrect format)
+
facet-fixed = \
The facet ''{0}'' is fixed and cannot be overridden.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org