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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 28f3697..67dadcc 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="net.sourceforge.phpeclipse"
    name="%pluginName"
-   version="1.0.8"
+   version="1.0.10"
    provider-name="%providerName"
    class="net.sourceforge.phpeclipse.PHPeclipsePlugin">
 
@@ -12,41 +13,84 @@
       </library>
    </runtime>
    <requires>
-      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
       <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.ui.console"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.search"/>
+      <import plugin="org.eclipse.debug.core"/>
+      <import plugin="org.eclipse.debug.ui"/>
+      <import plugin="org.eclipse.compare"/>
+      <import plugin="org.eclipse.core.filebuffers"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.ui.externaltools"/>
       <import plugin="org.eclipse.help"/>
       <import plugin="org.eclipse.swt"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
+      <import plugin="org.eclipse.search"/>
       <import plugin="org.apache.xerces"/>
       <import plugin="org.eclipse.update.ui"/>
+      <import plugin="com.quantum.Quantum"/>
    </requires>
 
-
    <extension
          id="phpnature"
          name="%naturePHP.name"
          point="org.eclipse.core.resources.natures">
       <runtime>
          <run
-          class="net.sourceforge.phpeclipse.resourcesview.PHPProject">
+          class="net.sourceforge.phpdt.internal.core.JavaProject">
          </run>
       </runtime>
-      <builder
-          id="net.sourceforge.phpeclipse.parserbuilder">
-      </builder>
    </extension>
+   
    <extension
          id="parserbuilder"
-         name="Parser Builder"
+         name="PHP Builder"
          point="org.eclipse.core.resources.builders">
-      <builder hasNature="true">
-         <run
-           class="net.sourceforge.phpeclipse.builder.ParserBuilder">
+      <builder>
+         <run  
+           class="net.sourceforge.phpdt.internal.core.builder.PHPBuilder">
          </run>
       </builder>
    </extension>
+   <!-- =================================================================================== -->
+<!-- Extension: Java Markers                                                             -->
+<!-- =================================================================================== -->
+
+<!-- Java problems -->
+
+<extension id="problem" point="org.eclipse.core.resources.markers" name="%phpProblemName">
+	<super type="org.eclipse.core.resources.problemmarker"/>
+	<super type="org.eclipse.core.resources.textmarker"/>
+	<persistent value="true"/>
+	<attribute name="id"/>
+	<attribute name="flags"/>
+	<attribute name="arguments"/>
+</extension>   
+
+<!-- Java transient problems -->
+
+<extension id="transient_problem" point="org.eclipse.core.resources.markers" name="%transientPHPProblemName">
+	<super type="org.eclipse.core.resources.textmarker"/>
+	<persistent value="false"/>
+	<attribute name="id"/>
+	<attribute name="flags"/>
+	<attribute name="arguments"/>
+</extension>
+
+<!-- Java tasks -->
+
+<extension id="task" name="%phpTaskName" point="org.eclipse.core.resources.markers">
+    <super type="org.eclipse.core.resources.taskmarker"/> 
+    <persistent value="true"/>
+</extension>
+
+   <extension-point name="%phpEditorTextHoversName" id="phpEditorTextHovers" schema="schema/phpEditorTextHovers.exsd"/> 
+
    <extension
          point="org.eclipse.team.core.fileTypes">
       <fileTypes
@@ -81,7 +125,41 @@
             type="text"
             extension="xml">
       </fileTypes>
+      <fileTypes
+            type="text"
+            extension="tpl">
+      </fileTypes>
    </extension>
+   
+   <extension
+      point="net.sourceforge.phpeclipse.phpEditorTextHovers">
+   <hover
+         class="net.sourceforge.phpdt.internal.ui.text.java.hover.BestMatchHover"
+         id="net.sourceforge.phpdt.ui.BestMatchHover"
+         label="%sequentialHover"
+         description="%sequentialHoverDescription">
+   </hover>
+</extension>
+
+<extension
+      point="net.sourceforge.phpeclipse.phpEditorTextHovers">
+   <hover
+         class="net.sourceforge.phpdt.internal.ui.text.java.hover.JavaSourceHover"
+         id="net.sourceforge.phpdt.ui.JavaSourceHover"
+         label="%sourceHover"
+         description="%sourceHoverDescription">
+   </hover>
+</extension>
+   <extension
+      point="net.sourceforge.phpeclipse.phpEditorTextHovers">
+   <hover
+         class="net.sourceforge.phpdt.internal.ui.text.java.hover.AnnotationHover"
+         id="net.sourceforge.phpdt.ui.AnnotationHover"
+         label="%annotationHover" 
+         description="%annotationHoverDescription">
+   </hover>
+   </extension>
+
    <extension
          point="org.eclipse.ui.perspectives">
       <perspective
@@ -97,9 +175,6 @@
             name="%newWizardCategory.name"
             id="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP">
       </category>
-<!--    
-Temporarily replaced until errors can be ironed out...
--->
       <wizard
             name="%newWizardPHPProject.name"
             icon="icons/obj16/php.gif"
@@ -111,6 +186,15 @@ Temporarily replaced until errors can be ironed out...
             Create a new PHP project.
          </description>
       </wizard>
+<!--  	<wizard
+		id="net.sourceforge.phpdt.internal.ui.wizards.NewClassCreationWizard"
+		name="%NewPHPClass.label"
+		class="net.sourceforge.phpdt.internal.ui.wizards.NewClassCreationWizard"
+		category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
+		icon="icons/ctool16/newclass_wiz.gif">
+		<description>%NewPHPClass.description</description>
+	</wizard>      
+      -->
 <!--
 <this wizard replaces it as it works - maybe not as pretty but still>
 
@@ -135,21 +219,18 @@ Temporarily replaced until errors can be ironed out...
             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.exportWizards">
+     <wizard name="%ExportWizards.Obfuscator" 
+             icon="icons/ctool16/exportdir_wiz.gif" 
+             class="net.sourceforge.phpeclipse.obfuscator.export.ObfuscatorExportWizard" 
+             id="net.sourceforge.phpeclipse.obfuscator.export.ObfuscatorExportWizard">
+     <description>%ExportWizards.ObfuscatorDescription</description> 
+     <selection class="org.eclipse.core.resources.IResource" /> 
+     </wizard>
+  </extension>
    <extension
-         point="org.eclipse.ui.projectNatureImages">
+         point="org.eclipse.ui.ide.projectNatureImages">
       <image
             icon="icons/obj16/php.gif"
             natureId="net.sourceforge.phpeclipse.phpnature"
@@ -170,14 +251,20 @@ Temporarily replaced until errors can be ironed out...
       </page> -->
       <page
             objectClass="org.eclipse.core.resources.IProject"
-            name="PHP Obfuscator"
-            class="net.sourceforge.phpeclipse.preferences.PHPObfuscatorPropertyPage"
-            id="net.sourceforge.phpeclipse.preferences.PHPObfuscatorPropertyPage">
+            name="PHP Project Settings"
+            class="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences"
+            id="net.sourceforge.phpeclipse.preferences.project.PHPMiscProjectPreferences">
          <filter
                name="nature"
                value="net.sourceforge.phpeclipse.phpnature">
          </filter>
       </page>
+      <page
+            objectClass="org.eclipse.core.resources.IFile"
+            name="PHP File Settings"
+            class="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences"
+            id="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences">
+      </page>
    </extension>
 <!--   <extension
          point="org.eclipse.ui.views">
@@ -262,8 +349,83 @@ Temporarily replaced until errors can be ironed out...
             class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
             id="net.sourceforge.phpeclipse.PHPUnitEditor">
       </editor>
+      <editor
+            name="%phpEditorName"
+            default="true"
+            icon="icons/obj16/htmledit.gif"
+            extensions="tpl"
+            contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
+            id="net.sourceforge.phpeclipse.PHPUnitEditor">
+      </editor>
+   </extension>
+   <extension
+         point="org.eclipse.ui.editors.annotationTypes">
+      <type
+         name="net.sourceforge.phpdt.ui.error"
+         super="org.eclipse.ui.workbench.texteditor.error"
+         markerType="net.sourceforge.phpeclipse.problem"
+         markerSeverity="2">
+      </type>
+      <type
+         name="net.sourceforge.phpdt.ui.warning"
+         super="org.eclipse.ui.workbench.texteditor.warning"
+         markerType="net.sourceforge.phpeclipse.problem"
+         markerSeverity="1">
+      </type>
+      <type
+         name="net.sourceforge.phpdt.ui.info"
+         super="org.eclipse.ui.workbench.texteditor.info"
+         markerType="net.sourceforge.phpeclipse.problem"
+         markerSeverity="0">
+      </type>
+      <type
+         name="net.sourceforge.phpdt.ui.occurrences">
+      </type>
    </extension>
    <extension
+         point="org.eclipse.ui.editors.markerAnnotationSpecification">
+      <specification
+            annotationType="net.sourceforge.phpdt.ui.error"
+            annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.JavaAnnotationImageProvider">
+      </specification>
+      <specification
+            annotationType="net.sourceforge.phpdt.ui.warning"
+            annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.JavaAnnotationImageProvider">
+      </specification>
+      <specification
+            annotationType="net.sourceforge.phpdt.ui.info"
+            annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.JavaAnnotationImageProvider">
+      </specification>
+      <specification
+            annotationType="org.eclipse.debug.core.breakpoint"
+            icon="icons/full/obj16/brkp_obj.gif"
+            annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.BreakpointImageProvider">
+      </specification>
+	  <specification
+            annotationType="net.sourceforge.phpdt.ui.occurrences"
+            label="%OccurrenceAnnotation.label"
+            icon="icons/full/obj16/searchm_obj.gif"
+            textPreferenceKey="occurrenceIndication"
+            textPreferenceValue="false"
+            highlightPreferenceKey="occurrenceHighlighting"
+            highlightPreferenceValue="true"
+            overviewRulerPreferenceKey="occurrenceIndicationInOverviewRuler"
+            overviewRulerPreferenceValue="true"
+            verticalRulerPreferenceKey="occurrenceIndicationInVerticalRuler"
+            verticalRulerPreferenceValue="false"
+            colorPreferenceKey="occurrenceIndicationColor"
+            colorPreferenceValue="180,207,205"
+            presentationLayer="3"
+            showInNextPrevDropdownToolbarActionKey="showOccurrenceInNextPrevDropdownToolbarAction"
+            showInNextPrevDropdownToolbarAction="true"
+            isGoToNextNavigationTargetKey="isOccurrenceGoToNextNavigationTarget"
+	        isGoToNextNavigationTarget="false"
+            isGoToPreviousNavigationTargetKey="isOccurrenceGoToPreviousNavigationTarget"
+	        isGoToPreviousNavigationTarget="false">
+	  </specification>
+    </extension>
+   <extension
          point="org.eclipse.ui.actionSets">
       <actionSet
             label="PHP/Apache"
@@ -418,14 +580,14 @@ Temporarily replaced until errors can be ironed out...
    
    <extension
          point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IResource"
-            id="net.sourceforge.phpeclipse.actions.obfuscator">
+       <objectContribution
+            objectClass="org.eclipse.core.resources.IProject"
+            id="net.sourceforge.phpeclipse.actions.PHPDocumentorAction">
          <action
-               label="PHP Obfuscator"
-               class="net.sourceforge.phpeclipse.actions.PHPObfuscatorAction"
+               label="Run PHPDocumentor"
+               class="net.sourceforge.phpeclipse.actions.PHPDocumentorAction"
                menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.obfuscatorAction">
+               id="net.sourceforge.phpeclipse.actions.PHPDocumentorAction">
          </action>
       </objectContribution>
       <objectContribution
@@ -602,18 +764,41 @@ Temporarily replaced until errors can be ironed out...
          </action>
       </viewerContribution>
    </extension>
+   
    <extension
          point="org.eclipse.ui.editorActions">
       <editorContribution
-            targetID="net.sourceforge.phpeclipse.PHPEditor"
-            id="org.eclipse.ui.texteditor.ruler.actions">
+            id="org.eclipse.ui.texteditor.ruler.actions"
+            targetID="net.sourceforge.phpeclipse.PHPUnitEditor">
+
+		<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>
+		<action
+            label="%Dummy.label"
+            class="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerAction"
+            actionID="RulerClick"
+            id="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerAction">
+        </action>
+      </editorContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.popupMenus">
+      <viewerContribution
+            targetID="#CompilationUnitRulerContext"
+            id="net.sourceforge.phpeclipse.phpeditor.QuickFixRulerMenuAction">
          <action
                label="%Dummy.label"
-               helpContextId="org.eclipse.ui.bookmark_action_context"
-               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
-               id="org.eclipse.ui.texteditor.BookmarkRulerAction">
+               helpContextId="org.eclipse.jdt.ui.quick_fix_action"
+               class="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerAction"
+               menubarPath="additions"
+               id="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerMenuAction">
          </action>
-      </editorContribution>
+      </viewerContribution>
    </extension>
    <extension
          point="org.eclipse.ui.preferencePages">
@@ -635,6 +820,18 @@ Temporarily replaced until errors can be ironed out...
             id="net.sourceforge.phpeclipse.preference.PHPSyntaxEditorPreferencePage">
       </page>  -->
       <page
+            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            name="PHP Project Defaults"
+            class="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences"
+            id="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences">
+      </page>
+      <page
+            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            name="PHP Browser Preview"
+            class="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences"
+            id="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences">
+      </page>
+      <page
             name="Outline"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
             class="net.sourceforge.phpeclipse.PHPOutlinePreferencePage"
@@ -652,21 +849,27 @@ Temporarily replaced until errors can be ironed out...
             class="net.sourceforge.phpdt.internal.ui.preferences.CodeFormatterPreferencePage"
             id="net.sourceforge.phpeclipse.preference.CodeFormatterPreferencePage">
       </page>
-      <page
+   <!--    <page
             name="Editor"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
             class="net.sourceforge.phpdt.internal.ui.preferences.PHPEditorPreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPEditorPreferencePage">
-      </page>
+      </page> -->
       <page
+            name="Editor 2"
+            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            class="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
+            id="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage">
+      </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">
+         point="org.eclipse.ui.editors.documentProviders">
       <provider
             extensions="%phpFileExtension"
             class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
@@ -674,7 +877,7 @@ Temporarily replaced until errors can be ironed out...
       </provider>
    </extension>
    <extension
-         point="org.eclipse.ui.documentProviders">
+         point="org.eclipse.ui.editors.documentProviders">
       <provider
             extensions="%php3FileExtension"
             class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
@@ -682,7 +885,7 @@ Temporarily replaced until errors can be ironed out...
       </provider>
    </extension>
    <extension
-         point="org.eclipse.ui.documentProviders">
+         point="org.eclipse.ui.editors.documentProviders">
       <provider
             extensions="%php4FileExtension"
             class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
@@ -690,7 +893,7 @@ Temporarily replaced until errors can be ironed out...
       </provider>
    </extension>
    <extension
-         point="org.eclipse.ui.documentProviders">
+         point="org.eclipse.ui.editors.documentProviders">
       <provider
             extensions="%incFileExtension"
             class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
@@ -698,7 +901,7 @@ Temporarily replaced until errors can be ironed out...
       </provider>
    </extension>
    <extension
-         point="org.eclipse.ui.documentProviders">
+         point="org.eclipse.ui.editors.documentProviders">
       <provider
             extensions="%phtmlFileExtension"
             class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
@@ -706,7 +909,7 @@ Temporarily replaced until errors can be ironed out...
       </provider>
    </extension>
    <extension
-         point="org.eclipse.ui.documentProviders">
+         point="org.eclipse.ui.editors.documentProviders">
       <provider
             extensions="%htmlFileExtension"
             class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
@@ -714,7 +917,7 @@ Temporarily replaced until errors can be ironed out...
       </provider>
    </extension>
    <extension
-         point="org.eclipse.ui.documentProviders">
+         point="org.eclipse.ui.editors.documentProviders">
       <provider
             extensions="%htmFileExtension"
             class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
@@ -722,7 +925,7 @@ Temporarily replaced until errors can be ironed out...
       </provider>
    </extension>
    <extension
-         point="org.eclipse.ui.documentProviders">
+         point="org.eclipse.ui.editors.documentProviders">
       <provider
             extensions="%xmlFileExtension"
             class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
@@ -730,120 +933,37 @@ Temporarily replaced until errors can be ironed out...
       </provider>
    </extension>
    <extension
+         point="org.eclipse.ui.editors.documentProviders">
+      <provider
+            extensions="%tplFileExtension"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
+            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
+      </provider>
+   </extension>
+   <extension
          point="org.eclipse.ui.views">
+      <category
+            name="%viewCategoryName"
+            id="net.sourceforge.phpeclipse.views.category">
+      </category>
       <view
             name="%phpConsoleView"
             icon="icons/obj16/php.gif"
+            category="net.sourceforge.phpeclipse.views.category"
             class="net.sourceforge.phpeclipse.views.PHPConsole"
             id="net.sourceforge.phpeclipse.views.phpconsoleview">
+      </view>  
+      <view
+            name="%phpBrowserView"
+            icon="icons/obj16/php.gif"
+            category="net.sourceforge.phpeclipse.views.category"
+            class="net.sourceforge.phpeclipse.views.browser.BrowserView"
+            id="net.sourceforge.phpeclipse.views.browser">
       </view>
    </extension>
 
 <!-- =========================================================================== -->
-<!-- PHPDT/UI command definitions                                                   -->
-<!-- =========================================================================== -->
-<!--
-<extension point="org.eclipse.ui.commands">
-	<category
-		name="%category.source.name"
-		description="%category.source.description"
-		id="net.sourceforge.phpeclipse.ui.category.source">
-	</category>
-
-      
-	<scope
-		name="%scope.javaEditor.name"
-		parent="org.eclipse.ui.textEditorScope"
-		description="%scope.javaEditor.description"
-		id="net.sourceforge.phpeclipse.ui.textEditorScope">
-	</scope>
-     
-          
-	<command
-		category="org.eclipse.ui.category.edit"
-		id="org.eclipse.jdt.ui.edit.text.java.correction.assist.proposals"
-		name= "%ActionDefinition.correctionAssistProposals.name"
-		description="%ActionDefinition.correctionAssistProposals.description">
-	</command>
-	<keyBinding
-		string="Ctrl+1"
-		scope="net.sourceforge.phpeclipse.ui.textEditorScope"
-		command="org.eclipse.jdt.ui.edit.text.java.correction.assist.proposals"
-		configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-	</keyBinding>      
-	<keyBinding
-		platform="carbon"
-		string="Command+1"
-		scope="net.sourceforge.phpeclipse.ui.textEditorScope"
-		command="org.eclipse.jdt.ui.edit.text.java.correction.assist.proposals"
-		configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-	</keyBinding>      
-                 
-      
-	<command
-		category="net.sourceforge.phpeclipse.ui.category.source"
-		id="net.sourceforge.phpeclipse.phpeditor.comment"
-		name= "%ActionDefinition.comment.name"
-		description= "%ActionDefinition.comment.description">
-	</command>
-	<keyBinding
-		string="Ctrl+/"
-		scope="net.sourceforge.phpeclipse.ui.textEditorScope"
-		command="net.sourceforge.phpeclipse.phpeditor.comment"
-		configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-	</keyBinding>
-	<keyBinding
-		platform="carbon"
-		string="Command+/"
-		scope="net.sourceforge.phpeclipse.ui.textEditorScope"
-		command="net.sourceforge.phpeclipse.phpeditor.comment"
-		configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-	</keyBinding>
-
-	<command
-		category="net.sourceforge.phpeclipse.ui.category.source"
-		id="net.sourceforge.phpeclipse.phpeditor.uncomment"
-		name= "%ActionDefinition.uncomment.name"
-		description= "%ActionDefinition.uncomment.description">
-	</command>
-	<keyBinding
-		string="Ctrl+\"
-		scope="net.sourceforge.phpeclipse.ui.textEditorScope"
-		command="net.sourceforge.phpeclipse.phpeditor.uncomment"
-		configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-	</keyBinding>
-	<keyBinding
-		platform="carbon"
-		string="Command+\"
-		scope="net.sourceforge.phpeclipse.ui.textEditorScope"
-		command="net.sourceforge.phpeclipse.phpeditor.uncomment"
-		configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-	</keyBinding>
-
-	<command
- 		category="net.sourceforge.phpeclipse.ui.category.source"
-		id="org.eclipse.jdt.ui.edit.text.java.format"
-		name= "%ActionDefinition.format.name"
-		description= "%ActionDefinition.format.description">
-	</command>
-	<keyBinding
-		string="Ctrl+Shift+F"
-		scope="net.sourceforge.phpeclipse.ui.textEditorScope"
-		command="org.eclipse.jdt.ui.edit.text.java.format"
-		configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-	</keyBinding>
-	<keyBinding
-		platform="carbon"
-		string="Command+Shift+F"
-		scope="net.sourceforge.phpeclipse.ui.textEditorScope"
-		command="org.eclipse.jdt.ui.edit.text.java.format"
-		configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-	</keyBinding>
-
-</extension>
--->
-<!-- =========================================================================== -->
-<!-- PHP Editor Key Bindings -->
+<!-- PHPDT/UI Editor Key Bindings -->
 <!-- =========================================================================== -->
    <extension
          point="org.eclipse.ui.acceleratorSets">
@@ -857,7 +977,7 @@ Temporarily replaced until errors can be ironed out...
          </accelerator>
          <accelerator
                key="Ctrl+1"
-               id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals">
+               id="org.eclipse.ui.edit.text.contentAssist.proposals">
          </accelerator>
 <!-- source -->
          <accelerator
@@ -891,8 +1011,8 @@ Temporarily replaced until errors can be ironed out...
          </accelerator>
          <accelerator
                key="Ctrl+Space"
-               id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals">
-         </accelerator>
+               id="org.eclipse.ui.edit.text.contentAssist.proposals">
+         </accelerator> 
 <!-- source -->
          <accelerator
                key="Ctrl+/"
@@ -927,7 +1047,7 @@ Temporarily replaced until errors can be ironed out...
          <accelerator
                platform="carbon"
                key="Command+1"
-               id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals">
+               id="org.eclipse.ui.edit.text.contentAssist.proposals">
          </accelerator>
 <!-- source -->
          <accelerator