1.1 --- a/boot/src/main/java/org/apidesign/html/boot/impl/FnUtils.java	Thu Sep 12 09:33:50 2013 +0200
     1.2 +++ b/boot/src/main/java/org/apidesign/html/boot/impl/FnUtils.java	Thu Oct 10 14:02:18 2013 +0200
     1.3 @@ -35,13 +35,12 @@
     1.4   * @author Jaroslav Tulach <jtulach@netbeans.org>
     1.5   */
     1.6  public final class FnUtils {
     1.7 -    private static final ThreadLocal<Fn.Presenter> CURRENT = new ThreadLocal<Fn.Presenter>();
     1.8      
     1.9      private FnUtils() {
    1.10      }
    1.11      
    1.12      public static Fn define(Class<?> caller, String code, String... names) {
    1.13 -        return currentPresenter().defineFn(code, names);
    1.14 +        return FnContext.currentPresenter().defineFn(code, names);
    1.15      }
    1.16      
    1.17      public static boolean isJavaScriptCapable(ClassLoader l) {
    1.18 @@ -120,18 +119,4 @@
    1.19              throw new IllegalStateException("Can't execute " + resource, ex);
    1.20          } 
    1.21      }
    1.22 -
    1.23 -    public static Fn.Presenter currentPresenter() {
    1.24 -        Fn.Presenter p = CURRENT.get();
    1.25 -        if (p == null) {
    1.26 -            throw new IllegalStateException("No current WebView context around!");
    1.27 -        }
    1.28 -        return p;
    1.29 -    }
    1.30 -    
    1.31 -    public static Fn.Presenter currentPresenter(Fn.Presenter p) {
    1.32 -        Fn.Presenter prev = CURRENT.get();
    1.33 -        CURRENT.set(p);
    1.34 -        return prev;
    1.35 -    }
    1.36  }