Bug 387295 - [Tooling] Fix org.eclipse.e4.tools.jdt.templates

3 files changed, 86 insertions, 11 deletions

diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml b/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
index b3ed8606..2a4f1536 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/plugin.xml
@@ -15,7 +15,6 @@
             activate="true"
             categoryId="org.eclipse.e4.tools.jdt.templates.e4ProposalCategory"
             class="org.eclipse.e4.internal.tools.jdt.templates.E4TemplateCompletionProposalComputer">
-			<partition type="__dftl_partition_content_type"/>
       </javaCompletionProposalComputer>
     </extension>
    <extension
@@ -42,6 +41,73 @@
             file="templates/default-e4templates.xml"
             translations="$nl$/templates/default-e4templates.properties">
       </include>
+            <resolver
+            class="org.eclipse.jdt.internal.corext.template.java.FieldResolver"
+            contextTypeId="e4-members"
+            description="%templates.java.resolvers.Field.description"
+            name="%templates.java.resolvers.Field.name"
+            type="field"/>
+      <resolver
+            class="org.eclipse.jdt.internal.corext.template.java.LocalVarResolver"
+            contextTypeId="e4-members"
+            description="%templates.java.resolvers.LocalVar.description"
+            name="%templates.java.resolvers.LocalVar.name"
+            type="localVar"/>
+      <resolver
+            class="org.eclipse.jdt.internal.corext.template.java.VarResolver"
+            contextTypeId="e4-members"
+            description="%templates.java.resolvers.Var.description"
+            name="%templates.java.resolvers.Var.name"
+            type="var"/>
+      <resolver
+            class="org.eclipse.jdt.internal.corext.template.java.NameResolver"
+            contextTypeId="e4-members"
+            description="%templates.java.resolvers.Name.description"
+            name="%templates.java.resolvers.Name.name"
+            type="newName"/>
+      <resolver
+            class="org.eclipse.jdt.internal.corext.template.java.TypeResolver"
+            contextTypeId="e4-members"
+            description="%templates.java.resolvers.Type.description"
+            name="%templates.java.resolvers.Type.name"
+            type="newType"/>
+      <resolver
+            class="org.eclipse.jdt.internal.corext.template.java.ElementTypeResolver"
+            contextTypeId="e4-members"
+            description="%templates.java.resolvers.ElementType.description"
+            name="%templates.java.resolvers.ElementType.name"
+            type="elemType"/>
+      <resolver
+            class="org.eclipse.jdt.internal.corext.template.java.TypeVariableResolver"
+            contextTypeId="e4-members"
+            description="%templates.java.resolvers.ArgumentType.description"
+            name="%templates.java.resolvers.ArgumentType.name"
+            type="argType"/>
+	  <resolver
+            class="org.eclipse.jdt.internal.corext.template.java.LinkResolver"
+            contextTypeId="e4-members"
+            description="%templates.java.resolvers.Link.description"
+            name="%templates.java.resolvers.Link.name"
+            type="link"/>
+      <resolver
+            class="org.eclipse.jdt.internal.corext.template.java.ImportsResolver"
+            contextTypeId="e4-members"
+            description="%templates.java.resolvers.Imports.description"
+            name="%templates.java.resolvers.Imports.name"
+            type="import"/>
+      <resolver
+            class="org.eclipse.jdt.internal.corext.template.java.StaticImportResolver"
+            contextTypeId="e4-members"
+            description="%templates.java.resolvers.ImportStatic.description"
+            name="%templates.java.resolvers.ImportStatic.name"
+            type="importStatic"/>
+      <resolver
+            class="org.eclipse.jdt.internal.corext.template.java.ExceptionVariableNameResolver"
+            contextTypeId="e4-members"
+            description="%templates.java.resolvers.ExceptionVariableName.description"
+            name="%templates.java.resolvers.ExceptionVariableName.name"
+            type="exception_variable_name">
+      </resolver>
    </extension>
 
 </plugin>
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
index cadf6bfc..fc49a7fb 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4TemplateCompletionProposalComputer.java
@@ -34,10 +34,10 @@ import org.eclipse.jface.text.templates.TemplateContextType;
 public class E4TemplateCompletionProposalComputer extends AbstractTemplateCompletionProposalComputer {
 
 	/**
-	 * The name of <code>org.eclipse.e4.core.services.IDisposable</code> used to detect
+	 * The name of <code>javax.inject.Inject</code> used to detect
 	 * if a project uses e4.
 	 */
-	private static final String E4_TYPE_NAME= "org.eclipse.e4.core.services.IDisposable"; //$NON-NLS-1$
+	private static final String E4_TYPE_NAME= "org.eclipse.e4.ui.di.Focus"; //$NON-NLS-1$
 
 
 	/**
diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
index 33dd0808..61cd4d65 100644
--- a/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
+++ b/bundles/org.eclipse.e4.tools.jdt.templates/templates/default-e4templates.xml
@@ -10,6 +10,7 @@
  *
  * Contributors:
  *     Boris Bokowski, IBM Corporation - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@gmail.com> - Reworked templates
  *******************************************************************************/
 -->
 
@@ -46,14 +47,22 @@ void handleSomeEvent(Payload payloadObject) {
 	${cursor}
 }</template>
 
-<template name="e4-init" description="Initialization Method" id="org.eclipse.e4.tools.jdt.templates.init" context="e4-members" enabled="true" autoinsert="false">@PostConstruct
-void init() {
-	${cursor}
-}</template>
+<template name="PostConstruct" description="Creates @PostConstruct method" id="org.eclipse.e4.tools.jdt.templates.init" context="e4-members" enabled="true" autoinsert="false">@PostConstruct
+public void postConstruct(${type:newType(org.eclipse.swt.widgets.Composite)} parent) { 
+}
+${imp:import(javax.annotation.PostConstruct)}
+</template>
 
-<template name="e4-dispose" description="Dispose Method" id="org.eclipse.e4.tools.jdt.templates.dispose" context="e4-members" enabled="true" autoinsert="false">@PreDestroy
-void dispose() {
-	${cursor}
-}</template>
+<template name="Focus" description="Creates @Focus method" id="org.eclipse.e4.tools.jdt.templates.focus" context="e4-members" enabled="true" autoinsert="false">@Focus
+public void onFocus() {
+}
+${imp:import(org.eclipse.e4.ui.di.Focus)}
+</template>
+
+<template name="PreDestroy" description="Creates @PreDestroy method" id="org.eclipse.e4.tools.jdt.templates.dispose" context="e4-members" enabled="true" autoinsert="false">@PreDestroy
+public void preDestroy() {
+}
+${imp:import(javax.annotation.PreDestroy)}
+</template>
 
 </templates>