User: ara_e_w
Date: 02/05/26 13:29:54
Modified: modules/ejb/src/xdoclet/modules/ejb/intf Tag:
MODULE_REFACTORING_BRANCH InterfaceTagsHandler.java
LocalInterfaceSubTask.java
RemoteInterfaceSubTask.java
Log:
xjavadoc javabeaninifiction refactoring
Revision Changes Path
No revision
No revision
1.1.2.7 +22 -22
xdoclet/modules/ejb/src/xdoclet/modules/ejb/intf/Attic/InterfaceTagsHandler.java
Index: InterfaceTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/intf/Attic/InterfaceTagsHandler.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -w -r1.1.2.6 -r1.1.2.7
--- InterfaceTagsHandler.java 15 May 2002 19:19:28 -0000 1.1.2.6
+++ InterfaceTagsHandler.java 26 May 2002 20:29:54 -0000 1.1.2.7
@@ -33,7 +33,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:taghandler namespace="EjbIntf"
- * @version $Revision: 1.1.2.6 $
+ * @version $Revision: 1.1.2.7 $
*/
public class InterfaceTagsHandler extends EjbTagsHandler
{
@@ -69,27 +69,27 @@
"interface_invalid_type", new String[]{type}));
}
- String fileName = clazz.containingPackage().name();
+ String fileName = clazz.getContainingPackage().getName();
String name_pattern = null;
String package_pattern = null;
String component_interface = null;
- component_interface = clazz.doc().tagAttributeValue("ejb:interface", type +
"-class");
+ component_interface = clazz.getDoc().getTagAttributeValue("ejb:interface",
type + "-class");
if (component_interface != null) {
return component_interface;
}
- name_pattern = clazz.doc().tagAttributeValue("ejb:interface", type +
"-pattern");
+ name_pattern = clazz.getDoc().getTagAttributeValue("ejb:interface", type +
"-pattern");
if (name_pattern == null) {
- name_pattern = clazz.doc().tagAttributeValue("ejb:interface",
"pattern");
+ name_pattern = clazz.getDoc().getTagAttributeValue("ejb:interface",
"pattern");
if (name_pattern == null) {
name_pattern = "remote".equals(type) ? getRemoteClassPattern() :
getLocalClassPattern();
}
}
- package_pattern = clazz.doc().tagAttributeValue("ejb:interface", type +
"-package");
+ package_pattern = clazz.getDoc().getTagAttributeValue("ejb:interface", type
+ "-package");
if (package_pattern == null) {
- package_pattern = clazz.doc().tagAttributeValue("ejb:interface",
"package");
+ package_pattern = clazz.getDoc().getTagAttributeValue("ejb:interface",
"package");
}
String ejb_name = null;
@@ -144,7 +144,7 @@
*/
public static boolean isComponentInterfaceMethod(XMethod method) throws
XDocletException
{
- return method.doc().hasTag("ejb:interface-method");
+ return method.getDoc().hasTag("ejb:interface-method");
}
/**
@@ -159,7 +159,7 @@
Log log = LogUtil.getLog(InterfaceTagsHandler.class,
"getBeanClassNameFromInterfaceName");
try {
- XClass[] classes = XJavaDoc.getInstance().sourceClasses();
+ XClass[] classes = XJavaDoc.getInstance().getSourceClasses();
if (log.isDebugEnabled()) {
log.debug("return_type=" + return_type);
@@ -187,10 +187,10 @@
if (return_type.equals(remote_intf_name) ||
return_type.equals(local_intf_name)) {
if (log.isDebugEnabled()) {
- log.debug("Found! beanClassNameFromInterfaceName
returns with: " + clazz.qualifiedName());
+ log.debug("Found! beanClassNameFromInterfaceName
returns with: " + clazz.getQualifiedName());
}
- return clazz.qualifiedName();
+ return clazz.getQualifiedName();
}
}
}
@@ -280,7 +280,7 @@
else {
String view_type = getTagValue(
FOR_CLASS,
- method.doc(),
+ method.getDoc(),
"ejb:interface-method",
"view-type",
"local,remote,both",
@@ -393,8 +393,8 @@
}
if (isInterfaceMethod(intf_view_type)) {
- boolean currentMethodDoesntBelongsToCurrentClass =
!getCurrentMethod().containingClass().equals(getCurrentClass());
- boolean shouldTraverse =
shouldTraverseSuperclassForDependentClass(getCurrentMethod().containingClass(),
"ejb:interface");
+ boolean currentMethodDoesntBelongsToCurrentClass =
!getCurrentMethod().getContainingClass().equals(getCurrentClass());
+ boolean shouldTraverse =
shouldTraverseSuperclassForDependentClass(getCurrentMethod().getContainingClass(),
"ejb:interface");
if (superclasses == false && currentMethodDoesntBelongsToCurrentClass
== true && shouldTraverse == false) {
return;
@@ -421,7 +421,7 @@
//is a component intf method
String view_type = getTagValue(
FOR_CLASS,
- getCurrentMethod().doc(),
+ getCurrentMethod().getDoc(),
"ejb:interface-method",
"view-type",
"local,remote,both",
@@ -436,7 +436,7 @@
//is a home intf method
String view_type = getTagValue(
FOR_CLASS,
- getCurrentClass().doc(),
+ getCurrentClass().getDoc(),
"ejb:bean",
"view-type",
"local,remote,both",
@@ -524,7 +524,7 @@
*/
public String interfaceMethodName() throws XDocletException
{
- return getInterfaceMethodName(getCurrentMethod().name());
+ return getInterfaceMethodName(getCurrentMethod().getName());
}
/**
@@ -586,13 +586,13 @@
*/
protected boolean isInterfaceMethod(String intFace) throws XDocletException
{
- if (!getCurrentMethod().doc().hasTag("ejb:interface-method")) {
+ if (!getCurrentMethod().getDoc().hasTag("ejb:interface-method")) {
return false;
}
String viewType = getTagValue(
FOR_CLASS,
- getCurrentMethod().doc(),
+ getCurrentMethod().getDoc(),
"ejb:interface-method",
"view-type",
"local,remote,both",
@@ -608,7 +608,7 @@
if (viewType == null) {
viewType = getTagValue(
FOR_CLASS,
- getCurrentClass().doc(),
+ getCurrentClass().getDoc(),
"ejb:bean",
"view-type",
"local,remote,both",
@@ -681,7 +681,7 @@
protected String fromInterfaceToBean(String value) throws XDocletException
{
try {
- XClass[] classes = XJavaDoc.getInstance().sourceClasses();
+ XClass[] classes = XJavaDoc.getInstance().getSourceClasses();
for (int i = 0; i < classes.length; i++) {
if (isEjb(classes[i])) {
@@ -689,7 +689,7 @@
String local_interface_name = getComponentInterface("local",
classes[i]);
if (value.equals(remote_interface_name) ||
value.equals(local_interface_name)) {
- return classes[i].qualifiedName();
+ return classes[i].getQualifiedName();
}
}
}
1.1.2.10 +6 -6
xdoclet/modules/ejb/src/xdoclet/modules/ejb/intf/Attic/LocalInterfaceSubTask.java
Index: LocalInterfaceSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/intf/Attic/LocalInterfaceSubTask.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -w -r1.1.2.9 -r1.1.2.10
--- LocalInterfaceSubTask.java 15 May 2002 19:19:28 -0000 1.1.2.9
+++ LocalInterfaceSubTask.java 26 May 2002 20:29:54 -0000 1.1.2.10
@@ -26,7 +26,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:subtask name="localinterface"
parent="xdoclet.modules.ejb.EjbDocletTask"
- * @version $Revision: 1.1.2.9 $
+ * @version $Revision: 1.1.2.10 $
*/
public class LocalInterfaceSubTask extends AbstractEjbCodeGeneratorSubTask
{
@@ -144,20 +144,20 @@
Log log = LogUtil.getLog(LocalInterfaceSubTask.class,
"matchesGenerationRules");
if (InterfaceTagsHandler.isOnlyRemoteEjb(getCurrentClass())) {
- log.debug("Reject file " + clazz.qualifiedName() + " because of
view-type remote");
+ log.debug("Reject file " + clazz.getQualifiedName() + " because of
view-type remote");
return false;
}
- XTag interfaceTag = getCurrentClass().doc().tag("ejb:interface");
+ XTag interfaceTag = getCurrentClass().getDoc().getTag("ejb:interface");
if (interfaceTag == null) {
return true;
}
- String generate = interfaceTag.attributeValue("generate");
+ String generate = interfaceTag.getAttributeValue("generate");
if ((generate != null) && (generate.indexOf("local") == -1)) {
- log.debug("Skip remote interface for " + clazz.qualifiedName() + "
because of generate=" + generate + " flag.");
+ log.debug("Skip remote interface for " + clazz.getQualifiedName() + "
because of generate=" + generate + " flag.");
return false;
}
@@ -171,7 +171,7 @@
protected void engineStarted() throws XDocletException
{
System.out.println(Translator.getString("xdoclet.modules.ejb.Messages",
"generating_local_for",
- new String[]{getCurrentClass().qualifiedName()}));
+ new String[]{getCurrentClass().getQualifiedName()}));
}
}
1.1.2.11 +7 -7
xdoclet/modules/ejb/src/xdoclet/modules/ejb/intf/Attic/RemoteInterfaceSubTask.java
Index: RemoteInterfaceSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/intf/Attic/RemoteInterfaceSubTask.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -w -r1.1.2.10 -r1.1.2.11
--- RemoteInterfaceSubTask.java 15 May 2002 19:39:23 -0000 1.1.2.10
+++ RemoteInterfaceSubTask.java 26 May 2002 20:29:54 -0000 1.1.2.11
@@ -26,7 +26,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:subtask name="remoteinterface"
parent="xdoclet.modules.ejb.EjbDocletTask"
- * @version $Revision: 1.1.2.10 $
+ * @version $Revision: 1.1.2.11 $
*/
public class RemoteInterfaceSubTask extends AbstractEjbCodeGeneratorSubTask
{
@@ -141,20 +141,20 @@
Log log = LogUtil.getLog(RemoteInterfaceSubTask.class,
"matchesGenerationRules");
if (InterfaceTagsHandler.isOnlyLocalEjb(getCurrentClass())) {
- log.debug("Reject file " + clazz.qualifiedName() + " because of
view-type local");
+ log.debug("Reject file " + clazz.getQualifiedName() + " because of
view-type local");
return false;
}
- XTag interfaceTag = getCurrentClass().doc().tag("ejb:interface");
+ XTag interfaceTag = getCurrentClass().getDoc().getTag("ejb:interface");
if (interfaceTag == null) {
return true;
}
- String generate = interfaceTag.attributeValue("generate");
+ String generate = interfaceTag.getAttributeValue("generate");
if ((generate != null) && (generate.indexOf("remote") == -1)) {
- log.debug("Skip remote interface for " + clazz.qualifiedName() + "
because of generate=" + generate + " flag.");
+ log.debug("Skip remote interface for " + clazz.getQualifiedName() + "
because of generate=" + generate + " flag.");
return false;
}
@@ -169,6 +169,6 @@
protected void engineStarted() throws XDocletException
{
System.out.println(Translator.getString("xdoclet.modules.ejb.Messages",
"generating_remote_for",
- new String[]{getCurrentClass().qualifiedName()}));
+ new String[]{getCurrentClass().getQualifiedName()}));
}
}
\ No newline at end of file
_______________________________________________________________
Don't miss the 2002 Sprint PCS Application Developer's Conference
August 25-28 in Las Vegas -- http://devcon.sprintpcs.com/adp/index.cfm
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel