some bugfixes

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / PHPPerspectiveFactory.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPPerspectiveFactory.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPPerspectiveFactory.java
index cc41bb1..30019d3 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPPerspectiveFactory.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPPerspectiveFactory.java
@@ -1,48 +1,66 @@
-
 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 {
 
-       public PHPPerspectiveFactory() {
-               super();
-       }
+  public PHPPerspectiveFactory() {
+    super();
+  }
+
+  public void createInitialLayout(IPageLayout layout) {
+    String editorArea = layout.getEditorArea();
 
-       public void createInitialLayout(IPageLayout layout) {
-               String editorArea = layout.getEditorArea();
-               
-//             IFolderLayout phpResourcesArea = layout.createFolder("phpresourcesarea", IPageLayout.LEFT, (float)0.25, editorArea);
-//             phpResourcesArea.addView(PHPeclipsePlugin.PHP_RESOURCES_VIEW_ID);
-               IFolderLayout folder= layout.createFolder("left", IPageLayout.LEFT, (float)0.25, editorArea); //$NON-NLS-1$
+    //         IFolderLayout phpResourcesArea = layout.createFolder("phpresourcesarea", IPageLayout.LEFT, (float)0.25, editorArea);
+    //         phpResourcesArea.addView(PHPeclipsePlugin.PHP_RESOURCES_VIEW_ID);
+    IFolderLayout folder = layout.createFolder("left", IPageLayout.LEFT, (float) 0.25, editorArea); //$NON-NLS-1$
     folder.addView(IPageLayout.ID_RES_NAV);
-    folder.addPlaceholder(IPageLayout.ID_RES_NAV);
-    
-               IFolderLayout consoleArea = layout.createFolder("consoleArea", IPageLayout.BOTTOM, (float)0.75, editorArea);
-               
-               consoleArea.addView(IPageLayout.ID_TASK_LIST);
+    //folder.addPlaceholder(IPageLayout.ID_RES_NAV);
+
+    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.addActionSet(IDebugUIConstants.LAUNCH_ACTION_SET);
-               
-               layout.addShowViewShortcut(IDebugUIConstants.ID_CONSOLE_VIEW);
-
-               layout.addShowViewShortcut(PHPeclipsePlugin.PHP_RESOURCES_VIEW_ID);
-    
+
+    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.addShowViewShortcut(IDebugUIConstants.ID_CONSOLE_VIEW);
+    if (SWT.getPlatform().equals("win32")) {
+      layout.addShowViewShortcut(UpdatePerspective.ID_BROWSER);
+    }
+
+    // layout.addShowViewShortcut(PHPeclipsePlugin.PHP_RESOURCES_VIEW_ID);
+
     // views - standard workbench
     layout.addShowViewShortcut(IPageLayout.ID_OUTLINE);
     layout.addShowViewShortcut(IPageLayout.ID_TASK_LIST);
     layout.addShowViewShortcut(IPageLayout.ID_BOOKMARKS);
-    
+
     // new actions - PHP project creation wizards
-    layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.folder");//$NON-NLS-1$
-    layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.file");//$NON-NLS-1$
-       }
+    layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.folder"); //$NON-NLS-1$
+    layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.file"); //$NON-NLS-1$
+  }
 
 }