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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 1a47b48..89e8568 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -18,6 +18,8 @@
       <import plugin="org.eclipse.swt"/>
       <import plugin="org.eclipse.debug.ui"/>
       <import plugin="org.apache.xerces"/>
+      <import plugin="org.junit"/>
+      <import plugin="org.eclipse.update.ui"/>
    </requires>
 
 
@@ -27,7 +29,7 @@
          point="org.eclipse.core.resources.natures">
       <runtime>
          <run
-               class="net.sourceforge.phpeclipse.PHPProject">
+               class="net.sourceforge.phpeclipse.resourcesview.PHPProject">
          </run>
       </runtime>
    </extension>
@@ -81,7 +83,9 @@
             name="%newWizardCategory.name"
             id="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP">
       </category>
-      <wizard
+<!--    
+Temporarily replaced until errors can be ironed out...
+  <wizard
             name="%newWizardPHPProject.name"
             icon="icons/obj16/php.gif"
             category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
@@ -92,42 +96,48 @@
             Create a new PHP project.
          </description>
       </wizard>
-<!-- choochter's stuff -->	  
-	  <wizard
-            name="Xaraya Module"
+<this wizard replaces it as it works - maybe not as pretty but still>
+-->
+      <wizard
+            name="%newWizardPHPProject.name"
             icon="icons/obj16/php.gif"
             category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
-            class="net.sourceforge.phpeclipse.wizards.NewXarayaModuleWizard"
+            class="net.sourceforge.phpeclipse.wizards.TempnewPHPProject"
             project="true"
-            id="net.sourceforge.phpeclipse.wizards.NewXarayaModuleWizard">
+            id="net.sourceforge.phpeclipse.wizards.NewWizardProjectCreation">
          <description>
-            Create a Xaraya module.
+            Create a new PHP project.
          </description>
-      </wizard>      
-   </extension>
-<!--   <extension
-         point="org.eclipse.ui.newWizards">
-      <category
-            name="%newWizardCategory.name"
-            id="net.sourceforge.phpeclipse.wizardCategory">
-      </category>
+      </wizard>
       <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> -->
+<!-- choochter's stuff -->
+      <wizard
+            name="Xaraya Module"
+            icon="icons/obj16/php.gif"
+            category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
+            class=" com.xaraya.wizard.NewXarayaResourceWizard"
+            project="true"
+            id="net.sourceforge.phpeclipse.wizards.NewXarayaModuleWizard">
+         <description>
+            Create a Xaraya module.
+         </description>
+      </wizard>
+   </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
@@ -142,7 +152,7 @@
                value="net.sourceforge.phpeclipse.phpnature">
          </filter>
       </page>
-	  <page
+      <page
             objectClass="net.sourceforge.phpeclipse.PHPProject"
             name="%propertyPagePHPProject.name"
             class="net.sourceforge.phpeclipse.preferences.PHPProjectPropertyPage"
@@ -217,49 +227,84 @@
                id="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction">
          </action>
       </actionSet>
-  <!--    <actionSet
-		id="net.sourceforge.phpeclipse.ui.CodingActionSet"
-        label="%phpActionSet.label"
-		visible="false"
-		description="%CodingActionSet.description">
-		<menu
-            id="net.sourceforge.phpeclipse.ui.source.menu"
-            label="%php.menu.label"
-            path="edit">
-         	<separator name="editGroup"/>
-      	</menu>
-      	<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.phpeclipse.ui.actions.Comment"
-      		menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
-      		label="%phpCommentAction.label"
-			retarget="true" />
-	  </actionSet> -->
+      <actionSet
+            label="%CodingActionSet.label"
+            description="%CodingActionSet.description"
+            visible="false"
+            id="net.sourceforge.phpeclipse.ui.CodingActionSet">
+         <!-- =========================================================================== -->
+         <!-- Source Menu                                                                 -->
+         <!-- =========================================================================== -->
+         <menu
+               label="%SourceMenu.label"
+               path="edit"
+               id="net.sourceforge.phpeclipse.ui.source.menu">
+            <separator name="editGroup"/>
+         </menu>    	
+      	
+         <action 
+			definitionId="net.sourceforge.phpeclipse.phpeditor.format"
+			label="%FormatAction.label"
+			retarget="true"
+			menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+			id="net.sourceforge.phpeclipse.phpeditor.Format" >
+	     </action>
+         <action
+               definitionId="net.sourceforge.phpeclipse.phpeditor.uncomment"
+               label="%UncommentAction.label"
+               retarget="true"
+               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               id="net.sourceforge.phpeclipse.phpeditor.Uncomment">
+         </action>
+         <action
+               definitionId="net.sourceforge.phpeclipse.phpeditor.comment"
+               label="%CommentAction.label"
+               retarget="true"
+               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               id="net.sourceforge.phpeclipse.phpeditor.Comment">
+         </action>
+      </actionSet>
    </extension>
-  <!-- <extension
+<!-- =========================================================================== -->
+<!-- PHP Editor Action Definition IDs -->
+<!-- =========================================================================== -->
+   <extension
          point="org.eclipse.ui.actionDefinitions">
+<!-- edit -->
       <actionDefinition
-            id="net.sourceforge.phpeclipse.phpeditor.comment">
+            name="%ActionDefinition.contentAssistProposals.name"
+            description="%ActionDefinition.contentAssistProposals.description"
+            id="net.sourceforge.phpeclipse.phpeditor.ContentAssistProposal">
       </actionDefinition>
+<!-- source -->
       <actionDefinition
-            id="net.sourceforge.phpeclipse.phpeditor.uncomment">
+            name="%ActionDefinition.comment.name"
+            description="%ActionDefinition.comment.description"
+            id="net.sourceforge.phpeclipse.phpeditor.Comment">
       </actionDefinition>
-   </extension> 
-   <extension
+      <actionDefinition
+            name="%ActionDefinition.uncomment.name"
+            description="%ActionDefinition.uncomment.description"
+            id="net.sourceforge.phpeclipse.phpeditor.Uncomment">
+      </actionDefinition>
+      	<actionDefinition
+      	    name= "%ActionDefinition.format.name"
+      	    description= "%ActionDefinition.format.description"
+     		id="net.sourceforge.phpeclipse.phpeditor.Format">
+	  </actionDefinition>
+   </extension>
+<!--   <extension
          point="org.eclipse.ui.acceleratorSets">
       <acceleratorSet
             scopeId="org.eclipse.ui.textEditorScope"
             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> -->
@@ -270,64 +315,72 @@
             icon="icons/obj16/phpedit.gif"
             extensions="php"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor">
-      </editor>
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
+            id="net.sourceforge.phpeclipse.PHPEditor"
+            default="true">
+      </editor>  
       <editor
             name="%phpEditorName"
             icon="icons/obj16/phpedit.gif"
             extensions="php3"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor">
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
+            id="net.sourceforge.phpeclipse.PHPEditor"
+            default="true">
       </editor>
       <editor
             name="%phpEditorName"
             icon="icons/obj16/phpedit.gif"
             extensions="php4"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor">
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
+            id="net.sourceforge.phpeclipse.PHPEditor"
+            default="true">
       </editor>
       <editor
             name="%phpEditorName"
             icon="icons/obj16/phpedit.gif"
             extensions="inc"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor">
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
+            id="net.sourceforge.phpeclipse.PHPEditor"
+            default="true">
       </editor>
       <editor
             name="%phpEditorName"
             icon="icons/obj16/phpedit.gif"
             extensions="phtml"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor">
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
+            id="net.sourceforge.phpeclipse.PHPEditor"
+            default="true">
       </editor>
       <editor
             name="%phpEditorName"
             icon="icons/obj16/htmledit.gif"
             extensions="htm"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor">
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
+            id="net.sourceforge.phpeclipse.PHPEditor"
+            default="true">
       </editor>
       <editor
             name="%phpEditorName"
             icon="icons/obj16/htmledit.gif"
             extensions="html"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor">
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
+            id="net.sourceforge.phpeclipse.PHPEditor"
+            default="true">
       </editor>
       <editor
             name="%phpEditorName"
             icon="icons/obj16/xmledit.gif"
             extensions="xml"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor">
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
+            id="net.sourceforge.phpeclipse.PHPEditor"
+            default="true">
       </editor>
    </extension>
    <extension
@@ -442,38 +495,84 @@
                id="net.sourceforge.phpeclipse.actions.showAction">
          </action>
       </objectContribution>
+      <viewerContribution
+            targetID="#PHPRulerContext"
+            id="net.sourceforge.phpdt.ui.PHPEditorPopupActions">
+         <action
+               label="%AddTask.label"
+               helpContextId="org.eclipse.ui.AddTask_action_context"
+               tooltip="%AddTask.tooltip"
+               class="org.eclipse.ui.texteditor.TaskRulerAction"
+               menubarPath="add"
+               id="org.eclipse.ui.texteditor.TaskRulerAction">
+         </action>
+         <action
+               label="%AddBookmark.label"
+               helpContextId="org.eclipse.ui.bookmark_action_context"
+               tooltip="%AddBookmark.tooltip"
+               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
+               menubarPath="add"
+               id="org.eclipse.ui.texteditor.BookmarkRulerAction">
+         </action>
+      </viewerContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.editorActions">
+      <editorContribution
+            targetID="net.sourceforge.phpeclipse.PHPEditor"
+            id="org.eclipse.ui.texteditor.ruler.actions">
+         <action
+               label="%Dummy.label"
+               helpContextId="org.eclipse.ui.bookmark_action_context"
+               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
+               actionID="RulerDoubleClick"
+               id="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">
       </page>
-      <page
-            name="Editor"
+  <!--    <page
+            name="Editor2"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
             class="net.sourceforge.phpeclipse.PHPSyntaxEditorPreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPSyntaxEditorPreferencePage">
-      </page>
+      </page>  -->
       <page
             name="Outline"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
             class="net.sourceforge.phpeclipse.PHPOutlinePreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPOutlinePreferencePage">
       </page>
-      <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">
+            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
+            id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
+      </page>
+      <page 
+        name="Formatter"
+		id="net.sourceforge.phpeclipse.preference.CodeFormatterPreferencePage"
+		class="net.sourceforge.phpdt.internal.ui.preferences.CodeFormatterPreferencePage"
+		category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
+	  </page>
+	  <page 
+        name="Editor"
+		id="net.sourceforge.phpeclipse.preference.PHPEditorPreferencePage"
+		class="net.sourceforge.phpdt.internal.ui.preferences.PHPEditorPreferencePage"
+		category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
 	  </page>
       <page
             name="Language Settings"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
             class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPLanguagePreferencePage">
-      </page>  	  
+      </page>
    </extension>
    <extension
          point="org.eclipse.ui.documentProviders">
@@ -516,6 +615,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"
@@ -524,5 +647,81 @@
             id="net.sourceforge.phpeclipse.views.phpconsoleview">
       </view>
    </extension>
+<!-- =========================================================================== -->
+<!-- Java Editor Key Bindings -->
+<!-- =========================================================================== -->
+   <extension
+         point="org.eclipse.ui.acceleratorSets">
+      <acceleratorSet
+            scopeId="org.eclipse.ui.textEditorScope"
+            configurationId="org.eclipse.ui.emacsAcceleratorConfiguration">
+<!-- edit -->
+  		 <accelerator key="Ctrl+Shift+P" id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket" />
+
+         <accelerator
+               key="Ctrl+1"
+               id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals">
+         </accelerator>
+<!-- source -->
+         <accelerator
+               key="Ctrl+/"
+               id="net.sourceforge.phpeclipse.phpeditor.comment">
+         </accelerator>
+         <accelerator
+               key="Ctrl+\"
+               id="net.sourceforge.phpeclipse.phpeditor.uncomment">
+         </accelerator>
+         <accelerator 
+               key="Ctrl+Shift+F" 
+               id="net.sourceforge.phpeclipse.phpeditor.format">
+         </accelerator>
+      </acceleratorSet>
+      <acceleratorSet
+            scopeId="org.eclipse.ui.textEditorScope"
+            configurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
+<!-- edit -->
+         <accelerator key="Ctrl+Shift+P" id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket" />
+         <accelerator
+               key="Ctrl+Space"
+               id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals">
+         </accelerator>
+<!-- source -->
+         <accelerator
+               key="Ctrl+/"
+               id="net.sourceforge.phpeclipse.phpeditor.comment">
+         </accelerator>
+         <accelerator
+               key="Ctrl+\"
+               id="net.sourceforge.phpeclipse.phpeditor.uncomment">
+         </accelerator>
+         <accelerator 
+               key="Ctrl+Shift+F" 
+               id="net.sourceforge.phpeclipse.phpeditor.format">
+         </accelerator>
+      </acceleratorSet>
+      <acceleratorSet
+            scopeId="org.eclipse.ui.textEditorScope"
+            configurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
+<!-- edit -->
+         <accelerator key="Command+Shift+P" id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket" platform="carbon" /> 
+		
+         <accelerator
+               platform="carbon"
+               key="Command+1"
+               id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals">
+         </accelerator>
+<!-- source -->
+         <accelerator
+               platform="carbon"
+               key="Command+/"
+               id="net.sourceforge.phpeclipse.phpeditor.comment">
+         </accelerator>
+         <accelerator
+               platform="carbon"
+               key="Command+\"
+               id="net.sourceforge.phpeclipse.phpeditor.uncomment">
+         </accelerator>
+      </acceleratorSet>
+   </extension>
 
 </plugin>