Frederic Ahring wrote:
I checked JavaSource.newJavaField and found it in three places. Below is a
diff.
It seems, you are using the 0.4 branch. Applies you find a suggested
patch for the HEAD (aka 0.5) branch. (Note, that 0.5 beta is already out
and 0.5final will most likely be published in two weeks.) Does that work
as well? (It simply eliminates getInstance(String).)
Jochen
Index: ant/docs.xml
===================================================================
RCS file: /home/cvs/ws-jaxme/ant/docs.xml,v
retrieving revision 1.5
diff -u -r1.5 docs.xml
--- ant/docs.xml 14 Jul 2005 20:27:37 -0000 1.5
+++ ant/docs.xml 27 Jul 2005 20:13:38 -0000
@@ -72,7 +72,7 @@
<target name="all" depends="javadoc,docbook.html,old.releases,forrest,replace"
description="Generates the documentation"/>
- <target name="javadoc" depends="all"
+ <target name="javadoc" depends="PM.all"
description="Generates the API documentation">
<delete dir="${build.apidocs}"/>
<mkdir dir="${build.apidocs}"/>
Index: src/jaxme/org/apache/ws/jaxme/generator/sg/impl/GlobalContext.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/jaxme/org/apache/ws/jaxme/generator/sg/impl/GlobalContext.java,v
retrieving revision 1.6
diff -u -r1.6 GlobalContext.java
--- src/jaxme/org/apache/ws/jaxme/generator/sg/impl/GlobalContext.java 10 Mar 2005 10:14:07 -0000 1.6
+++ src/jaxme/org/apache/ws/jaxme/generator/sg/impl/GlobalContext.java 27 Jul 2005 20:13:39 -0000
@@ -92,7 +92,7 @@
setXMLImplementationName(JavaQNameImpl.getInstance(xmlInterfaceName.getPackageName() + ".impl",
xmlInterfaceName.getClassName() + "Impl"));
} else {
- setXMLImplementationName(JavaQNameImpl.getInstance(implementationName, true));
+ setXMLImplementationName(JavaQNameImpl.getInstance(implementationName));
}
setXMLHandlerName(JavaQNameImpl.getInstance(xmlInterfaceName.getPackageName() + ".impl",
xmlInterfaceName.getClassName() + "Handler"));
Index: src/jaxme/org/apache/ws/jaxme/generator/sg/impl/JAXBTypeSG.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/jaxme/org/apache/ws/jaxme/generator/sg/impl/JAXBTypeSG.java,v
retrieving revision 1.16
diff -u -r1.16 JAXBTypeSG.java
--- src/jaxme/org/apache/ws/jaxme/generator/sg/impl/JAXBTypeSG.java 7 May 2005 19:42:26 -0000 1.16
+++ src/jaxme/org/apache/ws/jaxme/generator/sg/impl/JAXBTypeSG.java 27 Jul 2005 20:13:42 -0000
@@ -393,7 +393,7 @@
SchemaSG pSchema,
XSType pType)
throws SAXException {
- JavaQName qName = JavaQNameImpl.getInstance(pJavaType.getName(), true);
+ JavaQName qName = JavaQNameImpl.getInstance(pJavaType.getName());
if (BooleanSG.BOOLEAN_TYPE.equals(qName)) {
return new BooleanSG(pFactory, pSchema, pType);
} else if (BooleanSG.BOOLEAN_OBJECT_TYPE.equals(qName)) {
Index: src/jaxme/org/apache/ws/jaxme/generator/sg/impl/LocalContext.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/jaxme/org/apache/ws/jaxme/generator/sg/impl/LocalContext.java,v
retrieving revision 1.4
diff -u -r1.4 LocalContext.java
--- src/jaxme/org/apache/ws/jaxme/generator/sg/impl/LocalContext.java 10 Mar 2005 10:14:08 -0000 1.4
+++ src/jaxme/org/apache/ws/jaxme/generator/sg/impl/LocalContext.java 27 Jul 2005 20:13:42 -0000
@@ -65,7 +65,7 @@
setXMLImplementationName(JavaQNameImpl.getInnerInstance(pContext.getXMLImplementationName(),
className + "Impl"));
} else {
- setXMLImplementationName(JavaQNameImpl.getInstance(implementationName, true));
+ setXMLImplementationName(JavaQNameImpl.getInstance(implementationName));
}
setXMLHandlerName(JavaQNameImpl.getInnerInstance(pContext.getXMLHandlerName(), className + "Handler"));
setXMLSerializerName(JavaQNameImpl.getInnerInstance(pContext.getXMLSerializerName(), className + "Driver"));
Index: src/jaxme/org/apache/ws/jaxme/generator/sg/impl/ParsePrintSG.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/jaxme/org/apache/ws/jaxme/generator/sg/impl/ParsePrintSG.java,v
retrieving revision 1.8
diff -u -r1.8 ParsePrintSG.java
--- src/jaxme/org/apache/ws/jaxme/generator/sg/impl/ParsePrintSG.java 18 May 2005 22:09:10 -0000 1.8
+++ src/jaxme/org/apache/ws/jaxme/generator/sg/impl/ParsePrintSG.java 27 Jul 2005 20:13:42 -0000
@@ -38,7 +38,7 @@
if (javaType.getName() == null) {
return pController.getRuntimeType();
} else {
- return JavaQNameImpl.getInstance(javaType.getName(), true);
+ return JavaQNameImpl.getInstance(javaType.getName());
}
}
@@ -51,7 +51,7 @@
qName = getType(pController);
method = pMethod;
} else {
- qName = JavaQNameImpl.getInstance(pMethod.substring(0, offset), true);
+ qName = JavaQNameImpl.getInstance(pMethod.substring(0, offset));
method = pMethod.substring(offset+1);
}
pList.add(qName);
@@ -91,7 +91,7 @@
if (parseMethod.startsWith("new")
&& parseMethod.length() > 3
&& Character.isWhitespace(parseMethod.charAt(3))) {
- JavaQName qName = JavaQNameImpl.getInstance(parseMethod.substring(3).trim(), true);
+ JavaQName qName = JavaQNameImpl.getInstance(parseMethod.substring(3).trim());
list.add("new ");
list.add(qName);
} else {
Index: src/jaxme/org/apache/ws/jaxme/generator/types/ListTypeSGImpl.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/jaxme/org/apache/ws/jaxme/generator/types/ListTypeSGImpl.java,v
retrieving revision 1.4
diff -u -r1.4 ListTypeSGImpl.java
--- src/jaxme/org/apache/ws/jaxme/generator/types/ListTypeSGImpl.java 28 Apr 2005 23:57:53 -0000 1.4
+++ src/jaxme/org/apache/ws/jaxme/generator/types/ListTypeSGImpl.java 27 Jul 2005 20:13:43 -0000
@@ -116,7 +116,7 @@
if ("indexed".equals(collectionType)) {
return new TypedValueImpl(result, itemType.getSimpleTypeSG().getRuntimeType());
} else {
- JavaQName myListType = JavaQNameImpl.getInstance(collectionType, true);
+ JavaQName myListType = JavaQNameImpl.getInstance(collectionType);
return new TypedValueImpl(new Object[]{"(new ", myListType, "(", Arrays.class, ".asList(", result, ")))"}, myListType);
}
}
@@ -126,7 +126,7 @@
LocalJavaField list = pMethod.newJavaField(LIST_TYPE);
String collectionType = pController.getCollectionType();
list.addLine("new ", ("indexed".equals(collectionType) ?
- ARRAYLIST_TYPE : JavaQNameImpl.getInstance(collectionType, true)), "()");
+ ARRAYLIST_TYPE : JavaQNameImpl.getInstance(collectionType)), "()");
DirectAccessible st = pMethod.addForEnumeration(StringTokenizer.class, new Object[]{"new ", StringTokenizer.class, "(", pValue, ")"});
pMethod.addLine(list, ".add(", itemType.getSimpleTypeSG().getCastFromString(pMethod, new Object[]{st, ".nextToken()"}, pData),
");");
@@ -137,7 +137,7 @@
return new TypedValueImpl(new Object[]{"((", iType, ") ", list, ".toArray(new ", iType, "[", list, ".size()]))"},
itemType.getSimpleTypeSG().getRuntimeType());
} else {
- JavaQName myListType = JavaQNameImpl.getInstance(collectionType, true);
+ JavaQName myListType = JavaQNameImpl.getInstance(collectionType);
return new TypedValueImpl(list, myListType);
}
}
@@ -191,7 +191,7 @@
public Object getInitialValue(SimpleTypeSG pController, JavaSource p0) throws SAXException {
String s = pController.getCollectionType();
- JavaQName listClass = "indexed".equals(s) ? ARRAYLIST_TYPE : JavaQNameImpl.getInstance(s, true);
+ JavaQName listClass = "indexed".equals(s) ? ARRAYLIST_TYPE : JavaQNameImpl.getInstance(s);
return new Object[]{"new ", listClass, "()"};
}
Index: src/js/org/apache/ws/jaxme/js/AbstractJavaMethod.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/js/org/apache/ws/jaxme/js/AbstractJavaMethod.java,v
retrieving revision 1.5
diff -u -r1.5 AbstractJavaMethod.java
--- src/js/org/apache/ws/jaxme/js/AbstractJavaMethod.java 19 Jul 2005 19:54:32 -0000 1.5
+++ src/js/org/apache/ws/jaxme/js/AbstractJavaMethod.java 27 Jul 2005 20:13:43 -0000
@@ -97,7 +97,7 @@
* @deprecated Use [EMAIL PROTECTED] #addThrows(JavaQName)}
*/
public void addThrows(String e) {
- exceptions.add(JavaQNameImpl.getInstance(e, true));
+ exceptions.add(JavaQNameImpl.getInstance(e));
if (e == null) {
throw new NullPointerException("The exception argument must not be null.");
}
@@ -138,7 +138,7 @@
throw new NullPointerException("param argument must not be null");
}
p = p.trim();
- addParam(JavaQNameImpl.getInstance(p, true), v);
+ addParam(JavaQNameImpl.getInstance(p), v);
}
/** <p>Adds a parameter that this method takes.</p>
Index: src/js/org/apache/ws/jaxme/js/JavaQNameImpl.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/js/org/apache/ws/jaxme/js/JavaQNameImpl.java,v
retrieving revision 1.4
diff -u -r1.4 JavaQNameImpl.java
--- src/js/org/apache/ws/jaxme/js/JavaQNameImpl.java 11 May 2005 10:41:49 -0000 1.4
+++ src/js/org/apache/ws/jaxme/js/JavaQNameImpl.java 27 Jul 2005 20:13:43 -0000
@@ -259,32 +259,21 @@
return result;
}
- /** <p>Equivalent to <code>getInstance(pClassName, false)</code>.</p>
- */
- public static JavaQName getInstance(String pClassName) {
- return getInstance(null, pClassName);
- }
-
/** <p>Returns an instance with the given class name.</p>
* @param pClassName The class name
- * @param pAssumePackage True, if the class name is assumed to contain a
- * package prefix, in which case the prefix up to the last dot will be
- * the package name and the suffix following the last dot will be the
- * class name. Otherwise the root package is assumed.
*/
- public static JavaQName getInstance(String pClassName, boolean pAssumePackage) {
- if (!pAssumePackage) {
- return getInstance(pClassName);
- } else {
- int offset = pClassName.lastIndexOf('.');
- if (offset == -1) {
- return getInstance(pClassName);
- } else {
- return getInstance(pClassName.substring(0, offset), pClassName.substring(offset+1));
- }
- }
+ public static JavaQName getInstance(String pClassName) {
+ int offset = pClassName.lastIndexOf('.');
+ if (offset == -1) {
+ return getInstance(null, pClassName);
+ } else {
+ return getInstance(pClassName.substring(0, offset), pClassName.substring(offset+1));
+ }
}
+ /** Returns an instance of [EMAIL PROTECTED] JavaQName}, which represents
+ * an array. The array elements are instances of <code>pQName</code>.
+ */
public static JavaQName getArray(JavaQName pQName) {
String name = pQName.toString() + "[]";
JavaQName result;
Index: src/js/org/apache/ws/jaxme/js/JavaSource.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/js/org/apache/ws/jaxme/js/JavaSource.java,v
retrieving revision 1.12
diff -u -r1.12 JavaSource.java
--- src/js/org/apache/ws/jaxme/js/JavaSource.java 27 Jul 2005 19:46:25 -0000 1.12
+++ src/js/org/apache/ws/jaxme/js/JavaSource.java 27 Jul 2005 20:13:47 -0000
@@ -1010,21 +1010,21 @@
* type and default protection.
*/
public JavaMethod newJavaMethod(String pName, String pType) {
- return newJavaMethod(pName, JavaQNameImpl.getInstance(pType, true), (Protection) null);
+ return newJavaMethod(pName, JavaQNameImpl.getInstance(pType), (Protection) null);
}
/** Creates a new JavaMethod with the given name, return
* type and protection.
*/
public JavaMethod newJavaMethod(String pName, String pType, Protection pProtection) {
- return newJavaMethod(pName, JavaQNameImpl.getInstance(pType, true), pProtection);
+ return newJavaMethod(pName, JavaQNameImpl.getInstance(pType), pProtection);
}
/** Creates a new JavaMethod with the given name, return
* type and protection.
*/
public JavaMethod newJavaMethod(String pName, String pType, String pProtection) {
- return newJavaMethod(pName, JavaQNameImpl.getInstance(pType, true),
+ return newJavaMethod(pName, JavaQNameImpl.getInstance(pType),
Protection.valueOf(pProtection));
}
@@ -1160,14 +1160,14 @@
* protection.
*/
public JavaField newJavaField(String pName, String pType, Protection pProtection) {
- return newJavaField(pName, JavaQNameImpl.getInstance(pType, true), pProtection);
+ return newJavaField(pName, JavaQNameImpl.getInstance(pType), pProtection);
}
/** Creates a new JavaField with the given name, type and
* protection.
*/
public JavaField newJavaField(String pName, String pType, String pProtection) {
- return newJavaField(pName, JavaQNameImpl.getInstance(pType, true),
+ return newJavaField(pName, JavaQNameImpl.getInstance(pType),
Protection.valueOf(pProtection));
}
@@ -1175,7 +1175,7 @@
* default protection.
*/
public JavaField newJavaField(String pName, String pType) {
- return newJavaField(pName, JavaQNameImpl.getInstance(pType, true), (Protection) null);
+ return newJavaField(pName, JavaQNameImpl.getInstance(pType), (Protection) null);
}
/** Creates a new JavaField with the given name, type and
Index: src/js/org/apache/ws/jaxme/js/JavaSourceObject.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/js/org/apache/ws/jaxme/js/JavaSourceObject.java,v
retrieving revision 1.4
diff -u -r1.4 JavaSourceObject.java
--- src/js/org/apache/ws/jaxme/js/JavaSourceObject.java 18 May 2005 22:09:10 -0000 1.4
+++ src/js/org/apache/ws/jaxme/js/JavaSourceObject.java 27 Jul 2005 20:13:47 -0000
@@ -34,7 +34,7 @@
if (pType == null) {
throw new NullPointerException("Type must not be null");
}
- setType(JavaQNameImpl.getInstance(pType, true));
+ setType(JavaQNameImpl.getInstance(pType));
setProtection(pProtection);
}
Index: src/js/org/apache/ws/jaxme/js/apps/XmlRpcClientGenerator.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/js/org/apache/ws/jaxme/js/apps/XmlRpcClientGenerator.java,v
retrieving revision 1.7
diff -u -r1.7 XmlRpcClientGenerator.java
--- src/js/org/apache/ws/jaxme/js/apps/XmlRpcClientGenerator.java 7 Oct 2004 22:12:13 -0000 1.7
+++ src/js/org/apache/ws/jaxme/js/apps/XmlRpcClientGenerator.java 27 Jul 2005 20:13:48 -0000
@@ -413,7 +413,7 @@
public JavaSource getDispatcher(JavaQName pQName) {
JavaSource js = getFactory().newJavaSource(pQName, JavaSource.PUBLIC);
if (isDispatcherImplementsXmlRpcHandler()) {
- js.addImport(JavaQNameImpl.getInstance("org.apache.xmlrpc.XmlRpcHandler", true));
+ js.addImport(JavaQNameImpl.getInstance("org.apache.xmlrpc.XmlRpcHandler"));
}
JavaComment comment = js.newComment();
comment.addLine("The dispatcher is being used by the XmlRpcServer.");
Index: src/js/org/apache/ws/jaxme/js/pattern/Ant.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/js/org/apache/ws/jaxme/js/pattern/Ant.java,v
retrieving revision 1.10
diff -u -r1.10 Ant.java
--- src/js/org/apache/ws/jaxme/js/pattern/Ant.java 18 May 2005 22:09:09 -0000 1.10
+++ src/js/org/apache/ws/jaxme/js/pattern/Ant.java 27 Jul 2005 20:13:50 -0000
@@ -209,7 +209,7 @@
}
protected static JavaQName getJavaQName(String pName) {
- return JavaQNameImpl.getInstance(pName, true);
+ return JavaQNameImpl.getInstance(pName);
}
/** The <code>AntProxyGenerator</code> is an Ant task
@@ -659,7 +659,7 @@
Dispatcher disp = getDispatcher();
if (disp != null) {
gen.setDispatcherImplementsXmlRpcHandler(disp.isImplementingXmlRpcHandler());
- gen.getDispatcher(JavaQNameImpl.getInstance(disp.getName(), true));
+ gen.getDispatcher(JavaQNameImpl.getInstance(disp.getName()));
}
jsf.write(getDestDir());
}
Index: src/js/org/apache/ws/jaxme/js/pattern/ChainGenerator.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/js/org/apache/ws/jaxme/js/pattern/ChainGenerator.java,v
retrieving revision 1.8
diff -u -r1.8 ChainGenerator.java
--- src/js/org/apache/ws/jaxme/js/pattern/ChainGenerator.java 18 May 2005 22:09:09 -0000 1.8
+++ src/js/org/apache/ws/jaxme/js/pattern/ChainGenerator.java 27 Jul 2005 20:13:51 -0000
@@ -105,7 +105,7 @@
JavaSourceFactory jsf = new JavaSourceFactory();
List sources = new ArrayList();
Set names = new HashSet();
- loadSources(pClassLoader, JavaQNameImpl.getInstance(pName, true),
+ loadSources(pClassLoader, JavaQNameImpl.getInstance(pName),
jsf, sources, names);
if (sources.isEmpty()) {
return null;
@@ -146,7 +146,7 @@
/** <p>Sets the interface name being generated for the chain objects.</p>
*/
public void setChainInterfaceName(String pInterfaceName) {
- JavaQName qName = JavaQNameImpl.getInstance(pInterfaceName, true);
+ JavaQName qName = JavaQNameImpl.getInstance(pInterfaceName);
setChainInterface(qName);
}
@@ -165,7 +165,7 @@
/** <p>Sets the class name being generated for the chain objects.</p>
*/
public void setProxyClassName(String pClassName) {
- JavaQName qName = JavaQNameImpl.getInstance(pClassName, true);
+ JavaQName qName = JavaQNameImpl.getInstance(pClassName);
setProxyClass(qName);
}
@@ -195,7 +195,7 @@
/** <p>Sets the name of the chain implementation class.</p>
*/
public void setImplementationClassName(String pClassName) {
- setImplementationClass(JavaQNameImpl.getInstance(pClassName, true));
+ setImplementationClass(JavaQNameImpl.getInstance(pClassName));
}
/** <p>Sets the chain implementation class.</p>
Index: src/js/org/apache/ws/jaxme/js/pattern/CompiledClassReflector.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/js/org/apache/ws/jaxme/js/pattern/CompiledClassReflector.java,v
retrieving revision 1.2
diff -u -r1.2 CompiledClassReflector.java
--- src/js/org/apache/ws/jaxme/js/pattern/CompiledClassReflector.java 18 May 2005 22:09:09 -0000 1.2
+++ src/js/org/apache/ws/jaxme/js/pattern/CompiledClassReflector.java 27 Jul 2005 20:13:51 -0000
@@ -59,7 +59,7 @@
*/
public JavaSource getJavaSource(JavaSourceFactory pFactory) {
Class c = getCompiledClass();
- JavaSource js = new JavaSourceFactory().newJavaSource(JavaQNameImpl.getInstance(c.getName(), true));
+ JavaSource js = new JavaSourceFactory().newJavaSource(JavaQNameImpl.getInstance(c.getName()));
Method[] methods = c.getMethods();
for (int i = 0; i < methods.length; i++) {
Method m = methods[i];
Index: src/js/org/apache/ws/jaxme/js/util/JavaParser.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/js/org/apache/ws/jaxme/js/util/JavaParser.java,v
retrieving revision 1.8
diff -u -r1.8 JavaParser.java
--- src/js/org/apache/ws/jaxme/js/util/JavaParser.java 8 Jul 2005 14:45:07 -0000 1.8
+++ src/js/org/apache/ws/jaxme/js/util/JavaParser.java 27 Jul 2005 20:13:52 -0000
@@ -119,7 +119,7 @@
}
private void parseImportStatement(AST pAST) {
- addImportStatement(JavaQNameImpl.getInstance(parseIdentifier(pAST), true));
+ addImportStatement(JavaQNameImpl.getInstance(parseIdentifier(pAST)));
}
private String parseIdentifier(AST pAST) {
@@ -195,12 +195,7 @@
String className = classNameAST.getText();
if (pOuterClass == null) {
String packageName = getPackageName();
- JavaQName qName;
- if (packageName == null) {
- qName = JavaQNameImpl.getInstance(className);
- } else {
- qName = JavaQNameImpl.getInstance(packageName, className);
- }
+ JavaQName qName = JavaQNameImpl.getInstance(packageName, className);
JavaSource js = factory.newJavaSource(qName, JavaSource.DEFAULT_PROTECTION);
generatedClasses.add(js);
return js;
@@ -298,7 +293,7 @@
return qName;
}
}
- return JavaQNameImpl.getInstance(pName, true);
+ return JavaQNameImpl.getInstance(pName);
}
private void parseImplementsOrExtends(JavaSource pSource, AST pAST, int pType) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
