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/04/07 00:50:12 UTC
svn commit: r160341 - in xmlbeans/trunk/src:
common/org/apache/xmlbeans/impl/common/NameUtil.java
xmlpublic/org/apache/xmlbeans/XmlBeans.java
Author: radup
Date: Wed Apr 6 15:50:10 2005
New Revision: 160341
URL: http://svn.apache.org/viewcvs?view=rev&rev=160341
Log:
Two small fixes.
Modified:
xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/NameUtil.java
xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java
Modified: xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/NameUtil.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/NameUtil.java?view=diff&r1=160340&r2=160341
==============================================================================
--- xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/NameUtil.java (original)
+++ xmlbeans/trunk/src/common/org/apache/xmlbeans/impl/common/NameUtil.java Wed Apr 6 15:50:10 2005
@@ -403,7 +403,10 @@
StringBuffer buf = new StringBuffer(name);
for (int i = 0; i < name.length(); i++)
{
- if (!Character.isJavaIdentifierPart(buf.charAt(i)))
+ // We need to also make sure that our package names don't contain the
+ // "$" character in them, which, although a valid Java identifier part,
+ // would create confusion when trying to generate fully-qualified names
+ if (!Character.isJavaIdentifierPart(buf.charAt(i)) || '$' == buf.charAt(i))
buf.setCharAt(i, '_');
}
if (buf.length() == 0 || !Character.isJavaIdentifierStart(buf.charAt(0)))
Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java?view=diff&r1=160340&r2=160341
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java Wed Apr 6 15:50:10 2005
@@ -642,9 +642,6 @@
*/
public static SchemaTypeSystem compileXmlBeans(String name, SchemaTypeSystem system, XmlObject[] schemas, BindingConfig config, SchemaTypeLoader typepath, Filer filer, XmlOptions options) throws XmlException
{
- if (typepath == null)
- throw new IllegalArgumentException("Must supply a SchemaTypeLoader for compiletime linking");
-
try
{
return (SchemaTypeSystem)_compilationMethod.invoke(null, new Object[] { name, system, schemas, config, typepath != null ? typepath : getContextTypeLoader(), filer, options });
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org