1.1 --- a/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/fximpl/FXBrwsr.java	Fri May 31 09:12:10 2013 +0200
     1.2 +++ b/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/fximpl/FXBrwsr.java	Sat Jun 08 12:09:10 2013 +0200
     1.3 @@ -27,20 +27,13 @@
     1.4  import javafx.beans.value.ObservableValue;
     1.5  import javafx.event.ActionEvent;
     1.6  import javafx.event.EventHandler;
     1.7 -import javafx.geometry.HPos;
     1.8  import javafx.geometry.Insets;
     1.9  import javafx.geometry.Pos;
    1.10 -import javafx.geometry.VPos;
    1.11 -import javafx.scene.Node;
    1.12  import javafx.scene.Scene;
    1.13  import javafx.scene.control.Button;
    1.14  import javafx.scene.control.ToolBar;
    1.15  import javafx.scene.layout.BorderPane;
    1.16 -import javafx.scene.layout.ColumnConstraints;
    1.17 -import javafx.scene.layout.GridPane;
    1.18  import javafx.scene.layout.HBox;
    1.19 -import javafx.scene.layout.Pane;
    1.20 -import javafx.scene.layout.Priority;
    1.21  import javafx.scene.layout.VBox;
    1.22  import javafx.scene.text.Text;
    1.23  import javafx.scene.web.WebEngine;
    1.24 @@ -58,11 +51,12 @@
    1.25   */
    1.26  public class FXBrwsr extends Application {
    1.27      private static final Logger LOG = Logger.getLogger(FXBrwsr.class.getName());
    1.28 -
    1.29 +    
    1.30      @Override
    1.31      public void start(Stage primaryStage) throws Exception {
    1.32          WebView view = new WebView();
    1.33 -        WebController wc = new WebController(view, getParameters().getUnnamed());
    1.34 +        final String nbUserDir = this.getParameters().getNamed().get("userdir"); // NOI18N
    1.35 +        WebController wc = new WebController(view, nbUserDir, getParameters().getUnnamed());
    1.36  
    1.37          final VBox vbox = new VBox();
    1.38          vbox.setAlignment( Pos.CENTER );
    1.39 @@ -79,7 +73,7 @@
    1.40          final boolean showToolbar = "true".equals(this.getParameters().getNamed().get("toolbar")); // NOI18N
    1.41          final boolean useFirebug = "true".equals(this.getParameters().getNamed().get("firebug")); // NOI18N
    1.42          if (showToolbar) {
    1.43 -            final ToolBar toolbar = new BrowserToolbar(view, vbox, useFirebug);
    1.44 +            final ToolBar toolbar = new BrowserToolbar(view, vbox, useFirebug, wc.dbg);
    1.45              root.setTop( toolbar );
    1.46          }
    1.47          root.setCenter(hbox);
    1.48 @@ -96,8 +90,11 @@
    1.49       */
    1.50      private static class WebController {
    1.51          private final JVMBridge bridge = new JVMBridge();
    1.52 +        private final WebDebug dbg;
    1.53 +        private final String ud;
    1.54  
    1.55 -        public WebController(WebView view, List<String> params) {
    1.56 +        public WebController(WebView view, String ud, List<String> params) {
    1.57 +            this.ud = ud;
    1.58              LOG.log(Level.INFO, "Initializing WebView with {0}", params);
    1.59              final WebEngine eng = view.getEngine();
    1.60              try {
    1.61 @@ -140,6 +137,15 @@
    1.62                      dialogStage.showAndWait();
    1.63                  }
    1.64              });
    1.65 +            WebDebug wd = null;
    1.66 +            try {
    1.67 +                if (ud != null) {
    1.68 +                    wd = WebDebug.create(eng.impl_getDebugger(), ud);
    1.69 +                }
    1.70 +            } catch (Exception ex) {
    1.71 +                LOG.log(Level.WARNING, null, ex);
    1.72 +            }
    1.73 +            this.dbg = wd;
    1.74          }
    1.75  
    1.76          boolean initBck2Brwsr(WebEngine webEngine) {