1) Fixed issue #779: PHPEclipse reports error with a correct try/catch block

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / ui / actions / OpenPHPPerspectiveAction.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/actions/OpenPHPPerspectiveAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/actions/OpenPHPPerspectiveAction.java
index 238f7a9..1583139 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/actions/OpenPHPPerspectiveAction.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/actions/OpenPHPPerspectiveAction.java
@@ -12,6 +12,7 @@ package net.sourceforge.phpdt.ui.actions;
 
 import net.sourceforge.phpdt.internal.ui.actions.ActionMessages;
 import net.sourceforge.phpdt.internal.ui.util.ExceptionHandler;
+import net.sourceforge.phpdt.ui.JavaUI;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -37,24 +38,31 @@ public class OpenPHPPerspectiveAction extends Action {
         * Create a new <code>OpenPHPPerspectiveAction</code>.
         */
        public OpenPHPPerspectiveAction() {
-//             WorkbenchHelp.setHelp(this, IJavaHelpContextIds.OPEN_JAVA_PERSPECTIVE_ACTION);
+               // WorkbenchHelp.setHelp(this,
+               // IJavaHelpContextIds.OPEN_JAVA_PERSPECTIVE_ACTION);
        }
 
        public void run() {
-               IWorkbench workbench= PHPeclipsePlugin.getDefault().getWorkbench();
-               IWorkbenchWindow window= workbench.getActiveWorkbenchWindow();
-               IWorkbenchPage page= window.getActivePage();
+               IWorkbench workbench = PHPeclipsePlugin.getDefault().getWorkbench();
+               IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
+               IWorkbenchPage page = window.getActivePage();
                IAdaptable input;
                if (page != null)
-                       input= page.getInput();
+                       input = page.getInput();
                else
-                       input= ResourcesPlugin.getWorkspace().getRoot();
+                       input = ResourcesPlugin.getWorkspace().getRoot();
                try {
-                       workbench.showPerspective(PHPeclipsePlugin.ID_PERSPECTIVE, window, input);
+                       workbench.showPerspective(JavaUI.ID_PERSPECTIVE, window,
+                                       input);
                } catch (WorkbenchException e) {
-                       ExceptionHandler.handle(e, window.getShell(), 
-                               ActionMessages.getString("OpenPHPPerspectiveAction.dialog.title"), //$NON-NLS-1$
-                               ActionMessages.getString("OpenPHPPerspectiveAction.error.open_failed")); //$NON-NLS-1$
+                       ExceptionHandler
+                                       .handle(
+                                                       e,
+                                                       window.getShell(),
+                                                       ActionMessages
+                                                                       .getString("OpenPHPPerspectiveAction.dialog.title"), //$NON-NLS-1$
+                                                       ActionMessages
+                                                                       .getString("OpenPHPPerspectiveAction.error.open_failed")); //$NON-NLS-1$
                }
        }
 }