replaced a lot of deprecated code; if someone runs into a commit conflict afterwards...

[phpeclipse.git] / net.sourceforge.phpeclipse.ui / plugin.xml

diff --git a/net.sourceforge.phpeclipse.ui/plugin.xml b/net.sourceforge.phpeclipse.ui/plugin.xml
index cdcd7a5..12e683a 100644 (file)
--- a/net.sourceforge.phpeclipse.ui/plugin.xml
+++ b/net.sourceforge.phpeclipse.ui/plugin.xml
@@ -17,7 +17,6 @@
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.osgi"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.ui.ide"/>
@@ -34,12 +33,15 @@
             class="net.sourceforge.phpeclipse.ui.preferences.EmptyPreferencePage"
             id="net.sourceforge.phpeclipse.ui.preferencePage">
       </page>
+<!-- removed templates page, because it also exists in net.sf.phpeclipse,
+     and has more features there
       <page
             name="Templates"
             category="net.sourceforge.phpeclipse.ui.preferencePage"
             class="net.sourceforge.phpeclipse.ui.templates.preferences.TemplatesPreferencePage"
             id="net.sourceforge.phpeclipse.ui.templates.preferences.TemplatesPreferencePage">
       </page>
+-->
       <page
             category="net.sourceforge.phpeclipse.ui.preferencePage"
             name="Project Defaults"