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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index c982430..42ac482 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -6,7 +6,7 @@
    version="1.1.7"
    provider-name="%providerName"
    class="net.sourceforge.phpeclipse.PHPeclipsePlugin">
-    
+
    <runtime>
       <library name="phpeclipse.jar">
         <export name="*"/>
@@ -19,7 +19,7 @@
       <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.search"/>
       <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.debug.ui"/>
       <import plugin="org.eclipse.compare"/>
@@ -55,13 +55,13 @@
          </run>
       </runtime>
    </extension>
-   
+
    <extension
          id="parserbuilder"
          name="PHP Builder"
          point="org.eclipse.core.resources.builders">
       <builder>
-         <run  
+         <run
            class="net.sourceforge.phpdt.internal.core.builder.PHPBuilder">
          </run>
       </builder>
@@ -79,7 +79,7 @@
 	<attribute name="id"/>
 	<attribute name="flags"/>
 	<attribute name="arguments"/>
-</extension>   
+</extension>
 
 <!-- Java transient problems -->
 
@@ -94,14 +94,14 @@
 <!-- PHP tasks -->
 
 <extension id="task" name="%phpTaskName" point="org.eclipse.core.resources.markers">
-    <super type="org.eclipse.core.resources.taskmarker"/> 
+    <super type="org.eclipse.core.resources.taskmarker"/>
     <persistent value="true"/>
 </extension>
 
 <extension-point id="phpElementFilters" name="%elementFiltersName" schema="schema/phpElementFilters.exsd"/>
-<extension-point id="phpEditorTextHovers" name="%phpEditorTextHoversName" 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.ui.decorators">
 	<decorator
@@ -118,17 +118,17 @@
 			<or>
 				<objectClass
 					name="org.eclipse.core.resources.IResource">
-				</objectClass>         
+				</objectClass>
 				<objectClass
 					name="net.sourceforge.phpdt.core.IJavaElement">
-				</objectClass> 
-			</or>                
+				</objectClass>
+			</or>
 		</enablement>
 	</decorator>
 	<decorator
 		label="%OverrideIndicatorLabelDecorator.label"
 		lightweight="true"
-		location="BOTTOM_RIGHT"		
+		location="BOTTOM_RIGHT"
 		state="true"
 		class="net.sourceforge.phpdt.ui.OverrideIndicatorLabelDecorator"
 		id="net.sourceforge.phpdt.ui.override.decorator">
@@ -140,65 +140,29 @@
 				name="net.sourceforge.phpdt.core.IMethod">
 			</objectClass>
 		</enablement>
-	</decorator>	
+	</decorator>
   </extension>
-  
+
    <extension
          point="org.eclipse.team.core.fileTypes">
-      <fileTypes
-            type="text"
-            extension="php">
-      </fileTypes>
-      <fileTypes
-            type="text"
-            extension="php3">
-      </fileTypes>
-      <fileTypes
-            type="text"
-            extension="php4">
-      </fileTypes>
-      <fileTypes
-            type="text"
-            extension="php5"> 
-      </fileTypes>
-      <fileTypes
-            type="text"
-            extension="module">
-      </fileTypes>
-      <fileTypes
-            type="text"
-            extension="inc">
-      </fileTypes>
-      <fileTypes
-            type="text"
-            extension="phtml">
-      </fileTypes>
-      <fileTypes
-            type="text"
-            extension="html">
-      </fileTypes>
-      <fileTypes
-            type="text"
-            extension="htm">
-      </fileTypes>
-      <fileTypes
-            type="text"
-            extension="xhtml">
-      </fileTypes> 
-  <!--    <fileTypes
-            type="text"
-            extension="tpl">
-      </fileTypes> -->
+      <fileTypes type="text" extension="php" />
+      <fileTypes type="text" extension="php3" />
+      <fileTypes type="text" extension="php4" />
+      <fileTypes type="text" extension="php5" />
+      <fileTypes type="text" extension="module" />
+      <fileTypes type="text" extension="inc" />
+      <fileTypes type="text" extension="phtml" />
    </extension>
-   
+
+<!-- declares a content type for PHP Source files -->
+
    <extension point="org.eclipse.core.runtime.contentTypes">
-	<!-- declares a content type for PHP Source files -->
-	<content-type id="phpSource" name="%phpSourceName" 
+	<content-type id="phpSource" name="%phpSourceName"
 		base-type="org.eclipse.core.runtime.text"
 		priority="high"
-		file-extensions="php,php3,php4,php5,phtml,inc,module,htm,html,xhtml"/>
+		file-extensions="php,php3,php4,php5,phtml,inc,module"/>
    </extension>
-   
+
    <extension
       point="net.sourceforge.phpeclipse.phpEditorTextHovers">
    <hover
@@ -207,7 +171,7 @@
          label="%sequentialHover"
          description="%sequentialHoverDescription">
    </hover>
-</extension>
+   </extension>
 
 <extension
       point="net.sourceforge.phpeclipse.phpEditorTextHovers">
@@ -226,7 +190,7 @@
    <hover
          class="net.sourceforge.phpdt.internal.ui.text.java.hover.AnnotationHover"
          id="net.sourceforge.phpdt.ui.AnnotationHover"
-         label="%annotationHover" 
+         label="%annotationHover"
          description="%annotationHoverDescription">
    </hover>
    </extension>
@@ -240,7 +204,16 @@
             id="net.sourceforge.phpeclipse.PHPPerspective">
       </perspective>
    </extension>
-   
+
+   <extension
+         point="org.eclipse.ui.perspectiveExtensions">
+      <perspectiveExtension
+            targetID="net.sourceforge.phpeclipse.PHPPerspective">
+               <showInPart id="net.sourceforge.phpeclipse.webbrowser.view" />
+               <showInPart id="org.eclipse.ui.views.ResourceNavigator" />
+      </perspectiveExtension>
+   </extension>
+
    <extension
          point="org.eclipse.ui.newWizards">
       <category
@@ -302,12 +275,12 @@
       </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" 
+     <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" /> 
+     <description>%ExportWizards.ObfuscatorDescription</description>
+     <selection class="org.eclipse.core.resources.IResource" />
      </wizard>
   </extension>
    <extension
@@ -329,7 +302,7 @@
                name="nature"
                value="net.sourceforge.phpeclipse.phpnature">
          </filter>
-      </page> 
+      </page>
       <page
             objectClass="org.eclipse.core.resources.IProject"
             name="PHP Project Settings"
@@ -402,17 +375,19 @@
             name="%phpEditorName"
             default="true"
             icon="icons/obj16/phpedit.gif"
-            extensions="php,php3,php4,php5,phtml,inc,module,htm,html,xhtml"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
             symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont"
             id="net.sourceforge.phpeclipse.PHPUnitEditor">
+            <contentTypeBinding
+               contentTypeId="net.sourceforge.phpeclipse.phpSource"
+            />
       </editor>
  <!--     <editor
             name="%phpEditorName"
             default="true"
             icon="icons/obj16/htmledit.gif"
-            extensions="htm,html,xhtml" 
+            extensions="htm,html,xhtml"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
             symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont"
@@ -478,7 +453,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">
@@ -506,14 +481,14 @@
 	        isGoToPreviousNavigationTarget="false">
 	  </specification>
     </extension>
-    
+
    <extension
          point="org.eclipse.ui.actionSets">
       <actionSet
             label="%CodingActionSet.label"
             description="%CodingActionSet.description"
             visible="false"
-            id="net.sourceforge.phpeclipse.ui.CodingActionSet">   
+            id="net.sourceforge.phpeclipse.ui.CodingActionSet">
 <!-- =========================================================================== -->
 <!-- Source Menu                                                                 -->
 <!-- =========================================================================== -->
@@ -521,7 +496,7 @@
                label="%SourceMenu.label"
                path="edit/editEnd"
                id="net.sourceforge.phpeclipse.ui.source.menu">
-         	<separator 
+         	<separator
          	      name="editGroup">
          	</separator>
             <separator
@@ -560,7 +535,7 @@
                retarget="true"
                menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
                id="net.sourceforge.phpeclipse.ui.actions.AddBlockComment">
-         </action> 
+         </action>
          <action
                definitionId="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
                label="%ToggleCommentAction.label"
@@ -621,17 +596,17 @@
          <part id="net.sourceforge.phpeclipse.PHPUnitEditor" />
       </actionSetPartAssociation>
    </extension>
-   
+
 <!-- =========================================================================== -->
 <!-- PHP Editor Action Definition IDs -->
 <!-- =========================================================================== -->
 <!--   <extension
          point="org.eclipse.ui.actionDefinitions">
- 
+
       <actionDefinition
             id="net.sourceforge.phpeclipse.phpeditor.ContentAssistProposal">
       </actionDefinition>
- 
+
       <actionDefinition
             id="net.sourceforge.phpeclipse.phpeditor.Comment">
       </actionDefinition>
@@ -669,7 +644,7 @@
          </accelerator>
       </acceleratorSet>
    </extension> -->
-   
+
    <extension
          point="org.eclipse.ui.popupMenus">
       <objectContribution
@@ -782,8 +757,8 @@
                id="net.sourceforge.phpeclipse.actions.showAction">
          </action>
       </objectContribution>
-  
-  <!--    <viewerContribution  
+
+  <!--    <viewerContribution
             targetID="#PHPEditorContext"
             id="net.sourceforge.phpeclipse.actions.popupOpenSQLTable">
          <action
@@ -855,12 +830,12 @@
                label="%OpenDeclaration"
                tooltip="%OpenDeclaration"
                retarget="true"
-               menubarPath="navigate/open.ext" 
+               menubarPath="navigate/open.ext"
                allowLabelUpdate="true"
                id="net.sourceforge.phpeclipse.ui.actions.Open">
          </action>
       </actionSet>
-   </extension> 
+   </extension>
    <extension
          point="org.eclipse.ui.editorActions">
       <editorContribution
@@ -881,19 +856,19 @@
         </action>
       </editorContribution>
       <editorContribution
-            id="net.sourceforge.phpdt.editor.actions" 
+            id="net.sourceforge.phpdt.editor.actions"
             targetID="net.sourceforge.phpeclipse.PHPUnitEditor">
-         <action 
+         <action
                definitionId="net.sourceforge.phpeclipse.actions.opendeclaration"
                label="%OpenDeclaration"
                class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction"
                id="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction">
          </action>
-      </editorContribution>   
+      </editorContribution>
    </extension>
    <extension
          point="org.eclipse.ui.popupMenus">
-      <viewerContribution 
+      <viewerContribution
             targetID="#CompilationUnitRulerContext"
             id="net.sourceforge.phpeclipse.phpeditor.QuickFixRulerMenuAction">
          <action
@@ -953,10 +928,10 @@
 <!-- PHPDT/UI command definitions                                                   -->
 <!-- =========================================================================== -->
    <extension point="org.eclipse.ui.contexts">
-      <context name="%context.editingPHPSource.name" 
-       description="%context.editingPHPSource.description" 
-       parentId="org.eclipse.ui.textEditorScope" 
-       id="net.sourceforge.phpdt.ui.phpEditorScope" /> 
+      <context name="%context.editingPHPSource.name"
+       description="%context.editingPHPSource.description"
+       parentId="org.eclipse.ui.textEditorScope"
+       id="net.sourceforge.phpdt.ui.phpEditorScope" />
    </extension>
    <extension
          point="org.eclipse.ui.commands">
@@ -965,7 +940,7 @@
             description="%category.source.description"
             id="net.sourceforge.phpeclipse.ui.category.source">
       </category>
-      
+
  <!-- source -->
       <command
             name="%ActionDefinition.comment.name"
@@ -979,13 +954,13 @@
             category="net.sourceforge.phpeclipse.ui.category.source"
             id="net.sourceforge.phpeclipse.phpeditor.uncomment">
       </command>
-      <command 
+      <command
             name="%ActionDefinition.toggleComment.name"
             description="%ActionDefinition.toggleComment.description"
             category="net.sourceforge.phpeclipse.ui.category.source"
             id="net.sourceforge.phpeclipse.phpeditor.toggle.comment">
       </command>
-      
+
       <keyBinding
             string="Ctrl+Shift+C"
             scope="net.sourceforge.phpdt.ui.phpEditorScope"
@@ -1124,7 +1099,7 @@
             command="net.sourceforge.phpeclipse.phpeditor.indent"
             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
       </keyBinding>
-       
+
       <command
             name="%ActionDefinition.format.name"
             description="%ActionDefinition.format.description"
@@ -1165,7 +1140,7 @@
             command="net.sourceforge.phpeclipse.phpeditor.format"
             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
       </keyBinding>
-      
+
       <!-- navigate -->
       <command
             name="%ActionDefinition.gotoNextMember.name"
@@ -1252,7 +1227,7 @@
             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
       </keyBinding>
       <command
-            name="%OpenDeclaration" 
+            name="%OpenDeclaration"
             description="%OpenDeclaration"
             category="net.sourceforge.phpeclipse.ui.category.source"
             id="net.sourceforge.phpeclipse.actions.opendeclaration">
@@ -1262,14 +1237,14 @@
             scope="net.sourceforge.phpdt.ui.phpEditorScope"
             command="net.sourceforge.phpeclipse.actions.opendeclaration"
             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding> 
-   </extension>  
+      </keyBinding>
+   </extension>
    <extension
          id="net.sourceforge.phpeclipse.JavaDocumentSetupParticipant"
          name="%javaDocumentSetupParticipant"
-         point="org.eclipse.core.filebuffers.documentSetup"> 
+         point="org.eclipse.core.filebuffers.documentSetup">
       <participant
-            extensions="php,php3,php4,php5,module,inc,phtml,html,htm,xhtml"
+            contentTypeId="net.sourceforge.phpeclipse.phpSource"
             class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentSetupParticipant">
       </participant>
    <!--   <participant
@@ -1286,11 +1261,11 @@
          name="%javaDocumentFactory"
          point="org.eclipse.core.filebuffers.documentCreation">
       <factory
-            extensions="php,php3,php4,php5,phtml,inc,module,htm,html,xhtml"
+            contentTypeId="net.sourceforge.phpeclipse.phpSource"
             class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentFactory">
       </factory>
    </extension>
-   
+
    <extension
          point="org.eclipse.ui.preferencePages">
    <!--     <page
@@ -1315,7 +1290,7 @@
             category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
             class="net.sourceforge.phpdt.internal.ui.preferences.MembersOrderPreferencePage"
             id="net.sourceforge.phpeclipse.preference.MembersOrderPreferencePage">
-      </page> 
+      </page>
       <page
             name="PHP External Parser Command"
             category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
@@ -1327,13 +1302,13 @@
             category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
             class="net.sourceforge.phpeclipse.PHPSyntaxEditorPreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPSyntaxEditorPreferencePage">
-      </page> 
+      </page>
       <page
             category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
             name="PHP Project Defaults"
             class="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences"
             id="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences">
-      </page> 
+      </page>
       <page
             category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
             name="PHP Browser Preview"
@@ -1341,13 +1316,13 @@
             id="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences">
       </page> -->
       <page
-            name="%compilerOptionsPrefName" 
+            name="%compilerOptionsPrefName"
             category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
             class="net.sourceforge.phpdt.internal.ui.preferences.CompilerPreferencePage"
             id="net.sourceforge.phpeclipse.preference.CompilerPreferencePage">
       </page>
       <page
-            name="%todoTaskPrefName" 
+            name="%todoTaskPrefName"
             category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
             class="net.sourceforge.phpdt.internal.ui.preferences.TodoTaskPreferencePage"
             id="net.sourceforge.phpeclipse.preference.TodoTaskPreferencePage">
@@ -1381,17 +1356,24 @@
             class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPLanguagePreferencePage">
       </page> -->
-      <page 
+      <page
             name="%spellingPrefName"
             category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
             class="net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage"
             id = "net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage">
-      </page> 
+      </page>
+      <page
+            name="%editorMarkOccurrencesPage"
+            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
+            class="net.sourceforge.phpdt.internal.ui.preferences.MarkOccurrencesPreferencePage"
+            id="net.sourceforge.phpdt.internal.ui.preferences.MarkOccurrencesPreferencePage">
+  <!--       <keywordReference id="org.eclipse.jdt.ui.markoccurrences"/> -->
+      </page>
    </extension>
  <!--  <extension
          point="org.eclipse.ui.editors.documentProviders">
       <provider
-            extensions="php,php3,php4,php5,phtml,inc,module,html,htm,xhtml"
+            extensions="php,php3,php4,php5,phtml,inc,module"
             class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
             id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
       </provider>
@@ -1475,7 +1457,7 @@
             class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
             id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
       </provider>
-   </extension> 
+   </extension>
    <extension
          point="org.eclipse.ui.views">
       <category
@@ -1488,29 +1470,28 @@
             category="net.sourceforge.phpeclipse.views.category"
             class="net.sourceforge.phpeclipse.views.PHPConsole"
             id="net.sourceforge.phpeclipse.views.phpconsoleview">
-      </view>  
+      </view>
    </extension> -->
 
 <!-- external tools -->
-
 <!-- extension point definitions -->
 	<extension-point id="configurationDuplicationMaps" name="%ExtPoint.configurationDuplicationMaps"/>
 	<extension-point id="argumentVariables" name="%ExtPoint.argumentVariables"/>
 	<extension-point id="directoryVariables" name="%ExtPoint.directoryVariables"/>
 	<extension-point id="fileVariables" name="%ExtPoint.fileVariables"/>
 	<extension-point id="refreshVariables" name="%ExtPoint.refreshVariables"/>
-	
+
 <!-- Extensions -->
 	<!--<extension point="org.eclipse.ui.actionSets">
 		<actionSet
 			id="net.sourceforge.phpdt.externaltools.ExternalToolsSet"
 			label="%ActionSet.externalTools"
 			visible="true">
-			<menu id="org.eclipse.ui.run" 
-				label="%Menu.run" 
-				path="additions"> 
-				<separator name="ExternalToolsGroup"/> 
-			</menu> 
+			<menu id="org.eclipse.ui.run"
+				label="%Menu.run"
+				path="additions">
+				<separator name="ExternalToolsGroup"/>
+			</menu>
 			<action
 				id="net.sourceforge.phpdt.externaltools.ExternalToolMenuDelegateMenu"
 				label="%Action.externalTools"
@@ -1520,7 +1501,7 @@
 				hoverIcon="icons/externaltools/full/ctool16/external_tools.gif"
 				pulldown="true"
 				class="net.sourceforge.phpdt.externaltools.internal.menu.ExternalToolMenuDelegate">
-			</action> 
+			</action>
 			<action
 				id="net.sourceforge.phpdt.externaltools.ExternalToolMenuDelegateToolbar"
 				label="%Action.externalTools"
@@ -1531,10 +1512,10 @@
 				tooltip="%Action.externalToolsTip"
 				pulldown="true"
 				class="net.sourceforge.phpdt.externaltools.internal.menu.ExternalToolMenuDelegate">
-			</action> 
+			</action>
 		</actionSet>
 	</extension> -->
-	
+
     <extension
 		point= "net.sourceforge.phpeclipse.foldingStructureProviders">
 		<provider
@@ -1544,7 +1525,7 @@
 			preferencesClass="net.sourceforge.phpdt.internal.ui.text.folding.DefaultJavaFoldingPreferenceBlock">
 		</provider>
 	</extension>
-	
+
 <!-- =========================================================================== -->
 <!-- Filter Support                                                              -->
 <!-- =========================================================================== -->
@@ -1560,7 +1541,7 @@
             id="net.sourceforge.phpeclipse.JavaOutlinePage.ImportDeclarationFilter">
       </filter>
    </extension>
-   
+
 <!-- =========================================================================== -->
 <!-- Templates                                                                   -->
 <!-- =========================================================================== -->