Expose less from the FnUtils signature
authorJaroslav Tulach <jaroslav.tulach@netbeans.org>
Sun, 12 Jan 2014 07:41:23 +0100
changeset 4557782138f7491
parent 454 2e91df8f6114
child 456 81cb90970dd3
Expose less from the FnUtils signature
boot/src/main/java/org/netbeans/html/boot/impl/FnUtils.java
     1.1 --- a/boot/src/main/java/org/netbeans/html/boot/impl/FnUtils.java	Sat Jan 11 13:22:30 2014 +0100
     1.2 +++ b/boot/src/main/java/org/netbeans/html/boot/impl/FnUtils.java	Sun Jan 12 07:41:23 2014 +0100
     1.3 @@ -69,7 +69,7 @@
     1.4   *
     1.5   * @author Jaroslav Tulach <jtulach@netbeans.org>
     1.6   */
     1.7 -public final class FnUtils implements Fn.Presenter {
     1.8 +public final class FnUtils {
     1.9      
    1.10      private FnUtils() {
    1.11      }
    1.12 @@ -79,7 +79,7 @@
    1.13              return true;
    1.14          }
    1.15          Class<?> clazz;
    1.16 -        Closeable c = Fn.activate(new FnUtils());
    1.17 +        Closeable c = Fn.activate(new TrueFn());
    1.18          try {
    1.19              try {
    1.20                  clazz = Class.forName(Test.class.getName(), true, l);
    1.21 @@ -171,19 +171,6 @@
    1.22              throw new IllegalStateException("Can't execute " + resource, ex);
    1.23          } 
    1.24      }
    1.25 -
    1.26 -    @Override
    1.27 -    public Fn defineFn(String code, String... names) {
    1.28 -        return new TrueFn();
    1.29 -    }
    1.30 -
    1.31 -    @Override
    1.32 -    public void displayPage(URL page, Runnable onPageLoad) {
    1.33 -    }
    1.34 -
    1.35 -    @Override
    1.36 -    public void loadScript(Reader code) throws Exception {
    1.37 -    }
    1.38      
    1.39      private static final class FindInClass extends ClassVisitor {
    1.40          private String name;
    1.41 @@ -611,10 +598,23 @@
    1.42          return arr;
    1.43      }
    1.44  
    1.45 -    private static final class TrueFn extends Fn {
    1.46 +    private static final class TrueFn extends Fn implements Fn.Presenter {
    1.47          @Override
    1.48          public Object invoke(Object thiz, Object... args) throws Exception {
    1.49              return Boolean.TRUE;
    1.50          }
    1.51 +
    1.52 +        @Override
    1.53 +        public Fn defineFn(String code, String... names) {
    1.54 +            return this;
    1.55 +        }
    1.56 +
    1.57 +        @Override
    1.58 +        public void displayPage(URL page, Runnable onPageLoad) {
    1.59 +        }
    1.60 +
    1.61 +        @Override
    1.62 +        public void loadScript(Reader code) throws Exception {
    1.63 +        }
    1.64      } // end of TrueFn
    1.65  }