*** empty log message ***

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 1a47b48..b9ea43e 100644 (file)
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -92,42 +92,23 @@
             Create a new PHP project.
          </description>
       </wizard>
-<!-- choochter's stuff -->       
-         <wizard
-            name="Xaraya Module"
-            icon="icons/obj16/php.gif"
-            category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
-            class="net.sourceforge.phpeclipse.wizards.NewXarayaModuleWizard"
-            project="true"
-            id="net.sourceforge.phpeclipse.wizards.NewXarayaModuleWizard">
-         <description>
-            Create a Xaraya module.
-         </description>
-      </wizard>      
-   </extension>
-<!--   <extension
-         point="org.eclipse.ui.newWizards">
-      <category
-            name="%newWizardCategory.name"
-            id="net.sourceforge.phpeclipse.wizardCategory">
-      </category>
       <wizard
             name="%newWizardPHPFile.name"
             icon="icons/obj16/phpedit.gif"
-            category="net.sourceforge.phpeclipse.wizardCategory"
+            category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
             class="net.sourceforge.phpeclipse.wizards.PHPFileWizard"
             id="net.sourceforge.phpeclipse.wizards.PHPFileWizard">
          <description>
             Create a basic PHP file.
          </description>
       </wizard>
-   </extension> -->
+   </extension>
    <extension
          point="org.eclipse.ui.projectNatureImages">
       <image
             icon="icons/obj16/php.gif"
             natureId="net.sourceforge.phpeclipse.phpnature"
-            id="net.sourceforge.phpeclipse..ProjectNatureImagePHP">
+            id="net.sourceforge.phpeclipse.ProjectNatureImagePHP">
       </image>
    </extension>
    <extension
@@ -217,7 +198,7 @@
                id="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction">
          </action>
       </actionSet>
-  <!--    <actionSet
+      <actionSet
                id="net.sourceforge.phpeclipse.ui.CodingActionSet"
         label="%phpActionSet.label"
                visible="false"
@@ -228,24 +209,24 @@
             path="edit">
                <separator name="editGroup"/>
        </menu>
-       <action id="net.sourceforge.phpeclipse.ui.actions.Uncomment"
+       <action id="net.sourceforge.phpdt.ui.actions.Uncomment"
                menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
                label="%phpUncommentAction.label"
                        retarget="true" />
                        
-               <action id="net.sourceforge.phpeclipse.ui.actions.Comment"
+               <action id="net.sourceforge.phpdt.ui.actions.Comment"
                menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
                label="%phpCommentAction.label"
                        retarget="true" />
-         </actionSet> -->
+         </actionSet> 
    </extension>
-  <!-- <extension
+   <extension
          point="org.eclipse.ui.actionDefinitions">
       <actionDefinition
-            id="net.sourceforge.phpeclipse.phpeditor.comment">
+            id="net.sourceforge.phpdt.ui.actions.comment">
       </actionDefinition>
       <actionDefinition
-            id="net.sourceforge.phpeclipse.phpeditor.uncomment">
+            id="net.sourceforge.phpdt.ui.actions.uncomment">
       </actionDefinition>
    </extension> 
    <extension
@@ -255,14 +236,14 @@
             configurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
          <accelerator
                key="Ctrl+/"
-               id="net.sourceforge.phpeclipse.phpeditor.comment">
+               id="net.sourceforge.phpdt.ui.actions.comment">
          </accelerator>
          <accelerator
                key="Ctrl+\\"
-               id="net.sourceforge.phpeclipse.phpeditor.uncomment">
+               id="net.sourceforge.phpdt.ui.actions.uncomment">
          </accelerator>
       </acceleratorSet>
-   </extension> -->
+   </extension> 
    <extension
          point="org.eclipse.ui.editors">
       <editor
@@ -442,10 +423,45 @@
                id="net.sourceforge.phpeclipse.actions.showAction">
          </action>
       </objectContribution>
+       
+         <viewerContribution 
+               id="net.sourceforge.phpdt.ui.PHPEditorPopupActions" 
+               targetID="#PHPRulerContext">
+               <action
+                       id="org.eclipse.ui.texteditor.TaskRulerAction"
+                       menubarPath="add"
+                       label="%AddTask.label"
+                       tooltip="%AddTask.tooltip"
+            helpContextId="org.eclipse.ui.AddTask_action_context"
+                       class="org.eclipse.ui.texteditor.TaskRulerAction">
+               </action>
+               <action
+                       id="org.eclipse.ui.texteditor.BookmarkRulerAction"
+                       menubarPath="add"
+                       label="%AddBookmark.label"
+                       tooltip="%AddBookmark.tooltip"
+            helpContextId="org.eclipse.ui.bookmark_action_context"
+                       class="org.eclipse.ui.texteditor.BookmarkRulerAction">
+               </action>
+         </viewerContribution>
+   </extension>
+   <extension point="org.eclipse.ui.editorActions">
+       <editorContribution
+               id="org.eclipse.ui.texteditor.ruler.actions"
+               targetID="net.sourceforge.phpeclipse.PHPEditor">
+
+               <action
+                       id="org.eclipse.ui.texteditor.BookmarkRulerAction"
+                       actionID="RulerDoubleClick"
+                       label="%Dummy.label"
+            helpContextId="org.eclipse.ui.bookmark_action_context"
+                       class="org.eclipse.ui.texteditor.BookmarkRulerAction">
+               </action>
+       </editorContribution>
    </extension>
    <extension
          point="org.eclipse.ui.preferencePages">
-         <page
+      <page
             name="PHP"
             class="net.sourceforge.phpeclipse.PHPEclipseBasePreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
@@ -465,8 +481,8 @@
       <page 
             name="Templates"
             category= "net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
-                   class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
-                   id = "net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage">
+                       class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
+                       id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
          </page>
       <page
             name="Language Settings"
@@ -516,6 +532,30 @@
       </provider>
    </extension>
    <extension
+         point="org.eclipse.ui.documentProviders">
+      <provider
+            extensions="%htmlFileExtension"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
+            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
+      </provider>
+   </extension>
+   <extension
+         point="org.eclipse.ui.documentProviders">
+      <provider
+            extensions="%htmFileExtension"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
+            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
+      </provider>
+   </extension>
+   <extension
+         point="org.eclipse.ui.documentProviders">
+      <provider
+            extensions="%xmlFileExtension"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
+            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
+      </provider>
+   </extension>
+   <extension
          point="org.eclipse.ui.views">
       <view
             name="%phpConsoleView"