You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by pc...@apache.org on 2004/03/10 20:43:50 UTC
cvs commit: xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/visitor CommentInitializer.java CompositeElementVisitor.java ElementVisitor.java PropertyInitializer.java
pcal 2004/03/10 11:43:50
Modified: v2/jam/src/org/apache/xmlbeans/impl/jam JElement.java
v2/jam/src/org/apache/xmlbeans/impl/jam/annotation
DefaultAnnotationProxy.java
v2/jam/src/org/apache/xmlbeans/impl/jam/internal
JamClassLoaderImpl.java JamServiceImpl.java
ReflectingClassBuilder.java
v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements
AnnotatedElementImpl.java AnnotationImpl.java
BuiltinClassImpl.java ClassImpl.java
CommentImpl.java ConstructorImpl.java
ElementImpl.java FieldImpl.java InvokableImpl.java
MemberImpl.java MethodImpl.java PackageImpl.java
ParameterImpl.java SourcePositionImpl.java
v2/jam/src/org/apache/xmlbeans/impl/jam/internal/javadoc
JavadocClassBuilder.java
v2/jam/src/org/apache/xmlbeans/impl/jam/internal/parser
ParamStruct.java ParamStructPool.java
ParserClassBuilder.java
v2/jam/src/org/apache/xmlbeans/impl/jam/provider
CompositeJamClassBuilder.java JamClassBuilder.java
JamServiceContext.java
v2/jam/src/org/apache/xmlbeans/impl/jam/visitor
CommentInitializer.java
CompositeElementVisitor.java ElementVisitor.java
PropertyInitializer.java
Added: v2/jam/src/org/apache/xmlbeans/impl/jam/mutable
MAnnotatedElement.java MAnnotation.java MClass.java
MComment.java MConstructor.java MElement.java
MElementVisitor.java MField.java MInvokable.java
MMember.java MMethod.java MPackage.java
MParameter.java MSourcePosition.java package.html
Removed: v2/jam/src/org/apache/xmlbeans/impl/jam/editable
EAnnotatedElement.java EAnnotation.java EClass.java
EComment.java EConstructor.java EElement.java
EElementVisitor.java EField.java EInvokable.java
EMember.java EMethod.java EPackage.java
EParameter.java ESourcePosition.java package.html
Log:
jam: rename editable->mutable
Revision Changes Path
1.4 +1 -1 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/JElement.java
Index: JElement.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/JElement.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JElement.java 9 Mar 2004 10:38:51 -0000 1.3
+++ JElement.java 10 Mar 2004 19:43:48 -0000 1.4
@@ -85,7 +85,7 @@
* <p>Calls accept() with the given visitor, and then recursively calls
* acceptAndWalk for each of our component elements2, if any. Calling this
* on
- * an EClass will cause the EClass to accept the visitor, and then
+ * an MClass will cause the MClass to accept the visitor, and then
* all of it's declared fields constructors, and methods. The parameter
* for each constructor and method will also in turn be accepted.
* Any annotations for each of these elements types will also be visited
1.3 +1 -1 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/annotation/DefaultAnnotationProxy.java
Index: DefaultAnnotationProxy.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/annotation/DefaultAnnotationProxy.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultAnnotationProxy.java 10 Mar 2004 11:42:07 -0000 1.2
+++ DefaultAnnotationProxy.java 10 Mar 2004 19:43:48 -0000 1.3
@@ -69,7 +69,7 @@
* Introspects the src object for annotation member methods, invokes them
* and creates corresponding EAnnotationMembers in the given dest object.
- private void populateAnnotationMembers(EAnnotation dest,
+ private void populateAnnotationMembers(MAnnotation dest,
Object src,
Class srcClass)
{
1.3 +3 -3 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/JamClassLoaderImpl.java
Index: JamClassLoaderImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/JamClassLoaderImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JamClassLoaderImpl.java 10 Mar 2004 11:42:07 -0000 1.2
+++ JamClassLoaderImpl.java 10 Mar 2004 19:43:49 -0000 1.3
@@ -17,7 +17,7 @@
import org.apache.xmlbeans.impl.jam.JClass;
import org.apache.xmlbeans.impl.jam.JPackage;
import org.apache.xmlbeans.impl.jam.JamClassLoader;
-import org.apache.xmlbeans.impl.jam.editable.EClass;
+import org.apache.xmlbeans.impl.jam.mutable.MClass;
import org.apache.xmlbeans.impl.jam.visitor.ElementVisitor;
import org.apache.xmlbeans.impl.jam.internal.elements.*;
import org.apache.xmlbeans.impl.jam.provider.JamClassBuilder;
@@ -61,7 +61,7 @@
public final JClass loadClass(String fd)
{
fd = fd.trim();//REVIEW is this paranoid?
- EClass out = (EClass)mFd2ClassCache.get(fd);
+ MClass out = (MClass)mFd2ClassCache.get(fd);
if (out != null) return out;
if (fd.startsWith("[")) {
return ArrayClassImpl.createClassForFD(fd,this);
@@ -141,7 +141,7 @@
}
public void addToCache(JClass c) {
- //FIXME hack for editable classes for now
+ //FIXME hack for mutable classes for now
mFd2ClassCache.put(c.getQualifiedName(),c);
}
1.2 +3 -3 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/JamServiceImpl.java
Index: JamServiceImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/JamServiceImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JamServiceImpl.java 9 Mar 2004 10:38:52 -0000 1.1
+++ JamServiceImpl.java 10 Mar 2004 19:43:49 -0000 1.2
@@ -19,7 +19,7 @@
import org.apache.xmlbeans.impl.jam.JamClassIterator;
import org.apache.xmlbeans.impl.jam.JamClassLoader;
import org.apache.xmlbeans.impl.jam.JamService;
-import org.apache.xmlbeans.impl.jam.editable.EClass;
+import org.apache.xmlbeans.impl.jam.mutable.MClass;
import org.apache.xmlbeans.impl.jam.internal.elements.ClassImpl;
import org.apache.xmlbeans.impl.jam.internal.elements.ElementContext;
@@ -74,7 +74,7 @@
// at the moment, we just cast down to this elements class to get at
// these methods
- public EClass addNewClass(String packageName,
+ public MClass addNewClass(String packageName,
String className,
String[] importSpecs)
{
@@ -83,7 +83,7 @@
return out;
}
- public EClass addNewClass(JClass copyme) {
+ public MClass addNewClass(JClass copyme) {
throw new IllegalStateException("NYI");
}
1.4 +11 -11 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/ReflectingClassBuilder.java
Index: ReflectingClassBuilder.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/ReflectingClassBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ReflectingClassBuilder.java 10 Mar 2004 11:42:07 -0000 1.3
+++ ReflectingClassBuilder.java 10 Mar 2004 19:43:49 -0000 1.4
@@ -14,7 +14,7 @@
*/
package org.apache.xmlbeans.impl.jam.internal;
-import org.apache.xmlbeans.impl.jam.editable.*;
+import org.apache.xmlbeans.impl.jam.mutable.*;
import org.apache.xmlbeans.impl.jam.provider.JamClassBuilder;
import java.lang.reflect.Constructor;
@@ -52,7 +52,7 @@
// ========================================================================
// JamClassBuilder implementation
- public EClass build(String packageName, String className)
+ public MClass build(String packageName, String className)
{
Class rclass;
try {
@@ -61,7 +61,7 @@
getLogger().debug(cnfe);
return null;
}
- EClass out = createClassToBuild(packageName, className, null);
+ MClass out = createClassToBuild(packageName, className, null);
populate(out,rclass);
return out;
}
@@ -69,7 +69,7 @@
// ========================================================================
// Private methods
- private void populate(EClass dest, Class src) {
+ private void populate(MClass dest, Class src) {
dest.setModifiers(src.getModifiers());
dest.setIsInterface(src.isInterface());
// set the superclass
@@ -91,14 +91,14 @@
add175Annotations(dest, src);
}
- private void populate(EField dest, Field src) {
+ private void populate(MField dest, Field src) {
dest.setSimpleName(src.getName());
dest.setType(src.getType().getName());
dest.setModifiers(src.getModifiers());
add175Annotations(dest, src);
}
- private void populate(EConstructor dest, Constructor src) {
+ private void populate(MConstructor dest, Constructor src) {
dest.setSimpleName(src.getName());
dest.setModifiers(src.getModifiers());
Class[] exceptions = src.getExceptionTypes();
@@ -112,7 +112,7 @@
add175Annotations(dest, src);
}
- private void populate(EMethod dest, Method src) {
+ private void populate(MMethod dest, Method src) {
dest.setSimpleName(src.getName());
dest.setModifiers(src.getModifiers());
dest.setReturnType(src.getReturnType().getName());
@@ -127,17 +127,17 @@
add175Annotations(dest, src);
}
- private void addThrows(EInvokable dest, Class[] exceptionTypes) {
+ private void addThrows(MInvokable dest, Class[] exceptionTypes) {
for(int i=0; i<exceptionTypes.length; i++) {
dest.addException(exceptionTypes[i].getName());
}
}
- private void addParameter(EInvokable dest,
+ private void addParameter(MInvokable dest,
int paramNum,
Class paramType,
/*Annotation*/ Object[] param175Anns) {
- EParameter p = dest.addNewParameter();
+ MParameter p = dest.addNewParameter();
p.setSimpleName("param"+paramNum);
p.setType(paramType.getName());
if (param175Anns != null) { //add the 175 annotations to the parameter
@@ -147,7 +147,7 @@
}
}
- private void add175Annotations(EAnnotatedElement dest, Object src) {
+ private void add175Annotations(MAnnotatedElement dest, Object src) {
/*Annotation[]*/ Object[] anns = get175AnnotationsOn(src);
if (anns == null || anns.length == 0) return;
for(int i=0; i<anns.length; i++) {
1.3 +28 -28 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/AnnotatedElementImpl.java
Index: AnnotatedElementImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/AnnotatedElementImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AnnotatedElementImpl.java 10 Mar 2004 11:42:07 -0000 1.2
+++ AnnotatedElementImpl.java 10 Mar 2004 19:43:49 -0000 1.3
@@ -5,9 +5,9 @@
import org.apache.xmlbeans.impl.jam.JAnnotationValue;
import org.apache.xmlbeans.impl.jam.visitor.ElementVisitor;
import org.apache.xmlbeans.impl.jam.annotation.AnnotationProxy;
-import org.apache.xmlbeans.impl.jam.editable.EAnnotatedElement;
-import org.apache.xmlbeans.impl.jam.editable.EAnnotation;
-import org.apache.xmlbeans.impl.jam.editable.EComment;
+import org.apache.xmlbeans.impl.jam.mutable.MAnnotatedElement;
+import org.apache.xmlbeans.impl.jam.mutable.MAnnotation;
+import org.apache.xmlbeans.impl.jam.mutable.MComment;
import java.util.Map;
import java.util.HashMap;
@@ -16,14 +16,14 @@
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
public abstract class AnnotatedElementImpl extends ElementImpl
- implements EAnnotatedElement
+ implements MAnnotatedElement
{
// ========================================================================
// Variables
private Map mName2Annotation = null;
- private EComment mComment = null;
+ private MComment mComment = null;
// ========================================================================
// Constructors
@@ -69,37 +69,37 @@
public JComment getComment() { return getEditableComment(); }
// ========================================================================
- // EAnnotatedElement implementation
+ // MAnnotatedElement implementation
public AnnotationProxy getEditableProxy(Class proxyClass) {
if (mName2Annotation == null) return null;
- EAnnotation out = getEditableAnnotation(proxyClass.getName());
+ MAnnotation out = getEditableAnnotation(proxyClass.getName());
return (out == null) ? null : (AnnotationProxy)out.getProxy();
}
- public void removeAnnotation(EAnnotation ann) {
+ public void removeAnnotation(MAnnotation ann) {
if (mName2Annotation != null) mName2Annotation.values().remove(ann);
}
- public EAnnotation[] getEditableAnnotations() {
- if (mName2Annotation == null) return new EAnnotation[0];
- EAnnotation[] out = new EAnnotation[mName2Annotation.values().size()];
+ public MAnnotation[] getEditableAnnotations() {
+ if (mName2Annotation == null) return new MAnnotation[0];
+ MAnnotation[] out = new MAnnotation[mName2Annotation.values().size()];
mName2Annotation.values().toArray(out);
return out;
}
- public EAnnotation getEditableAnnotation(String named) {
+ public MAnnotation getEditableAnnotation(String named) {
if (mName2Annotation == null) return null;
- return (EAnnotation)mName2Annotation.get(named);
+ return (MAnnotation)mName2Annotation.get(named);
}
- public EAnnotation getEditableAnnotation(Class proxyClass) {
+ public MAnnotation getEditableAnnotation(Class proxyClass) {
if (mName2Annotation == null) return null;
- return (EAnnotation)mName2Annotation.get(proxyClass.getName());
+ return (MAnnotation)mName2Annotation.get(proxyClass.getName());
}
- public EAnnotation addAnnotationForTag(String tagName) {
- EAnnotation out = getEditableAnnotation(tagName);
+ public MAnnotation addAnnotationForTag(String tagName) {
+ MAnnotation out = getEditableAnnotation(tagName);
if (out != null) {
//REVIEW this is a weird case. we'll just go with it for now.
} else {
@@ -111,8 +111,8 @@
return out;
}
- public EAnnotation addAnnotationForTag(String tagName, String tagContents) {
- EAnnotation out = getEditableAnnotation(tagName);
+ public MAnnotation addAnnotationForTag(String tagName, String tagContents) {
+ MAnnotation out = getEditableAnnotation(tagName);
if (out != null) {
//REVIEW this is a weird case where they add the same thing twice.
// we'll just go with it for now.
@@ -127,12 +127,12 @@
return out;
}
- public EAnnotation addAnnotationForInstance(/*Annotation*/ Object jsr175annotationInstance) {
+ public MAnnotation addAnnotationForInstance(/*Annotation*/ Object jsr175annotationInstance) {
if (jsr175annotationInstance == null) {
throw new IllegalArgumentException("null instance");
}
String typename = getAnnotationTypeFor(jsr175annotationInstance);
- EAnnotation ann = getEditableAnnotation(typename);
+ MAnnotation ann = getEditableAnnotation(typename);
if (ann != null) {
//REVIEW this is an extremely weird case where they add another instance
// of the same annotation type. We'll just go with it for now,
@@ -148,9 +148,9 @@
return ann;
}
- public EAnnotation addAnnotationForType(String jsr175annotationClassname) {
+ public MAnnotation addAnnotationForType(String jsr175annotationClassname) {
ClassImpl.validateClassName(jsr175annotationClassname);
- EAnnotation ann = getEditableAnnotation(jsr175annotationClassname);
+ MAnnotation ann = getEditableAnnotation(jsr175annotationClassname);
if (ann != null) return ann; //REVIEW weird case again
AnnotationProxy proxy = getContext().
createProxyForAnnotationType(jsr175annotationClassname);
@@ -159,10 +159,10 @@
return ann;
}
- public EAnnotation addAnnotationForProxy(AnnotationProxy proxy) {
+ public MAnnotation addAnnotationForProxy(AnnotationProxy proxy) {
if (proxy == null) throw new IllegalArgumentException("null proxy");
String name = proxy.getClass().getName();
- EAnnotation ann = getEditableAnnotation(name);
+ MAnnotation ann = getEditableAnnotation(name);
if (ann != null) return ann; //REVIEW weird case yet again
ann = new AnnotationImpl(getContext(),proxy,name);
getName2Annotation().put(name,ann);
@@ -170,9 +170,9 @@
}
- public EComment getEditableComment() { return mComment; }
+ public MComment getEditableComment() { return mComment; }
- public EComment createComment() { return mComment = new CommentImpl(this); }
+ public MComment createComment() { return mComment = new CommentImpl(this); }
public void removeComment() { mComment = null; }
@@ -180,7 +180,7 @@
// Protect methods
protected void visitAnnotations(ElementVisitor visitor) {
- EAnnotation[] anns = getEditableAnnotations();
+ MAnnotation[] anns = getEditableAnnotations();
for(int i=0; i<anns.length; i++) visitor.visit(anns[i]);
if (mComment != null) visitor.visit(mComment);
}
1.3 +3 -3 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/AnnotationImpl.java
Index: AnnotationImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/AnnotationImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AnnotationImpl.java 10 Mar 2004 11:42:07 -0000 1.2
+++ AnnotationImpl.java 10 Mar 2004 19:43:49 -0000 1.3
@@ -16,7 +16,7 @@
import org.apache.xmlbeans.impl.jam.visitor.ElementVisitor;
import org.apache.xmlbeans.impl.jam.annotation.AnnotationProxy;
-import org.apache.xmlbeans.impl.jam.editable.EAnnotation;
+import org.apache.xmlbeans.impl.jam.mutable.MAnnotation;
import org.apache.xmlbeans.impl.jam.JAnnotationValue;
/**
@@ -24,7 +24,7 @@
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
-public final class AnnotationImpl extends ElementImpl implements EAnnotation {
+public final class AnnotationImpl extends ElementImpl implements MAnnotation {
// ========================================================================
// Variables
@@ -73,7 +73,7 @@
}
// ========================================================================
- // EElement implementation
+ // MElement implementation
public AnnotationProxy getEditableProxy() {
return mProxy;
1.3 +13 -13 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/BuiltinClassImpl.java
Index: BuiltinClassImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/BuiltinClassImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BuiltinClassImpl.java 9 Mar 2004 11:47:10 -0000 1.2
+++ BuiltinClassImpl.java 10 Mar 2004 19:43:49 -0000 1.3
@@ -18,7 +18,7 @@
import org.apache.xmlbeans.impl.jam.*;
import org.apache.xmlbeans.impl.jam.visitor.ElementVisitor;
-import org.apache.xmlbeans.impl.jam.editable.*;
+import org.apache.xmlbeans.impl.jam.mutable.*;
/**
* <p>Base class for types that are 'built in' to the VM. This includes
@@ -33,7 +33,7 @@
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
public abstract class BuiltinClassImpl extends AnnotatedElementImpl
- implements EClass
+ implements MClass
{
// ========================================================================
@@ -107,11 +107,11 @@
public JClass[] getImportedClasses() { return NO_CLASS; }
// ========================================================================
- // EClass implementation
+ // MClass implementation
- public EField[] getEditableFields() { return NO_FIELD; }
- public EConstructor[] getEditableConstructors() { return NO_CONSTRUCTOR; }
- public EMethod[] getEditableMethods() { return NO_METHOD; }
+ public MField[] getEditableFields() { return NO_FIELD; }
+ public MConstructor[] getEditableConstructors() { return NO_CONSTRUCTOR; }
+ public MMethod[] getEditableMethods() { return NO_METHOD; }
public void setSimpleName(String s) { nocando(); }
@@ -126,14 +126,14 @@
public void addInterface(JClass interf) { nocando(); }
public void removeInterface(String className) { nocando(); }
public void removeInterface(JClass interf) { nocando(); }
- public EConstructor addNewConstructor() { nocando(); return null; }
- public void removeConstructor(EConstructor constr) { nocando(); }
- public EField addNewField() { nocando(); return null; }
- public void removeField(EField field) { nocando(); }
- public EMethod addNewMethod() { nocando(); return null; }
- public void removeMethod(EMethod method) { nocando(); }
+ public MConstructor addNewConstructor() { nocando(); return null; }
+ public void removeConstructor(MConstructor constr) { nocando(); }
+ public MField addNewField() { nocando(); return null; }
+ public void removeField(MField field) { nocando(); }
+ public MMethod addNewMethod() { nocando(); return null; }
+ public void removeMethod(MMethod method) { nocando(); }
public void setModifiers(int modifiers) { nocando(); }
- public JProperty addNewProperty(String name, EMethod m, EMethod x) {
+ public JProperty addNewProperty(String name, MMethod m, MMethod x) {
nocando();
return null;
}
1.4 +23 -23 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/ClassImpl.java
Index: ClassImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/ClassImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ClassImpl.java 10 Mar 2004 11:42:08 -0000 1.3
+++ ClassImpl.java 10 Mar 2004 19:43:49 -0000 1.4
@@ -17,7 +17,7 @@
import org.apache.xmlbeans.impl.jam.*;
import org.apache.xmlbeans.impl.jam.visitor.ElementVisitor;
-import org.apache.xmlbeans.impl.jam.editable.*;
+import org.apache.xmlbeans.impl.jam.mutable.*;
import org.apache.xmlbeans.impl.jam.internal.classrefs.JClassRef;
import org.apache.xmlbeans.impl.jam.internal.classrefs.JClassRefContext;
import org.apache.xmlbeans.impl.jam.internal.classrefs.QualifiedJClassRef;
@@ -29,11 +29,11 @@
import java.util.List;
/**
- * <p>Implementation of JClass and EClass.</p>
+ * <p>Implementation of JClass and MClass.</p>
*
* @author Patrick Calahan <jd...@bea.com>
*/
-public class ClassImpl extends MemberImpl implements EClass,
+public class ClassImpl extends MemberImpl implements MClass,
JClassRef, JClassRefContext
{
// ========================================================================
@@ -207,7 +207,7 @@
public int getArrayDimensions() { return 0; }
// ========================================================================
- // EClass implementation
+ // MClass implementation
public void setSuperclass(String qualifiedClassName) {
mSuperClassRef = QualifiedJClassRef.create(qualifiedClassName, this);
@@ -257,71 +257,71 @@
}
}
- public EConstructor addNewConstructor() {
+ public MConstructor addNewConstructor() {
if (mConstructors == null) mConstructors = new ArrayList();
- EConstructor out = new ConstructorImpl(this);
+ MConstructor out = new ConstructorImpl(this);
mConstructors.add(out);
return out;
}
- public void removeConstructor(EConstructor constr) {
+ public void removeConstructor(MConstructor constr) {
if (mConstructors == null) return;
mConstructors.remove(constr);
}
- public EConstructor[] getEditableConstructors() {
+ public MConstructor[] getEditableConstructors() {
if (mConstructors == null || mConstructors.size() == 0) {
- return new EConstructor[0];
+ return new MConstructor[0];
}
- EConstructor[] out = new EConstructor[mConstructors.size()];
+ MConstructor[] out = new MConstructor[mConstructors.size()];
mConstructors.toArray(out);
return out;
}
- public EField addNewField() {
+ public MField addNewField() {
if (mFields == null) mFields = new ArrayList();
- EField out = new FieldImpl(defaultName(mFields.size()),
+ MField out = new FieldImpl(defaultName(mFields.size()),
this,"java.lang.Object");
mFields.add(out);
return out;
}
- public void removeField(EField field) {
+ public void removeField(MField field) {
if (mFields == null) return;
mFields.remove(field);
}
- public EField[] getEditableFields() {
+ public MField[] getEditableFields() {
if (mFields == null || mFields.size() == 0) {
- return new EField[0];
+ return new MField[0];
}
- EField[] out = new EField[mFields.size()];
+ MField[] out = new MField[mFields.size()];
mFields.toArray(out);
return out;
}
- public EMethod addNewMethod() {
+ public MMethod addNewMethod() {
if (mMethods == null) mMethods = new ArrayList();
- EMethod out = new MethodImpl(defaultName(mMethods.size()),this);
+ MMethod out = new MethodImpl(defaultName(mMethods.size()),this);
mMethods.add(out);
return out;
}
- public void removeMethod(EMethod method) {
+ public void removeMethod(MMethod method) {
if (mMethods == null) return;
mMethods.remove(method);
}
- public EMethod[] getEditableMethods() {
+ public MMethod[] getEditableMethods() {
if (mMethods == null || mMethods.size() == 0) {
- return new EMethod[0];
+ return new MMethod[0];
}
- EMethod[] out = new EMethod[mMethods.size()];
+ MMethod[] out = new MMethod[mMethods.size()];
mMethods.toArray(out);
return out;
}
- public JProperty addNewProperty(String name, EMethod getter, EMethod setter) {
+ public JProperty addNewProperty(String name, MMethod getter, MMethod setter) {
if (mProperties == null) mProperties = new ArrayList();
JProperty out = new PropertyImpl(name,getter,setter,
getter.getReturnType().getQualifiedName());
1.2 +3 -3 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/CommentImpl.java
Index: CommentImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/CommentImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CommentImpl.java 9 Mar 2004 10:38:52 -0000 1.1
+++ CommentImpl.java 10 Mar 2004 19:43:49 -0000 1.2
@@ -15,14 +15,14 @@
package org.apache.xmlbeans.impl.jam.internal.elements;
import org.apache.xmlbeans.impl.jam.visitor.ElementVisitor;
-import org.apache.xmlbeans.impl.jam.editable.EComment;
+import org.apache.xmlbeans.impl.jam.mutable.MComment;
/**
* <p>Implementation
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
-public final class CommentImpl extends ElementImpl implements EComment {
+public final class CommentImpl extends ElementImpl implements MComment {
// ========================================================================
// Variables
@@ -35,7 +35,7 @@
/*package*/ CommentImpl(ElementImpl parent) { super(parent); }
// ========================================================================
- // EComment implementation
+ // MComment implementation
public void setText(String text) { mText = text; }
1.2 +3 -3 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/ConstructorImpl.java
Index: ConstructorImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/ConstructorImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConstructorImpl.java 9 Mar 2004 10:38:52 -0000 1.1
+++ ConstructorImpl.java 10 Mar 2004 19:43:49 -0000 1.2
@@ -16,14 +16,14 @@
package org.apache.xmlbeans.impl.jam.internal.elements;
import org.apache.xmlbeans.impl.jam.visitor.ElementVisitor;
-import org.apache.xmlbeans.impl.jam.editable.EConstructor;
-import org.apache.xmlbeans.impl.jam.editable.EElementVisitor;
+import org.apache.xmlbeans.impl.jam.mutable.MConstructor;
+import org.apache.xmlbeans.impl.jam.mutable.MElementVisitor;
/**
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
-public final class ConstructorImpl extends InvokableImpl implements EConstructor {
+public final class ConstructorImpl extends InvokableImpl implements MConstructor {
// ========================================================================
// Constructors
1.3 +8 -8 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/ElementImpl.java
Index: ElementImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/ElementImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ElementImpl.java 9 Mar 2004 11:47:10 -0000 1.2
+++ ElementImpl.java 10 Mar 2004 19:43:49 -0000 1.3
@@ -17,15 +17,15 @@
import org.apache.xmlbeans.impl.jam.*;
import org.apache.xmlbeans.impl.jam.visitor.ElementVisitor;
-import org.apache.xmlbeans.impl.jam.editable.EElement;
-import org.apache.xmlbeans.impl.jam.editable.ESourcePosition;
+import org.apache.xmlbeans.impl.jam.mutable.MElement;
+import org.apache.xmlbeans.impl.jam.mutable.MSourcePosition;
/**
- * <p>Implementation of JElement and EElement.</p>
+ * <p>Implementation of JElement and MElement.</p>
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
-public abstract class ElementImpl implements EElement {
+public abstract class ElementImpl implements MElement {
// ========================================================================
// Constants
@@ -48,7 +48,7 @@
private ElementContext mContext;
protected String mSimpleName;
- private ESourcePosition mPosition = null;
+ private MSourcePosition mPosition = null;
private Object mArtifact = null;
private ElementImpl mParent;
@@ -86,14 +86,14 @@
public Object getArtifact() { return mArtifact; }
// ========================================================================
- // EElement implementation
+ // MElement implementation
public void setSimpleName(String name) {
if (name == null) throw new IllegalArgumentException("null name");
mSimpleName = name;
}
- public ESourcePosition createSourcePosition() {
+ public MSourcePosition createSourcePosition() {
return mPosition = new SourcePositionImpl();
}
@@ -101,7 +101,7 @@
mPosition = null;
}
- public ESourcePosition getEditableSourcePosition() {
+ public MSourcePosition getEditableSourcePosition() {
return mPosition;
}
1.2 +4 -4 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/FieldImpl.java
Index: FieldImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/FieldImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FieldImpl.java 9 Mar 2004 10:38:53 -0000 1.1
+++ FieldImpl.java 10 Mar 2004 19:43:49 -0000 1.2
@@ -17,7 +17,7 @@
import org.apache.xmlbeans.impl.jam.JClass;
import org.apache.xmlbeans.impl.jam.visitor.ElementVisitor;
-import org.apache.xmlbeans.impl.jam.editable.EField;
+import org.apache.xmlbeans.impl.jam.mutable.MField;
import org.apache.xmlbeans.impl.jam.internal.classrefs.DirectJClassRef;
import org.apache.xmlbeans.impl.jam.internal.classrefs.JClassRef;
import org.apache.xmlbeans.impl.jam.internal.classrefs.QualifiedJClassRef;
@@ -26,11 +26,11 @@
import java.lang.reflect.Modifier;
/**
- * <p>Implementation of JField and EField.</p>
+ * <p>Implementation of JField and MField.</p>
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
-public final class FieldImpl extends MemberImpl implements EField {
+public final class FieldImpl extends MemberImpl implements MField {
// ========================================================================
// Variables
@@ -59,7 +59,7 @@
// ========================================================================
- // EField implementation
+ // MField implementation
public void setType(JClass type) {
if (type == null) throw new IllegalArgumentException("null type");
1.2 +10 -10 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/InvokableImpl.java
Index: InvokableImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/InvokableImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InvokableImpl.java 9 Mar 2004 10:38:53 -0000 1.1
+++ InvokableImpl.java 10 Mar 2004 19:43:49 -0000 1.2
@@ -18,8 +18,8 @@
import org.apache.xmlbeans.impl.jam.JClass;
import org.apache.xmlbeans.impl.jam.visitor.ElementVisitor;
import org.apache.xmlbeans.impl.jam.JParameter;
-import org.apache.xmlbeans.impl.jam.editable.EInvokable;
-import org.apache.xmlbeans.impl.jam.editable.EParameter;
+import org.apache.xmlbeans.impl.jam.mutable.MInvokable;
+import org.apache.xmlbeans.impl.jam.mutable.MParameter;
import org.apache.xmlbeans.impl.jam.internal.classrefs.DirectJClassRef;
import org.apache.xmlbeans.impl.jam.internal.classrefs.JClassRef;
import org.apache.xmlbeans.impl.jam.internal.classrefs.QualifiedJClassRef;
@@ -33,7 +33,7 @@
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
-public abstract class InvokableImpl extends MemberImpl implements EInvokable {
+public abstract class InvokableImpl extends MemberImpl implements MInvokable {
// ========================================================================
// Variables
@@ -49,7 +49,7 @@
}
// ========================================================================
- // EConstructor implementation
+ // MConstructor implementation
public void addException(JClass exceptionClass) {
if (exceptionClass == null) {
@@ -86,23 +86,23 @@
removeException(exceptionClass.getQualifiedName());
}
- public EParameter addNewParameter() {
+ public MParameter addNewParameter() {
if (mParameters == null) mParameters = new ArrayList();
- EParameter param = new ParameterImpl(defaultName(mParameters.size()),
+ MParameter param = new ParameterImpl(defaultName(mParameters.size()),
this,"java.lang.Object");
mParameters.add(param);
return param;
}
- public void removeParameter(EParameter parameter) {
+ public void removeParameter(MParameter parameter) {
if (mParameters != null) mParameters.remove(parameter);
}
- public EParameter[] getEditableParameters() {
+ public MParameter[] getEditableParameters() {
if (mParameters == null || mParameters.size() == 0) {
- return new EParameter[0];
+ return new MParameter[0];
} else {
- EParameter[] out = new EParameter[mParameters.size()];
+ MParameter[] out = new MParameter[mParameters.size()];
mParameters.toArray(out);
return out;
}
1.5 +3 -3 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/MemberImpl.java
Index: MemberImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/MemberImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MemberImpl.java 10 Mar 2004 11:42:08 -0000 1.4
+++ MemberImpl.java 10 Mar 2004 19:43:49 -0000 1.5
@@ -18,7 +18,7 @@
import org.apache.xmlbeans.impl.jam.JClass;
import org.apache.xmlbeans.impl.jam.JMember;
import org.apache.xmlbeans.impl.jam.JElement;
-import org.apache.xmlbeans.impl.jam.editable.EMember;
+import org.apache.xmlbeans.impl.jam.mutable.MMember;
import java.lang.reflect.Modifier;
@@ -27,7 +27,7 @@
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
-public abstract class MemberImpl extends AnnotatedElementImpl implements EMember {
+public abstract class MemberImpl extends AnnotatedElementImpl implements MMember {
// ========================================================================
// Variables
@@ -69,7 +69,7 @@
public boolean isPublic() { return Modifier.isPublic(mModifiers); }
// ========================================================================
- // EMember implementation
+ // MMember implementation
public void setModifiers(int modifiers) { mModifiers = modifiers; }
1.2 +4 -4 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/MethodImpl.java
Index: MethodImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/MethodImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MethodImpl.java 9 Mar 2004 10:38:53 -0000 1.1
+++ MethodImpl.java 10 Mar 2004 19:43:49 -0000 1.2
@@ -17,7 +17,7 @@
import org.apache.xmlbeans.impl.jam.JClass;
import org.apache.xmlbeans.impl.jam.visitor.ElementVisitor;
-import org.apache.xmlbeans.impl.jam.editable.EMethod;
+import org.apache.xmlbeans.impl.jam.mutable.MMethod;
import org.apache.xmlbeans.impl.jam.internal.classrefs.DirectJClassRef;
import org.apache.xmlbeans.impl.jam.internal.classrefs.JClassRef;
import org.apache.xmlbeans.impl.jam.internal.classrefs.QualifiedJClassRef;
@@ -26,14 +26,14 @@
import java.lang.reflect.Modifier;
/**
- * <p>Standard implementation of EMethod. It's probably bad inheritance to
+ * <p>Standard implementation of MMethod. It's probably bad inheritance to
* extend ConstructorImpl, but it's convenient and no one should ever care
* since this is a private class; there is no inheritance between method and
* constructor in the public API.</p>
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
-public final class MethodImpl extends InvokableImpl implements EMethod {
+public final class MethodImpl extends InvokableImpl implements MMethod {
// ========================================================================
// Variables
@@ -49,7 +49,7 @@
}
// ========================================================================
- // EMethod implementation
+ // MMethod implementation
public void setReturnType(String className) {
mReturnTypeRef = QualifiedJClassRef.create
1.2 +2 -2 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/PackageImpl.java
Index: PackageImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/PackageImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PackageImpl.java 9 Mar 2004 10:38:53 -0000 1.1
+++ PackageImpl.java 10 Mar 2004 19:43:49 -0000 1.2
@@ -17,7 +17,7 @@
import org.apache.xmlbeans.impl.jam.JClass;
import org.apache.xmlbeans.impl.jam.visitor.ElementVisitor;
-import org.apache.xmlbeans.impl.jam.editable.EPackage;
+import org.apache.xmlbeans.impl.jam.mutable.MPackage;
import java.util.ArrayList;
import java.util.List;
@@ -30,7 +30,7 @@
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
-public class PackageImpl extends AnnotatedElementImpl implements EPackage {
+public class PackageImpl extends AnnotatedElementImpl implements MPackage {
// ========================================================================
// Variables
1.3 +4 -4 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/ParameterImpl.java
Index: ParameterImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/ParameterImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ParameterImpl.java 9 Mar 2004 11:47:10 -0000 1.2
+++ ParameterImpl.java 10 Mar 2004 19:43:49 -0000 1.3
@@ -17,18 +17,18 @@
import org.apache.xmlbeans.impl.jam.JClass;
import org.apache.xmlbeans.impl.jam.visitor.ElementVisitor;
-import org.apache.xmlbeans.impl.jam.editable.EParameter;
+import org.apache.xmlbeans.impl.jam.mutable.MParameter;
import org.apache.xmlbeans.impl.jam.internal.classrefs.DirectJClassRef;
import org.apache.xmlbeans.impl.jam.internal.classrefs.JClassRef;
import org.apache.xmlbeans.impl.jam.internal.classrefs.QualifiedJClassRef;
import org.apache.xmlbeans.impl.jam.internal.classrefs.UnqualifiedJClassRef;
/**
- * <p>Implementation of JParameter and EParameter.</p>
+ * <p>Implementation of JParameter and MParameter.</p>
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
-public class ParameterImpl extends MemberImpl implements EParameter {
+public class ParameterImpl extends MemberImpl implements MParameter {
// ========================================================================
// Variables
@@ -55,7 +55,7 @@
}
// ========================================================================
- // EParameter implementation
+ // MParameter implementation
public void setType(String qcname) {
if (qcname == null) throw new IllegalArgumentException("null typename");
1.2 +4 -4 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/SourcePositionImpl.java
Index: SourcePositionImpl.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/elements/SourcePositionImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SourcePositionImpl.java 9 Mar 2004 10:38:53 -0000 1.1
+++ SourcePositionImpl.java 10 Mar 2004 19:43:49 -0000 1.2
@@ -15,16 +15,16 @@
package org.apache.xmlbeans.impl.jam.internal.elements;
-import org.apache.xmlbeans.impl.jam.editable.ESourcePosition;
+import org.apache.xmlbeans.impl.jam.mutable.MSourcePosition;
import java.net.URI;
/**
- * <p>Implementation of JSourcePosition and ESourcePosition.</p>
+ * <p>Implementation of JSourcePosition and MSourcePosition.</p>
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
-public final class SourcePositionImpl implements ESourcePosition {
+public final class SourcePositionImpl implements MSourcePosition {
// ========================================================================
// Variables
@@ -39,7 +39,7 @@
/*package*/ SourcePositionImpl() {}
// ========================================================================
- // ESourcePosition implementation
+ // MSourcePosition implementation
public void setColumn(int col) { mColumn = col; }
1.4 +14 -14 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/javadoc/JavadocClassBuilder.java
Index: JavadocClassBuilder.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/javadoc/JavadocClassBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JavadocClassBuilder.java 10 Mar 2004 11:42:08 -0000 1.3
+++ JavadocClassBuilder.java 10 Mar 2004 19:43:49 -0000 1.4
@@ -16,7 +16,7 @@
import com.sun.javadoc.*;
import org.apache.xmlbeans.impl.jam.annotation.AnnotationProxy;
-import org.apache.xmlbeans.impl.jam.editable.*;
+import org.apache.xmlbeans.impl.jam.mutable.*;
import org.apache.xmlbeans.impl.jam.internal.elements.ElementContext;
import org.apache.xmlbeans.impl.jam.internal.elements.PrimitiveClassImpl;
import org.apache.xmlbeans.impl.jam.internal.JamServiceContextImpl;
@@ -96,7 +96,7 @@
- public EClass build(String packageName, String className) {
+ public MClass build(String packageName, String className) {
if (VERBOSE) {
System.out.println("[JavadocClassBuilder] building '"+
packageName+"' '"+className+"'");
@@ -109,7 +109,7 @@
}
ClassDoc cd = mRootDoc.classNamed(cn);
if (cd == null) return null;
- EClass out = createClassToBuild(packageName, className, null);
+ MClass out = createClassToBuild(packageName, className, null);
populate(out,cd);
return out;
}
@@ -117,7 +117,7 @@
// ========================================================================
// Private methods
- private void populate(EClass dest, ClassDoc src) {
+ private void populate(MClass dest, ClassDoc src) {
dest.setArtifact(src);
dest.setModifiers(src.modifierSpecifier());
dest.setIsInterface(src.isInterface());
@@ -141,7 +141,7 @@
addSourcePosition(dest,src);
}
- private void populate(EField dest, FieldDoc src) {
+ private void populate(MField dest, FieldDoc src) {
dest.setArtifact(src);
dest.setSimpleName(src.name());
dest.setType(getFdFor(src.type()));
@@ -150,12 +150,12 @@
addSourcePosition(dest,src);
}
- private void populate(EMethod dest, MethodDoc src) {
- populate((EInvokable)dest,(ExecutableMemberDoc)src);
+ private void populate(MMethod dest, MethodDoc src) {
+ populate((MInvokable)dest,(ExecutableMemberDoc)src);
dest.setReturnType(getFdFor(src.returnType()));
}
- private void populate(EInvokable dest, ExecutableMemberDoc src) {
+ private void populate(MInvokable dest, ExecutableMemberDoc src) {
dest.setArtifact(src);
dest.setSimpleName(src.name());
dest.setModifiers(src.modifierSpecifier());
@@ -171,7 +171,7 @@
addSourcePosition(dest,src);
}
- private void populate(EParameter dest, Parameter src) {
+ private void populate(MParameter dest, Parameter src) {
dest.setArtifact(src);
dest.setSimpleName(src.name());
dest.setType(getFdFor(src.type()));
@@ -205,10 +205,10 @@
}
}
- private void addSourcePosition(EElement dest, Doc src) {
+ private void addSourcePosition(MElement dest, Doc src) {
SourcePosition jds = src.position();
if (jds == null) return;
- ESourcePosition sp = dest.createSourcePosition();
+ MSourcePosition sp = dest.createSourcePosition();
sp.setColumn(jds.column());
sp.setLine(jds.line());
File f = jds.file();
@@ -216,17 +216,17 @@
}
- private void addAnnotations(EAnnotatedElement dest, ProgramElementDoc src) {
+ private void addAnnotations(MAnnotatedElement dest, ProgramElementDoc src) {
String comments = src.getRawCommentText();
if (comments != null) dest.createComment().setText(comments);
if (mIs15) addAnnotations(dest,callGetAnnotations(src));
}
- private void addAnnotations(EAnnotatedElement dest, Object[] descs) {
+ private void addAnnotations(MAnnotatedElement dest, Object[] descs) {
if (descs == null) return;
if (!mIs15) return;
for(int i=0; i<descs.length; i++) {
- EAnnotation ann =
+ MAnnotation ann =
dest.addAnnotationForType(callGetAnnotationType(descs[i]).qualifiedTypeName());
ann.setArtifact(descs[i]);
AnnotationProxy proxy = ann.getEditableProxy();
1.4 +4 -4 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/parser/ParamStruct.java
Index: ParamStruct.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/parser/ParamStruct.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ParamStruct.java 9 Mar 2004 10:38:53 -0000 1.3
+++ ParamStruct.java 10 Mar 2004 19:43:49 -0000 1.4
@@ -14,8 +14,8 @@
*/
package org.apache.xmlbeans.impl.jam.internal.parser;
-import org.apache.xmlbeans.impl.jam.editable.EInvokable;
-import org.apache.xmlbeans.impl.jam.editable.EParameter;
+import org.apache.xmlbeans.impl.jam.mutable.MInvokable;
+import org.apache.xmlbeans.impl.jam.mutable.MParameter;
/**
*
@@ -44,9 +44,9 @@
mName = name;
}
- public EParameter createParameter(EInvokable e) {
+ public MParameter createParameter(MInvokable e) {
if (e == null) throw new IllegalArgumentException("null invokable");
- EParameter param = e.addNewParameter();
+ MParameter param = e.addNewParameter();
param.setSimpleName(mName);
param.setUnqualifiedType(mType);
return param;
1.4 +2 -2 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/parser/ParamStructPool.java
Index: ParamStructPool.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/parser/ParamStructPool.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ParamStructPool.java 9 Mar 2004 10:38:53 -0000 1.3
+++ ParamStructPool.java 10 Mar 2004 19:43:49 -0000 1.4
@@ -14,7 +14,7 @@
*/
package org.apache.xmlbeans.impl.jam.internal.parser;
-import org.apache.xmlbeans.impl.jam.editable.EInvokable;
+import org.apache.xmlbeans.impl.jam.mutable.MInvokable;
import java.util.ArrayList;
import java.util.List;
@@ -42,7 +42,7 @@
// ========================================================================
// Public methods
- public void setParametersOn(EInvokable e) {
+ public void setParametersOn(MInvokable e) {
for(int i=0; i<mLength; i++) {
ParamStruct struct = (ParamStruct)mList.get(i);
struct.createParameter(e);
1.6 +5 -5 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/parser/ParserClassBuilder.java
Index: ParserClassBuilder.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/internal/parser/ParserClassBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ParserClassBuilder.java 10 Mar 2004 11:42:08 -0000 1.5
+++ ParserClassBuilder.java 10 Mar 2004 19:43:49 -0000 1.6
@@ -15,7 +15,7 @@
package org.apache.xmlbeans.impl.jam.internal.parser;
import org.apache.xmlbeans.impl.jam.JamClassLoader;
-import org.apache.xmlbeans.impl.jam.editable.EClass;
+import org.apache.xmlbeans.impl.jam.mutable.MClass;
import org.apache.xmlbeans.impl.jam.internal.JamPrinter;
import org.apache.xmlbeans.impl.jam.provider.JamClassBuilder;
import org.apache.xmlbeans.impl.jam.provider.JamServiceContext;
@@ -60,7 +60,7 @@
// ========================================================================
// BaseJClassLoader implementation
- public EClass build(String pkg, String name) {
+ public MClass build(String pkg, String name) {
if (pkg == null) throw new IllegalArgumentException("null pkg");
if (name == null) throw new IllegalArgumentException("null name");
String filespec = pkg.replace('.',File.separatorChar)+
@@ -82,7 +82,7 @@
}
Reader rin = new InputStreamReader(in);
try {
- EClass[] clazz = null;//FIXME parse(rin,loader);
+ MClass[] clazz = null;//FIXME parse(rin,loader);
if (clazz.length > 1) {
System.out.println("WARNING: multiple classes per package are not "+
"handled correctly at the moment. FIXME");
@@ -97,7 +97,7 @@
// ========================================================================
// Private methods
- private static EClass[] parse(Reader in, JamClassLoader loader) throws Exception {
+ private static MClass[] parse(Reader in, JamClassLoader loader) throws Exception {
if (in == null) throw new IllegalArgumentException("null in");
if (loader == null) throw new IllegalArgumentException("null loader");
@@ -171,7 +171,7 @@
mOut.println("-----------------------------------------");
}
mCount++;
- EClass[] results = null;
+ MClass[] results = null;
try {
results = parser.parse(new FileReader(input),null);
if (results == null) {
1.1 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/mutable/MAnnotatedElement.java
Index: MAnnotatedElement.java
===================================================================
package org.apache.xmlbeans.impl.jam.mutable;
import org.apache.xmlbeans.impl.jam.JAnnotatedElement;
import org.apache.xmlbeans.impl.jam.annotation.AnnotationProxy;
/**
* <p>Mutable version of JAnnotatedElement.</p>
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
public interface MAnnotatedElement extends MElement, JAnnotatedElement {
/**
* <p>Creates an annotation to expose the metadata in a javadoc tag.
* You should subsequently call <code>setMemberValue()</code> on
* the returned object to populate the annotation's values.</p>
*
* @param tagName name of the javadoc tag to be represented.
* @return
*/
public MAnnotation addAnnotationForTag(String tagName);
/**
* <p>Creates an annotation to expose the metadata in a javadoc tag.</p>
*
* @param tagName
* @param tagContents
* @return
*/
public MAnnotation addAnnotationForTag(String tagName, String tagContents);
//DOCME
public MAnnotation addAnnotationForInstance(/*Annotation*/ Object jsr175annotationInstance);
//DOCME
public MAnnotation addAnnotationForType(String jsr175annotationClassname);
//DOCME actually not entirely clear we ever want to be able to do this
public MAnnotation addAnnotationForProxy(AnnotationProxy proxy);
//DOCME
public MAnnotation getEditableAnnotation(Class proxyClass);
//DOCME
public MAnnotation getEditableAnnotation(String tagnameOr175typename);
//DOCME
public MComment getEditableComment();
//DOCME
public MComment createComment();
//DOCME
public void removeComment();
}
1.1 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/mutable/MAnnotation.java
Index: MAnnotation.java
===================================================================
/* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.xmlbeans.impl.jam.mutable;
import org.apache.xmlbeans.impl.jam.JAnnotation;
import org.apache.xmlbeans.impl.jam.annotation.AnnotationProxy;
/**
* <p>Mutable version of JAnnotation.</p>
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
public interface MAnnotation extends JAnnotation, MElement {
public AnnotationProxy getEditableProxy();
}
1.1 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/mutable/MClass.java
Index: MClass.java
===================================================================
/* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.xmlbeans.impl.jam.mutable;
import org.apache.xmlbeans.impl.jam.JClass;
import org.apache.xmlbeans.impl.jam.JProperty;
/**
* <p>Mutable version of JClass.</p>
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
public interface MClass extends MMember, JClass {
public void setIsInterface(boolean b);
public void setIsAnnotationType(boolean b);
/**
* Sets the class which this class extends. The class name must be fully-
* qualified. Pass null to make the class extend nothing.
*
* @throws IllegalArgumentException if the name is not a valid class name.
*/
public void setSuperclass(String qualifiedClassName);
/**
* Sets the name of this class that this class extends. The name
* may or may nor be fully-qualified. Pass null to make the class
* extend nothing.
*
* @throws IllegalArgumentException if the name is not a valid class name.
*/
public void setSuperclassUnqualified(String unqualifiedClassName);
/**
* Sets the class which this class extends. Pass null to make the class
* extend nothing.
*
* @throws IllegalArgumentException if the given class cannot be extended
* (i.e. final classes, interfaces, void, primitives, arrays).
*/
public void setSuperclass(JClass clazz);
/**
* Adds to the list of interfaces implemented by this class.
*
* @throws IllegalArgumentException if the parameter is null or is not
* a valid class name.
*/
public void addInterface(String className);
/**
* Adds to the list of interfaces implemented by this class. The class name
* may or may not be qualified.
*
* @throws IllegalArgumentException if the parameter is null or is not
* a valid class name.
*/
public void addInterfaceUnqualified(String unqualifiedClassName);
/**
* Adds to the list of interfaces implemented by this class.
*
* @throws IllegalArgumentException if the given class cannot be implemented
* (i.e. is not an interface).
*/
public void addInterface(JClass interf);
/**
* Removes a named interface from the list of interfaces implemented by
* this class. Does nothing if the class does not implement the named
* interface.
*
* @throws IllegalArgumentException if the parameter is null or is not
* a valid class name.
*/
public void removeInterface(String className);
/**
* Removes an interface from the list of interfaces implemented by
* this class. Does nothing if the class does not implement the named
* interface.
*
* @throws IllegalArgumentException if the parameter is null or is not
* an interface.
*/
public void removeInterface(JClass interf);
/**
* Creates a new constructor, adds it to this class, and returns it.
*/
public MConstructor addNewConstructor();
/**
* Removes a constructor from this class. Does nothing if the given
* constructor is not on this class.
*/
public void removeConstructor(MConstructor constr);
/**
* Returns the constructors declared on this class. This does not include
* constructors from any base class or interface. This is simply a more
* strongly-typed version of getDeclaredConstructors().
*/
public MConstructor[] getEditableConstructors();
/**
* Creates a new field, adds it to this class, and returns it.
* The type of the field must be qualified
*/
public MField addNewField();
/**
* Removes the given field from this class. Does nothing if this class
* does not contain the field.
*/
public void removeField(MField field);
/**
* Returns the fields declared on this class. This does not include
* fields from any base class or interface. This is simply a more
* strongly-typed version of getDeclaredFields().
*/
public MField[] getEditableFields();
/**
* Creates a new method, adds it to this class, and returns it.
*/
public MMethod addNewMethod();
/**
* Removes the given method from this class. Does nothing if this class
* does not contain the method.
*/
public void removeMethod(MMethod method);
/**
* Returns the EditableMethods declared on this class. This does not
* include methods inherited from any base class or interface. This is
* simply a more strongly-typed version of getDeclaredMethods().
*/
public MMethod[] getEditableMethods();
public JProperty addNewProperty(String name, MMethod getter, MMethod setter);
public void removeProperty(JProperty prop);
}
1.1 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/mutable/MComment.java
Index: MComment.java
===================================================================
/* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.xmlbeans.impl.jam.mutable;
import org.apache.xmlbeans.impl.jam.JComment;
/**
* <p>Mutable version of JComment.</p>
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
public interface MComment extends JComment {
/**
* Sets the text of this comment.
*/
public void setText(String text);
}
1.1 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/mutable/MConstructor.java
Index: MConstructor.java
===================================================================
/* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.xmlbeans.impl.jam.mutable;
import org.apache.xmlbeans.impl.jam.JConstructor;
/**
* <p>Mutable version of JConstructor.</p>
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
public interface MConstructor extends JConstructor, MInvokable {
}
1.1 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/mutable/MElement.java
Index: MElement.java
===================================================================
/* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.xmlbeans.impl.jam.mutable;
import org.apache.xmlbeans.impl.jam.JElement;
/**
* <p>Mutable version of JElement.</p>
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
public interface MElement extends JElement {
//DOCME
public void setSimpleName(String name);
//DOCME
public MSourcePosition createSourcePosition();
//DOCME
public void removeSourcePosition();
//DOCME
public MSourcePosition getEditableSourcePosition();
//DOCME
public void setArtifact(Object o);
}
1.1 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/mutable/MElementVisitor.java
Index: MElementVisitor.java
===================================================================
/* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.xmlbeans.impl.jam.mutable;
/**
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
public interface MElementVisitor {
public void visit(MClass clazz);
public void visit(MConstructor ctor);
public void visit(MField field);
public void visit(MMethod method);
public void visit(MParameter param);
public void visit(MAnnotation param);
public void visit(MComment param);
//FIXME implement this? public void visit(MPackage param);
}
1.1 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/mutable/MField.java
Index: MField.java
===================================================================
/* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.xmlbeans.impl.jam.mutable;
import org.apache.xmlbeans.impl.jam.JClass;
import org.apache.xmlbeans.impl.jam.JField;
/**
* <p>Mutable version of JField.</p>
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
public interface MField extends JField, MMember {
public void setType(String typeName);
public void setUnqualifiedType(String typeName);
public void setType(JClass type);
}
1.1 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/mutable/MInvokable.java
Index: MInvokable.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache
* XMLBeans", nor may "Apache" appear in their name, without prior
* written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation and was
* originally based on software copyright (c) 2003 BEA Systems
* Inc., <http://www.bea.com/>. For more information on the Apache Software
* Foundation, please see <http://www.apache.org/>.
*/
package org.apache.xmlbeans.impl.jam.mutable;
import org.apache.xmlbeans.impl.jam.JClass;
import org.apache.xmlbeans.impl.jam.JInvokable;
/**
* <p>Mutable version of JInvokable.</p>
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
public interface MInvokable extends JInvokable, MMember {
/**
* <p>Adds a declaration of a checked exception of the given type.</p>
*
* @throws java.lang.IllegalArgumentException if the parameter is null or is not
* a valid class name.
*/
public void addException(String qualifiedClassName);
/**
* <p>Adds a declaration of a checked exception of the given type.</p>
*
* @throws java.lang.IllegalArgumentException if the parameter is null or represents
* a class which does not extend throwable.
*/
public void addException(JClass exceptionClass);
/**
* Removes a declaration of a checked exception of the named class. Does
* nothing if no such declaration exists.
*
* @throws java.lang.IllegalArgumentException if the parameter is null or is not
* a valid class name.
*/
public void removeException(String qualifiedClassName);
/**
* Removes a declaration of a checked exception of the given class. Does
* nothing if no such declaration exists.
*
* @throws java.lang.IllegalArgumentException if the parameter is null.
*/
public void removeException(JClass exceptionClass);
/**
* Creates a new parameter on this method of type java.lang.Object and
* with a default name.
*/
public MParameter addNewParameter();
/**
* Removes the given parameter. Does nothing if the parameter is not
* present on this method.
*
* @throws java.lang.IllegalArgumentException if either parameter is null.
*/
public void removeParameter(MParameter parameter);
/**
* Returns all of the parameters on this method, or an empty array if there
* are none. This is simply a more strongly-typed version of
* getParameters().
*/
public MParameter[] getEditableParameters();
}
1.1 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/mutable/MMember.java
Index: MMember.java
===================================================================
/* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.xmlbeans.impl.jam.mutable;
import org.apache.xmlbeans.impl.jam.JMember;
/**
* <p>Mutable version of JMember.</p>
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
public interface MMember extends MAnnotatedElement, JMember {
public void setModifiers(int modifiers);
}
1.1 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/mutable/MMethod.java
Index: MMethod.java
===================================================================
/* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.xmlbeans.impl.jam.mutable;
import org.apache.xmlbeans.impl.jam.JClass;
import org.apache.xmlbeans.impl.jam.JMethod;
/**
* <p>Mutable version of JMethod.</p>
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
public interface MMethod extends JMethod, MInvokable {
/**
* <p>Sets the type of this method's return value. Null can be passed if
* a 'void' return type is desired.</p>
*
* @throws IllegalArgumentException if the parameter is not a valid
* java class name.
*/
public void setReturnType(String qualifiedTypeName);
public void setUnqualifiedReturnType(String unqualifiedTypeName);
/**
* <p>Sets the type of this method's return value. Null may be passed if
* a 'void' return type is desired. This method is exactly equivalent to
* calling setReturnType(jclass.getQualifiedName()).</p>
*/
public void setReturnType(JClass c);
}
1.1 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/mutable/MPackage.java
Index: MPackage.java
===================================================================
/* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.xmlbeans.impl.jam.mutable;
import org.apache.xmlbeans.impl.jam.JPackage;
/**
* <p>Mutable version of JPackage.</p>
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
public interface MPackage extends JPackage, MAnnotatedElement {
}
1.1 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/mutable/MParameter.java
Index: MParameter.java
===================================================================
/* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.xmlbeans.impl.jam.mutable;
import org.apache.xmlbeans.impl.jam.JClass;
import org.apache.xmlbeans.impl.jam.JParameter;
/**
* <p>Mutable version of JParameter.</p>
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
public interface MParameter extends JParameter, MMember {
public void setType(String typeName);
public void setType(JClass type);
public void setUnqualifiedType(String ucname);
}
1.1 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/mutable/MSourcePosition.java
Index: MSourcePosition.java
===================================================================
/* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.xmlbeans.impl.jam.mutable;
import org.apache.xmlbeans.impl.jam.JSourcePosition;
import java.net.URI;
/**
* <p>Mutable version of JSourcePosition.</p>
*
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
*/
public interface MSourcePosition extends JSourcePosition {
/**
* Sets the text column number for this source position. Set to -1 if
* it is not known.
*/
public void setColumn(int col);
/**
* Sets the text line number for this source position. Set to -1 if
* it is not known.
*/
public void setLine(int line);
/**
* Sets the URI of the source file. Set to null if it is not known.
*/
public void setSourceURI(URI uri);
}
1.1 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/mutable/package.html
Index: package.html
===================================================================
<body>
<p>
Provides a modifiable view of the JElement tree. This package contains
interfaces which parallel and extend the JElement tree, adding and
editing functionality to that the view of the java type system can
be modified.
</p>
<p>
Typically, this is only used in conjunction with an 'initializer'
ElementVisitor which is run on a JClass when it is first loaded. The
initializer might use these editable 'E*' abstractions to, for example,
do some pre-processing on the comments or annotations, or to determine
which methods on a class should be exposed as JProperties. The E*
classes are also used by JAM providers in implementing the JamClassBuilder
interface, which populates an EClass with methods, fields, and so on.
</p>
<p>
It is also possible to use this package to synthesize a view
of a java class which does not actually exist in any class or source
file. This could be useful, for example, to drive a code-generation
mechanism (Note that JAM does not provide a model for the contents of
method bodies, so this may not be a useful approach).
</body>
1.3 +3 -3 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/provider/CompositeJamClassBuilder.java
Index: CompositeJamClassBuilder.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/provider/CompositeJamClassBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CompositeJamClassBuilder.java 9 Mar 2004 11:47:10 -0000 1.2
+++ CompositeJamClassBuilder.java 10 Mar 2004 19:43:50 -0000 1.3
@@ -14,7 +14,7 @@
*/
package org.apache.xmlbeans.impl.jam.provider;
-import org.apache.xmlbeans.impl.jam.editable.EClass;
+import org.apache.xmlbeans.impl.jam.mutable.MClass;
import org.apache.xmlbeans.impl.jam.internal.elements.ElementContext;
/**
@@ -45,8 +45,8 @@
for(int i=0; i<mBuilders.length; i++) mBuilders[i].init(ctx);
}
- public EClass build(String pkg, String cname) {
- EClass out = null;
+ public MClass build(String pkg, String cname) {
+ MClass out = null;
for(int i=0; i<mBuilders.length; i++) {
out = mBuilders[i].build(pkg,cname);
if (out != null) return out;
1.3 +6 -6 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/provider/JamClassBuilder.java
Index: JamClassBuilder.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/provider/JamClassBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JamClassBuilder.java 10 Mar 2004 11:42:08 -0000 1.2
+++ JamClassBuilder.java 10 Mar 2004 19:43:50 -0000 1.3
@@ -14,7 +14,7 @@
*/
package org.apache.xmlbeans.impl.jam.provider;
-import org.apache.xmlbeans.impl.jam.editable.EClass;
+import org.apache.xmlbeans.impl.jam.mutable.MClass;
import org.apache.xmlbeans.impl.jam.internal.elements.ClassImpl;
import org.apache.xmlbeans.impl.jam.internal.elements.ElementContext;
@@ -49,7 +49,7 @@
/**
* <p>When a JamClassBuilder decides that it is going to be able
* to respond to a build() request, it must call this method to get an
- * initial instance of EClass. It should then initialize the EClass
+ * initial instance of MClass. It should then initialize the MClass
* as appropriate and then return it.</p>
*
* @param packageName qualified name of the package that contains the
@@ -60,7 +60,7 @@
* the builder is planning on setting any unqualified type references
* on the class.
*/
- protected EClass createClassToBuild(String packageName,
+ protected MClass createClassToBuild(String packageName,
String className,
String[] importSpecs)
{
@@ -84,8 +84,8 @@
* <p>This is called by JAM when it attempts to load a class. If the
* builder has access to an artifact (typically a java source or classfile)
* that represents the given type, it should call createClass() to get
- * a new instance of EClass, populate that instance, and then return it.
- * It should not perform any caching - if an EClass is going to be returned,
+ * a new instance of MClass, populate that instance, and then return it.
+ * It should not perform any caching - if an MClass is going to be returned,
* it should be a new instance.</p>
*
* <p>If not artififact is available, the builder should just return null,
@@ -96,5 +96,5 @@
* @param className
* @return
*/
- public abstract EClass build(String packageName, String className);
+ public abstract MClass build(String packageName, String className);
}
1.3 +2 -2 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/provider/JamServiceContext.java
Index: JamServiceContext.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/provider/JamServiceContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JamServiceContext.java 9 Mar 2004 11:47:10 -0000 1.2
+++ JamServiceContext.java 10 Mar 2004 19:43:50 -0000 1.3
@@ -79,14 +79,14 @@
// Public methods
/**
- * @return The classpath to be searched when trying to initialize an EClass
+ * @return The classpath to be searched when trying to initialize an MClass
* for a java class which was not in the inputSources or inputClasses,
* or null.
*/
public ResourcePath getInputClasspath();
/**
- * @return The sourcepath to be searched when trying to initialize an EClass
+ * @return The sourcepath to be searched when trying to initialize an MClass
* for a java class which was not in the inputSources or inputClasses, or
* null.
*/
1.3 +13 -13 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/visitor/CommentInitializer.java
Index: CommentInitializer.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/visitor/CommentInitializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CommentInitializer.java 10 Mar 2004 11:42:08 -0000 1.2
+++ CommentInitializer.java 10 Mar 2004 19:43:50 -0000 1.3
@@ -15,7 +15,7 @@
package org.apache.xmlbeans.impl.jam.visitor;
import org.apache.xmlbeans.impl.jam.JComment;
-import org.apache.xmlbeans.impl.jam.editable.*;
+import org.apache.xmlbeans.impl.jam.mutable.*;
import java.io.*;
import java.util.*;
@@ -54,22 +54,22 @@
}
// ========================================================================
- // EElementVisitor implementation - nothing to see here
+ // MElementVisitor implementation - nothing to see here
- public void visit(EClass clazz) { visit((EAnnotatedElement)clazz); }
- public void visit(EConstructor ctor) { visit((EAnnotatedElement)ctor); }
- public void visit(EField field) { visit((EAnnotatedElement)field); }
- public void visit(EMethod method) { visit((EAnnotatedElement)method); }
- public void visit(EParameter param) { visit((EAnnotatedElement)param); }
+ public void visit(MClass clazz) { visit((MAnnotatedElement)clazz); }
+ public void visit(MConstructor ctor) { visit((MAnnotatedElement)ctor); }
+ public void visit(MField field) { visit((MAnnotatedElement)field); }
+ public void visit(MMethod method) { visit((MAnnotatedElement)method); }
+ public void visit(MParameter param) { visit((MAnnotatedElement)param); }
- public void visit(EAnnotation ann) {}
- public void visit(EComment param) {}
+ public void visit(MAnnotation ann) {}
+ public void visit(MComment param) {}
// ========================================================================
// Protected methods
- protected void visit(EAnnotatedElement element) {
- EComment comment = element.getEditableComment();
+ protected void visit(MAnnotatedElement element) {
+ MComment comment = element.getEditableComment();
if (comment != null) {
String[] commentsAndTags = getCommentsAndTags(comment);
if (commentsAndTags == null || commentsAndTags.length == 0) return;
@@ -113,13 +113,13 @@
return out;
}
- protected void processComment(EAnnotatedElement commentedElement,
+ protected void processComment(MAnnotatedElement commentedElement,
String trimmedComment) {
commentedElement.getEditableComment().setText(trimmedComment);
}
- protected void processJavadocTag(EAnnotatedElement element, String tagtext) {
+ protected void processJavadocTag(MAnnotatedElement element, String tagtext) {
tagtext = tagtext.trim();
if (!tagtext.startsWith("@")) {
throw new IllegalArgumentException("invalid tagtext '"+tagtext+"'");
1.2 +9 -9 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/visitor/CompositeElementVisitor.java
Index: CompositeElementVisitor.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/visitor/CompositeElementVisitor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CompositeElementVisitor.java 9 Mar 2004 10:38:53 -0000 1.1
+++ CompositeElementVisitor.java 10 Mar 2004 19:43:50 -0000 1.2
@@ -14,7 +14,7 @@
*/
package org.apache.xmlbeans.impl.jam.visitor;
-import org.apache.xmlbeans.impl.jam.editable.*;
+import org.apache.xmlbeans.impl.jam.mutable.*;
/**
* @author Patrick Calahan <email: pcal-at-bea-dot-com>
@@ -37,35 +37,35 @@
// ========================================================================
// ElementVisitor implementation
- public void visit(EPackage pkg) {
+ public void visit(MPackage pkg) {
for(int i=0; i<mVisitors.length; i++) mVisitors[i].visit(pkg);
}
- public void visit(EClass clazz) {
+ public void visit(MClass clazz) {
for(int i=0; i<mVisitors.length; i++) mVisitors[i].visit(clazz);
}
- public void visit(EConstructor ctor) {
+ public void visit(MConstructor ctor) {
for(int i=0; i<mVisitors.length; i++) mVisitors[i].visit(ctor);
}
- public void visit(EField field) {
+ public void visit(MField field) {
for(int i=0; i<mVisitors.length; i++) mVisitors[i].visit(field);
}
- public void visit(EMethod method) {
+ public void visit(MMethod method) {
for(int i=0; i<mVisitors.length; i++) mVisitors[i].visit(method);
}
- public void visit(EParameter param) {
+ public void visit(MParameter param) {
for(int i=0; i<mVisitors.length; i++) mVisitors[i].visit(param);
}
- public void visit(EAnnotation ann) {
+ public void visit(MAnnotation ann) {
for(int i=0; i<mVisitors.length; i++) mVisitors[i].visit(ann);
}
- public void visit(EComment comment) {
+ public void visit(MComment comment) {
for(int i=0; i<mVisitors.length; i++) mVisitors[i].visit(comment);
}
1.2 +9 -9 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/visitor/ElementVisitor.java
Index: ElementVisitor.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/visitor/ElementVisitor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ElementVisitor.java 9 Mar 2004 10:38:53 -0000 1.1
+++ ElementVisitor.java 10 Mar 2004 19:43:50 -0000 1.2
@@ -14,7 +14,7 @@
*/
package org.apache.xmlbeans.impl.jam.visitor;
-import org.apache.xmlbeans.impl.jam.editable.*;
+import org.apache.xmlbeans.impl.jam.mutable.*;
/**
* <p>To be extended by classes which wish to traverse a set of JClasses.</p>
@@ -23,20 +23,20 @@
*/
public abstract class ElementVisitor {
- public void visit(EPackage pkg) {}
+ public void visit(MPackage pkg) {}
- public void visit(EClass clazz) {}
+ public void visit(MClass clazz) {}
- public void visit(EConstructor ctor) {}
+ public void visit(MConstructor ctor) {}
- public void visit(EField field) {}
+ public void visit(MField field) {}
- public void visit(EMethod method) {}
+ public void visit(MMethod method) {}
- public void visit(EParameter param) {}
+ public void visit(MParameter param) {}
- public void visit(EAnnotation ann) {}
+ public void visit(MAnnotation ann) {}
- public void visit(EComment comment) {}
+ public void visit(MComment comment) {}
}
1.3 +4 -4 xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/visitor/PropertyInitializer.java
Index: PropertyInitializer.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/visitor/PropertyInitializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PropertyInitializer.java 10 Mar 2004 11:42:08 -0000 1.2
+++ PropertyInitializer.java 10 Mar 2004 19:43:50 -0000 1.3
@@ -16,8 +16,8 @@
import org.apache.xmlbeans.impl.jam.JProperty;
import org.apache.xmlbeans.impl.jam.JClass;
-import org.apache.xmlbeans.impl.jam.editable.EClass;
-import org.apache.xmlbeans.impl.jam.editable.EMethod;
+import org.apache.xmlbeans.impl.jam.mutable.MClass;
+import org.apache.xmlbeans.impl.jam.mutable.MMethod;
import org.apache.xmlbeans.impl.jam.internal.elements.PropertyImpl;
import java.util.Map;
@@ -31,9 +31,9 @@
// ========================================================================
// Element visitor implementation
- public void visit(EClass clazz) {
+ public void visit(MClass clazz) {
Map name2prop = new HashMap();
- EMethod[] methods = clazz.getEditableMethods();
+ MMethod[] methods = clazz.getEditableMethods();
for(int i=0; i<methods.length; i++) {
String name = methods[i].getSimpleName();
---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org