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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPPerspectiveFactory.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPPerspectiveFactory.java
index 0f29b99..6f59900 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPPerspectiveFactory.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPPerspectiveFactory.java
@@ -1,68 +1,61 @@
 package net.sourceforge.phpeclipse;
 
+import net.sourceforge.phpeclipse.webbrowser.views.BrowserView;
+
 import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.swt.SWT;
+import org.eclipse.search.ui.NewSearchUI;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
-//import org.eclipse.update.internal.ui.UpdatePerspective;
+import org.eclipse.ui.console.IConsoleConstants;
 
 public class PHPPerspectiveFactory implements IPerspectiveFactory {
-
-  public PHPPerspectiveFactory() {
-    super();
-  }
-
-  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$
-    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);
-    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.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.jdt.ui.wizards.NewInterfaceCreationWizard"); //$NON-NLS-1$
-		layout.addNewWizardShortcut("net.sourceforge.phpeclipse.wizards.PHPFileWizard");	 //$NON-NLS-1$
+	public static final String ID_PROGRESS_VIEW = "org.eclipse.ui.views.ProgressView"; //$NON-NLS-1$
+	// see bug 63563
+
+	public PHPPerspectiveFactory() {
+		super();
+	}
+
+	public void createInitialLayout(IPageLayout layout) {
+		String editorArea = layout.getEditorArea();
+		IFolderLayout folder = layout.createFolder("left", IPageLayout.LEFT,
+				(float) 0.25, editorArea); //$NON-NLS-1$
+		folder.addView(IPageLayout.ID_RES_NAV);
+		IFolderLayout outputfolder = layout.createFolder("bottom",
+				IPageLayout.BOTTOM, (float) 0.75, editorArea); //$NON-NLS-1$
+		outputfolder.addView(IPageLayout.ID_PROBLEM_VIEW);
+
+		outputfolder.addPlaceholder(NewSearchUI.SEARCH_VIEW_ID);
+		outputfolder.addView(IConsoleConstants.ID_CONSOLE_VIEW);
+		outputfolder.addView(IPageLayout.ID_BOOKMARKS);
+		outputfolder.addView(BrowserView.ID_BROWSER);
+		outputfolder.addPlaceholder(ID_PROGRESS_VIEW);
+
+		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.addShowViewShortcut(BrowserView.ID_BROWSER);
+
+		// views - search
+		layout.addShowViewShortcut(NewSearchUI.SEARCH_VIEW_ID);
+
+		// views - debugging
+		layout.addShowViewShortcut(IConsoleConstants.ID_CONSOLE_VIEW);
+		// views - standard workbench
+		layout.addShowViewShortcut(IPageLayout.ID_OUTLINE);
+		layout.addShowViewShortcut(IPageLayout.ID_PROBLEM_VIEW);
+		layout.addShowViewShortcut(IPageLayout.ID_RES_NAV);
+		// new actions - PHP project creation wizards
+		layout
+				.addNewWizardShortcut("net.sourceforge.phpeclipse.wizards.PHPFileWizard"); //$NON-NLS-1$
+		layout
+				.addNewWizardShortcut("net.sourceforge.phpeclipse.wizards.NewWizardProjectCreation"); //$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$
-  }
-
-}
+		// perspective shortcuts
+		layout.addPerspectiveShortcut(IDebugUIConstants.ID_DEBUG_PERSPECTIVE);
+		layout.addPerspectiveShortcut("org.eclipse.ui.resourcePerspective");
+	}
+}
\ No newline at end of file