X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 7d4e3e2..a767b83 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -1437,12 +1437,6 @@
             class="net.sourceforge.phpdt.internal.ui.preferences.CodeFormatterPreferencePage"
             id="net.sourceforge.phpeclipse.preference.CodeFormatterPreferencePage">
       </page>
-   <!--    <page
-            name="Editor"
-            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
-            class="net.sourceforge.phpdt.internal.ui.preferences.PHPEditorPreferencePage"
-            id="net.sourceforge.phpeclipse.preference.PHPEditorPreferencePage">
-      </page> -->
       <page name="Editor"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
             class="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
@@ -1453,13 +1447,19 @@
             class="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage"
             id="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage">
       </page>
-      <page
+            <page
+            name="%templatePageName"
+            category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
+            class="net.sourceforge.phpdt.internal.ui.preferences.JavaTemplatePreferencePage"
+            id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
+      </page>
+  <!--      <page
             name="%templatePageName"
             category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
             class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
             id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
       </page>
- <!--     <page
+      <page
             name="Language Settings"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
             class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage"
@@ -1800,4 +1800,34 @@
 			preferencesClass="net.sourceforge.phpdt.internal.ui.text.folding.DefaultJavaFoldingPreferenceBlock">
 		</provider>
 	</extension>
+	
+	<!-- =========================================================================== -->
+<!-- Templates                                                                   -->
+<!-- =========================================================================== -->
+   <extension
+         point="org.eclipse.ui.editors.templates">
+      <contextType
+            name="%templates.php.contextType.name"
+            class="net.sourceforge.phpdt.internal.corext.template.php.JavaContextType"
+            id="java">
+      </contextType>
+      <contextType
+            name="%templates.phpdoc.contextType.name"
+            class="net.sourceforge.phpdt.internal.corext.template.php.JavaDocContextType"
+            id="javadoc">
+      </contextType>
+      <contextType
+            name="%templates.html.contextType.name"
+            class="net.sourceforge.phpdt.internal.corext.template.php.HTMLContextType"
+            id="javadoc">
+      </contextType>
+      <include
+      		file="templates/default-templates.xml"
+      		translations="templates/default-templates.properties">
+      </include>
+      <include
+      		file="templates/default-codetemplates.xml"
+      		translations="templates/default-templates.properties">
+      </include>
+   </extension>
 </plugin>