avoid NPE

[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..1b9238d 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,52 @@
-
 package net.sourceforge.phpeclipse;
+import net.sourceforge.phpeclipse.views.browser.BrowserView;
 
 import org.eclipse.debug.ui.IDebugUIConstants;
+import org.eclipse.search.ui.SearchUI;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
-
+import org.eclipse.ui.console.IConsoleConstants;
+//import org.eclipse.update.internal.ui.UpdatePerspective;
 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$
+  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);
-    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);
+    //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(SearchUI.SEARCH_RESULT_VIEW_ID);
+    outputfolder.addView(IConsoleConstants.ID_CONSOLE_VIEW);
+    outputfolder.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.addShowViewShortcut(BrowserView.ID_BROWSER);
+    // views - search
+    layout.addShowViewShortcut(SearchUI.SEARCH_RESULT_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.jdt.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$
-       }
-
+  }
 }