User: rinkrank
Date: 02/03/16 10:22:05
Modified: core/src/xdoclet/ejb Tag: XJAVADOC_REFACTORING
AbstractEjbDeploymentDescriptorSubTask.java
DaoSubTask.java DataObjectSubTask.java
EjbDocletTask.java EntityBmpSubTask.java
EntityCmpSubTask.java EntityPkSubTask.java
HomeInterfaceSubTask.java
LocalHomeInterfaceSubTask.java
LocalInterfaceSubTask.java
RemoteInterfaceSubTask.java SessionSubTask.java
UtilObjectSubTask.java ValueObjectSubTask.java
Log:
xjavadoc refactoring. doesn't work yet, but it compiles
Revision Changes Path
No revision
No revision
1.1.4.1 +15 -9
xdoclet/core/src/xdoclet/ejb/AbstractEjbDeploymentDescriptorSubTask.java
Index: AbstractEjbDeploymentDescriptorSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/AbstractEjbDeploymentDescriptorSubTask.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -w -r1.1 -r1.1.4.1
--- AbstractEjbDeploymentDescriptorSubTask.java 11 Dec 2001 15:28:49 -0000
1.1
+++ AbstractEjbDeploymentDescriptorSubTask.java 16 Mar 2002 18:22:04 -0000
1.1.4.1
@@ -1,31 +1,37 @@
package xdoclet.ejb;
+import xjavadoc.XJavaDoc;
+import xjavadoc.XClass;
+import xjavadoc.XJavaDocException;
import xdoclet.XmlSubTask;
import xdoclet.XDocletException;
import xdoclet.ejb.tags.CmpTagsHandler;
-import com.sun.javadoc.ClassDoc;
/**
* Base class for all subtasks that generate xml-ish ejb deployment descriptors.
*
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Dec 11, 2001
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.1.4.1 $
*/
public abstract class AbstractEjbDeploymentDescriptorSubTask extends XmlSubTask
{
protected boolean atLeastOneCmpEntityBeanExists() throws XDocletException
{
- ClassDoc[] classes = getContext().getRoot().classes();
+ try {
+ XClass[] classes = XJavaDoc.getInstance().sourceClasses();
for( int i = 0; i < classes.length; i++ )
{
- ClassDoc clazz = classes[i];
+ XClass clazz = classes[i];
if( CmpTagsHandler.isEntityCmp( clazz ) == true )
return true;
}
return false;
+ } catch( XJavaDocException e ) {
+ throw new XDocletException( e, e.getMessage() );
+ }
}
}
1.1.2.1 +6 -6 xdoclet/core/src/xdoclet/ejb/DaoSubTask.java
Index: DaoSubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/DaoSubTask.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -w -r1.1 -r1.1.2.1
--- DaoSubTask.java 4 Mar 2002 01:25:29 -0000 1.1
+++ DaoSubTask.java 16 Mar 2002 18:22:04 -0000 1.1.2.1
@@ -1,13 +1,13 @@
package xdoclet.ejb;
-import com.sun.javadoc.ClassDoc;
+import xjavadoc.XClass;
import xdoclet.TemplateSubTask;
import xdoclet.XDocletException;
import xdoclet.XmlSubTask;
import xdoclet.XDocletTagSupport;
import xdoclet.util.Log;
-import xdoclet.util.DocletUtil;
+
import xdoclet.util.Translator;
import xdoclet.ejb.tags.DaoTagsHandler;
import xdoclet.ejb.tags.EjbTagsHandler;
@@ -20,7 +20,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Andrew Stevens</a>
* @created February 8, 2002
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.1.2.1 $
*/
public class DaoSubTask extends AbstractEjbCodeGeneratorSubTask
{
@@ -93,7 +93,7 @@
}
}
- protected String getGeneratedFileName( ClassDoc clazz ) throws XDocletException
+ protected String getGeneratedFileName( XClass clazz ) throws XDocletException
{
return PackageTagsHandler.packageNameAsPathFor(
DaoTagsHandler.getDaoClassFor( getCurrentClass() ) ) + ".java";
}
@@ -104,7 +104,7 @@
new String[]{getCurrentClass().qualifiedName()} ) );
}
- protected boolean matchesGenerationRules( ClassDoc clazz ) throws
XDocletException
+ protected boolean matchesGenerationRules( XClass clazz ) throws
XDocletException
{
Category cat = Log.getCategory( DaoSubTask.class,
"matchesGenerationRules" );
@@ -114,7 +114,7 @@
return false;
}
- String generate = XDocletTagSupport.getParameterValue( clazz,
DocletUtil.getText( getCurrentClass(), "ejb:dao", false ), "generate", -1 );
+ String generate = clazz.doc().tagAttributeValue("ejb:dao", "generate",
false );
if( ( generate != null ) && ( generate.equals( "false" ) ||
generate.equals( "no" ) ) )
{
1.20.2.1 +11 -11 xdoclet/core/src/xdoclet/ejb/DataObjectSubTask.java
Index: DataObjectSubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/DataObjectSubTask.java,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -w -r1.20 -r1.20.2.1
--- DataObjectSubTask.java 22 Feb 2002 16:28:20 -0000 1.20
+++ DataObjectSubTask.java 16 Mar 2002 18:22:04 -0000 1.20.2.1
@@ -1,7 +1,7 @@
package xdoclet.ejb;
-import com.sun.javadoc.ClassDoc;
-import com.sun.javadoc.Tag;
+import xjavadoc.XClass;
+import xjavadoc.XTag;
import org.apache.log4j.Category;
@@ -9,7 +9,7 @@
import xdoclet.XDocletException;
import xdoclet.ejb.tags.DataObjectTagsHandler;
import xdoclet.tags.PackageTagsHandler;
-import xdoclet.util.DocletUtil;
+
import xdoclet.util.Log;
import xdoclet.util.Translator;
@@ -19,7 +19,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @version $Revision: 1.20 $
+ * @version $Revision: 1.20.2.1 $
*/
public class DataObjectSubTask extends AbstractEjbCodeGeneratorSubTask
{
@@ -93,12 +93,12 @@
}
}
- protected String getGeneratedFileName( ClassDoc clazz ) throws XDocletException
+ protected String getGeneratedFileName( XClass clazz ) throws XDocletException
{
return PackageTagsHandler.packageNameAsPathFor(
DataObjectTagsHandler.getDataObjectClassFor( getCurrentClass() ) ) + ".java";
}
- protected boolean matchesGenerationRules( ClassDoc clazz ) throws
XDocletException
+ protected boolean matchesGenerationRules( XClass clazz ) throws
XDocletException
{
if( super.matchesGenerationRules( clazz ) == false )
{
@@ -117,22 +117,22 @@
}
}
- protected void generateForClass( ClassDoc clazz ) throws XDocletException
+ protected void generateForClass( XClass clazz ) throws XDocletException
{
if( DataObjectTagsHandler.hasCustomBulkData( getCurrentClass() ) )
{
// Don't make a new DataObject class; use the custom one
instead
- Tag[] bdo = DocletUtil.getTagsByName( getCurrentClass(),
"ejb:bulk-data" );
- StringTokenizer enum = new StringTokenizer( bdo[0].text(), " "
);
+ XTag bdo = getCurrentClass().doc().tag( "ejb:bulk-data" );
+ StringTokenizer enum = new StringTokenizer( bdo.value(), " " );
DataObjectTagsHandler.setCurrentDataObjectClassname(
enum.nextToken().trim() );
- DataObjectTagsHandler.putDataObjectClassnames(
getCurrentClass().name(), DataObjectTagsHandler.getCurrentDataObjectClassname() );
+ DataObjectTagsHandler.putDataObjectClassnames(
getCurrentClass().qualifiedName(),
DataObjectTagsHandler.getCurrentDataObjectClassname() );
}
else
{
DataObjectTagsHandler.setCurrentDataObjectClassname(
DataObjectTagsHandler.generateDataObjectClass( clazz ) );
- DataObjectTagsHandler.putDataObjectClassnames(
getCurrentClass().name(), DataObjectTagsHandler.getCurrentDataObjectClassname() );
+ DataObjectTagsHandler.putDataObjectClassnames(
getCurrentClass().qualifiedName(),
DataObjectTagsHandler.getCurrentDataObjectClassname() );
}
super.generateForClass( clazz );
1.34.2.1 +44 -38 xdoclet/core/src/xdoclet/ejb/EjbDocletTask.java
Index: EjbDocletTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/EjbDocletTask.java,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -u -w -r1.34 -r1.34.2.1
--- EjbDocletTask.java 4 Mar 2002 21:32:40 -0000 1.34
+++ EjbDocletTask.java 16 Mar 2002 18:22:04 -0000 1.34.2.1
@@ -6,8 +6,8 @@
import xdoclet.tags.PackageTagsHandler;
import xdoclet.ejb.vendor.*;
-import java.util.Hashtable;
-import java.util.Vector;
+import java.util.HashMap;
+import java.util.ArrayList;
import java.io.Serializable;
import org.apache.tools.ant.types.FileSet;
@@ -17,7 +17,7 @@
*
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created April 30, 2001
- * @version $Revision: 1.34 $
+ * @version $Revision: 1.34.2.1 $
*/
public class EjbDocletTask extends DocletTask
{
@@ -26,7 +26,7 @@
// list of suffix strings used when calculating a default bean name from a
class
private String ejbClassNameSuffix = "Bean,EJB,Ejb";
- private Vector packageSubstitutions = new Vector();
+ private ArrayList packageSubstitutions = new ArrayList();
// Generic sub-tasks
private DataObjectSubTask dataObject = null;
@@ -64,7 +64,7 @@
return ejbspec;
}
- public Vector getPackageSubstitutions()
+ public ArrayList getPackageSubstitutions()
{
return packageSubstitutions;
}
@@ -90,7 +90,7 @@
this.ejbClassNameSuffix = ejbClassNameSuffix;
}
- public void setPackageSubstitutions( Vector packageSubstitutions )
+ public void setPackageSubstitutions( ArrayList packageSubstitutions )
{
this.packageSubstitutions = packageSubstitutions;
}
@@ -102,7 +102,7 @@
*/
public void addPackageSubstitution( PackageTagsHandler.PackageSubstitution ps )
{
- packageSubstitutions.addElement( ps );
+ packageSubstitutions.add( ps );
}
public DataObjectSubTask createDataobject()
@@ -249,34 +249,34 @@
return pramati;
}
- protected Vector getSubTasks()
+ protected ArrayList getSubTasks()
{
- Vector subtasks = super.getSubTasks();
+ ArrayList subtasks = super.getSubTasks();
- subtasks.addElement( this.homeInterface );
- subtasks.addElement( this.localHomeInterface );
- subtasks.addElement( this.remoteInterface );
- subtasks.addElement( this.localInterface );
- subtasks.addElement( this.session );
- subtasks.addElement( this.entityPk );
- subtasks.addElement( this.dataObject );
- subtasks.addElement( this.dao );
- subtasks.addElement( this.valueObject );
- subtasks.addElement( this.entityBmp );
- subtasks.addElement( this.entityCmp );
- subtasks.addElement( this.deploymentDescriptor );
- subtasks.addElement( this.jboss );
- subtasks.addElement( this.orion );
- subtasks.addElement( this.webSphere );
- subtasks.addElement( this.webLogic );
- subtasks.addElement( this.apachesoap );
- subtasks.addElement( this.strutsformsubtask );
- subtasks.addElement( this.utilObject );
- subtasks.addElement( this.mappingXmlSubTask );
- subtasks.addElement( this.mvcsoft );
- subtasks.addElement( this.bluestone );
- subtasks.addElement( this.jrun );
- subtasks.addElement( this.pramati );
+ subtasks.add( this.homeInterface );
+ subtasks.add( this.localHomeInterface );
+ subtasks.add( this.remoteInterface );
+ subtasks.add( this.localInterface );
+ subtasks.add( this.session );
+ subtasks.add( this.entityPk );
+ subtasks.add( this.dataObject );
+ subtasks.add( this.dao );
+ subtasks.add( this.valueObject );
+ subtasks.add( this.entityBmp );
+ subtasks.add( this.entityCmp );
+ subtasks.add( this.deploymentDescriptor );
+ subtasks.add( this.jboss );
+ subtasks.add( this.orion );
+ subtasks.add( this.webSphere );
+ subtasks.add( this.webLogic );
+ subtasks.add( this.apachesoap );
+ subtasks.add( this.strutsformsubtask );
+ subtasks.add( this.utilObject );
+ subtasks.add( this.mappingXmlSubTask );
+ subtasks.add( this.mvcsoft );
+ subtasks.add( this.bluestone );
+ subtasks.add( this.jrun );
+ subtasks.add( this.pramati );
return subtasks;
}
@@ -286,12 +286,18 @@
if( context != null )
return context;
- Vector subtasks = getSubTasks();
- Hashtable configs = getConfigParams( subtasks );
+ ArrayList subtasks = getSubTasks();
+ HashMap configs = getConfigParams( subtasks );
- context = new DocletContext( getSourcePath().toString(),
getClasspath().toString(), getDestDir().toString(),
- getMergeDir() != null ? getMergeDir().toString() : null,
getExcludedTags(),
- ( SubTask[] ) subtasks.toArray( new SubTask[subtasks.size()]
), project.getProperties(), configs, isForce() );
+ context = new DocletContext(
+ getDestDir().toString(),
+ getMergeDir() != null ? getMergeDir().toString() : null,
+ getExcludedTags(),
+ ( SubTask[] ) subtasks.toArray( new SubTask[subtasks.size()] ),
+ project.getProperties(),
+ configs,
+ isForce()
+ );
//now register this single instance
DocletContext.setSingleInstance( context );
1.20.2.1 +6 -6 xdoclet/core/src/xdoclet/ejb/EntityBmpSubTask.java
Index: EntityBmpSubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/EntityBmpSubTask.java,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -w -r1.20 -r1.20.2.1
--- EntityBmpSubTask.java 22 Feb 2002 16:28:20 -0000 1.20
+++ EntityBmpSubTask.java 16 Mar 2002 18:22:05 -0000 1.20.2.1
@@ -1,11 +1,11 @@
package xdoclet.ejb;
-import com.sun.javadoc.ClassDoc;
+import xjavadoc.XClass;
import xdoclet.TemplateSubTask;
import xdoclet.XDocletException;
import xdoclet.XDocletTagSupport;
-import xdoclet.util.DocletUtil;
+
import xdoclet.util.Log;
import xdoclet.util.Translator;
import xdoclet.ejb.tags.BmpTagsHandler;
@@ -20,7 +20,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @version $Revision: 1.20 $
+ * @version $Revision: 1.20.2.1 $
*/
public class EntityBmpSubTask extends AbstractEjbCodeGeneratorSubTask
{
@@ -96,12 +96,12 @@
}
}
- protected String getGeneratedFileName( ClassDoc clazz ) throws XDocletException
+ protected String getGeneratedFileName( XClass clazz ) throws XDocletException
{
return PackageTagsHandler.packageNameAsPathFor(
BmpTagsHandler.getEntityBmpClassFor( getCurrentClass() ) ) + ".java";
}
- protected boolean matchesGenerationRules( ClassDoc clazz ) throws
XDocletException
+ protected boolean matchesGenerationRules( XClass clazz ) throws
XDocletException
{
Category cat = Log.getCategory( EntityBmpSubTask.class,
"matchesGenerationRules" );
@@ -117,7 +117,7 @@
return false;
}
- String generate = XDocletTagSupport.getParameterValue( clazz,
DocletUtil.getText( getCurrentClass(), "ejb:bean", false ), "generate", -1 );
+ String generate = clazz.doc().tagAttributeValue( "ejb:bean",
"generate", false );
if( ( generate != null ) && ( generate.equals( "false" ) ||
generate.equals( "no" ) ) )
{
1.24.2.1 +9 -6 xdoclet/core/src/xdoclet/ejb/EntityCmpSubTask.java
Index: EntityCmpSubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/EntityCmpSubTask.java,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -w -r1.24 -r1.24.2.1
--- EntityCmpSubTask.java 23 Feb 2002 00:22:40 -0000 1.24
+++ EntityCmpSubTask.java 16 Mar 2002 18:22:05 -0000 1.24.2.1
@@ -1,12 +1,12 @@
package xdoclet.ejb;
-import com.sun.javadoc.ClassDoc;
+import xjavadoc.XClass;
import xdoclet.TemplateSubTask;
import xdoclet.XDocletException;
import xdoclet.XDocletTagSupport;
import xdoclet.util.Log;
-import xdoclet.util.DocletUtil;
+
import xdoclet.util.Translator;
import xdoclet.ejb.tags.CmpTagsHandler;
import xdoclet.ejb.tags.EjbTagsHandler;
@@ -19,7 +19,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @version $Revision: 1.24 $
+ * @version $Revision: 1.24.2.1 $
*/
public class EntityCmpSubTask extends AbstractEjbCodeGeneratorSubTask
{
@@ -105,12 +105,15 @@
}
}
- protected String getGeneratedFileName( ClassDoc clazz ) throws XDocletException
+ protected String getGeneratedFileName( XClass clazz ) throws XDocletException
{
return PackageTagsHandler.packageNameAsPathFor(
CmpTagsHandler.getEntityCmpClassFor( getCurrentClass() ) ) + ".java";
}
- protected boolean matchesGenerationRules( ClassDoc clazz ) throws
XDocletException
+ /**
+ * @todo refactor/merge this method with matchesGenerationRules from
EntityBmpSubTask
+ */
+ protected boolean matchesGenerationRules( XClass clazz ) throws
XDocletException
{
Category cat = Log.getCategory( EntityCmpSubTask.class,
"matchesGenerationRules" );
@@ -126,7 +129,7 @@
return false;
}
- String generate = XDocletTagSupport.getParameterValue( clazz,
DocletUtil.getText( getCurrentClass(), "ejb:bean", false ), "generate", -1 );
+ String generate = clazz.doc().tagAttributeValue( "ejb:bean",
"generate", false );
if( ( generate != null ) && ( generate.equals( "false" ) ||
generate.equals( "no" ) ) )
{
1.22.2.1 +6 -6 xdoclet/core/src/xdoclet/ejb/EntityPkSubTask.java
Index: EntityPkSubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/EntityPkSubTask.java,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -w -r1.22 -r1.22.2.1
--- EntityPkSubTask.java 22 Feb 2002 16:28:20 -0000 1.22
+++ EntityPkSubTask.java 16 Mar 2002 18:22:05 -0000 1.22.2.1
@@ -1,6 +1,6 @@
package xdoclet.ejb;
-import com.sun.javadoc.ClassDoc;
+import xjavadoc.XClass;
import org.apache.log4j.Category;
@@ -9,7 +9,7 @@
import xdoclet.XDocletTagSupport;
import xdoclet.ejb.tags.PkTagsHandler;
import xdoclet.tags.PackageTagsHandler;
-import xdoclet.util.DocletUtil;
+
import xdoclet.util.Log;
import xdoclet.util.Translator;
@@ -18,7 +18,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @version $Revision: 1.22 $
+ * @version $Revision: 1.22.2.1 $
*/
public class EntityPkSubTask extends AbstractEjbCodeGeneratorSubTask
{
@@ -92,12 +92,12 @@
}
}
- protected String getGeneratedFileName( ClassDoc clazz ) throws XDocletException
+ protected String getGeneratedFileName( XClass clazz ) throws XDocletException
{
return PackageTagsHandler.packageNameAsPathFor(
PkTagsHandler.getPkClassFor( getCurrentClass() ) ) + ".java";
}
- protected boolean matchesGenerationRules( ClassDoc clazz ) throws
XDocletException
+ protected boolean matchesGenerationRules( XClass clazz ) throws
XDocletException
{
if( super.matchesGenerationRules( clazz ) == false )
{
@@ -108,7 +108,7 @@
String pk_class = PkTagsHandler.getPkClassFor( clazz );
- if( "false".equals( XDocletTagSupport.getParameterValue( clazz,
DocletUtil.getText( getCurrentClass(), "ejb:pk", false ), "generate", -1 ) ) )
+ if( "false".equals( clazz.doc().tagAttributeValue( "ejb:pk",
"generate", false) ) )
{
cat.debug( "Skip primary key for " + clazz.qualifiedName() + "
because of false generate flag" );
return false;
1.23.2.1 +8 -7 xdoclet/core/src/xdoclet/ejb/HomeInterfaceSubTask.java
Index: HomeInterfaceSubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/HomeInterfaceSubTask.java,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -w -r1.23 -r1.23.2.1
--- HomeInterfaceSubTask.java 22 Feb 2002 16:28:20 -0000 1.23
+++ HomeInterfaceSubTask.java 16 Mar 2002 18:22:05 -0000 1.23.2.1
@@ -1,6 +1,7 @@
package xdoclet.ejb;
-import com.sun.javadoc.ClassDoc;
+import xjavadoc.XClass;
+import xjavadoc.XTag;
import org.apache.log4j.Category;
@@ -10,7 +11,7 @@
import xdoclet.ejb.tags.HomeTagsHandler;
import xdoclet.ejb.tags.InterfaceTagsHandler;
import xdoclet.tags.PackageTagsHandler;
-import xdoclet.util.DocletUtil;
+
import xdoclet.util.Log;
import xdoclet.util.Translator;
@@ -19,7 +20,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @version $Revision: 1.23 $
+ * @version $Revision: 1.23.2.1 $
*/
public class HomeInterfaceSubTask extends AbstractEjbCodeGeneratorSubTask
{
@@ -97,12 +98,12 @@
}
}
- protected String getGeneratedFileName( ClassDoc clazz ) throws XDocletException
+ protected String getGeneratedFileName( XClass clazz ) throws XDocletException
{
return PackageTagsHandler.packageNameAsPathFor(
HomeTagsHandler.getHomeInterface( "remote", getCurrentClass() ) ) + ".java";
}
- protected boolean matchesGenerationRules( ClassDoc clazz ) throws
XDocletException
+ protected boolean matchesGenerationRules( XClass clazz ) throws
XDocletException
{
if( super.matchesGenerationRules( clazz ) == false )
{
@@ -117,14 +118,14 @@
return false;
}
- String interfaceTag = DocletUtil.getText( getCurrentClass(),
"ejb:interface", false );
+ XTag interfaceTag = getCurrentClass().doc().tag( "ejb:interface",
false );
if( interfaceTag == null )
{
return true;
}
- String generate = XDocletTagSupport.getParameterValue( clazz,
interfaceTag, "generate", -1 );
+ String generate = interfaceTag.attributeValue( "generate" );
if( ( generate != null ) && ( generate.indexOf( "remote" ) == -1 ) )
{
1.18.2.1 +8 -7 xdoclet/core/src/xdoclet/ejb/LocalHomeInterfaceSubTask.java
Index: LocalHomeInterfaceSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/LocalHomeInterfaceSubTask.java,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -w -r1.18 -r1.18.2.1
--- LocalHomeInterfaceSubTask.java 22 Feb 2002 16:28:20 -0000 1.18
+++ LocalHomeInterfaceSubTask.java 16 Mar 2002 18:22:05 -0000 1.18.2.1
@@ -1,6 +1,7 @@
package xdoclet.ejb;
-import com.sun.javadoc.ClassDoc;
+import xjavadoc.XClass;
+import xjavadoc.XTag;
import org.apache.log4j.Category;
@@ -10,7 +11,7 @@
import xdoclet.ejb.tags.HomeTagsHandler;
import xdoclet.ejb.tags.InterfaceTagsHandler;
import xdoclet.tags.PackageTagsHandler;
-import xdoclet.util.DocletUtil;
+
import xdoclet.util.Log;
import xdoclet.util.Translator;
@@ -19,7 +20,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @version $Revision: 1.18 $
+ * @version $Revision: 1.18.2.1 $
*/
public class LocalHomeInterfaceSubTask extends AbstractEjbCodeGeneratorSubTask
{
@@ -93,12 +94,12 @@
}
}
- protected String getGeneratedFileName( ClassDoc clazz ) throws XDocletException
+ protected String getGeneratedFileName( XClass clazz ) throws XDocletException
{
return PackageTagsHandler.packageNameAsPathFor(
HomeTagsHandler.getHomeInterface( "local", getCurrentClass() ) ) + ".java";
}
- protected boolean matchesGenerationRules( ClassDoc clazz ) throws
XDocletException
+ protected boolean matchesGenerationRules( XClass clazz ) throws
XDocletException
{
if( super.matchesGenerationRules( clazz ) == false )
{
@@ -113,14 +114,14 @@
return false;
}
- String interfaceTag = DocletUtil.getText( getCurrentClass(),
"ejb:interface", false );
+ XTag interfaceTag = getCurrentClass().doc().tag( "ejb:interface" );
if( interfaceTag == null )
{
return true;
}
- String generate = XDocletTagSupport.getParameterValue( clazz,
interfaceTag, "generate", -1 );
+ String generate = interfaceTag.attributeValue( "generate" );
if( ( generate != null ) && ( generate.indexOf( "local" ) == -1 ) )
{
1.19.2.1 +11 -7 xdoclet/core/src/xdoclet/ejb/LocalInterfaceSubTask.java
Index: LocalInterfaceSubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/LocalInterfaceSubTask.java,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -w -r1.19 -r1.19.2.1
--- LocalInterfaceSubTask.java 22 Feb 2002 16:28:20 -0000 1.19
+++ LocalInterfaceSubTask.java 16 Mar 2002 18:22:05 -0000 1.19.2.1
@@ -1,6 +1,7 @@
package xdoclet.ejb;
-import com.sun.javadoc.ClassDoc;
+import xjavadoc.XClass;
+import xjavadoc.XTag;
import org.apache.log4j.Category;
@@ -9,7 +10,7 @@
import xdoclet.XDocletTagSupport;
import xdoclet.ejb.tags.InterfaceTagsHandler;
import xdoclet.tags.PackageTagsHandler;
-import xdoclet.util.DocletUtil;
+
import xdoclet.util.Log;
import xdoclet.util.Translator;
@@ -18,7 +19,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @version $Revision: 1.19 $
+ * @version $Revision: 1.19.2.1 $
*/
public class LocalInterfaceSubTask extends AbstractEjbCodeGeneratorSubTask
{
@@ -93,12 +94,15 @@
throw new XDocletException( Translator.getString(
"xdoclet.ejb.Messages", "pattern_has_no_placeholder" ) );
}
- protected String getGeneratedFileName( ClassDoc clazz ) throws XDocletException
+ protected String getGeneratedFileName( XClass clazz ) throws XDocletException
{
return PackageTagsHandler.packageNameAsPathFor(
InterfaceTagsHandler.getComponentInterface( "local", getCurrentClass() ) ) + ".java";
}
- protected boolean matchesGenerationRules( ClassDoc clazz ) throws
XDocletException
+ /**
+ * @todo (Aslak) This needs refactoring. Nearly all matchesGenerationRules
implementations are the same!
+ */
+ protected boolean matchesGenerationRules( XClass clazz ) throws
XDocletException
{
if( super.matchesGenerationRules( clazz ) == false )
return false;
@@ -111,12 +115,12 @@
return false;
}
- String interfaceTag = DocletUtil.getText( getCurrentClass(),
"ejb:interface", false );
+ XTag interfaceTag = getCurrentClass().doc().tag( "ejb:interface" );
if( interfaceTag == null )
return true;
- String generate = XDocletTagSupport.getParameterValue( clazz,
interfaceTag, "generate", -1 );
+ String generate = interfaceTag.attributeValue( "generate" );
if( ( generate != null ) && ( generate.indexOf( "local" ) == -1 ) )
{
1.22.2.1 +8 -7 xdoclet/core/src/xdoclet/ejb/RemoteInterfaceSubTask.java
Index: RemoteInterfaceSubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/RemoteInterfaceSubTask.java,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -w -r1.22 -r1.22.2.1
--- RemoteInterfaceSubTask.java 22 Feb 2002 16:28:20 -0000 1.22
+++ RemoteInterfaceSubTask.java 16 Mar 2002 18:22:05 -0000 1.22.2.1
@@ -1,6 +1,7 @@
package xdoclet.ejb;
-import com.sun.javadoc.ClassDoc;
+import xjavadoc.XClass;
+import xjavadoc.XTag;
import org.apache.log4j.Category;
@@ -9,7 +10,7 @@
import xdoclet.XDocletTagSupport;
import xdoclet.ejb.tags.InterfaceTagsHandler;
import xdoclet.tags.PackageTagsHandler;
-import xdoclet.util.DocletUtil;
+
import xdoclet.util.Log;
import xdoclet.util.Translator;
@@ -18,7 +19,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @version $Revision: 1.22 $
+ * @version $Revision: 1.22.2.1 $
*/
public class RemoteInterfaceSubTask extends AbstractEjbCodeGeneratorSubTask
{
@@ -88,12 +89,12 @@
throw new XDocletException( Translator.getString(
"xdoclet.ejb.Messages", "pattern_has_no_placeholder" ) );
}
- protected String getGeneratedFileName( ClassDoc clazz ) throws XDocletException
+ protected String getGeneratedFileName( XClass clazz ) throws XDocletException
{
return PackageTagsHandler.packageNameAsPathFor(
InterfaceTagsHandler.getComponentInterface( "remote", getCurrentClass() ) ) + ".java";
}
- protected boolean matchesGenerationRules( ClassDoc clazz ) throws
XDocletException
+ protected boolean matchesGenerationRules( XClass clazz ) throws
XDocletException
{
if( super.matchesGenerationRules( clazz ) == false )
return false;
@@ -106,12 +107,12 @@
return false;
}
- String interfaceTag = DocletUtil.getText( getCurrentClass(),
"ejb:interface", false );
+ XTag interfaceTag = getCurrentClass().doc().tag( "ejb:interface" );
if( interfaceTag == null )
return true;
- String generate = XDocletTagSupport.getParameterValue( clazz,
interfaceTag, "generate", -1 );
+ String generate = interfaceTag.attributeValue( "generate" );
if( ( generate != null ) && ( generate.indexOf( "remote" ) == -1 ) )
{
1.22.2.1 +6 -6 xdoclet/core/src/xdoclet/ejb/SessionSubTask.java
Index: SessionSubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/SessionSubTask.java,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -w -r1.22 -r1.22.2.1
--- SessionSubTask.java 22 Feb 2002 16:28:20 -0000 1.22
+++ SessionSubTask.java 16 Mar 2002 18:22:05 -0000 1.22.2.1
@@ -1,6 +1,6 @@
package xdoclet.ejb;
-import com.sun.javadoc.ClassDoc;
+import xjavadoc.XClass;
import xdoclet.TemplateSubTask;
import xdoclet.XDocletException;
@@ -10,7 +10,7 @@
import xdoclet.ejb.tags.EjbTagsHandler;
import xdoclet.tags.PackageTagsHandler;
import xdoclet.util.Log;
-import xdoclet.util.DocletUtil;
+
import xdoclet.util.Translator;
import java.io.File;
@@ -20,7 +20,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @version $Revision: 1.22 $
+ * @version $Revision: 1.22.2.1 $
*/
public class SessionSubTask extends AbstractEjbCodeGeneratorSubTask
{
@@ -92,7 +92,7 @@
throw new XDocletException( Translator.getString(
"xdoclet.ejb.Messages", "pattern_has_no_placeholder" ) );
}
- protected String getGeneratedFileName( ClassDoc clazz ) throws XDocletException
+ protected String getGeneratedFileName( XClass clazz ) throws XDocletException
{
return PackageTagsHandler.packageNameAsPathFor(
SessionTagsHandler.getSessionClassFor( getCurrentClass() ) ) + ".java";
}
@@ -103,7 +103,7 @@
new String[]{getCurrentClass().qualifiedName()} ) );
}
- protected boolean matchesGenerationRules( ClassDoc clazz ) throws
XDocletException
+ protected boolean matchesGenerationRules( XClass clazz ) throws
XDocletException
{
Category cat = Log.getCategory( SessionSubTask.class,
"matchesGenerationRules" );
@@ -113,7 +113,7 @@
return false;
}
- String generate = XDocletTagSupport.getParameterValue( clazz,
DocletUtil.getText( getCurrentClass(), "ejb:bean", false ), "generate", -1 );
+ String generate = getCurrentClass().doc().tagAttributeValue(
"ejb:bean", "generate", false );
if( ( generate != null ) && ( generate.equals( "false" ) ||
generate.equals( "no" ) ) )
{
1.16.2.1 +6 -6 xdoclet/core/src/xdoclet/ejb/UtilObjectSubTask.java
Index: UtilObjectSubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/UtilObjectSubTask.java,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -w -r1.16 -r1.16.2.1
--- UtilObjectSubTask.java 5 Mar 2002 20:56:46 -0000 1.16
+++ UtilObjectSubTask.java 16 Mar 2002 18:22:05 -0000 1.16.2.1
@@ -1,11 +1,11 @@
package xdoclet.ejb;
-import com.sun.javadoc.ClassDoc;
+import xjavadoc.XClass;
import xdoclet.XDocletException;
import xdoclet.XDocletTagSupport;
import xdoclet.util.Log;
-import xdoclet.util.DocletUtil;
+
import xdoclet.util.Translator;
import xdoclet.ejb.tags.UtilTagsHandler;
import xdoclet.ejb.tags.EjbTagsHandler;
@@ -16,7 +16,7 @@
/**
* @author Konstantin Pribluda
* @created October 3, 2001
- * @version $Revision: 1.16 $
+ * @version $Revision: 1.16.2.1 $
*/
public class UtilObjectSubTask extends AbstractEjbCodeGeneratorSubTask
{
@@ -103,7 +103,7 @@
}
}
- protected String getGeneratedFileName( ClassDoc clazz ) throws XDocletException
+ protected String getGeneratedFileName( XClass clazz ) throws XDocletException
{
return PackageTagsHandler.packageNameAsPathFor(
UtilTagsHandler.getUtilClassFor( getCurrentClass() ) ) + ".java";
}
@@ -114,7 +114,7 @@
new String[]{getCurrentClass().qualifiedName()} ) );
}
- protected boolean matchesGenerationRules( ClassDoc clazz ) throws
XDocletException
+ protected boolean matchesGenerationRules( XClass clazz ) throws
XDocletException
{
Category cat = Log.getCategory( UtilObjectSubTask.class,
"matchesGenerationRules" );
@@ -130,7 +130,7 @@
return false;
}
- String generate = XDocletTagSupport.getParameterValue( clazz,
DocletUtil.getText( getCurrentClass(), "ejb:util", false ), "generate", -1 );
+ String generate = getCurrentClass().doc().tagAttributeValue(
"ejb:util", "generate", false );
if( ( generate != null ) && ( generate.equals( "false" ) ||
generate.equals( "no" ) ) )
{
1.4.2.1 +11 -11 xdoclet/core/src/xdoclet/ejb/ValueObjectSubTask.java
Index: ValueObjectSubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/ValueObjectSubTask.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -w -r1.4 -r1.4.2.1
--- ValueObjectSubTask.java 22 Feb 2002 16:28:20 -0000 1.4
+++ ValueObjectSubTask.java 16 Mar 2002 18:22:05 -0000 1.4.2.1
@@ -1,14 +1,14 @@
package xdoclet.ejb;
-import com.sun.javadoc.Tag;
-import com.sun.javadoc.ClassDoc;
+import xjavadoc.XTag;
+import xjavadoc.XClass;
import java.io.File;
import java.text.MessageFormat;
import xdoclet.ejb.tags.ValueObjectTagsHandler;
import xdoclet.util.Log;
-import xdoclet.util.DocletUtil;
+
import xdoclet.XDocletException;
import xdoclet.XDocletTagSupport;
import xdoclet.tags.PackageTagsHandler;
@@ -17,7 +17,7 @@
/**
* @author Vincent Harcq ([EMAIL PROTECTED])
* @created Feb 5, 2002
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.4.2.1 $
*/
public class ValueObjectSubTask extends AbstractEjbCodeGeneratorSubTask
{
@@ -42,7 +42,7 @@
/**
* Form tag being processed right now
*/
- protected Tag currentDataObjectTag;
+ protected XTag currentDataObjectTag;
public ValueObjectSubTask()
{
@@ -119,12 +119,12 @@
}
- protected String getGeneratedFileName( ClassDoc clazz ) throws XDocletException
+ protected String getGeneratedFileName( XClass clazz ) throws XDocletException
{
return PackageTagsHandler.packageNameAsPathFor(
getCurrentValueObjectClass() ) + ".java";
}
- protected boolean matchesGenerationRules( ClassDoc clazz ) throws
XDocletException
+ protected boolean matchesGenerationRules( XClass clazz ) throws
XDocletException
{
if( super.matchesGenerationRules( clazz ) == false )
{
@@ -141,18 +141,18 @@
}
}
- protected void generateForClass( ClassDoc clazz ) throws XDocletException
+ protected void generateForClass( XClass clazz ) throws XDocletException
{
- Tag[] dos = DocletUtil.getTagsByName( getCurrentClass(),
"ejb:value-object", false );
+ XTag[] dos = getCurrentClass().doc().tags( "ejb:value-object" );
System.out.println( "Generating Value Object classes for '" +
getCurrentClass().qualifiedName() + "'." );
for( int i = 0; i < dos.length; i++ )
{
currentValueObjectClass =
ValueObjectTagsHandler.getCurrentValueObjectClass( getCurrentClass(), dos[i] );
- currentValueObjectName =
ValueObjectTagsHandler.getCurrentValueObjectName( getCurrentClass(), dos[i] );
- currentValueObjectMatch =
ValueObjectTagsHandler.getCurrentValueObjectMatch( getCurrentClass(), dos[i] );
+ currentValueObjectName =
ValueObjectTagsHandler.getCurrentValueObjectName( dos[i] );
+ currentValueObjectMatch =
ValueObjectTagsHandler.getCurrentValueObjectMatch( dos[i] );
super.generateForClass( clazz );
}
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
