Modified: 1764120 - Variables View doesn't show global vars in class context

[phpeclipse.git] / net.sourceforge.phpeclipse.webbrowser / src / net / sourceforge / phpeclipse / webbrowser / WebBrowser.java

diff --git a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/WebBrowser.java b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/WebBrowser.java
index e348805..69c82a7 100644 (file)
--- a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/WebBrowser.java
+++ b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/WebBrowser.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+ �*
  * Contributors:
  *    IBM - Initial API and implementation
  */
@@ -13,13 +13,18 @@ package net.sourceforge.phpeclipse.webbrowser;
 import java.net.URL;
 import java.util.List;
 
-import net.sourceforge.phpeclipse.webbrowser.internal.*;
+import net.sourceforge.phpeclipse.webbrowser.internal.BrowserManager;
+import net.sourceforge.phpeclipse.webbrowser.internal.ExternalWebBrowserWorkingCopy;
+import net.sourceforge.phpeclipse.webbrowser.internal.Trace;
+import net.sourceforge.phpeclipse.webbrowser.internal.WebBrowserEditor;
+import net.sourceforge.phpeclipse.webbrowser.internal.WebBrowserUIPlugin;
+import net.sourceforge.phpeclipse.webbrowser.internal.WebBrowserUtil;
 
 import org.eclipse.swt.widgets.Display;
+
 /**
- * The main interface to the internal Web browser. If allows
- * you to query the file types supported by the Web browser
- * and open a URL.
+ * The main interface to the internal Web browser. If allows you to query the
+ * file types supported by the Web browser and open a URL.
  */
 public class WebBrowser {
        /**
@@ -30,9 +35,9 @@ public class WebBrowser {
        }
 
        /**
-        * Returns true if the internal Web browser is supported on this
-        * platform and the user has chosen to use it.
-        *
+        * Returns true if the internal Web browser is supported on this platform
+        * and the user has chosen to use it.
+        * 
         * @return boolean
         */
        public static boolean isUsingInternalBrowser() {
@@ -40,22 +45,22 @@ public class WebBrowser {
        }
 
        /**
-        * Display the given URL in a Web browser. If the user has chosen not
-        * to use the internal browser, an external browser will be used. If
-        * not, a browser in the current page will be reused if forceNewPage
-        * is not true and the user preference is not set. Finally, showToolbar
-        * will decide when the toolbar should be shown in the internal browser.
-        *
+        * Display the given URL in a Web browser. If the user has chosen not to use
+        * the internal browser, an external browser will be used. If not, a browser
+        * in the current page will be reused if forceNewPage is not true and the
+        * user preference is not set. Finally, showToolbar will decide when the
+        * toolbar should be shown in the internal browser.
+        * 
         * @param input
         */
        public static void openURL(final IWebBrowserEditorInput input) {
                Trace.trace(Trace.FINEST, "openURL() " + input);
                if (input == null)
                        return;
-       
+
                Display.getDefault().asyncExec(new Runnable() {
                        public void run() {
-                               if (!isUsingInternalBrowser()){
+                               if (!isUsingInternalBrowser()) {
                                        IWebBrowser browser = getCurrentWebBrowser();
                                        browser.openURL(input.getURL());
                                } else
@@ -102,8 +107,9 @@ public class WebBrowser {
 
        /**
         * Display the given URL in a Web browser.
-        *
-        * @param url java.net.URL
+        * 
+        * @param url
+        *            java.net.URL
         */
        public static void openURL(URL url) {
                IWebBrowser browser = getCurrentWebBrowser();
@@ -112,7 +118,8 @@ public class WebBrowser {
                else {
                        Display.getDefault().asyncExec(new Runnable() {
                                public void run() {
-                                       WebBrowserUtil.openError(WebBrowserUIPlugin.getResource("%errorNoBrowser"));
+                                       WebBrowserUtil.openError(WebBrowserUIPlugin
+                                                       .getResource("%errorNoBrowser"));
                                }
                        });
                }