Added "Navigate->Show In->Navigator" and "Navigate->Show In->PHP Browser" actions.

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

diff --git a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowser.java b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowser.java
index d0b396f..1556311 100644 (file)
--- a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowser.java
+++ b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowser.java
@@ -8,21 +8,44 @@
 //TODO 2. Support printing: waiting on eclipse bug 47937/44823.
 package net.sourceforge.phpeclipse.webbrowser.internal;
 
-import java.util.*;
+import java.util.Iterator;
 
 import net.sourceforge.phpeclipse.webbrowser.IURLMap;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.browser.CloseWindowListener;
+import org.eclipse.swt.browser.LocationEvent;
+import org.eclipse.swt.browser.LocationListener;
+import org.eclipse.swt.browser.OpenWindowListener;
+import org.eclipse.swt.browser.ProgressEvent;
+import org.eclipse.swt.browser.ProgressListener;
+import org.eclipse.swt.browser.StatusTextEvent;
+import org.eclipse.swt.browser.StatusTextListener;
+import org.eclipse.swt.browser.TitleEvent;
+import org.eclipse.swt.browser.TitleListener;
+import org.eclipse.swt.browser.WindowEvent;
 import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.events.*;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
+import org.eclipse.swt.widgets.ProgressBar;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
 import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.swt.browser.*;
 
 public class WebBrowser extends Composite {
   protected Composite toolbarComp;
@@ -131,7 +154,8 @@ public class WebBrowser extends Composite {
     }
 
     // create a new SWT Web browser widget, checking once again to make sure we can use it in this environment
-    if (WebBrowserUtil.canUseInternalWebBrowser() & WebBrowserUtil.isInternalBrowserOperational())
+//    if (WebBrowserUtil.canUseInternalWebBrowser() & WebBrowserUtil.isInternalBrowserOperational())
+    if (WebBrowserUtil.isInternalBrowserOperational())
       this.browser = new Browser(this, SWT.NONE);
     else {
       WebBrowserUtil.openError(WebBrowserUIPlugin.getResource("%errorCouldNotLaunchInternalWebBrowser"));
@@ -159,7 +183,7 @@ public class WebBrowser extends Composite {
   }
 
   /**
-   *  
+   *
    */
   protected void addBrowserListeners() {
     if (showStatusbar) {
@@ -262,7 +286,7 @@ public class WebBrowser extends Composite {
 
   /**
    * Return the underlying browser control.
-   * 
+   *
    * @return org.eclipse.swt.browser.Browser
    */
   public Browser getBrowser() {
@@ -270,28 +294,28 @@ public class WebBrowser extends Composite {
   }
 
   /**
-   *  
+   *
    */
   protected void forward() {
     browser.forward();
   }
 
   /**
-   *  
+   *
    */
   protected void back() {
     browser.back();
   }
 
   /**
-   *  
+   *
    */
   protected void stop() {
     browser.stop();
   }
 
   /**
-   *  
+   *
    */
   protected void navigate(String url) {
     Trace.trace(Trace.FINER, "Navigate: " + url);
@@ -397,7 +421,7 @@ public class WebBrowser extends Composite {
   }
 
   /**
-   *  
+   *
    */
   public void dispose() {
     super.dispose();
@@ -414,7 +438,7 @@ public class WebBrowser extends Composite {
 
   /**
    * Populate the toolbar.
-   * 
+   *
    * @param toolbar
    *          org.eclipse.swt.widgets.ToolBar
    */
@@ -570,7 +594,7 @@ public class WebBrowser extends Composite {
 
   /**
    * Returns true if the homepage is currently being displayed.
-   * 
+   *
    * @return boolean
    */
   protected boolean isHome() {