# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1449701996 -3600
# Node ID cda94194f901dcc38f7feaf31cbd10cfb7d0167b
# Parent  2f6f1d20fa7a865b52955cc2d01544c4844db93f# Parent  1122c615fffd7a789aaced554a376d7e5a007462
Merge of #257086 into default branch

diff -r 2f6f1d20fa7a -r cda94194f901 json/src/main/java/org/netbeans/html/json/impl/ModelProcessor.java
--- a/json/src/main/java/org/netbeans/html/json/impl/ModelProcessor.java	Wed Dec 02 08:44:31 2015 +0100
+++ b/json/src/main/java/org/netbeans/html/json/impl/ModelProcessor.java	Wed Dec 09 23:59:56 2015 +0100
@@ -654,6 +654,7 @@
                 {
                     Collection<String> dependants = functionDeps.get(p.name());
                     if (dependants != null) {
+                        w.append("    ");
                         w.append(className).append(" model = ").append(className).append(".this;\n");
                         for (String call : dependants) {
                             w.append("  ").append(call);
@@ -1003,7 +1004,7 @@
 
             for (String pn : onPC.value()) {
                 StringBuilder call = new StringBuilder();
-                call.append("  ").append(clazz.getSimpleName()).append(".").append(n).append("(");
+                call.append("  ").append(inPckName(clazz)).append(".").append(n).append("(");
                 call.append(wrapPropName(e, className, "name", pn));
                 call.append(");\n");
 
diff -r 2f6f1d20fa7a -r cda94194f901 json/src/test/java/net/java/html/json/ModelTest.java
--- a/json/src/test/java/net/java/html/json/ModelTest.java	Wed Dec 02 08:44:31 2015 +0100
+++ b/json/src/test/java/net/java/html/json/ModelTest.java	Wed Dec 09 23:59:56 2015 +0100
@@ -359,6 +359,16 @@
         assertEquals(first, "1st");
         assertEquals(last, "2nd");
     }
+    
+    @Model(className = "Inner", properties = {
+        @Property(name = "x", type = int.class)
+    })
+    static final class InnerCntrl {
+        @OnPropertyChange("x")
+        static void increment(Inner model) {
+            model.setX(model.getX() + 1);
+        }
+    }
 
     private static class MockTechnology implements Technology<Object> {
         private final List<String> mutated = new ArrayList<String>();