Merge branch 'master' of ssh://git.phpeclipse.com/phpeclipse

Pulling in different changes

diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/BrowserUtil.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/BrowserUtil.java
index fa3be6f..f905c83 100644 (file)
--- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/BrowserUtil.java
+++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/BrowserUtil.java
@@ -127,34 +127,34 @@ public class BrowserUtil {
                                // return;
                                // }
                                // localhostURL += postFix;
-                               ShowInContext context = getShowInContext(previewFile,
-                                               forceDBGPreview, postFix);
+                               ShowInContext context = getShowInContext (previewFile, forceDBGPreview, postFix);
                                IWorkbenchPart sourcePart = page.getActivePart();
+                               
                                if (sourcePart == null && context != null) {
                                        return;
                                }
 
                                // try {
-                               Perspective persp = ((WorkbenchPage) page)
-                                               .getActivePerspective();
+/* Don't know what this is for, but I removed it by now because of some compile errors!                        
+                               Perspective persp = ((WorkbenchPage) page).getActivePerspective();
                                if (persp != null) {
-
                                        // If this view is already visible just return.
-                                       IViewReference ref = persp.findView(BrowserView.ID_BROWSER,
-                                                       null);
+                                       IViewReference ref = persp.findView (BrowserView.ID_BROWSER, null);
                                        IViewPart view = null;
+                                       
                                        if (ref != null) {
                                                view = ref.getView(true);
                                        }
+                                       
                                        if (view == null && forceDBGPreview) {
                                                try {
-                                                       view = persp.showView(BrowserView.ID_BROWSER, null);
-                                                       persp.bringToTop(persp.findView(
-                                                                       BrowserView.ID_BROWSER, null));
+                                                       view = persp.showView (BrowserView.ID_BROWSER, null);
+                                                       persp.bringToTop (persp.findView (BrowserView.ID_BROWSER, null));
                                                } catch (PartInitException e) {
                                                        WebUI.log(e);
                                                }
                                        }
+                                       
                                        if (view != null) {
                                                IShowInTarget target = getShowInTarget(view);
                                                boolean stickyBrowserURL = ProjectPrefUtil.getPreviewBooleanValue(
@@ -169,11 +169,10 @@ public class BrowserUtil {
                                                                target.show(context);
                                                        }
                                                }
-                                               ((WorkbenchPage) page)
-                                                               .performedShowIn(BrowserView.ID_BROWSER);
+                                               ((WorkbenchPage) page).performedShowIn (BrowserView.ID_BROWSER);
                                        }
                                }
-
+*/
                                // IViewPart view = page.showView(BrowserView.ID_BROWSER);
                                // IShowInTarget target = getShowInTarget(view);
                                // if (target != null && target.show(new