[206501] Simplifies JETEmitter templates used by the Servlet wizard.
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/servletXDocletNonAnnotated.javajet b/plugins/org.eclipse.jst.j2ee.web/templates/servlet.javajet similarity index 98% rename from plugins/org.eclipse.jst.j2ee.web/templates/servletXDocletNonAnnotated.javajet rename to plugins/org.eclipse.jst.j2ee.web/templates/servlet.javajet index d31c39e..0179fdc 100644 --- a/plugins/org.eclipse.jst.j2ee.web/templates/servletXDocletNonAnnotated.javajet +++ b/plugins/org.eclipse.jst.j2ee.web/templates/servlet.javajet
@@ -1,128 +1,128 @@ -<%@ jet package="org.eclipse.jst.j2ee.web" - imports="org.eclipse.jst.j2ee.internal.web.operations.* java.util.* " - class="ServletTemplate" -%><%@ include file="servletHeaderNonAnnotated.template" %> - -<%if (model.isPublic()) {%>public<%}%> <%if (model.isAbstract()) {%>abstract <%}%><%if (model.isFinal()) {%>final <%} -%>class <%=model.getServletClassName()%><%String superClass = model.getSuperclassName(); - if (! "".equals(superClass)) {%> extends <%=superClass%><%}%><% - List interfaces = model.getInterfaces(); - if (interfaces.size()>0) {%> implements <% } - for (int i=0; i<interfaces.size(); i++) { - String INTERFACE = (String) interfaces.get(i); - if (i>0) { %>, <%}%><%=INTERFACE%><%}%> { - static final long serialVersionUID = 1L; - - /* (non-Java-doc) - * @see javax.servlet.http.HttpServlet#HttpServlet() - */ - public <%=model.getServletClassName()%>() { - super(); - } <% if (model.shouldGenInit()) { %> - - /* (non-Javadoc) - * @see javax.servlet.GenericServlet#init() - */ - public void init(ServletConfig config) throws ServletException { - // TODO Auto-generated method stub <% if (model.isGenericServletSuperclass()) { %> - super.init(); <% } %> - } <% } %> <% if (model.shouldGenDestroy()) { %> - - /* (non-Javadoc) - * @see javax.servlet.Servlet#destroy() - */ - public void destroy() { - // TODO Auto-generated method stub <% if (model.isGenericServletSuperclass()) { %> - super.destroy(); <% } %> - } <% } %> <% if (model.shouldGenGetServletConfig()) { %> - - /* (non-Javadoc) - * @see javax.servlet.Servlet#getServletConfig() - */ - public ServletConfig getServletConfig() { - // TODO Auto-generated method stub <% if (model.isGenericServletSuperclass()) { %> - return super.getServletConfig(); <% } else { %> - return null; <% } %> - } <% } %> <% if (model.shouldGenGetServletInfo()) { %> - - /* (non-Javadoc) - * @see javax.servlet.Servlet#getServletInfo() - */ - public String getServletInfo() { - // TODO Auto-generated method stub <% if (model.isGenericServletSuperclass()) { %> - return super.getServletInfo(); <% } else { %> - return null; <% } %> - } <% } %> <% if (model.shouldGenService() && !model.isHttpServletSuperclass()) { %> - - /* (non-Java-doc) - * @see javax.servlet.GenericServlet#service(ServletRequest request, ServletResponse response) - */ - public void service(ServletRequest request, ServletResponse response) throws ServletException, IOException { - // TODO Auto-generated method stub - } <% } %> <% if (model.shouldGenService() && model.isHttpServletSuperclass()) { %> - - /* (non-Java-doc) - * @see javax.servlet.http.HttpServlet#service(HttpServletRequest request, HttpServletResponse response) - */ - protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - // TODO Auto-generated method stub - super.service(request, response); - } <% } %> <% if (model.shouldGenDoGet()) { %> - - /* (non-Java-doc) - * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response) - */ - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - // TODO Auto-generated method stub - super.doGet(request, response); - } <% } %> <% if (model.shouldGenDoPost()) { %> - - /* (non-Java-doc) - * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response) - */ - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - // TODO Auto-generated method stub - super.doPost(request, response); - } <% } %> <% if (model.shouldGenDoPut()) { %> - - /* (non-Javadoc) - * @see javax.servlet.http.HttpServlet#doPut(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ - protected void doPut(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - // TODO Auto-generated method stub - super.doPut(request, response); - } <% } %> <% if (model.shouldGenDoDelete()) { %> - - /* (non-Javadoc) - * @see javax.servlet.http.HttpServlet#doDelete(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ - protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - // TODO Auto-generated method stub - super.doDelete(request, response); - } <% } %> <% if (model.shouldGenDoHead()) { %> - - /* (non-Javadoc) - * @see javax.servlet.http.HttpServlet#doHead(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ - protected void doHead(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - // TODO Auto-generated method stub - super.doHead(request, response); - } <% } %> <% if (model.shouldGenDoOptions()) { %> - - /* (non-Javadoc) - * @see javax.servlet.http.HttpServlet#doOptions(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ - protected void doOptions(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - // TODO Auto-generated method stub - super.doOptions(request, response); - } <% } %> <% if (model.shouldGenDoTrace()) { %> - - /* (non-Javadoc) - * @see javax.servlet.http.HttpServlet#doTrace(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ - protected void doTrace(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - // TODO Auto-generated method stub - super.doTrace(request, response); - } <% } %> - +<%@ jet package="org.eclipse.jst.j2ee.web" + imports="org.eclipse.jst.j2ee.internal.web.operations.* java.util.* " + class="ServletTemplate" +%><%@ include file="servletHeader.template" %> + +<%if (model.isPublic()) {%>public<%}%> <%if (model.isAbstract()) {%>abstract <%}%><%if (model.isFinal()) {%>final <%} +%>class <%=model.getServletClassName()%><%String superClass = model.getSuperclassName(); + if (! "".equals(superClass)) {%> extends <%=superClass%><%}%><% + List interfaces = model.getInterfaces(); + if (interfaces.size()>0) {%> implements <% } + for (int i=0; i<interfaces.size(); i++) { + String INTERFACE = (String) interfaces.get(i); + if (i>0) { %>, <%}%><%=INTERFACE%><%}%> { + static final long serialVersionUID = 1L; + + /* (non-Java-doc) + * @see javax.servlet.http.HttpServlet#HttpServlet() + */ + public <%=model.getServletClassName()%>() { + super(); + } <% if (model.shouldGenInit()) { %> + + /* (non-Javadoc) + * @see javax.servlet.GenericServlet#init() + */ + public void init(ServletConfig config) throws ServletException { + // TODO Auto-generated method stub <% if (model.isGenericServletSuperclass()) { %> + super.init(); <% } %> + } <% } %> <% if (model.shouldGenDestroy()) { %> + + /* (non-Javadoc) + * @see javax.servlet.Servlet#destroy() + */ + public void destroy() { + // TODO Auto-generated method stub <% if (model.isGenericServletSuperclass()) { %> + super.destroy(); <% } %> + } <% } %> <% if (model.shouldGenGetServletConfig()) { %> + + /* (non-Javadoc) + * @see javax.servlet.Servlet#getServletConfig() + */ + public ServletConfig getServletConfig() { + // TODO Auto-generated method stub <% if (model.isGenericServletSuperclass()) { %> + return super.getServletConfig(); <% } else { %> + return null; <% } %> + } <% } %> <% if (model.shouldGenGetServletInfo()) { %> + + /* (non-Javadoc) + * @see javax.servlet.Servlet#getServletInfo() + */ + public String getServletInfo() { + // TODO Auto-generated method stub <% if (model.isGenericServletSuperclass()) { %> + return super.getServletInfo(); <% } else { %> + return null; <% } %> + } <% } %> <% if (model.shouldGenService() && !model.isHttpServletSuperclass()) { %> + + /* (non-Java-doc) + * @see javax.servlet.GenericServlet#service(ServletRequest request, ServletResponse response) + */ + public void service(ServletRequest request, ServletResponse response) throws ServletException, IOException { + // TODO Auto-generated method stub + } <% } %> <% if (model.shouldGenService() && model.isHttpServletSuperclass()) { %> + + /* (non-Java-doc) + * @see javax.servlet.http.HttpServlet#service(HttpServletRequest request, HttpServletResponse response) + */ + protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + // TODO Auto-generated method stub + super.service(request, response); + } <% } %> <% if (model.shouldGenDoGet()) { %> + + /* (non-Java-doc) + * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response) + */ + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + // TODO Auto-generated method stub + super.doGet(request, response); + } <% } %> <% if (model.shouldGenDoPost()) { %> + + /* (non-Java-doc) + * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response) + */ + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + // TODO Auto-generated method stub + super.doPost(request, response); + } <% } %> <% if (model.shouldGenDoPut()) { %> + + /* (non-Javadoc) + * @see javax.servlet.http.HttpServlet#doPut(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) + */ + protected void doPut(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + // TODO Auto-generated method stub + super.doPut(request, response); + } <% } %> <% if (model.shouldGenDoDelete()) { %> + + /* (non-Javadoc) + * @see javax.servlet.http.HttpServlet#doDelete(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) + */ + protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + // TODO Auto-generated method stub + super.doDelete(request, response); + } <% } %> <% if (model.shouldGenDoHead()) { %> + + /* (non-Javadoc) + * @see javax.servlet.http.HttpServlet#doHead(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) + */ + protected void doHead(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + // TODO Auto-generated method stub + super.doHead(request, response); + } <% } %> <% if (model.shouldGenDoOptions()) { %> + + /* (non-Javadoc) + * @see javax.servlet.http.HttpServlet#doOptions(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) + */ + protected void doOptions(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + // TODO Auto-generated method stub + super.doOptions(request, response); + } <% } %> <% if (model.shouldGenDoTrace()) { %> + + /* (non-Javadoc) + * @see javax.servlet.http.HttpServlet#doTrace(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) + */ + protected void doTrace(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + // TODO Auto-generated method stub + super.doTrace(request, response); + } <% } %> + } \ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/servletHeader.template b/plugins/org.eclipse.jst.j2ee.web/templates/servletHeader.template index b610c89..b6590a3 100644 --- a/plugins/org.eclipse.jst.j2ee.web/templates/servletHeader.template +++ b/plugins/org.eclipse.jst.j2ee.web/templates/servletHeader.template
@@ -15,6 +15,7 @@ /** * Servlet implementation class for Servlet: <%=model.getServletClassName()%> * +<% if (model.isAnnotated()) { %> * @web.servlet * name="<%=model.getServletName()%>" * display-name="<%=model.getServletName()%>" <% @@ -38,6 +39,5 @@ * name="<%=name%>" * value="<%=value%>" <% if (description !=null && description!="") { %> * description="<%=description%>" <%} %> - * <% } } %> - */ - \ No newline at end of file + * <% } } } %> + */ \ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/servletHeaderNonAnnotated.template b/plugins/org.eclipse.jst.j2ee.web/templates/servletHeaderNonAnnotated.template deleted file mode 100644 index c667538..0000000 --- a/plugins/org.eclipse.jst.j2ee.web/templates/servletHeaderNonAnnotated.template +++ /dev/null
@@ -1,19 +0,0 @@ -<% CreateServletTemplateModel model = (CreateServletTemplateModel) argument; -if (model.getJavaPackageName()!=null && model.getJavaPackageName()!="") { %>package <%=model.getJavaPackageName()%>;<%}%> - -import java.io.IOException; -import javax.servlet.ServletException; -<% if (model.shouldGenGetServletConfig() || model.shouldGenInit()) { %> -import javax.servlet.ServletConfig; <% } %> -<% if (model.shouldGenService() && !model.isHttpServletSuperclass()) { %> -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; <% } %> -<% if (model.isHttpServletSuperclass()) { %> -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse;<% } %> - -/** - * Servlet implementation class for Servlet: <%=model.getServletClassName()%> - * - */ - \ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/servletXDoclet.javajet b/plugins/org.eclipse.jst.j2ee.web/templates/servletXDoclet.javajet deleted file mode 100644 index f275128..0000000 --- a/plugins/org.eclipse.jst.j2ee.web/templates/servletXDoclet.javajet +++ /dev/null
@@ -1,128 +0,0 @@ -<%@ jet package="org.eclipse.jst.j2ee.web" - imports="org.eclipse.jst.j2ee.internal.web.operations.* java.util.* " - class="ServletTemplate" -%><%@ include file="servletHeader.template" %> - -<%if (model.isPublic()) {%>public<%}%> <%if (model.isAbstract()) {%>abstract <%}%><%if (model.isFinal()) {%>final <%} -%>class <%=model.getServletClassName()%><%String superClass = model.getSuperclassName(); - if (! "".equals(superClass)) {%> extends <%=superClass%><%}%> - <%List interfaces = model.getInterfaces(); - if (interfaces.size()>0) {%> implements <% } - for (int i=0; i<interfaces.size(); i++) { - String INTERFACE = (String) interfaces.get(i); - if (i>0) { %>, <%}%><%=INTERFACE%><%}%> { - static final long serialVersionUID = 1L; - - /* (non-Java-doc) - * @see javax.servlet.http.HttpServlet#HttpServlet() - */ - public <%=model.getServletClassName()%>() { - super(); - } <% if (model.shouldGenInit()) { %> - - /* (non-Javadoc) - * @see javax.servlet.GenericServlet#init() - */ - public void init(ServletConfig config) throws ServletException { - // TODO Auto-generated method stub <% if (model.isGenericServletSuperclass()) { %> - super.init(); <% } %> - } <% } %> <% if (model.shouldGenDestroy()) { %> - - /* (non-Javadoc) - * @see javax.servlet.Servlet#destroy() - */ - public void destroy() { - // TODO Auto-generated method stub <% if (model.isGenericServletSuperclass()) { %> - super.destroy(); <% } %> - } <% } %> <% if (model.shouldGenGetServletConfig()) { %> - - /* (non-Javadoc) - * @see javax.servlet.Servlet#getServletConfig() - */ - public ServletConfig getServletConfig() { - // TODO Auto-generated method stub <% if (model.isGenericServletSuperclass()) { %> - return super.getServletConfig(); <% } else { %> - return null; <% } %> - } <% } %> <% if (model.shouldGenGetServletInfo()) { %> - - /* (non-Javadoc) - * @see javax.servlet.Servlet#getServletInfo() - */ - public String getServletInfo() { - // TODO Auto-generated method stub <% if (model.isGenericServletSuperclass()) { %> - return super.getServletInfo(); <% } else { %> - return null; <% } %> - } <% } %> <% if (model.shouldGenService() && !model.isHttpServletSuperclass()) { %> - - /* (non-Java-doc) - * @see javax.servlet.GenericServlet#service(ServletRequest request, ServletResponse response) - */ - public void service(ServletRequest request, ServletResponse response) throws ServletException, IOException { - // TODO Auto-generated method stub - } <% } %> <% if (model.shouldGenService() && model.isHttpServletSuperclass()) { %> - - /* (non-Java-doc) - * @see javax.servlet.http.HttpServlet#service(HttpServletRequest request, HttpServletResponse response) - */ - protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - // TODO Auto-generated method stub - super.service(request, response); - } <% } %> <% if (model.shouldGenDoGet()) { %> - - /* (non-Java-doc) - * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response) - */ - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - // TODO Auto-generated method stub - super.doGet(request, response); - } <% } %> <% if (model.shouldGenDoPost()) { %> - - /* (non-Java-doc) - * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response) - */ - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - // TODO Auto-generated method stub - super.doPost(request, response); - } <% } %> <% if (model.shouldGenDoPut()) { %> - - /* (non-Javadoc) - * @see javax.servlet.http.HttpServlet#doPut(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ - protected void doPut(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - // TODO Auto-generated method stub - super.doPut(request, response); - } <% } %> <% if (model.shouldGenDoDelete()) { %> - - /* (non-Javadoc) - * @see javax.servlet.http.HttpServlet#doDelete(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ - protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - // TODO Auto-generated method stub - super.doDelete(request, response); - } <% } %> <% if (model.shouldGenDoHead()) { %> - - /* (non-Javadoc) - * @see javax.servlet.http.HttpServlet#doHead(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ - protected void doHead(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - // TODO Auto-generated method stub - super.doHead(request, response); - } <% } %> <% if (model.shouldGenDoOptions()) { %> - - /* (non-Javadoc) - * @see javax.servlet.http.HttpServlet#doOptions(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ - protected void doOptions(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - // TODO Auto-generated method stub - super.doOptions(request, response); - } <% } %> <% if (model.shouldGenDoTrace()) { %> - - /* (non-Javadoc) - * @see javax.servlet.http.HttpServlet#doTrace(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ - protected void doTrace(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - // TODO Auto-generated method stub - super.doTrace(request, response); - } <% } %> - -} \ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateServletTemplateModel.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateServletTemplateModel.java index c933afb..90dfa76 100644 --- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateServletTemplateModel.java +++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateServletTemplateModel.java
@@ -16,6 +16,7 @@ import java.util.List; +import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel; import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; @@ -80,6 +81,10 @@ public boolean isAbstract() { return dataModel.getBooleanProperty(INewJavaClassDataModelProperties.MODIFIER_ABSTRACT); } + + public boolean isAnnotated() { + return dataModel.getBooleanProperty(IAnnotationsDataModel.USE_ANNOTATIONS); + } protected String getProperty(String propertyName) { return dataModel.getStringProperty(propertyName);
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/INewServletClassDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/INewServletClassDataModelProperties.java index 929b5ef..f3f4bb8 100644 --- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/INewServletClassDataModelProperties.java +++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/INewServletClassDataModelProperties.java
@@ -109,14 +109,4 @@ */ public static final String USE_EXISTING_CLASS = "NewServletClassDataModel.USE_EXISTING_CLASS"; //$NON-NLS-1$ - /** - * Do not set! The javajet template file used in creating the annotated servlet template class - */ - public static final String TEMPLATE_FILE = "NewServletClassDataModel.TEMPLATE_FILE"; //$NON-NLS-1$ - - /** - * Do not set! The javajet template file used in creating the non-annotated servlet template class - */ - public static final String NON_ANNOTATED_TEMPLATE_FILE = "NewServletClassDataModel.NON_ANNOTATED_TEMPLATE_FILE"; //$NON-NLS-1$ - }
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassDataModelProvider.java index 482514f..da85b69 100644 --- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassDataModelProvider.java +++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassDataModelProvider.java
@@ -75,10 +75,6 @@ */ private final static String[] SERVLET_INTERFACES = {"javax.servlet.Servlet"}; //$NON-NLS-1$ - private final static String ANNOTATED_TEMPLATE_DEFAULT = "servletXDoclet.javajet"; //$NON-NLS-1$ - - private final static String NON_ANNOTATED_TEMPLATE_DEFAULT = "servletXDocletNonAnnotated.javajet"; //$NON-NLS-1$ - /** * The cache of all the interfaces the servlet java class will implement. */ @@ -149,8 +145,6 @@ propertyNames.add(USE_ANNOTATIONS); propertyNames.add(DISPLAY_NAME); propertyNames.add(DESCRIPTION); - propertyNames.add(NON_ANNOTATED_TEMPLATE_FILE); - propertyNames.add(TEMPLATE_FILE); propertyNames.add(USE_EXISTING_CLASS); return propertyNames; } @@ -214,10 +208,6 @@ return getServletInterfaces(); else if (propertyName.equals(SUPERCLASS)) return SERVLET_SUPERCLASS; - else if (propertyName.equals(TEMPLATE_FILE)) - return ANNOTATED_TEMPLATE_DEFAULT; - else if (propertyName.equals(NON_ANNOTATED_TEMPLATE_FILE)) - return NON_ANNOTATED_TEMPLATE_DEFAULT; else if (propertyName.equals(USE_EXISTING_CLASS)) return Boolean.FALSE; // Otherwise check super for default value for property
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassOperation.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassOperation.java index a189d56..38dc81d 100644 --- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassOperation.java +++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassOperation.java
@@ -120,7 +120,7 @@ /** * folder location of the servlet creation templates diretory */ - protected static final String TEMPLATE_DIR = "/templates/"; //$NON-NLS-1$ + protected static final String TEMPLATE_FILE = "/templates/servlet.javajet"; //$NON-NLS-1$ /** * name of the template emitter to be used to generate the deployment @@ -337,16 +337,7 @@ * @throws JETException */ private String generateTemplateSource(CreateServletTemplateModel tempModel, IProgressMonitor monitor) throws JETException { - URL templateURL = null; - // If annotated, use annotated template - if (model.getBooleanProperty(IAnnotationsDataModel.USE_ANNOTATIONS)) - templateURL = WebPlugin.getDefault().find( - new Path(TEMPLATE_DIR + getDataModel().getStringProperty(INewServletClassDataModelProperties.TEMPLATE_FILE))); - // Otherwise use non annotated template - else - templateURL = WebPlugin.getDefault().find( - new Path(TEMPLATE_DIR - + getDataModel().getStringProperty(INewServletClassDataModelProperties.NON_ANNOTATED_TEMPLATE_FILE))); + URL templateURL = WebPlugin.getDefault().find(new Path(TEMPLATE_FILE)); cleanUpOldEmitterProject(); WTPJETEmitter emitter = new WTPJETEmitter(templateURL.toString(), this.getClass().getClassLoader()); emitter.setIntelligentLinkingEnabled(true);