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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 7783dea..3f512ea 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -18,6 +18,7 @@
       <import plugin="org.eclipse.swt"/>
       <import plugin="org.eclipse.debug.ui"/>
       <import plugin="org.apache.xerces"/>
+      <import plugin="org.junit"/>
    </requires>
 
 
@@ -27,7 +28,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 +82,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,7 +95,20 @@
             Create a new PHP project.
          </description>
       </wizard>
-      <wizard
+<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.TempnewPHPProject"
+            project="true"
+            id="net.sourceforge.phpeclipse.wizards.NewWizardProjectCreation">
+         <description>
+            Create a new PHP project.
+         </description>
+      </wizard>  
+		<wizard
             name="%newWizardPHPFile.name"
             icon="icons/obj16/phpedit.gif"
             category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
@@ -102,6 +118,18 @@
             Create a basic PHP file.
          </description>
       </wizard>
+<!-- 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">
@@ -198,38 +226,62 @@
                id="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction">
          </action>
       </actionSet>
+
       <actionSet
 		id="net.sourceforge.phpeclipse.ui.CodingActionSet"
-        label="%phpActionSet.label"
+        label="%CodingActionSet.label"
 		visible="false"
 		description="%CodingActionSet.description">
-		<menu
+
+        <!-- =========================================================================== -->
+		<!-- Source Menu                                                                 -->
+		<!-- =========================================================================== -->
+
+      	<menu
             id="net.sourceforge.phpeclipse.ui.source.menu"
-            label="%php.menu.label"
+            label="%SourceMenu.label"
             path="edit">
          	<separator name="editGroup"/>
       	</menu>
-      	<action id="net.sourceforge.phpdt.ui.actions.Uncomment"
+			
+		<action id="net.sourceforge.phpeclipse.phpeditor.Uncomment"
       		menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
-      		label="%phpUncommentAction.label"
+      		label="%UncommentAction.label"
+			definitionId="net.sourceforge.phpeclipse.phpeditor.uncomment"
 			retarget="true" />
 			
-		<action id="net.sourceforge.phpdt.ui.actions.Comment"
+		<action id="net.sourceforge.phpeclipse.phpeditor.Comment"
       		menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
-      		label="%phpCommentAction.label"
+      		label="%CommentAction.label"
+			definitionId="net.sourceforge.phpeclipse.phpeditor.comment"
 			retarget="true" />
+
 	  </actionSet> 
    </extension>
-   <extension
-         point="org.eclipse.ui.actionDefinitions">
-      <actionDefinition
-            id="net.sourceforge.phpdt.ui.actions.comment">
+   
+<!-- =========================================================================== -->
+<!-- PHP Editor Action Definition IDs -->
+<!-- =========================================================================== -->
+   <extension point="org.eclipse.ui.actionDefinitions">
+	    <!-- edit -->
+	  <actionDefinition
+		id="net.sourceforge.phpeclipse.phpeditor.ContentAssistProposal"
+		name= "%ActionDefinition.contentAssistProposals.name"
+		description="%ActionDefinition.contentAssistProposals.description">
       </actionDefinition>
-      <actionDefinition
-            id="net.sourceforge.phpdt.ui.actions.uncomment">
+      <!-- source -->
+	  <actionDefinition
+		id="net.sourceforge.phpeclipse.phpeditor.Comment"
+		name= "%ActionDefinition.comment.name"
+		description= "%ActionDefinition.comment.description">
+	  </actionDefinition>
+	  <actionDefinition
+		id="net.sourceforge.phpeclipse.phpeditor.Uncomment"
+		name= "%ActionDefinition.uncomment.name"
+		description= "%ActionDefinition.uncomment.description">
       </actionDefinition>
    </extension> 
-   <extension
+<!--   <extension
          point="org.eclipse.ui.acceleratorSets">
       <acceleratorSet
             scopeId="org.eclipse.ui.textEditorScope"
@@ -243,7 +295,7 @@
                id="net.sourceforge.phpdt.ui.actions.uncomment">
          </accelerator>
       </acceleratorSet>
-   </extension> 
+   </extension> -->
    <extension
          point="org.eclipse.ui.editors">
       <editor
@@ -315,39 +367,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
@@ -496,20 +515,33 @@
          point="org.eclipse.ui.preferencePages">
       <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="Outline"
+            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            class="net.sourceforge.phpeclipse.PHPOutlinePreferencePage"
+            id="net.sourceforge.phpeclipse.preference.PHPOutlinePreferencePage">
       </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="Templates"
+            category= "net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+			class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
+			id="net.sourceforge.phpeclipse.preference.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">
@@ -584,5 +616,45 @@
             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+1" id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals" />
+		
+        <!-- source -->
+		<accelerator key="Ctrl+/" id="net.sourceforge.phpeclipse.phpeditor.comment" />
+		<accelerator key="Ctrl+\" id="net.sourceforge.phpeclipse.phpeditor.uncomment" />
+    </acceleratorSet>	
+	
+	<acceleratorSet
+		scopeId="org.eclipse.ui.textEditorScope"
+		configurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
+		<!-- edit -->
+		<accelerator key="Ctrl+Space" id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals" />
+		
+		<!-- source -->
+		<accelerator key="Ctrl+/" id="net.sourceforge.phpeclipse.phpeditor.comment" />
+		<accelerator key="Ctrl+\" id="net.sourceforge.phpeclipse.phpeditor.uncomment" />
+    </acceleratorSet>
+    
+    <acceleratorSet 
+        scopeId="org.eclipse.ui.textEditorScope" 
+        configurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
+		<!-- edit --> 
+		<accelerator key="Command+1" id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals" platform="carbon" />
+
+		<!-- source --> 
+		<accelerator key="Command+/" id="net.sourceforge.phpeclipse.phpeditor.comment" platform="carbon" /> 
+		<accelerator key="Command+\" id="net.sourceforge.phpeclipse.phpeditor.uncomment" platform="carbon" /> 
+		
+	</acceleratorSet>
 
+   </extension>
+    
 </plugin>