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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 7783dea..1a47b48 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -92,23 +92,42 @@
             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.wizards.NewWizardCategoryPHP"
+            category="net.sourceforge.phpeclipse.wizardCategory"
             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
@@ -198,7 +217,7 @@
                id="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction">
          </action>
       </actionSet>
-      <actionSet
+  <!--    <actionSet
 		id="net.sourceforge.phpeclipse.ui.CodingActionSet"
         label="%phpActionSet.label"
 		visible="false"
@@ -209,24 +228,24 @@
             path="edit">
          	<separator name="editGroup"/>
       	</menu>
-      	<action id="net.sourceforge.phpdt.ui.actions.Uncomment"
+      	<action id="net.sourceforge.phpeclipse.ui.actions.Uncomment"
       		menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
       		label="%phpUncommentAction.label"
 			retarget="true" />
 			
-		<action id="net.sourceforge.phpdt.ui.actions.Comment"
+		<action id="net.sourceforge.phpeclipse.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.phpdt.ui.actions.comment">
+            id="net.sourceforge.phpeclipse.phpeditor.comment">
       </actionDefinition>
       <actionDefinition
-            id="net.sourceforge.phpdt.ui.actions.uncomment">
+            id="net.sourceforge.phpeclipse.phpeditor.uncomment">
       </actionDefinition>
    </extension> 
    <extension
@@ -236,14 +255,14 @@
             configurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
          <accelerator
                key="Ctrl+/"
-               id="net.sourceforge.phpdt.ui.actions.comment">
+               id="net.sourceforge.phpeclipse.phpeditor.comment">
          </accelerator>
          <accelerator
                key="Ctrl+\\"
-               id="net.sourceforge.phpdt.ui.actions.uncomment">
+               id="net.sourceforge.phpeclipse.phpeditor.uncomment">
          </accelerator>
       </acceleratorSet>
-   </extension> 
+   </extension> -->
    <extension
          point="org.eclipse.ui.editors">
       <editor
@@ -315,39 +334,6 @@
          point="org.eclipse.ui.popupMenus">
       <objectContribution
             objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.html"
-            id="net.sourceforge.phpeclipse.actions.htmlParserAction">
-         <action
-               label="Run JTidy Parser"
-               class="net.sourceforge.phpeclipse.actions.HTMLParserAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.htmlParserAction">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.htm"
-            id="net.sourceforge.phpeclipse.actions.htmlParserAction">
-         <action
-               label="Run JTidy Parser"
-               class="net.sourceforge.phpeclipse.actions.HTMLParserAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.htmlParserAction">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.xml"
-            id="net.sourceforge.phpeclipse.actions.htmlParserAction">
-         <action
-               label="Run JTidy Parser"
-               class="net.sourceforge.phpeclipse.actions.HTMLParserAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.htmlParserAction">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
             nameFilter="*.php"
             id="net.sourceforge.phpeclipse.actions.externalParserAction">
          <action
@@ -456,60 +442,38 @@
                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.PHPEclipsePreferencePage"
+            class="net.sourceforge.phpeclipse.PHPEclipseBasePreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
       </page>
       <page
             name="Editor"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
-            class="net.sourceforge.phpeclipse.PHPSyntaxPreferencePage"
-            id="net.sourceforge.phpeclipse.preference.PHPSyntaxPreferencePage">
+            class="net.sourceforge.phpeclipse.PHPSyntaxEditorPreferencePage"
+            id="net.sourceforge.phpeclipse.preference.PHPSyntaxEditorPreferencePage">
       </page>
-      <page name="Templates"
-		id = "net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
-		class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
-		category= "net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
+      <page
+            name="Outline"
+            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            class="net.sourceforge.phpeclipse.PHPOutlinePreferencePage"
+            id="net.sourceforge.phpeclipse.preference.PHPOutlinePreferencePage">
+      </page>
+      <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">
 	  </page>
+      <page
+            name="Language Settings"
+            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage"
+            id="net.sourceforge.phpeclipse.preference.PHPLanguagePreferencePage">
+      </page>  	  
    </extension>
    <extension
          point="org.eclipse.ui.documentProviders">
@@ -552,30 +516,6 @@
       </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"