1.1 --- a/boot-fx/src/main/java/org/netbeans/html/boot/fx/AbstractFXPresenter.java	Wed Jun 24 23:51:08 2015 +0200
     1.2 +++ b/boot-fx/src/main/java/org/netbeans/html/boot/fx/AbstractFXPresenter.java	Wed Jul 01 23:21:56 2015 +0200
     1.3 @@ -152,9 +152,24 @@
     1.4          }
     1.5      }
     1.6  
     1.7 +    private static String findCalleeClassName() {
     1.8 +        for (StackTraceElement e : new Exception().getStackTrace()) {
     1.9 +            String cn = e.getClassName();
    1.10 +            if (cn.startsWith("org.netbeans.html")) {
    1.11 +                continue;
    1.12 +            }
    1.13 +            if (cn.startsWith("net.java.html")) {
    1.14 +                continue;
    1.15 +            }
    1.16 +            return cn;
    1.17 +        }
    1.18 +        return "org.netbeans.html";
    1.19 +    }
    1.20 +
    1.21      @Override
    1.22      public void displayPage(final URL resource, final Runnable onLoad) {
    1.23          this.onLoad = onLoad;
    1.24 +        System.err.println("className: " + findCalleeClassName());
    1.25          final WebView view = findView(resource);
    1.26          this.engine = view.getEngine();
    1.27          boolean inspectOn = false;

     2.1 --- a/json/src/main/java/org/netbeans/html/json/impl/ModelProcessor.java	Wed Jun 24 23:51:08 2015 +0200
     2.2 +++ b/json/src/main/java/org/netbeans/html/json/impl/ModelProcessor.java	Wed Jul 01 23:21:56 2015 +0200
     2.3 @@ -1293,7 +1293,7 @@
     2.4          body.append(
     2.5              "    case " + index + ": {\n" +
     2.6              "      if (type == 0) { /* on open */\n" +
     2.7 -            "        ").append(clazz.getSimpleName()).append(".").append(n).append("(");
     2.8 +            "        ").append(inPckName(clazz)).append(".").append(n).append("(");
     2.9          {
    2.10              String sep = "";
    2.11              for (String arg : args) {
    2.12 @@ -1320,7 +1320,7 @@
    2.13              if (!findOnError(e, ((TypeElement)clazz), onR.onError(), className)) {
    2.14                  return true;
    2.15              }
    2.16 -            body.append("        ").append(clazz.getSimpleName()).append(".").append(onR.onError()).append("(");
    2.17 +            body.append("        ").append(inPckName(clazz)).append(".").append(onR.onError()).append("(");
    2.18              body.append("model, value);\n");
    2.19          }
    2.20          body.append(
    2.21 @@ -1341,7 +1341,7 @@
    2.22              "        TYPE.copyJSON(model.proto.getContext(), ev, " + modelClass + ".class, arr);\n"
    2.23          );
    2.24          {
    2.25 -            body.append("        ").append(clazz.getSimpleName()).append(".").append(n).append("(");
    2.26 +            body.append("        ").append(inPckName(clazz)).append(".").append(n).append("(");
    2.27              String sep = "";
    2.28              for (String arg : args) {
    2.29                  body.append(sep);
    2.30 @@ -1356,7 +1356,7 @@
    2.31          );
    2.32          if (!onR.onError().isEmpty()) {
    2.33              body.append(" else if (type == 3) { /* on close */\n");
    2.34 -            body.append("        ").append(clazz.getSimpleName()).append(".").append(onR.onError()).append("(");
    2.35 +            body.append("        ").append(inPckName(clazz)).append(".").append(onR.onError()).append("(");
    2.36              body.append("model, null);\n");
    2.37              body.append(
    2.38                  "        return;" +

     3.1 --- a/json/src/test/java/net/java/html/json/PersonImpl.java	Wed Jun 24 23:51:08 2015 +0200
     3.2 +++ b/json/src/test/java/net/java/html/json/PersonImpl.java	Wed Jul 01 23:21:56 2015 +0200
     3.3 @@ -44,7 +44,6 @@
     3.4  
     3.5  import java.io.IOException;
     3.6  import java.util.Arrays;
     3.7 -import java.util.HashSet;
     3.8  import java.util.List;
     3.9  
    3.10  /**
    3.11 @@ -102,6 +101,10 @@
    3.12          @ModelOperation static void addAge42(People p) {
    3.13              p.getAge().add(42);
    3.14          }
    3.15 +
    3.16 +        @OnReceive(url = "url", method = "WebSocket", data = String.class)
    3.17 +        static void innerClass(People p, String d) {
    3.18 +        }
    3.19          
    3.20          @Function static void inInnerClass(People p, Person data, int x, double y, String nick) throws IOException {
    3.21              p.getInfo().add(data);