removed NPE in XMLPreferenceInitializer

[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 8e709d8..e7352d7 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPPerspectiveFactory.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPPerspectiveFactory.java
@@ -1,11 +1,17 @@
 package net.sourceforge.phpeclipse;
 
+import net.sourceforge.phpeclipse.webbrowser.views.BrowserView;
+
 import org.eclipse.debug.ui.IDebugUIConstants;
+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();
@@ -13,37 +19,44 @@ public class PHPPerspectiveFactory implements IPerspectiveFactory {
 
   public void createInitialLayout(IPageLayout layout) {
     String editorArea = layout.getEditorArea();
-
-    //         IFolderLayout phpResourcesArea = layout.createFolder("phpresourcesarea", IPageLayout.LEFT, (float)0.25, editorArea);
+    //         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 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);
-    consoleArea.addView(IPageLayout.ID_BOOKMARKS);
-
-    layout.addView(IPageLayout.ID_OUTLINE, IPageLayout.RIGHT, (float) 0.75, editorArea);
-
+    //folder.addPlaceholder(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.addActionSet(PHPeclipsePlugin.PHP_CODING_ACTION_SET_ID);
-       
-    layout.addShowViewShortcut(IDebugUIConstants.ID_CONSOLE_VIEW);
+    layout.addActionSet(IPageLayout.ID_NAVIGATE_ACTION_SET);
+    layout.addShowViewShortcut(BrowserView.ID_BROWSER);
+
+    //  views - search
+    layout.addShowViewShortcut(NewSearchUI.SEARCH_VIEW_ID);
 
-   // layout.addShowViewShortcut(PHPeclipsePlugin.PHP_RESOURCES_VIEW_ID);
-       
+    // views - debugging
+    layout.addShowViewShortcut(IConsoleConstants.ID_CONSOLE_VIEW);
     // views - standard workbench
     layout.addShowViewShortcut(IPageLayout.ID_OUTLINE);
-    layout.addShowViewShortcut(IPageLayout.ID_TASK_LIST);
-    layout.addShowViewShortcut(IPageLayout.ID_BOOKMARKS);
-
+    layout.addShowViewShortcut(IPageLayout.ID_PROBLEM_VIEW);
+    layout.addShowViewShortcut(IPageLayout.ID_RES_NAV);
     // 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("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