User: pathoss
Date: 02/05/15 09:47:47
Modified: modules/ejb/src/xdoclet/modules/ejb Tag:
MODULE_REFACTORING_BRANCH EjbTagsHandler.java
Log:
Cleanup.
Revision Changes Path
No revision
No revision
1.1.2.7 +94 -95
xdoclet/modules/ejb/src/xdoclet/modules/ejb/Attic/EjbTagsHandler.java
Index: EjbTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/Attic/EjbTagsHandler.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
--- EjbTagsHandler.java 14 May 2002 21:06:26 -0000 1.1.2.6
+++ EjbTagsHandler.java 15 May 2002 16:47:46 -0000 1.1.2.7
@@ -44,7 +44,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:taghandler namespace="Ejb"
- * @version $Revision: 1.1.2.6 $
+ * @version $Revision: 1.1.2.7 $
*/
public class EjbTagsHandler extends XDocletTagSupport
{
@@ -64,10 +64,10 @@
XTag beanTag = clazz.doc().tag("ejb:bean");
if (beanTag != null) {
- String generate_str = beanTag.attributeValue("generate");
+ String generateStr = beanTag.attributeValue("generate");
- if (generate_str != null) {
- boolean generate = TypeConversionUtil.stringToBoolean(generate_str,
true);
+ if (generateStr != null) {
+ boolean generate = TypeConversionUtil.stringToBoolean(generateStr,
true);
// generate="true" specifically
if (generate == true) {
@@ -333,31 +333,31 @@
/**
* Returns modified package name for a package name. If package name ends with
one of the toReplace Strings, then
- * it's substituted by the replaceWith String. If package_pattern not null then
it's roughly used.
+ * it's substituted by the replaceWith String. If packagePattern not null then
it's roughly used.
*
* @param packageName The name of the package name the new package
name will be derived from
- * @param package_pattern The package pattern to use. Can be null
- * @param for_subtask
+ * @param packagePattern The package pattern to use. Can be null
+ * @param subtask
* @return Description of the Returned Value
* @exception XDocletException
*/
- protected static String choosePackage(String packageName, String
package_pattern, String for_subtask) throws XDocletException
+ protected static String choosePackage(String packageName, String
packagePattern, String subtask) throws XDocletException
{
Log log = LogUtil.getLog(EjbTagsHandler.class, "choosePackage");
- ArrayList package_substitutions =
PackageTagsHandler.getPackageSubstitutions(for_subtask);
+ ArrayList packageSubstitutions =
PackageTagsHandler.getPackageSubstitutions(subtask);
if (log.isDebugEnabled()) {
- log.debug("Package name=" + packageName + " - Pattern=" +
package_pattern);
+ log.debug("Package name=" + packageName + " - Pattern=" +
packagePattern);
}
- if (package_pattern != null) {
+ if (packagePattern != null) {
// later we may do some parametric {0} fancy stuff here
- return package_pattern;
+ return packagePattern;
}
else {
- for (int i = 0; i < package_substitutions.size(); i++) {
- PackageTagsHandler.PackageSubstitution ps =
(PackageTagsHandler.PackageSubstitution) package_substitutions.get(i);
+ for (int i = 0; i < packageSubstitutions.size(); i++) {
+ PackageTagsHandler.PackageSubstitution ps =
(PackageTagsHandler.PackageSubstitution) packageSubstitutions.get(i);
StringTokenizer st = new StringTokenizer(ps.getPackages(), ",",
false);
while (st.hasMoreTokens()) {
@@ -365,7 +365,7 @@
String suffix = "." + packages;
if (packageName.endsWith(suffix)) {
- packageName = packageName.substring(0, packageName.length()
- suffix.length()) + "." + ps.getSubstituteWith();
+ packageName = packageName.substring(0, packageName.length()
- suffix.length()) + '.' + ps.getSubstituteWith();
break;
}
}
@@ -373,7 +373,7 @@
}
if (log.isDebugEnabled()) {
- log.debug("Package name=" + packageName);
+ log.debug("packageName=" + packageName);
}
return packageName;
@@ -446,15 +446,15 @@
*/
public String ejbName(Properties attributes) throws XDocletException
{
- String prefix_with_ejbslash_str =
attributes.getProperty("prefixWithEjbSlash");
- boolean prefix_with_ejbslash =
TypeConversionUtil.stringToBoolean(prefix_with_ejbslash_str, false);
- String ejb_name = getEjbNameFor(getCurrentClass());
+ String prefixWithEjbSlashStr = attributes.getProperty("prefixWithEjbSlash");
+ boolean prefixWithEjbSlash =
TypeConversionUtil.stringToBoolean(prefixWithEjbSlashStr, false);
+ String ejbName = getEjbNameFor(getCurrentClass());
- if (prefix_with_ejbslash == true) {
- return prefixWithEjbSlash(ejb_name);
+ if (prefixWithEjbSlash == true) {
+ return prefixWithEjbSlash(ejbName);
}
else {
- return ejb_name;
+ return ejbName;
}
}
@@ -467,24 +467,24 @@
*/
public String ejbRefName() throws XDocletException
{
- String ejb_ref_name = null;
+ String ejbRefName = null;
- String ref_name = getCurrentClassTag().attributeValue("ref-name");
+ String refName = getCurrentClassTag().attributeValue("ref-name");
- if (ref_name != null) {
- ejb_ref_name = ref_name;
+ if (refName != null) {
+ ejbRefName = refName;
}
else {
- ejb_ref_name = getEjbNameFor(getCurrentClass());
+ ejbRefName = getEjbNameFor(getCurrentClass());
String type = getCurrentClassTag().attributeValue("view-type");
if (type != null && type.equals("local") &&
isLocalEjb(getCurrentClass()) && isRemoteEjb(getCurrentClass())) {
- ejb_ref_name = ejb_ref_name + LOCAL_SUFFIX;
+ ejbRefName = ejbRefName + LOCAL_SUFFIX;
}
}
- return prefixWithEjbSlash(ejb_ref_name);
+ return prefixWithEjbSlash(ejbRefName);
}
/**
@@ -496,17 +496,17 @@
*/
public String ejbExternalRefName() throws XDocletException
{
- String ejb_ref_name = null;
- String ref_name = getCurrentClassTag().attributeValue("ref-name");
+ String ejbRefName = null;
+ String refName = getCurrentClassTag().attributeValue("ref-name");
- if (ref_name != null) {
- ejb_ref_name = ref_name;
+ if (refName != null) {
+ ejbRefName = refName;
}
else {
- ejb_ref_name = getCurrentClassTag().attributeValue("ejb-name");
+ ejbRefName = getCurrentClassTag().attributeValue("ejb-name");
}
- return prefixWithEjbSlash(ejb_ref_name);
+ return prefixWithEjbSlash(ejbRefName);
}
/**
@@ -777,16 +777,16 @@
/**
* Describe what the method does
*
- * @param ejb_name Describe what the parameter does
+ * @param ejbName Describe what the parameter does
* @return Describe the return value
*/
- protected String prefixWithEjbSlash(String ejb_name)
+ protected String prefixWithEjbSlash(String ejbName)
{
- if (ejb_name.startsWith("ejb/")) {
- return ejb_name;
+ if (ejbName.startsWith("ejb/")) {
+ return ejbName;
}
else {
- return "ejb/" + ejb_name;
+ return "ejb/" + ejbName;
}
}
@@ -806,28 +806,27 @@
* Returns the name of the class pk/etc class extends.
*
* @param clazz the class
- * @param tag_name name of the tag (ejb:bean for example, used
for getting generate parameter)
+ * @param tagName name of the tag (ejb:bean for example, used for
getting generate parameter)
* @param type type value used for view type of remote/local
- * @param extends_param_name extends parameter name (is "extends" for
ejb:bean but is "local-extends" for
- * local)
- * @param default_base_class_name default base class name, returned when not
deriving from another base class
+ * @param extendsParamName extends parameter name (is "extends" for
ejb:bean but is "local-extends" for local)
+ * @param defaultBaseClassName default base class name, returned when not
deriving from another base class
* @return correct value for the extends statement of a
generated class
* @exception XDocletException
*/
- protected String extendsFromFor(XClass clazz, String tag_name, String type,
String extends_param_name, String default_base_class_name) throws XDocletException
+ protected String extendsFromFor(XClass clazz, String tagName, String type,
String extendsParamName, String defaultBaseClassName) throws XDocletException
{
Log log = LogUtil.getLog(EjbTagsHandler.class, "extendsFromFor");
//see ejb:pk/etc generate="?" in superclass
XClass superclass = clazz.superclass();
- boolean super_generate;
+ boolean generateSuper;
- if (superclass.doc().hasTag(tag_name)) {
- String super_generate_str = getTagValue(
+ if (superclass.doc().hasTag(tagName)) {
+ String generateSuperStr = getTagValue(
FOR_CLASS,
superclass.doc(),
- tag_name,
+ tagName,
"generate",
null,
null,
@@ -835,23 +834,24 @@
false
);
- super_generate = TypeConversionUtil.stringToBoolean(super_generate_str,
true);
+ generateSuper = TypeConversionUtil.stringToBoolean(generateSuperStr,
true);
}
else {
// Two Cases : PersonBean and BaseEntityBean
- super_generate = false;
+ generateSuper = false;
XClass[] interfaces = clazz.superclass().interfaces();
for (int i = 0; i < interfaces.length; i++) {
XClass intf = interfaces[i];
- //if superclass is not javax.ejb.EntityBean then we have a
superclass which is itself deriving from javax.ejb.EntityBean
+ // if superclass is not javax.ejb.EntityBean then we have a
superclass which
+ // is itself deriving from javax.ejb.EntityBean
if (intf.qualifiedName().equals("javax.ejb.EntityBean") ||
intf.qualifiedName().equals("javax.ejb.SessionBean") ||
intf.qualifiedName().equals("javax.ejb.MessageDrivenBean")) {
//it derives from javax.ejb.*Bean and no superclass for pk/etc
class is explicitly defined
- super_generate = true;
+ generateSuper = true;
}
}
@@ -859,48 +859,46 @@
//note: look for ejb:pk/etc extends in superclasses also only if
generate="false" in superclass
//so extends attribute is inherited only if superclass's pk/etc is not to
be generated
-
- String extends_value = getTagValue(
+ String extendsValue = getTagValue(
FOR_CLASS,
clazz.doc(),
- tag_name,
- extends_param_name,
+ tagName,
+ extendsParamName,
null,
null,
- !super_generate,
+ !generateSuper,
false
);
//if explicitly specified
- if (extends_value != null) {
- return extends_value;
+ if (extendsValue != null) {
+ return extendsValue;
}
else {
- //now try to guess
- //if we are deriving from another ejb bean then derive from that bean's
pk class too
- //(if generate="true" for superclass's pk/etc class)
+ // now try to guess if we are deriving from another ejb bean, and if
so, then derive from
+ // that bean's pk class too (if generate="true" for superclass's pk/etc
class)
// java.lang.Object (the only that have no superclass)
if (superclass.superclass() == null) {
- return default_base_class_name;
+ return defaultBaseClassName;
}
//if a superclass with generate="true"
- else if (super_generate == true) {
- String class_name = getDependentClassFor(superclass, type);
+ else if (generateSuper == true) {
+ String className = getDependentClassFor(superclass, type);
if (log.isDebugEnabled()) {
- log.debug("DCF = " + class_name + " " +
superclass.superclass());
+ log.debug("DCF = " + className + ' ' + superclass.superclass());
}
- if (class_name != null) {
- return class_name;
+ if (className != null) {
+ return className;
}
else {
- return default_base_class_name;
+ return defaultBaseClassName;
}
}
else {
//so we have a superclass with pk-generate="false", look at
superclass of that superclass!
- return extendsFromFor(superclass, tag_name, type,
extends_param_name, default_base_class_name);
+ return extendsFromFor(superclass, tagName, type, extendsParamName,
defaultBaseClassName);
}
}
}
@@ -909,11 +907,11 @@
* Describe what the method does
*
* @param clazz Describe what the parameter does
- * @param tag_name Describe what the parameter does
+ * @param tagName Describe what the parameter does
* @return Describe the return value
* @exception XDocletException
*/
- protected boolean shouldTraverseSuperclassForDependentClass(XClass clazz,
String tag_name) throws XDocletException
+ protected boolean shouldTraverseSuperclassForDependentClass(XClass clazz,
String tagName) throws XDocletException
{
Log log = LogUtil.getLog(EjbTagsHandler.class,
"shouldTraverseSuperclassForDependentClass");
@@ -934,7 +932,7 @@
}
//see ejb:bean generate="?" in superclass
- String bean_generate_str = getTagValue(
+ String generateBeanStr = getTagValue(
FOR_CLASS,
clazz.doc(),
"ejb:bean",
@@ -944,22 +942,23 @@
false,
false
);
- boolean bean_generate =
TypeConversionUtil.stringToBoolean(bean_generate_str, true);
- if (bean_generate == false) {
- log.debug("bean_generate == false");
+ boolean generateBean = TypeConversionUtil.stringToBoolean(generateBeanStr,
true);
+
+ if (generateBean == false) {
+ log.debug("generateBean == false");
return true;
}
boolean generate = false;
- if (tag_name != null) {
+ if (tagName != null) {
//see ejb:pk/etc generate="?" in superclass
- String generate_str = getTagValue(
+ String generateStr = getTagValue(
FOR_CLASS,
clazz.doc(),
- tag_name,
+ tagName,
"generate",
null,
"true",
@@ -967,7 +966,7 @@
false
);
- generate = TypeConversionUtil.stringToBoolean(generate_str, true);
+ generate = TypeConversionUtil.stringToBoolean(generateStr, true);
}
if (generate == false) {
_______________________________________________________________
Have big pipes? SourceForge.net is looking for download mirrors. We supply
the hardware. You get the recognition. Email Us: [EMAIL PROTECTED]
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
