Update of
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/entity
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20096/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/entity
Modified Files:
PrimaryKeyClassPlugin.java
Log Message:
- ServiceEndpointPlugin stub created
- Uniformed package/pattern/class tag values for java generation for tags that
permit default naming override
- Qtags classes name fixed
- Qtags refactorings
- Fixed testcases
Index: PrimaryKeyClassPlugin.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-ejb/src/main/java/org/xdoclet/plugin/ejb/entity/PrimaryKeyClassPlugin.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PrimaryKeyClassPlugin.java 6 Sep 2005 01:49:59 -0000 1.2
--- PrimaryKeyClassPlugin.java 13 Sep 2005 02:22:32 -0000 1.3
***************
*** 12,18 ****
import org.generama.WriterMapper;
- import org.generama.defaults.JavaGeneratingPlugin;
-
import org.xdoclet.plugin.ejb.EjbConfig;
import org.xdoclet.plugin.ejb.EjbRuntime;
import org.xdoclet.plugin.ejb.EjbUtils;
--- 12,17 ----
import org.generama.WriterMapper;
import org.xdoclet.plugin.ejb.EjbConfig;
+ import org.xdoclet.plugin.ejb.EjbJavaGeneratingPlugin;
import org.xdoclet.plugin.ejb.EjbRuntime;
import org.xdoclet.plugin.ejb.EjbUtils;
***************
*** 28,37 ****
* @version $Revision$
*/
! public class PrimaryKeyClassPlugin extends JavaGeneratingPlugin {
private EjbUtils ejbUtils;
- private String fileregex;
- private String filereplace;
- private String packageregex;
- private String packagereplace;
public PrimaryKeyClassPlugin(TemplateEngine templateEngine,
QDoxCapableMetadataProvider metadataProvider,
--- 27,32 ----
* @version $Revision$
*/
! public class PrimaryKeyClassPlugin extends EjbJavaGeneratingPlugin {
private EjbUtils ejbUtils;
public PrimaryKeyClassPlugin(TemplateEngine templateEngine,
QDoxCapableMetadataProvider metadataProvider,
***************
*** 60,98 ****
}
- public void setFileregex(String fileregex) {
- if (fileregex == null) {
- throw new NullPointerException();
- }
-
- this.fileregex = fileregex;
- super.setFileregex(fileregex);
- }
-
- public void setFilereplace(String filereplace) {
- if (filereplace == null) {
- throw new NullPointerException();
- }
-
- this.filereplace = filereplace;
- super.setFilereplace(filereplace);
- }
-
- public void setPackageregex(String packageregex) {
- if (packageregex == null) {
- throw new NullPointerException();
- }
-
- this.packageregex = packageregex;
- super.setPackageregex(packageregex);
- }
-
- public void setPackagereplace(String packagereplace) {
- if (packagereplace == null) {
- throw new NullPointerException();
- }
-
- this.packagereplace = packagereplace;
- super.setPackagereplace(packagereplace);
- }
public boolean shouldGenerate(Object metadata) {
--- 55,58 ----
***************
*** 111,164 ****
}
! public String getDestinationFilename(Object metadata) {
! JavaClass javaClass = (JavaClass) metadata;
! String retVal = null;
! EjbPkTag pkTag = (EjbPkTag) javaClass.getTagByName("ejb.pk");
!
! if (pkTag != null) {
! retVal = pkTag.getClass_();
!
! if (retVal != null) {
! int idx = retVal.lastIndexOf('.');
! retVal = (idx >= 0) ? retVal.substring(idx + 1) : retVal;
! }
! }
!
! if (retVal == null) {
! if (pkTag != null && pkTag.getPattern() != null) {
! retVal = MessageFormat.format(pkTag.getPattern(), new
String[] {ejbUtils.getEjbName(javaClass)});
! } else {
! retVal = javaClass.getName();
! retVal = retVal.replaceAll(fileregex, filereplace);
! }
! }
!
! return retVal + ".java";
}
!
! public String getDestinationPackage(Object metadata) {
! JavaClass javaClass = (JavaClass) metadata;
! String retVal = null;
! EjbPkTag pkTag = (EjbPkTag) javaClass.getTagByName("ejb.pk");
!
! if (pkTag != null) {
! retVal = pkTag.getClass_();
!
! if (retVal != null) {
! int idx = retVal.lastIndexOf('.');
! retVal = (idx >= 0) ? retVal.substring(0, idx) : "";
! }
!
! if (retVal == null) {
! retVal = pkTag.getPackage();
! }
! }
!
! if (retVal == null) {
! retVal = javaClass.getPackage();
! retVal = retVal.replaceAll(packageregex, packagereplace);
! }
!
! return retVal;
}
}
\ No newline at end of file
--- 71,88 ----
}
! protected String getLocalyDefinedFullClassName(JavaClass clazz) {
! EjbPkTag pkTag = (EjbPkTag) clazz.getTagByName("ejb.pk");
! return (pkTag != null) ? pkTag.getClass_() : null;
}
!
! protected String getPatternBasedUnqualifiedName(JavaClass clazz) {
! EjbPkTag pkTag = (EjbPkTag) clazz.getTagByName("ejb.pk");
! return (pkTag != null && pkTag.getPattern() != null)
! ? MessageFormat.format(pkTag.getPattern(), new String[]
{ejbUtils.getEjbName(clazz)}) : null;
! }
!
! protected String getLocalyDefinedPackageName(JavaClass clazz) {
! EjbPkTag pkTag = (EjbPkTag) clazz.getTagByName("ejb.pk");
! return (pkTag != null) ? pkTag.getPackage() : null;
}
}
\ No newline at end of file
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits
