reverted previous fix, it was bogus; applied similar changes at better location

[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 1b9238d..e7352d7 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPPerspectiveFactory.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPPerspectiveFactory.java
@@ -1,17 +1,22 @@
 package net.sourceforge.phpeclipse;
-import net.sourceforge.phpeclipse.views.browser.BrowserView;
+
+import net.sourceforge.phpeclipse.webbrowser.views.BrowserView;
 
 import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.search.ui.SearchUI;
+import org.eclipse.search.ui.NewSearchUI;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
 import org.eclipse.ui.console.IConsoleConstants;
+import org.eclipse.core.internal.content.ContentType;
 //import org.eclipse.update.internal.ui.UpdatePerspective;
 public class PHPPerspectiveFactory implements IPerspectiveFactory {
+  public static final String ID_PROGRESS_VIEW= "org.eclipse.ui.views.ProgressView"; // see bug 63563  //$NON-NLS-1$
+
   public PHPPerspectiveFactory() {
     super();
   }
+
   public void createInitialLayout(IPageLayout layout) {
     String editorArea = layout.getEditorArea();
     //         IFolderLayout phpResourcesArea = layout.createFolder("phpresourcesarea",
@@ -24,17 +29,22 @@ public class PHPPerspectiveFactory implements IPerspectiveFactory {
     IFolderLayout outputfolder = layout.createFolder("bottom",
         IPageLayout.BOTTOM, (float) 0.75, editorArea); //$NON-NLS-1$
     outputfolder.addView(IPageLayout.ID_PROBLEM_VIEW);
-    outputfolder.addPlaceholder(SearchUI.SEARCH_RESULT_VIEW_ID);
+
+    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(SearchUI.SEARCH_RESULT_VIEW_ID);
+
+    //  views - search
+    layout.addShowViewShortcut(NewSearchUI.SEARCH_VIEW_ID);
+
     // views - debugging
     layout.addShowViewShortcut(IConsoleConstants.ID_CONSOLE_VIEW);
     // views - standard workbench
@@ -42,11 +52,11 @@ public class PHPPerspectiveFactory implements IPerspectiveFactory {
     layout.addShowViewShortcut(IPageLayout.ID_PROBLEM_VIEW);
     layout.addShowViewShortcut(IPageLayout.ID_RES_NAV);
     // new actions - PHP project creation wizards
-    //         layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard");
+    //         layout.addNewWizardShortcut("net.sourceforge.phpdt.ui.wizards.NewInterfaceCreationWizard");
     // //$NON-NLS-1$
     layout
         .addNewWizardShortcut("net.sourceforge.phpeclipse.wizards.PHPFileWizard"); //$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$
   }
-}
+}
\ No newline at end of file