Update of /cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/intf
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7136/modules/ejb/src/xdoclet/modules/ejb/intf
Modified Files:
InterfaceTagsHandler.java
Log Message:
forAllViewTypes does not check the view-type parameter of @ejb.bean and
@ejb.create-method for home interface methods (XDT-532)
Index: InterfaceTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/intf/InterfaceTagsHandler.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** InterfaceTagsHandler.java 7 Aug 2004 08:31:05 -0000 1.18
--- InterfaceTagsHandler.java 8 Feb 2005 20:08:35 -0000 1.19
***************
*** 480,488 ****
public void forAllInterfaceViewTypes(String template, Properties
attributes) throws XDocletException
{
! String[] view_types = null;
if (isComponentInterfaceMethod(getCurrentMethod())) {
//is a component intf method
! String view_type = getTagValue(
FOR_METHOD,
getCurrentMethod().getDoc(),
--- 480,488 ----
public void forAllInterfaceViewTypes(String template, Properties
attributes) throws XDocletException
{
! String view_type;
if (isComponentInterfaceMethod(getCurrentMethod())) {
//is a component intf method
! view_type = getTagValue(
FOR_METHOD,
getCurrentMethod().getDoc(),
***************
*** 494,503 ****
false
);
if (view_type == null) {
view_type = getTagValue(
! FOR_CLASS,
! getCurrentClass().getDoc(),
! "ejb.bean",
"view-type",
"remote,local,both," + SERVICE_ENDPOINT + ",local-" +
SERVICE_ENDPOINT + ",remote-" + SERVICE_ENDPOINT + "," + ALL,
--- 494,516 ----
false
);
+ }
+ else {
+ //is a home intf method
+ view_type = getTagValue(
+ FOR_METHOD,
+ getCurrentMethod().getDoc(),
+ "ejb.home-method",
+ "view-type",
+ "remote,local,both," + SERVICE_ENDPOINT + ",local-" +
SERVICE_ENDPOINT + ",remote-" + SERVICE_ENDPOINT + "," + ALL,
+ null,
+ true,
+ false
+ );
if (view_type == null) {
view_type = getTagValue(
! FOR_METHOD,
! getCurrentMethod().getDoc(),
! "ejb.create-method",
"view-type",
"remote,local,both," + SERVICE_ENDPOINT + ",local-" +
SERVICE_ENDPOINT + ",remote-" + SERVICE_ENDPOINT + "," + ALL,
***************
*** 507,519 ****
);
}
-
- view_types = getViewTypesFromString(view_type);
}
! else {
! //is a home intf method
! String view_type = getTagValue(
! FOR_METHOD,
! getCurrentMethod().getDoc(),
! "ejb.home-method",
"view-type",
"remote,local,both," + SERVICE_ENDPOINT + ",local-" +
SERVICE_ENDPOINT + ",remote-" + SERVICE_ENDPOINT + "," + ALL,
--- 520,531 ----
);
}
}
!
! // get the class-level view-type parameter if not specified at method
level
! if (view_type == null) {
! view_type = getTagValue(
! FOR_CLASS,
! getCurrentClass().getDoc(),
! "ejb.bean",
"view-type",
"remote,local,both," + SERVICE_ENDPOINT + ",local-" +
SERVICE_ENDPOINT + ",remote-" + SERVICE_ENDPOINT + "," + ALL,
***************
*** 522,529 ****
false
);
-
- view_types = getViewTypesFromString(view_type);
}
for (int i = 0; i < view_types.length; i++) {
currentMethodViewType = view_types[i];
--- 534,541 ----
false
);
}
+ String[] view_types = getViewTypesFromString(view_type);
+
for (int i = 0; i < view_types.length; i++) {
currentMethodViewType = view_types[i];
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
xdoclet-devel mailing list
xdoclet-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
