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

diff --git a/archive/net.sourceforge.phpeclipse.jtidy/plugin.xml b/archive/net.sourceforge.phpeclipse.jtidy/plugin.xml
index 18d5609..167eb5a 100644
--- a/archive/net.sourceforge.phpeclipse.jtidy/plugin.xml
+++ b/archive/net.sourceforge.phpeclipse.jtidy/plugin.xml
@@ -1,24 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
-   id="net.sourceforge.phpdt.tidy"
-   name="Jtidy Plug-in"
-   version="1.0.1"
-   provider-name="Jan Schulz"
+   id="net.sourceforge.phpeclipse.tidy"
+   name="%pluginName"
+   version="1.1.0"
+   provider-name="%providerName"
    class="net.sourceforge.phpdt.tidy.JtidyPlugin">
 
    <runtime>
-      <library name="jtidy_plugin.jar"/>
+      <library name="jtidy.jar"/>
    </runtime>
    <requires>
-      <import plugin="org.eclipse.core.resources" export="true"/>
-      <import plugin="org.eclipse.ui" export="true"/>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.editors"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.core.filebuffers"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.swt"/>
    </requires>
 
 
    <extension
          point="org.eclipse.ui.popupMenus">
-         <viewerContribution
-         id="net.sourceforge.phpdt.tidy.EditorPopUp"
+      <viewerContribution
+         id="net.sourceforge.phpdt.tidy.editorpopup"
          targetID="#TextEditorContext">
          <menu
                label="JTidy"
@@ -43,10 +52,63 @@
                id="net.sourceforge.phpdt.tidy.FormatEditorAction">
          </action>
       </viewerContribution>
+      <viewerContribution
+            targetID="#PHPEditorContext"
+            id="net.sourceforge.phpdt.tidy.editorpopup">
+         <menu
+               label="JTidy"
+               path="additions"
+               id="net.sourceforge.phpdt.tidy.menu2">
+            <separator
+                  name="group1">
+            </separator>
+         </menu>
+         <action
+               label="Check Markup"
+               class="net.sourceforge.phpdt.tidy.actions.ParseWithJTidyEditorAction"
+               menubarPath="net.sourceforge.phpdt.tidy.menu2/group1"
+               
+               id="net.sourceforge.phpdt.tidy.ParseEditorAction">
+         </action>
+         <action
+               label="Format"
+               class="net.sourceforge.phpdt.tidy.actions.FormatWithJTidyEditorAction"
+               menubarPath="net.sourceforge.phpdt.tidy.menu2/group1"
+              
+               id="net.sourceforge.phpdt.tidy.FormatEditorAction">
+         </action>
+      </viewerContribution> 
       <objectContribution
             objectClass="org.eclipse.core.resources.IFile"
             nameFilter="*.htm*"
-            id="net.sourceforge.phpdt.tidy.contribution1">
+            id="net.sourceforge.phpdt.tidy.filepopups">
+         <menu
+               label="JTidy"
+               path="additions"
+               id="net.sourceforge.phpdt.tidy.menu1">
+            <separator
+                  name="group1">
+            </separator>
+         </menu>
+         <action
+               label="Check Markup"
+               class="net.sourceforge.phpdt.tidy.actions.ParseWithJTidyAction"
+               menubarPath="net.sourceforge.phpdt.tidy.menu1/group1"
+               enablesFor="+"
+               id="net.sourceforge.phpdt.tidy.ParseAction">
+         </action>
+         <action
+               label="Format"
+               class="net.sourceforge.phpdt.tidy.actions.FormatWithJTidyAction"
+               menubarPath="net.sourceforge.phpdt.tidy.menu1/group1"
+               enablesFor="+"
+               id="net.sourceforge.phpdt.tidy.FormatAction">
+         </action>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.php*"
+            id="net.sourceforge.phpdt.tidy.filepopups">
          <menu
                label="JTidy"
                path="additions"
@@ -71,9 +133,7 @@
          </action>
       </objectContribution>
    </extension>
-   <extension
-         point="org.eclipse.ui.popupMenus">
-   </extension>
+
     <extension
          point="org.eclipse.ui.preferencePages">
           <page