#1467296 patch for bug #1454529

[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 5238299..cc26650 100644 (file)
--- a/net.sourceforge.phpeclipse.ui/plugin.xml
+++ b/net.sourceforge.phpeclipse.ui/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.phpeclipse.ui"
    name="%pluginName"
-   version="1.1.6"
+   version="1.1.8"
    provider-name="%providerName"
    class="net.sourceforge.phpeclipse.ui.WebUI">
 
@@ -17,10 +17,9 @@
       <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"/> 
+      <import plugin="org.eclipse.ui.ide"/>
       <import plugin="org.eclipse.ui.views"/>
       <import plugin="org.eclipse.ui.workbench.texteditor"/>
       <import plugin="net.sourceforge.phpeclipse.webbrowser"/>
@@ -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"
@@ -66,20 +68,21 @@
          </filter>
       </page> -->
       <page
-            objectClass="org.eclipse.core.resources.IProject"
-            name="PHP Project Settings"
             class="net.sourceforge.phpeclipse.ui.preferences.PHPMiscProjectPreferences"
-            id="net.sourceforge.phpeclipse.ui.preferences.project.PHPMiscProjectPreferences">
+            icon="icons/full/obj16/php.png"
+            id="net.sourceforge.phpeclipse.ui.preferences.project.PHPMiscProjectPreferences"
+            name="PHP Project Settings"
+            objectClass="org.eclipse.core.resources.IProject">
          <filter
                name="nature"
                value="net.sourceforge.phpeclipse.phpnature">
          </filter>
       </page>
       <page
-            objectClass="org.eclipse.core.resources.IFile"
-            name="PHP Browser Preview"
             class="net.sourceforge.phpeclipse.ui.preferences.PHPPreviewProjectPreferences"
-            id="net.sourceforge.phpeclipse.ui.preferences.PHPPreviewProjectPreferences">
+            id="net.sourceforge.phpeclipse.ui.preferences.PHPPreviewProjectPreferences"
+            name="PHP Browser Preview"
+            objectClass="org.eclipse.core.resources.IFile">
       </page>
    </extension>
     <!-- <extension
@@ -95,7 +98,7 @@
             fastViewWidthRatio="66"
             class="net.sourceforge.phpeclipse.ui.views.preview.BrowserPreview"
             id="net.sourceforge.phpeclipse.ui.views.browserPreview">
-      </view> 
+      </view>
    </extension> -->
 
    <extension
@@ -119,7 +122,7 @@
             name="%templates.contextType.smarty"
             class="net.sourceforge.phpeclipse.ui.templates.template.SmartyContextType"
             id="smarty">
-      </contextType> 
+      </contextType>
   <!--    <contextType
             name="%templates.javadoc.contextType.name"
             class="org.eclipse.jdt.internal.corext.template.java.JavaDocContextType"
@@ -134,7 +137,7 @@
                translations="templates/default-templates.properties">
       </include> -->
    </extension>
-   <extension
+ <!--     <extension
          point="org.eclipse.team.core.fileTypes">
       <fileTypes
             type="text"
@@ -144,5 +147,5 @@
             type="text"
             extension="html">
       </fileTypes>
-   </extension>
+   </extension> -->
 </plugin>