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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index ffa939f..3f512ea 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -2,7 +2,7 @@
 <plugin
    id="net.sourceforge.phpeclipse"
    name="%pluginName"
-   version="1.0.3"
+   version="1.0.6"
    provider-name="%providerName"
    class="net.sourceforge.phpeclipse.PHPeclipsePlugin">
 
@@ -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>
@@ -61,6 +62,10 @@
             type="text"
             extension="htm">
       </fileTypes>
+      <fileTypes
+            type="text"
+            extension="xml">
+      </fileTypes>
    </extension>
    <extension
          point="org.eclipse.ui.perspectives">
@@ -77,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"
@@ -88,30 +95,48 @@
             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
+<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.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
@@ -126,7 +151,7 @@
                value="net.sourceforge.phpeclipse.phpnature">
          </filter>
       </page>
-      <page
+	  <page
             objectClass="net.sourceforge.phpeclipse.PHPProject"
             name="%propertyPagePHPProject.name"
             class="net.sourceforge.phpeclipse.preferences.PHPProjectPropertyPage"
@@ -201,28 +226,73 @@
                id="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction">
          </action>
       </actionSet>
+
+      <actionSet
+		id="net.sourceforge.phpeclipse.ui.CodingActionSet"
+        label="%CodingActionSet.label"
+		visible="false"
+		description="%CodingActionSet.description">
+
+        <!-- =========================================================================== -->
+		<!-- Source Menu                                                                 -->
+		<!-- =========================================================================== -->
+
+      	<menu
+            id="net.sourceforge.phpeclipse.ui.source.menu"
+            label="%SourceMenu.label"
+            path="edit">
+         	<separator name="editGroup"/>
+      	</menu>
+			
+		<action id="net.sourceforge.phpeclipse.phpeditor.Uncomment"
+      		menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+      		label="%UncommentAction.label"
+			definitionId="net.sourceforge.phpeclipse.phpeditor.uncomment"
+			retarget="true" />
+			
+		<action id="net.sourceforge.phpeclipse.phpeditor.Comment"
+      		menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+      		label="%CommentAction.label"
+			definitionId="net.sourceforge.phpeclipse.phpeditor.comment"
+			retarget="true" />
+
+	  </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> -->
@@ -270,7 +340,7 @@
       </editor>
       <editor
             name="%phpEditorName"
-            icon="icons/obj16/phpedit.gif"
+            icon="icons/obj16/htmledit.gif"
             extensions="htm"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
@@ -278,12 +348,20 @@
       </editor>
       <editor
             name="%phpEditorName"
-            icon="icons/obj16/phpedit.gif"
+            icon="icons/obj16/htmledit.gif"
             extensions="html"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
             id="net.sourceforge.phpeclipse.PHPEditor">
       </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">
+      </editor>
    </extension>
    <extension
          point="org.eclipse.ui.popupMenus">
@@ -397,20 +475,73 @@
                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
             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"
+            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">
@@ -453,13 +584,77 @@
       </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"
-            icon="icons/obj16/java.gif"
+            icon="icons/obj16/php.gif"
             class="net.sourceforge.phpeclipse.views.PHPConsole"
             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>