1.1 --- a/json/src/main/java/org/netbeans/html/json/impl/ModelProcessor.java	Mon Sep 21 21:19:13 2015 +0200
     1.2 +++ b/json/src/main/java/org/netbeans/html/json/impl/ModelProcessor.java	Wed Dec 09 23:58:27 2015 +0100
     1.3 @@ -607,6 +607,7 @@
     1.4                  {
     1.5                      Collection<String> dependants = functionDeps.get(p.name());
     1.6                      if (dependants != null) {
     1.7 +                        w.append("    ");
     1.8                          w.append(className).append(" model = ").append(className).append(".this;\n");
     1.9                          for (String call : dependants) {
    1.10                              w.append("  ").append(call);
    1.11 @@ -950,7 +951,7 @@
    1.12  
    1.13              for (String pn : onPC.value()) {
    1.14                  StringBuilder call = new StringBuilder();
    1.15 -                call.append("  ").append(clazz.getSimpleName()).append(".").append(n).append("(");
    1.16 +                call.append("  ").append(inPckName(clazz)).append(".").append(n).append("(");
    1.17                  call.append(wrapPropName(e, className, "name", pn));
    1.18                  call.append(");\n");
    1.19  

     2.1 --- a/json/src/test/java/net/java/html/json/ModelTest.java	Mon Sep 21 21:19:13 2015 +0200
     2.2 +++ b/json/src/test/java/net/java/html/json/ModelTest.java	Wed Dec 09 23:58:27 2015 +0100
     2.3 @@ -349,6 +349,16 @@
     2.4          assertEquals(first, "1st");
     2.5          assertEquals(last, "2nd");
     2.6      }
     2.7 +    
     2.8 +    @Model(className = "Inner", properties = {
     2.9 +        @Property(name = "x", type = int.class)
    2.10 +    })
    2.11 +    static final class InnerCntrl {
    2.12 +        @OnPropertyChange("x")
    2.13 +        static void increment(Inner model) {
    2.14 +            model.setX(model.getX() + 1);
    2.15 +        }
    2.16 +    }
    2.17  
    2.18      private static class MockTechnology implements Technology<Object> {
    2.19          private final List<String> mutated = new ArrayList<String>();