User: rinkrank
Date: 02/03/16 23:21:26
Modified: core/src/xdoclet/ejb/tags Tag: XJAVADOC_REFACTORING
DaoTagsHandler.java DataObjectTagsHandler.java
EjbRefTagsHandler.java HomeTagsHandler.java
RelationTagsHandler.java UtilTagsHandler.java
Log:
bugfixes
Revision Changes Path
No revision
No revision
1.1.2.2 +2 -2 xdoclet/core/src/xdoclet/ejb/tags/DaoTagsHandler.java
Index: DaoTagsHandler.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/tags/DaoTagsHandler.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -w -r1.1.2.1 -r1.1.2.2
--- DaoTagsHandler.java 16 Mar 2002 18:22:09 -0000 1.1.2.1
+++ DaoTagsHandler.java 17 Mar 2002 07:21:26 -0000 1.1.2.2
@@ -17,7 +17,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Andrew Stevens</a>
* @created February 8, 2002
- * @version $Revision: 1.1.2.1 $
+ * @version $Revision: 1.1.2.2 $
*/
public class DaoTagsHandler extends EjbTagsHandler
{
@@ -45,7 +45,7 @@
String dao_pattern = null;
if( cat.isDebugEnabled() )
- cat.debug( "dao for " + clazz.name() );
+ cat.debug( "dao for " + clazz.qualifiedName() );
dao_pattern = getDaoClassPattern();
1.22.2.3 +9 -5 xdoclet/core/src/xdoclet/ejb/tags/DataObjectTagsHandler.java
Index: DataObjectTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/tags/DataObjectTagsHandler.java,v
retrieving revision 1.22.2.2
retrieving revision 1.22.2.3
diff -u -w -r1.22.2.2 -r1.22.2.3
--- DataObjectTagsHandler.java 16 Mar 2002 20:59:20 -0000 1.22.2.2
+++ DataObjectTagsHandler.java 17 Mar 2002 07:21:26 -0000 1.22.2.3
@@ -29,7 +29,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @version $Revision: 1.22.2.2 $
+ * @version $Revision: 1.22.2.3 $
*/
public class DataObjectTagsHandler extends EjbTagsHandler
{
@@ -68,6 +68,9 @@
cur_clazz = cur_clazz.superclass();
}while ( cur_clazz != null );
+ if( currentDataClass == null ) {
+ throw new XDocletException(Translator.getString(
"xdoclet.ejb.Messages","dataclass_not_found" ));
+ }
return currentDataClass;
}
@@ -91,8 +94,8 @@
*/
public static String getDataObjectClassFor( XClass clazz ) throws
XDocletException
{
- if( dataObjectClassnames.get( clazz.name() ) != null )
- return ( String ) dataObjectClassnames.get( clazz.name() );
+ if( dataObjectClassnames.get( clazz.qualifiedName() ) != null )
+ return ( String ) dataObjectClassnames.get(
clazz.qualifiedName() );
String fileName = clazz.containingPackage().name();
String name_pattern = null;
@@ -255,7 +258,7 @@
Category cat = Log.getCategory( DataObjectSubTask.class,
"hasDataEquals" );
if( cat.isDebugEnabled() )
- cat.debug( "Searching @ejb:data-object equals for Class " +
clazz.name() );
+ cat.debug( "Searching @ejb:data-object equals for Class " +
clazz.qualifiedName() );
if( isDataObjectSubTaskActive() == false )
return false;
@@ -345,7 +348,8 @@
false
);
- return TypeConversionUtil.stringToBoolean( value, true );
+ boolean result = TypeConversionUtil.stringToBoolean( value, false );
+ return result;
}
/**
1.5.2.2 +1 -1 xdoclet/core/src/xdoclet/ejb/tags/EjbRefTagsHandler.java
Index: EjbRefTagsHandler.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/tags/EjbRefTagsHandler.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -w -r1.5.2.1 -r1.5.2.2
--- EjbRefTagsHandler.java 16 Mar 2002 18:22:09 -0000 1.5.2.1
+++ EjbRefTagsHandler.java 17 Mar 2002 07:21:26 -0000 1.5.2.2
@@ -40,10 +40,10 @@
* @return Description of the Returned Value
* @exception XDocletException Description of Exception
* @doc:tag type="content"
+ * @todo refactor this properly to account for ejb:bean - it may not be needed
anymore.
*/
public String ejbRefId() throws XDocletException
{
- // TODO: refactor this properly to account for ejb:bean - it may not
be needed anymore.
return referringClassId + "_" + EjbTagsHandler.getEjbIdFor(
getCurrentClass() );
}
1.19.2.2 +2 -2 xdoclet/core/src/xdoclet/ejb/tags/HomeTagsHandler.java
Index: HomeTagsHandler.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/tags/HomeTagsHandler.java,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -u -w -r1.19.2.1 -r1.19.2.2
--- HomeTagsHandler.java 16 Mar 2002 18:22:09 -0000 1.19.2.1
+++ HomeTagsHandler.java 17 Mar 2002 07:21:26 -0000 1.19.2.2
@@ -20,7 +20,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @version $Revision: 1.19.2.1 $
+ * @version $Revision: 1.19.2.2 $
*/
public class HomeTagsHandler extends EjbTagsHandler
{
@@ -70,7 +70,7 @@
home_interface = clazz.doc().tagAttributeValue( "ejb:home", type +
"-class" );
if( cat.isDebugEnabled() )
- cat.debug( type + " home Interface for " + clazz.name() + " =
" + home_interface );
+ cat.debug( type + " home Interface for " +
clazz.qualifiedName() + " = " + home_interface );
if( home_interface != null )
return home_interface;
1.20.2.2 +4 -4 xdoclet/core/src/xdoclet/ejb/tags/RelationTagsHandler.java
Index: RelationTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/tags/RelationTagsHandler.java,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -w -r1.20.2.1 -r1.20.2.2
--- RelationTagsHandler.java 16 Mar 2002 18:22:10 -0000 1.20.2.1
+++ RelationTagsHandler.java 17 Mar 2002 07:21:26 -0000 1.20.2.2
@@ -22,7 +22,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Aslak Helles�y</a>
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @version $Revision: 1.20.2.1 $
+ * @version $Revision: 1.20.2.2 $
*/
public class RelationTagsHandler extends EjbTagsHandler
{
@@ -56,7 +56,7 @@
"yes,no",
"no",
false,
- true
+ false
);
if( "yes".equals( cd ) )
@@ -93,7 +93,7 @@
"yes,no",
"no",
false,
- true
+ false
);
if( "yes".equals( cd ) )
@@ -129,7 +129,7 @@
null,
null,
true,
- false
+ true
);
}
1.12.2.2 +2 -2 xdoclet/core/src/xdoclet/ejb/tags/UtilTagsHandler.java
Index: UtilTagsHandler.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/ejb/tags/UtilTagsHandler.java,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -w -r1.12.2.1 -r1.12.2.2
--- UtilTagsHandler.java 16 Mar 2002 18:22:10 -0000 1.12.2.1
+++ UtilTagsHandler.java 17 Mar 2002 07:21:26 -0000 1.12.2.2
@@ -15,7 +15,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @version $Revision: 1.12.2.1 $
+ * @version $Revision: 1.12.2.2 $
*/
public class UtilTagsHandler extends EjbTagsHandler
{
@@ -55,7 +55,7 @@
String util_pattern = null;
if( cat.isDebugEnabled() )
- cat.debug( " utility object for " + clazz.name() );
+ cat.debug( " utility object for " + clazz.qualifiedName() );
util_pattern = getUtilClassPattern();
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
