Added "External preview" View (win32 only HTML Browser) to the PHP Perspective.

diff --git a/net.sourceforge.phpeclipse/.classpath b/net.sourceforge.phpeclipse/.classpath
index 8e0620c..63d1517 100644 (file)
--- a/net.sourceforge.phpeclipse/.classpath
+++ b/net.sourceforge.phpeclipse/.classpath
@@ -32,6 +32,8 @@
     <classpathentry kind="var"
         path="ECLIPSE_HOME/plugins/org.junit_3.8.1/junit.jar" sourcepath="ORG_ECLIPSE_JDT_SOURCE_SRC/org.junit_3.8.1/junitsrc.zip"/>
     <classpathentry kind="var"
+        path="ECLIPSE_HOME/plugins/org.eclipse.update.ui_2.1.0/updateui.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.update.ui_2.1.0/updateuisrc.zip"/>
+    <classpathentry kind="var"
         path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_2.1.0/runtime.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_2.1.0/runtimesrc.zip"/>
     <classpathentry kind="var"
         path="ECLIPSE_HOME/plugins/org.eclipse.core.boot_2.1.0/boot.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.boot_2.1.0/bootsrc.zip"/>

diff --git a/net.sourceforge.phpeclipse/icons/obj16/html.gif b/net.sourceforge.phpeclipse/icons/obj16/html.gif
new file mode 100644 (file)
index 0000000..35eccbe
Binary files /dev/null and b/net.sourceforge.phpeclipse/icons/obj16/html.gif differ

diff --git a/net.sourceforge.phpeclipse/plugin.properties b/net.sourceforge.phpeclipse/plugin.properties
index 7070756..50f37d3 100644 (file)
--- a/net.sourceforge.phpeclipse/plugin.properties
+++ b/net.sourceforge.phpeclipse/plugin.properties
@@ -6,6 +6,7 @@ providerName=EclipseProject.de
 naturePHP.name=PHP Project
 
 perspectivePHP.name=PHP
+perspectiveHTML.name=HTML
 viewPHPResources.name=PHP Resources
 
 newWizardCategory.name=PHP

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 3f512ea..5d25fbb 100644 (file)
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -19,6 +19,7 @@
       <import plugin="org.eclipse.debug.ui"/>
       <import plugin="org.apache.xerces"/>
       <import plugin="org.junit"/>
+      <import plugin="org.eclipse.update.ui"/>
    </requires>
 
 
@@ -96,8 +97,8 @@ Temporarily replaced until errors can be ironed out...
          </description>
       </wizard>
 <this wizard replaces it as it works - maybe not as pretty but still>
--->    
-               <wizard
+-->
+      <wizard
             name="%newWizardPHPProject.name"
             icon="icons/obj16/php.gif"
             category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
@@ -107,8 +108,8 @@ Temporarily replaced until errors can be ironed out...
          <description>
             Create a new PHP project.
          </description>
-      </wizard>  
-               <wizard
+      </wizard>
+      <wizard
             name="%newWizardPHPFile.name"
             icon="icons/obj16/phpedit.gif"
             category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
@@ -118,8 +119,8 @@ Temporarily replaced until errors can be ironed out...
             Create a basic PHP file.
          </description>
       </wizard>
-<!-- choochter's stuff -->       
-         <wizard
+<!-- choochter's stuff -->
+      <wizard
             name="Xaraya Module"
             icon="icons/obj16/php.gif"
             category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
@@ -129,7 +130,7 @@ Temporarily replaced until errors can be ironed out...
          <description>
             Create a Xaraya module.
          </description>
-      </wizard>       
+      </wizard>
    </extension>
    <extension
          point="org.eclipse.ui.projectNatureImages">
@@ -151,7 +152,7 @@ Temporarily replaced until errors can be ironed out...
                value="net.sourceforge.phpeclipse.phpnature">
          </filter>
       </page>
-         <page
+      <page
             objectClass="net.sourceforge.phpeclipse.PHPProject"
             name="%propertyPagePHPProject.name"
             class="net.sourceforge.phpeclipse.preferences.PHPProjectPropertyPage"
@@ -226,61 +227,61 @@ Temporarily replaced until errors can be ironed out...
                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> 
+            label="%CodingActionSet.label"
+            description="%CodingActionSet.description"
+            visible="false"
+            id="net.sourceforge.phpeclipse.ui.CodingActionSet">
+<!-- =========================================================================== -->
+<!-- Source Menu                                                                 -->
+<!-- =========================================================================== -->
+         <menu
+               label="%SourceMenu.label"
+               path="edit"
+               id="net.sourceforge.phpeclipse.ui.source.menu">
+            <separator
+                  name="editGroup">
+            </separator>
+         </menu>
+         <action
+               definitionId="net.sourceforge.phpeclipse.phpeditor.uncomment"
+               label="%UncommentAction.label"
+               retarget="true"
+               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               id="net.sourceforge.phpeclipse.phpeditor.Uncomment">
+         </action>
+         <action
+               definitionId="net.sourceforge.phpeclipse.phpeditor.comment"
+               label="%CommentAction.label"
+               retarget="true"
+               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               id="net.sourceforge.phpeclipse.phpeditor.Comment">
+         </action>
+      </actionSet>
    </extension>
-   
 <!-- =========================================================================== -->
 <!-- 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">
+   <extension
+         point="org.eclipse.ui.actionDefinitions">
+<!-- edit -->
+      <actionDefinition
+            name="%ActionDefinition.contentAssistProposals.name"
+            description="%ActionDefinition.contentAssistProposals.description"
+            id="net.sourceforge.phpeclipse.phpeditor.ContentAssistProposal">
+      </actionDefinition>
+<!-- source -->
+      <actionDefinition
+            name="%ActionDefinition.comment.name"
+            description="%ActionDefinition.comment.description"
+            id="net.sourceforge.phpeclipse.phpeditor.Comment">
       </actionDefinition>
-      <!-- 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
+            name="%ActionDefinition.uncomment.name"
+            description="%ActionDefinition.uncomment.description"
+            id="net.sourceforge.phpeclipse.phpeditor.Uncomment">
       </actionDefinition>
-   </extension> 
+   </extension>
 <!--   <extension
          point="org.eclipse.ui.acceleratorSets">
       <acceleratorSet
@@ -475,41 +476,40 @@ Temporarily replaced until errors can be ironed out...
                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>
+      <viewerContribution
+            targetID="#PHPRulerContext"
+            id="net.sourceforge.phpdt.ui.PHPEditorPopupActions">
+         <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>
+      </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
+         point="org.eclipse.ui.editorActions">
+      <editorContribution
+            targetID="net.sourceforge.phpeclipse.PHPEditor"
+            id="org.eclipse.ui.texteditor.ruler.actions">
+         <action
+               label="%Dummy.label"
+               helpContextId="org.eclipse.ui.bookmark_action_context"
+               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
+               actionID="RulerDoubleClick"
+               id="org.eclipse.ui.texteditor.BookmarkRulerAction">
+         </action>
+      </editorContribution>
    </extension>
    <extension
          point="org.eclipse.ui.preferencePages">
@@ -530,18 +530,18 @@ Temporarily replaced until errors can be ironed out...
             class="net.sourceforge.phpeclipse.PHPOutlinePreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPOutlinePreferencePage">
       </page>
-      <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>
+            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>            
+      </page>
    </extension>
    <extension
          point="org.eclipse.ui.documentProviders">
@@ -619,42 +619,65 @@ Temporarily replaced until errors can be ironed out...
 <!-- =========================================================================== -->
 <!-- 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
+         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">
+         </accelerator>
+<!-- source -->
+         <accelerator
+               key="Ctrl+/"
+               id="net.sourceforge.phpeclipse.phpeditor.comment">
+         </accelerator>
+         <accelerator
+               key="Ctrl+\"
+               id="net.sourceforge.phpeclipse.phpeditor.uncomment">
+         </accelerator>
+      </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">
+         </accelerator>
+<!-- source -->
+         <accelerator
+               key="Ctrl+/"
+               id="net.sourceforge.phpeclipse.phpeditor.comment">
+         </accelerator>
+         <accelerator
+               key="Ctrl+\"
+               id="net.sourceforge.phpeclipse.phpeditor.uncomment">
+         </accelerator>
+      </acceleratorSet>
+      <acceleratorSet
+            scopeId="org.eclipse.ui.textEditorScope"
+            configurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
+<!-- edit -->
+         <accelerator
+               platform="carbon"
+               key="Command+1"
+               id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals">
+         </accelerator>
+<!-- source -->
+         <accelerator
+               platform="carbon"
+               key="Command+/"
+               id="net.sourceforge.phpeclipse.phpeditor.comment">
+         </accelerator>
+         <accelerator
+               platform="carbon"
+               key="Command+\"
+               id="net.sourceforge.phpeclipse.phpeditor.uncomment">
+         </accelerator>
+      </acceleratorSet>
    </extension>
-    
+
 </plugin>

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPPerspectiveFactory.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPPerspectiveFactory.java
index d489d3d..30019d3 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPPerspectiveFactory.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPPerspectiveFactory.java
@@ -1,9 +1,11 @@
 package net.sourceforge.phpeclipse;
 
 import org.eclipse.debug.ui.IDebugUIConstants;
+import org.eclipse.swt.SWT;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
+import org.eclipse.update.internal.ui.UpdatePerspective;
 
 public class PHPPerspectiveFactory implements IPerspectiveFactory {
 
@@ -20,22 +22,37 @@ public class PHPPerspectiveFactory implements IPerspectiveFactory {
     folder.addView(IPageLayout.ID_RES_NAV);
     //folder.addPlaceholder(IPageLayout.ID_RES_NAV);
 
-    IFolderLayout consoleArea = layout.createFolder("consoleArea", IPageLayout.BOTTOM, (float) 0.75, editorArea);
+    IFolderLayout consoleArea =
+      layout.createFolder(
+        "consoleArea",
+        IPageLayout.BOTTOM,
+        (float) 0.75,
+        editorArea);
 
     consoleArea.addView(IPageLayout.ID_TASK_LIST);
     consoleArea.addView(IDebugUIConstants.ID_CONSOLE_VIEW);
+    if (SWT.getPlatform().equals("win32")) {
+      consoleArea.addView(UpdatePerspective.ID_BROWSER);
+    }
     consoleArea.addView(IPageLayout.ID_BOOKMARKS);
 
-    layout.addView(IPageLayout.ID_OUTLINE, IPageLayout.RIGHT, (float) 0.75, editorArea);
+    layout.addView( 
+      IPageLayout.ID_OUTLINE,
+      IPageLayout.RIGHT,
+      (float) 0.75,
+      editorArea);
 
     layout.addActionSet(IDebugUIConstants.LAUNCH_ACTION_SET);
-       layout.addActionSet(IPageLayout.ID_NAVIGATE_ACTION_SET);
-       layout.addActionSet(PHPeclipsePlugin.PHP_CODING_ACTION_SET_ID);
-       
+    layout.addActionSet(IPageLayout.ID_NAVIGATE_ACTION_SET);
+    layout.addActionSet(PHPeclipsePlugin.PHP_CODING_ACTION_SET_ID);
+
     layout.addShowViewShortcut(IDebugUIConstants.ID_CONSOLE_VIEW);
+    if (SWT.getPlatform().equals("win32")) {
+      layout.addShowViewShortcut(UpdatePerspective.ID_BROWSER);
+    }
+
+    // layout.addShowViewShortcut(PHPeclipsePlugin.PHP_RESOURCES_VIEW_ID);
 
-   // layout.addShowViewShortcut(PHPeclipsePlugin.PHP_RESOURCES_VIEW_ID);
-       
     // views - standard workbench
     layout.addShowViewShortcut(IPageLayout.ID_OUTLINE);
     layout.addShowViewShortcut(IPageLayout.ID_TASK_LIST);