# HG changeset patch # User Jaroslav Tulach # Date 1449701907 -3600 # Node ID 1122c615fffd7a789aaced554a376d7e5a007462 # Parent 6f1a8b251b7d1402a70422f10af556e058be77d6 #257086: Use inPckName to propertly specify the name of the static method diff -r 6f1a8b251b7d -r 1122c615fffd json/src/main/java/org/netbeans/html/json/impl/ModelProcessor.java --- a/json/src/main/java/org/netbeans/html/json/impl/ModelProcessor.java Mon Sep 21 21:19:13 2015 +0200 +++ b/json/src/main/java/org/netbeans/html/json/impl/ModelProcessor.java Wed Dec 09 23:58:27 2015 +0100 @@ -607,6 +607,7 @@ { Collection 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); @@ -950,7 +951,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 6f1a8b251b7d -r 1122c615fffd json/src/test/java/net/java/html/json/ModelTest.java --- a/json/src/test/java/net/java/html/json/ModelTest.java Mon Sep 21 21:19:13 2015 +0200 +++ b/json/src/test/java/net/java/html/json/ModelTest.java Wed Dec 09 23:58:27 2015 +0100 @@ -349,6 +349,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 { private final List mutated = new ArrayList();