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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index d3f4fb9..055ac93 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -6,10 +6,10 @@
    version="1.1.0"
    provider-name="%providerName"
    class="net.sourceforge.phpeclipse.PHPeclipsePlugin">
-
+    
    <runtime>
       <library name="phpeclipse.jar">
-         <export name="*"/>
+        <export name="*"/>
       </library>
    </runtime>
    <requires>
@@ -31,7 +31,6 @@
       <import plugin="org.eclipse.help"/>
       <import plugin="org.eclipse.swt"/>
       <import plugin="org.eclipse.search"/>
-      <import plugin="org.apache.xerces"/>
       <import plugin="org.eclipse.update.ui"/>
       <import plugin="net.sourceforge.phpeclipse.quantum.sql"/> 
    </requires>
@@ -89,8 +88,8 @@
     <persistent value="true"/>
 </extension>
 
-   <extension-point name="%phpEditorTextHoversName" id="phpEditorTextHovers" schema="schema/phpEditorTextHovers.exsd"/> 
-
+   <extension-point id="phpEditorTextHovers" name="%phpEditorTextHoversName" schema="schema/phpEditorTextHovers.exsd"/> 
+   <extension-point id="foldingStructureProviders" name="%foldingStructureProvidersExtensionPoint" schema="schema/foldingStructureProviders.exsd"/>
    <extension
          point="org.eclipse.team.core.fileTypes">
       <fileTypes
@@ -186,15 +185,14 @@
             Create a new PHP project.
          </description>
       </wizard>
-<!--  	<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>      
-      -->
+	</wizard>      -->
 <!--
 <this wizard replaces it as it works - maybe not as pretty but still>
 
@@ -279,6 +277,26 @@
                value="net.sourceforge.phpeclipse.phpnature">
          </filter>
       </page>
+            <page
+            objectClass="org.eclipse.core.resources.IProject"
+            name="%compilerPageName"
+            class="net.sourceforge.phpdt.internal.ui.preferences.CompilerPropertyPage"
+            id="net.sourceforge.phpdt.ui.propertyPages.CompilerPropertyPage">
+         <filter
+               name="nature"
+               value="net.sourceforge.phpeclipse.phpnature">
+         </filter>
+      </page>
+      <page
+            objectClass="net.sourceforge.phpdt.core.IJavaProject"
+            name="%compilerPageName"
+            class="net.sourceforge.phpdt.internal.ui.preferences.CompilerPropertyPage"
+            id="net.sourceforge.phpdt.ui.propertyPages.CompilerPropertyPage">
+         <filter
+               name="nature"
+               value="net.sourceforge.phpeclipse.phpnature">
+         </filter>
+      </page>
       <page
             objectClass="org.eclipse.core.resources.IFile"
             name="PHP File Settings"
@@ -437,7 +455,7 @@
             annotationType="net.sourceforge.phpdt.ui.info"
             annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.JavaAnnotationImageProvider">
       </specification>
-      <specification
+      <specification 
             annotationType="org.eclipse.debug.core.breakpoint"
             icon="icons/full/obj16/brkp_obj.gif"
             annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.BreakpointImageProvider">
@@ -836,11 +854,41 @@
             id="net.sourceforge.phpeclipse.actions.popupOpenDeclaration">
          <action
                label="Open PHP Declaration"
-               class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorActon"
+               class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction"
                menubarPath="additions"
                id="net.sourceforge.phpeclipse.actions.opendeclaration">
          </action>
       </viewerContribution>
+      <viewerContribution
+            targetID="#PHPEditorContext"
+            id="net.sourceforge.phpeclipse.actions.popupOpenAllIncludes">
+         <action
+               label="Open Included Files List"
+               class="net.sourceforge.phpeclipse.actions.PHPOpenAllIncludesEditorAction"
+               menubarPath="additions"
+               id="net.sourceforge.phpeclipse.actions.openallincludes">
+         </action>
+      </viewerContribution>
+      <viewerContribution
+            targetID="#PHPEditorContext"
+            id="net.sourceforge.phpeclipse.actions.popupOpenInclude">
+         <action
+               label="Open Include File"
+               class="net.sourceforge.phpeclipse.actions.PHPOpenIncludeEditorAction"
+               menubarPath="additions"
+               id="net.sourceforge.phpeclipse.actions.openinclude">
+         </action>
+      </viewerContribution>
+      <viewerContribution
+            targetID="#PHPEditorContext"
+            id="net.sourceforge.phpeclipse.actions.popupOpenSQLTable">
+         <action
+               label="Open Quantum SQL Table View"
+               class="net.sourceforge.phpeclipse.actions.PHPOpenSQLTableEditorAction"
+               menubarPath="additions"
+               id="net.sourceforge.phpeclipse.actions.opensqltable">
+         </action>
+      </viewerContribution>
    
       <viewerContribution
             targetID="#PHPRulerContext"
@@ -897,6 +945,50 @@
          </action>
       </viewerContribution>
    </extension>
+   <extension
+         point="org.eclipse.ui.popupMenus">
+      <viewerContribution
+            targetID="#CompilationUnitRulerContext"
+            id="net.sourceforge.phpdt.ui.CompilationUnitEditorPopupActions">
+         <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>
+         <menu
+			id="projection"
+			label="%Folding.label"
+			path="rest">
+		 </menu>
+         <action
+               label="%Dummy.label"
+               tooltip="%Dummy.label"
+               class="net.sourceforge.phpdt.internal.ui.actions.FoldingExpandAllRulerAction"
+               menubarPath="projection/additions"
+               definitionId="org.eclipse.ui.edit.text.folding.expand_all"
+               id="net.sourceforge.phpdt.ui.folding.expandAll">
+         </action>
+         <action
+               label="%Dummy.label"
+               tooltip="%Dummy.label"
+               class="net.sourceforge.phpdt.internal.ui.actions.FoldingToggleRulerAction"
+               menubarPath="projection/additions"
+               definitionId="org.eclipse.ui.edit.text.folding.toggle"
+               id="net.sourceforge.phpdt.ui.folding.toggle">
+         </action>
+      </viewerContribution>
+   </extension>
  <!-- =========================================================================== -->
 <!-- JDT/UI command definitions                                                   -->
 <!-- =========================================================================== -->
@@ -1080,6 +1172,33 @@
       </keyBinding>
    </extension>
    <extension
+         id="net.sourceforge.phpeclipse.JavaDocumentSetupParticipant"
+         name="%javaDocumentSetupParticipant"
+         point="org.eclipse.core.filebuffers.documentSetup"> 
+      <participant
+            extensions="php,php3,php4,inc"
+            class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentSetupParticipant">
+      </participant>
+      <participant
+            extensions="html,xml"
+            class="net.sourceforge.phpeclipse.phpeditor.HTMLDocumentSetupParticipant">
+      </participant>
+      <participant
+            extensions="tpl"
+            class="net.sourceforge.phpeclipse.phpeditor.SmartyDocumentSetupParticipant">
+      </participant>
+   </extension>
+   <extension
+         id="net.sourceforge.phpeclipse.JavaDocumentFactory"
+         name="%javaDocumentFactory"
+         point="org.eclipse.core.filebuffers.documentCreation">
+      <factory
+            extensions="php"
+            class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentFactory">
+      </factory>
+   </extension>
+   
+   <extension
          point="org.eclipse.ui.preferencePages">
       <page
             name="PHP"
@@ -1111,10 +1230,10 @@
             id="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences">
       </page>
       <page
-            name="Outline"
+            name="%compilerOptionsPrefName" 
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
-            class="net.sourceforge.phpeclipse.PHPOutlinePreferencePage"
-            id="net.sourceforge.phpeclipse.preference.PHPOutlinePreferencePage">
+            class="net.sourceforge.phpdt.internal.ui.preferences.CompilerPreferencePage"
+            id="net.sourceforge.phpeclipse.preference.CompilerPreferencePage">
       </page>
       <page
             name="%todoTaskPrefName" 
@@ -1152,6 +1271,12 @@
             class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPLanguagePreferencePage">
       </page> -->
+      <page 
+            name="%spellingPrefName"
+            category= "net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            class="net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage"
+            id = "net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage">
+      </page>	
    </extension>
    <extension
          point="org.eclipse.ui.editors.documentProviders">
@@ -1564,4 +1689,13 @@
 			expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkingSetExpander">
 		</variable>
 	</extension>
+		<extension
+		point= "net.sourceforge.phpeclipse.foldingStructureProviders">
+		<provider
+			id="net.sourceforge.phpdt.ui.text.defaultFoldingProvider"
+			name= "%defaultFoldingStructureProviderName"
+			class="net.sourceforge.phpdt.internal.ui.text.folding.DefaultJavaFoldingStructureProvider"
+			preferencesClass="net.sourceforge.phpdt.internal.ui.text.folding.DefaultJavaFoldingPreferenceBlock">
+		</provider>
+	</extension>
 </plugin>