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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index e64396c..5e67157 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -33,6 +33,11 @@
       <import plugin="org.eclipse.search"/>
       <import plugin="org.eclipse.update.ui"/>
       <import plugin="net.sourceforge.phpeclipse.quantum.sql"/> 
+      <import plugin="net.sourceforge.phpeclipse.webbrowser"/>
+      <import plugin="net.sourceforge.phpeclipse.core"/>
+      <import plugin="net.sourceforge.phpeclipse.ui"/>
+      <import plugin="net.sourceforge.phpeclipse.xml.core"/>
+      <import plugin="net.sourceforge.phpeclipse.xml.ui"/>
    </requires>
 
    <extension
@@ -151,7 +156,11 @@
       </fileTypes>
       <fileTypes
             type="text"
-            extension="php5">
+            extension="php5"> 
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="module">
       </fileTypes>
       <fileTypes
             type="text"
@@ -171,12 +180,12 @@
       </fileTypes>
       <fileTypes
             type="text"
-            extension="xml">
-      </fileTypes>
-      <fileTypes
+            extension="xhtml">
+      </fileTypes> 
+  <!--    <fileTypes
             type="text"
             extension="tpl">
-      </fileTypes>
+      </fileTypes> -->
    </extension>
    
    <extension
@@ -298,7 +307,7 @@
                name="nature"
                value="net.sourceforge.phpeclipse.phpnature">
          </filter>
-      </page> -->
+      </page> 
       <page
             objectClass="org.eclipse.core.resources.IProject"
             name="PHP Project Settings"
@@ -308,7 +317,7 @@
                name="nature"
                value="net.sourceforge.phpeclipse.phpnature">
          </filter>
-      </page>
+      </page> -->
       <page
             objectClass="org.eclipse.core.resources.IProject"
             name="%todoPageName"
@@ -349,12 +358,12 @@
                value="net.sourceforge.phpeclipse.phpnature">
          </filter>
       </page>
-      <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>
+      </page> -->
    </extension>
 <!--   <extension
          point="org.eclipse.ui.views">
@@ -401,6 +410,16 @@
             name="%phpEditorName"
             default="true"
             icon="icons/obj16/phpedit.gif"
+            extensions="module"
+            contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
+            symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont"
+            id="net.sourceforge.phpeclipse.PHPUnitEditor">
+      </editor>
+      <editor
+            name="%phpEditorName"
+            default="true"
+            icon="icons/obj16/phpedit.gif"
             extensions="php5"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
@@ -450,14 +469,14 @@
       <editor
             name="%phpEditorName"
             default="true"
-            icon="icons/obj16/xmledit.gif"
-            extensions="xml"
+            icon="icons/obj16/htmledit.gif"
+            extensions="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">
       </editor>
-      <editor
+  <!--    <editor
             name="%phpEditorName"
             default="true"
             icon="icons/obj16/htmledit.gif"
@@ -466,7 +485,7 @@
             class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
             symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont"
             id="net.sourceforge.phpeclipse.PHPUnitEditor">
-      </editor>
+      </editor> -->
    </extension>
       <extension
          point="org.eclipse.ui.fontDefinitions">
@@ -804,6 +823,28 @@
       </objectContribution>
       <objectContribution
             objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.php5"
+            id="net.sourceforge.phpeclipse.actions.externalParserAction">
+         <action
+               label="Run External PHP Parser"
+               class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction"
+               menubarPath="additions"
+               id="net.sourceforge.phpeclipse.actions.externalParserAction">
+         </action>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.module"
+            id="net.sourceforge.phpeclipse.actions.externalParserAction">
+         <action
+               label="Run External PHP Parser"
+               class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction"
+               menubarPath="additions"
+               id="net.sourceforge.phpeclipse.actions.externalParserAction">
+         </action>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IFile"
             nameFilter="*.inc"
             id="net.sourceforge.phpeclipse.actions.externalParserAction">
          <action
@@ -870,6 +911,17 @@
       </objectContribution>
       <objectContribution
             objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.module"
+            id="net.sourceforge.phpeclipse.actions.popupShowAction">
+         <action
+               label="Open PHP Browser"
+               class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
+               menubarPath="additions"
+               id="net.sourceforge.phpeclipse.actions.showAction">
+         </action>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IFile"
             nameFilter="*.inc"
             id="net.sourceforge.phpeclipse.actions.popupShowAction">
          <action
@@ -912,7 +964,7 @@
                id="net.sourceforge.phpeclipse.actions.showAction">
          </action>
       </objectContribution>
-            <objectContribution
+      <objectContribution
             objectClass="org.eclipse.core.resources.IFile"
             nameFilter="*.xml"
             id="net.sourceforge.phpeclipse.actions.popupShowAction">
@@ -1008,7 +1060,7 @@
    </extension>
    <extension
          point="org.eclipse.ui.popupMenus">
-      <viewerContribution
+      <viewerContribution 
             targetID="#CompilationUnitRulerContext"
             id="net.sourceforge.phpeclipse.phpeditor.QuickFixRulerMenuAction">
          <action
@@ -1313,17 +1365,17 @@
          name="%javaDocumentSetupParticipant"
          point="org.eclipse.core.filebuffers.documentSetup"> 
       <participant
-            extensions="php,php3,php4,inc"
+            extensions="php,php3,php4,php5,module,inc,phtml,html,htm,xhtml"
             class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentSetupParticipant">
       </participant>
-      <participant
+   <!--   <participant
             extensions="html,xml"
             class="net.sourceforge.phpeclipse.phpeditor.HTMLDocumentSetupParticipant">
       </participant>
       <participant
             extensions="tpl"
             class="net.sourceforge.phpeclipse.phpeditor.SmartyDocumentSetupParticipant">
-      </participant>
+      </participant> -->
    </extension>
    <extension
          id="net.sourceforge.phpeclipse.JavaDocumentFactory"
@@ -1339,10 +1391,23 @@
          point="org.eclipse.ui.preferencePages">
       <page
             name="PHP"
+            category="net.sourceforge.phpeclipse.ui.preferencePage"
             class="net.sourceforge.phpeclipse.PHPEclipseBasePreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
       </page>
       <page
+            name="Code Templates"
+            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            class="net.sourceforge.phpdt.internal.ui.preferences.CodeTemplatePreferencePage"
+            id="net.sourceforge.phpeclipse.preference.CodeTemplatePreferencePage">
+      </page>
+  <!--    <page
+            name="Members Sort Order"
+            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            class="net.sourceforge.phpdt.internal.ui.preferences.MembersOrderPreferencePage"
+            id="net.sourceforge.phpeclipse.preference.MembersOrderPreferencePage">
+      </page> -->
+      <page
             name="PHP External Parser Command"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
             class="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage"
@@ -1353,19 +1418,19 @@
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
             class="net.sourceforge.phpeclipse.PHPSyntaxEditorPreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPSyntaxEditorPreferencePage">
-      </page>  -->
+      </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> 
       <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> -->
       <page
             name="%compilerOptionsPrefName" 
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
@@ -1384,12 +1449,6 @@
             class="net.sourceforge.phpdt.internal.ui.preferences.CodeFormatterPreferencePage"
             id="net.sourceforge.phpeclipse.preference.CodeFormatterPreferencePage">
       </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 name="Editor"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
             class="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
@@ -1400,24 +1459,30 @@
             class="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage"
             id="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage">
       </page>
-      <page
+            <page
+            name="%templatePageName"
+            category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
+            class="net.sourceforge.phpdt.internal.ui.preferences.JavaTemplatePreferencePage"
+            id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
+      </page>
+  <!--      <page
             name="%templatePageName"
             category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
             class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
             id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
       </page>
- <!--     <page
+      <page
             name="Language Settings"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
             class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPLanguagePreferencePage">
-      </page> 
+      </page> -->
       <page 
             name="%spellingPrefName"
-            category= "net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
             class="net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage"
             id = "net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage">
-      </page>	-->
+      </page> 
    </extension>
    <extension
          point="org.eclipse.ui.editors.documentProviders">
@@ -1454,6 +1519,14 @@
    <extension
          point="org.eclipse.ui.editors.documentProviders">
       <provider
+            extensions="%moduleFileExtension"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
+            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
+      </provider>
+   </extension>
+   <extension
+         point="org.eclipse.ui.editors.documentProviders">
+      <provider
             extensions="%incFileExtension"
             class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
             id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
@@ -1467,7 +1540,7 @@
             id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
       </provider>
    </extension>
-   <extension
+  <extension
          point="org.eclipse.ui.editors.documentProviders">
       <provider
             extensions="%htmlFileExtension"
@@ -1486,19 +1559,19 @@
    <extension
          point="org.eclipse.ui.editors.documentProviders">
       <provider
-            extensions="%xmlFileExtension"
+            extensions="xhtml"
             class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
             id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
       </provider>
    </extension>
-   <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> -->
    <extension
          point="org.eclipse.ui.views">
       <category
@@ -1512,13 +1585,6 @@
             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>
 
 <!-- external tools -->
@@ -1746,4 +1812,34 @@
 			preferencesClass="net.sourceforge.phpdt.internal.ui.text.folding.DefaultJavaFoldingPreferenceBlock">
 		</provider>
 	</extension>
+	
+<!-- =========================================================================== -->
+<!-- Templates                                                                   -->
+<!-- =========================================================================== -->
+   <extension
+         point="org.eclipse.ui.editors.templates">
+      <contextType
+            name="%templates.php.contextType.name"
+            class="net.sourceforge.phpdt.internal.corext.template.php.JavaContextType"
+            id="java">
+      </contextType>
+      <contextType
+            name="%templates.phpdoc.contextType.name"
+            class="net.sourceforge.phpdt.internal.corext.template.php.JavaDocContextType"
+            id="javadoc">
+      </contextType>
+      <contextType
+            name="%templates.html.contextType.name"
+            class="net.sourceforge.phpdt.internal.corext.template.php.HTMLContextType"
+            id="javadoc">
+      </contextType>
+      <include
+      		file="templates/default-templates.xml"
+      		translations="templates/default-templates.properties">
+      </include>
+      <include
+      		file="templates/default-codetemplates.xml"
+      		translations="templates/default-templates.properties">
+      </include>
+   </extension>
 </plugin>