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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 1a47b48..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,42 +95,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>  
+		<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
@@ -217,49 +226,73 @@
                id="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction">
          </action>
       </actionSet>
-  <!--    <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.phpeclipse.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.phpeclipse.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> -->
+
+	  </actionSet> 
    </extension>
-  <!-- <extension
-         point="org.eclipse.ui.actionDefinitions">
-      <actionDefinition
-            id="net.sourceforge.phpeclipse.phpeditor.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.phpeclipse.phpeditor.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"
             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> -->
@@ -442,10 +475,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 +533,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 +584,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 +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>